date:20130516

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

2013-05-16 Thread Miklos Vajna

 sw/qa/extras/rtfimport/data/fdo62977.rtf   |   24 
 sw/qa/extras/rtfimport/rtfimport.cxx   |8 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 -
 3 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit 53d40e18515c78e59583f1f8fadc82ffa2ab9e32
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed May 15 09:59:18 2013 +0200

fdo#62977 allow SAL_MAX_INT16..SAL_MAX_UINT16 when importing RTF_U

(cherry picked from commit 4a816a816e8b4e213394898bd0e307dd90fcbb64)

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

Change-Id: Ie36d5881b0ebe8c38526690ca27d02bfb7af7829
Reviewed-on: https://gerrit.libreoffice.org/3913
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/qa/extras/rtfimport/data/fdo62977.rtf 
b/sw/qa/extras/rtfimport/data/fdo62977.rtf
new file mode 100644
index 000..f16135d
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo62977.rtf
@@ -0,0 +1,24 @@
+{\rtf1 \ansi 
+{\fonttbl; 
+{
+\f0 \'41\'72\'69\'61\'6c;}
+{
+\f1 \'53\'79\'6d\'62\'6f\'6c;}
+{
+\f2 \'54\'69\'6d\'65\'73\'20\'4e\'65\'77\'20\'52\'6f\'6d\'61\'6e;}
+{
+\f3 \'82\'6c\'82\'72\'20\'96\'be\'92\'a9;}
+}
+{\*\generator Apache XML Graphics RTF Library;}
+\fet0 \ftnbj \paperw11905 \paperh16837 \margt1984 \margb1700 \margl1700 
\margr1700 \itap0 \sectd \headery720 \footery720 \stextflow0 \cols1 
+{\ri0 \li0 
+{\qr \b0 \fi0 \cf1 \loch\af3 \hich\af3 \dbch\f3 \ri0 \sl420 \i0 \li0 \fs21 
+{\b0 \cf1 \loch\af3 \hich\af3 \dbch\f3 \i0 \fs21 
+{\strike0 \b0 \cf1 \loch\af3 \hich\af3 \dbch\f3 \ul0 \i0 \fs21 \sa0 \sb0 
+\u24180\'3f\u65300\'3f\u26376\'3f
+\par 
+}
+}
+}
+}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c02dac5..bbac478 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -147,6 +147,7 @@ public:
 void testFdo51916();
 void testFdo61193();
 void testFdo63023();
+void testFdo62977();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -264,6 +265,7 @@ void Test::run()
 {fdo51916.rtf, Test::testFdo51916},
 {hello.rtf, Test::testFdo61193},
 {fdo63023.rtf, Test::testFdo63023},
+{fdo62977.rtf, Test::testFdo62977},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1214,6 +1216,12 @@ void Test::testFdo63023()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0x99), 
getPropertysal_Int32(getRun(getParagraphOfText(1, xHeaderText), 1), 
CharBackColor));
 }
 
+void Test::testFdo62977()
+{
+// The middle character was imported as '?' instead of the proper unicode 
value.
+getRun(getParagraph(1), 1, 
OUString(\xE5\xB9\xB4\xEF\xBC\x94\xE6\x9C\x88, 9, RTL_TEXTENCODING_UTF8));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0a2348d..056ac08 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2971,7 +2971,10 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 m_aStates.top().nUc = nParam;
 break;
 case RTF_U:
-if ((SAL_MIN_INT16 = nParam)  (nParam = SAL_MAX_INT16))
+// sal_Unicode is unsigned 16-bit, RTF may represent that as a
+// signed SAL_MIN_INT16..SAL_MAX_INT16 or 0..SAL_MAX_UINT16. The
+// static_cast() will do the right thing.
+if ((SAL_MIN_INT16 = nParam)  (nParam = SAL_MAX_UINT16))
 {
 m_aUnicodeBuffer.append(static_castsal_Unicode(nParam));
 m_aStates.top().nCharsToSkip = m_aStates.top().nUc;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#62977 allow SAL_MAX_INT16..SAL_MAX_UINT16 when importing...

2013-05-16 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3913

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3913
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie36d5881b0ebe8c38526690ca27d02bfb7af7829
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

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

2013-05-16 Thread Fridrich Štrba

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

New commits:
commit a59d35d02b6612e2c05bcbd888c276675ac10aee
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu May 16 09:01:07 2013 +0200

Bump version

diff --git a/configure.ac b/configure.ac
index af92ee6..e099c31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libvisio_version_major],[0])
 m4_define([libvisio_version_minor],[0])
-m4_define([libvisio_version_micro],[26])
+m4_define([libvisio_version_micro],[27])
 
m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst libvisio/ExternalPackage_libvisio.mk

2013-05-16 Thread Fridrich Štrba

 download.lst |4 ++--
 libvisio/ExternalPackage_libvisio.mk |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 09269acdb98854b1892aa539efec7d6a7875ad06
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu May 16 09:18:07 2013 +0200

Uploading libvisio 0.0.27

Change-Id: Icfb2eea611ed50e76753a71c73f5d43172aa8a9a

diff --git a/download.lst b/download.lst
index 6165f69..c20f83b 100644
--- a/download.lst
+++ b/download.lst
@@ -4,8 +4,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
 MWAW_MD5SUM := 2090daf6e8a27b52e8c5f26c915bd7c5
 export MWAW_TARBALL := libmwaw-0.1.9.tar.bz2
-VISIO_MD5SUM := 2f638cf6f92cec59c9205ac3cbf1702e
-export VISIO_TARBALL := libvisio-0.0.26.tar.bz2
+VISIO_MD5SUM := 4e9a029d8390a1707eb49a1a918797ff
+export VISIO_TARBALL := libvisio-0.0.27.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
diff --git a/libvisio/ExternalPackage_libvisio.mk 
b/libvisio/ExternalPackage_libvisio.mk
index 042f10b..4baa0a4 100644
--- a/libvisio/ExternalPackage_libvisio.mk
+++ b/libvisio/ExternalPackage_libvisio.mk
@@ -10,9 +10,9 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libvisio,libvisio))
 
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libvisio,inc/external/libvisio,\
-   src/lib/libvisio.h \
-   src/lib/VisioDocument.h \
-   src/lib/VSDStringVector.h \
+   inc/libvisio/libvisio.h \
+   inc/libvisio/VisioDocument.h \
+   inc/libvisio/VSDStringVector.h \
 ))
 
 $(eval $(call gb_ExternalPackage_use_external_project,libvisio,libvisio))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download.lst libvisio/ExternalPackage_libvisio.mk

2013-05-16 Thread Fridrich Štrba

 download.lst |4 ++--
 libvisio/ExternalPackage_libvisio.mk |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 38b8cdec8a2cf408f6813e338c25d8875f34eeae
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu May 16 09:18:07 2013 +0200

Uploading libvisio 0.0.27

(cherry picked from commit 09269acdb98854b1892aa539efec7d6a7875ad06)

Conflicts:
download.lst

Change-Id: Icfb2eea611ed50e76753a71c73f5d43172aa8a9a
Reviewed-on: https://gerrit.libreoffice.org/3918
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/download.lst b/download.lst
index cf4e219..657a418 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00
 export CDR_TARBALL := libcdr-0.0.13.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
-VISIO_MD5SUM := 2f638cf6f92cec59c9205ac3cbf1702e
-export VISIO_TARBALL := libvisio-0.0.26.tar.bz2
+VISIO_MD5SUM := 4e9a029d8390a1707eb49a1a918797ff
+export VISIO_TARBALL := libvisio-0.0.27.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
diff --git a/libvisio/ExternalPackage_libvisio.mk 
b/libvisio/ExternalPackage_libvisio.mk
index 76d573a..90be9e8 100644
--- a/libvisio/ExternalPackage_libvisio.mk
+++ b/libvisio/ExternalPackage_libvisio.mk
@@ -10,9 +10,9 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libvisio,visio))
 
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libvisio,inc/external/libvisio,\
-   src/lib/libvisio.h \
-   src/lib/VisioDocument.h \
-   src/lib/VSDStringVector.h \
+   inc/libvisio/libvisio.h \
+   inc/libvisio/VisioDocument.h \
+   inc/libvisio/VSDStringVector.h \
 ))
 
 $(eval $(call gb_ExternalPackage_use_external_project,libvisio,libvisio))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] Uploading libvisio 0.0.27

2013-05-16 Thread Fridrich Strba (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3918

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/3918/1

Uploading libvisio 0.0.27

(cherry picked from commit 09269acdb98854b1892aa539efec7d6a7875ad06)

Conflicts:
download.lst

Change-Id: Icfb2eea611ed50e76753a71c73f5d43172aa8a9a
---
M download.lst
M libvisio/ExternalPackage_libvisio.mk
2 files changed, 5 insertions(+), 5 deletions(-)



diff --git a/download.lst b/download.lst
index cf4e219..657a418 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@
 export CDR_TARBALL := libcdr-0.0.13.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
-VISIO_MD5SUM := 2f638cf6f92cec59c9205ac3cbf1702e
-export VISIO_TARBALL := libvisio-0.0.26.tar.bz2
+VISIO_MD5SUM := 4e9a029d8390a1707eb49a1a918797ff
+export VISIO_TARBALL := libvisio-0.0.27.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
diff --git a/libvisio/ExternalPackage_libvisio.mk 
b/libvisio/ExternalPackage_libvisio.mk
index 76d573a..90be9e8 100644
--- a/libvisio/ExternalPackage_libvisio.mk
+++ b/libvisio/ExternalPackage_libvisio.mk
@@ -10,9 +10,9 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libvisio,visio))
 
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libvisio,inc/external/libvisio,\
-   src/lib/libvisio.h \
-   src/lib/VisioDocument.h \
-   src/lib/VSDStringVector.h \
+   inc/libvisio/libvisio.h \
+   inc/libvisio/VisioDocument.h \
+   inc/libvisio/VSDStringVector.h \
 ))
 
 $(eval $(call gb_ExternalPackage_use_external_project,libvisio,libvisio))

-- 
To view, visit https://gerrit.libreoffice.org/3918
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfb2eea611ed50e76753a71c73f5d43172aa8a9a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED libreoffice-4-0] Uploading libvisio 0.0.27

2013-05-16 Thread David Tardon (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3918

Approvals:
  David Tardon: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3918
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfb2eea611ed50e76753a71c73f5d43172aa8a9a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - reportdesign/source

2013-05-16 Thread Lionel Elie Mamane

 reportdesign/source/core/api/FixedLine.cxx|5 -
 reportdesign/source/core/api/FixedText.cxx|5 -
 reportdesign/source/core/api/FormattedField.cxx   |3 +++
 reportdesign/source/core/api/ImageControl.cxx |5 -
 reportdesign/source/core/api/ReportDefinition.cxx |4 
 reportdesign/source/core/api/Shape.cxx|5 -
 6 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 777661cedbccf69876794eb7152367401d25d4ed
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri May 3 17:47:24 2013 +0200

fdo#48056 revert part of return correct name for shapetype

Keep hardcoded values as *fallback* only, but trust 
m_aProps.aComponent.m_xShape-getShapeType when present.

Change-Id: I5a024a9bc5f87d226ab3c857817dfe91ad975acb
Reviewed-on: https://gerrit.libreoffice.org/3769
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/reportdesign/source/core/api/FixedLine.cxx 
b/reportdesign/source/core/api/FixedLine.cxx
index dee328a..9c52a5f 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -531,7 +531,10 @@ void SAL_CALL OFixedLine::setSize( const awt::Size aSize 
) throw (beans::Proper
 // XShapeDescriptor
 ::rtl::OUString SAL_CALL OFixedLine::getShapeType(  ) throw 
(uno::RuntimeException)
 {
-   return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
+::osl::MutexGuard aGuard(m_aMutex);
+if ( m_aProps.aComponent.m_xShape.is() )
+return m_aProps.aComponent.m_xShape-getShapeType();
+return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
 }
 // 
-
 ::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw 
(uno::RuntimeException, beans::UnknownPropertyException)
diff --git a/reportdesign/source/core/api/FixedText.cxx 
b/reportdesign/source/core/api/FixedText.cxx
index aff7ff7..02336fd 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -330,7 +330,10 @@ void SAL_CALL OFixedText::setSize( const awt::Size aSize 
) throw (beans::Proper
 // XShapeDescriptor
 ::rtl::OUString SAL_CALL OFixedText::getShapeType(  ) throw 
(uno::RuntimeException)
 {
-   return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
+::osl::MutexGuard aGuard(m_aMutex);
+if ( m_aProps.aComponent.m_xShape.is() )
+return m_aProps.aComponent.m_xShape-getShapeType();
+return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
 }
 // 
-
 // 
-
diff --git a/reportdesign/source/core/api/FormattedField.cxx 
b/reportdesign/source/core/api/FormattedField.cxx
index 95a2243..979fd2a 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -373,6 +373,9 @@ void SAL_CALL OFormattedField::setSize( const awt::Size 
aSize ) throw (beans::P
 // XShapeDescriptor
 ::rtl::OUString SAL_CALL OFormattedField::getShapeType(  ) throw 
(uno::RuntimeException)
 {
+::osl::MutexGuard aGuard(m_aMutex);
+if ( m_aProps.aComponent.m_xShape.is() )
+return m_aProps.aComponent.m_xShape-getShapeType();
return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
 }
 // 
-
diff --git a/reportdesign/source/core/api/ImageControl.cxx 
b/reportdesign/source/core/api/ImageControl.cxx
index 71d2a22..6d0c375 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -467,7 +467,10 @@ void SAL_CALL OImageControl::setSize( const awt::Size 
aSize ) throw (beans::Pro
 // XShapeDescriptor
 ::rtl::OUString SAL_CALL OImageControl::getShapeType(  ) throw 
(uno::RuntimeException)
 {
-   return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
+::osl::MutexGuard aGuard(m_aMutex);
+if ( m_aProps.aComponent.m_xShape.is() )
+return m_aProps.aComponent.m_xShape-getShapeType();
+return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape));
 }
 // 
-
 ::sal_Int16 SAL_CALL OImageControl::getScaleMode() throw 
(uno::RuntimeException)
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index c5189dc..4da53df 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2445,6 +2445,10 @@ void SAL_CALL OReportDefinition::setSize( const 
awt::Size aSize )

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - comphelper/inc xmloff/source

2013-05-16 Thread Lionel Elie Mamane

 comphelper/inc/comphelper/classids.hxx |6 ++
 xmloff/source/draw/shapeexport.cxx |3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 7e868f818c9863461cdf388e3d9fddaffb70d9ca
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri May 3 18:09:15 2013 +0200

fdo#48056 treat report chart as draw chart

Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2
Reviewed-on: https://gerrit.libreoffice.org/3770
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/comphelper/inc/comphelper/classids.hxx 
b/comphelper/inc/comphelper/classids.hxx
index dcfe502..a6c304a 100644
--- a/comphelper/inc/comphelper/classids.hxx
+++ b/comphelper/inc/comphelper/classids.hxx
@@ -414,6 +414,12 @@
 // #110743#
 #define BF_SO3_SCH_CLASSID  BF_SO3_SCH_CLASSID_50
 
+// Report chart
+
+#define SO3_RPTCH_CLASSID \
+0x80243D39, 0x6741, 0x46C5, 0x92, 0x6E, 0x06, \
+0x91, 0x64, 0xFF, 0x87, 0xBB
+
 /
 * StarImage
 /
diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index bec909b..22891c4 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1091,7 +1091,8 @@ void XMLShapeExport::ImpCalcShapeType(const 
uno::Reference drawing::XShape  x
 rtl::OUString sCLSID;
 if(xPropSet-getPropertyValue(OUString(CLSID)) = 
sCLSID)
 {
-if 
(sCLSID.equals(mrExport.GetChartExport()-getChartCLSID()))
+if 
(sCLSID.equals(mrExport.GetChartExport()-getChartCLSID()) ||
+sCLSID.equals(rtl::OUString( SvGlobalName( 
SO3_RPTCH_CLASSID ).GetHexName(
 {
 eShapeType = XmlShapeTypeDrawChartShape;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-3-6] fdo#48056 revert part of return correct name for shapetype

2013-05-16 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3769

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3769
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a024a9bc5f87d226ab3c857817dfe91ad975acb
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

[PUSHED libreoffice-3-6] fdo#48056 treat report chart as draw chart

2013-05-16 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3770

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3770
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

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

2013-05-16 Thread Tor Lillqvist

 configure.ac |   12 
 1 file changed, 12 deletions(-)

New commits:
commit e812381c2fb0128404a00abb819364703f5eede3
Author: Tor Lillqvist t...@iki.fi
Date:   Thu May 16 10:51:24 2013 +0300

Bin some pointless checking for messages

Not really useful to see such messages for stuff that does not depend
in any interesting way on the LibreOffice or system configuration but
is trivially hardcoded based on just the prefix.

Change-Id: I83ec78bb32891a18318d9f174e4efef901c74846

diff --git a/configure.ac b/configure.ac
index 91737ba..cbd7c79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11551,34 +11551,22 @@ PREFIXDIR=$prefix
 AC_MSG_RESULT([$PREFIXDIR])
 AC_SUBST(PREFIXDIR)
 
-AC_MSG_CHECKING([for libdir])
 LIBDIR=[$(eval echo $(eval echo $libdir))]
-AC_MSG_RESULT([$LIBDIR])
 AC_SUBST(LIBDIR)
 
-AC_MSG_CHECKING([for data dir])
 DATADIR=[$(eval echo $(eval echo $datadir))]
-AC_MSG_RESULT([$DATADIR])
 AC_SUBST(DATADIR)
 
-AC_MSG_CHECKING([for man dir])
 MANDIR=[$(eval echo $(eval echo $mandir))]
-AC_MSG_RESULT([$MANDIR])
 AC_SUBST(MANDIR)
 
-AC_MSG_CHECKING([for doc dir])
 DOCDIR=[$(eval echo $(eval echo $docdir))]
-AC_MSG_RESULT([$DOCDIR])
 AC_SUBST(DOCDIR)
 
-AC_MSG_CHECKING([for install dir])
 INSTALLDIR=$LIBDIR/$INSTALLDIRNAME
-AC_MSG_RESULT([$INSTALLDIR])
 AC_SUBST(INSTALLDIR)
 
-AC_MSG_CHECKING([for dev-install dir])
 DEVINSTALLDIR=$OUTDIR/installation
-AC_MSG_RESULT([$DEVINSTALLDIR])
 AC_SUBST(DEVINSTALLDIR)
 
 # ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/inc

2013-05-16 Thread Herbert Dürr

 sal/inc/rtl/string.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 515de997f69222b06a07ce9a95e8610cc9c7cbcc
Author: Herbert DÃ¼rr h...@apache.org
Date:   Thu May 16 07:25:49 2013 +

fix constness issue causing a build breaker

diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 951fa78..dcd6ca4 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -947,7 +947,7 @@ struct CStringHash
 size_t operator()( const char* p) const {
 size_t n = 0;
 while( *p)
-n += 4*n + *static_castunsigned char*(p++);
+n += 4*n + *static_castconst unsigned char*(p++);
 return n;
 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-05-16 Thread bugzilla-daemon

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

Timur gti...@gmail.com changed:

   What|Removed |Added

 Depends on|52226   |

--- Comment #152 from Timur gti...@gmail.com ---
There are many bug reports for images in .docx. Here is Bug 52226 but it
shouldn't be here, rather on MAB 3.6, so I move it there.

-- 
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 44446] LibreOffice 3.6 most annoying bugs

2013-05-16 Thread bugzilla-daemon

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

Timur gti...@gmail.com changed:

   What|Removed |Added

 Depends on||43641, 52226

--- Comment #223 from Timur gti...@gmail.com ---
There are many bug reports for images in .docx. I move here Bug 52226 from MAB
4.0. I'd like also to add Bug 43641 - Image in .docx file not shown reported in
2011. Some may be duplicate, but hopefully this will at least be resolved.

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

Module SVL?

2013-05-16 Thread Sameer Deshmukh

Hello all,

I am trying to solve a bug, and have stumbled across this module called
'SVL'.

Can someone please tell what it does and what its meant for? It doesnt have
a README file nor does it have an API listing...

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

SolarMutex: why a sketch plan ...

2013-05-16 Thread Michael Meeks


On Tue, 2013-05-14 at 11:49 +0200, Stephan Bergmann wrote:
 Historically, the SolarMutex was assumed to be a clever solution to the 
 problem of turning StarOffice from a single-threaded application to a 
 multi-threaded one---lock the SolarMutex around any code that is not yet 
 thread-safe, and be done with it.  Or so people thought.

Hah :-)

 The world has long since found out that single global mutex is a 
 horrible idea for GUI applications (where all GUI frameworks have 
 settled on confine relevant code to run in a single event-loop thread 
 instead).

Quite; then again - the next big, clever idea was to have highly
granular threading - with thread/re-enterancy hazards at every single
UNO method call :-) The combination of these two brainwaves makes
~everything a nightmare :-)

 This leaves us with completely unmaintainable (where do I need to lock 
 SolarMutex?---nobody knows for sure) and broken (cf. 
 SolarMutexReleaser) code.

Right. So - here are the rules that I'm sticking to:

* anything that calls anything that does anything with vcl -
  and anything that depends on / uses it needs to hold the
  SolarMutex

* If you think you need to use the SolarMutexReleaser you
  probably don't  seek expert help ;-)

  The releaser is designed to fully drop the (recusive)
  SolarMutex to allow another thread to take the toolkit
  lock while we're waiting in the VCL main-loop. The VCL
  main-loop does this itself FWIW.

= in general if you grab the SolarMutex from another
   thread, you will block until the (or sadly possibly
   an inferior) main-loop is idle and then you can do
   your work.

* Lock ordering is a nightmare - there is no lock ordering;
  the whole threading situation is built on optimism and a
  lack of rigour:
Luckily the SolarMutex is (almost always) held, so
in general, take it first: since that's almost
certainly a no-op ;-)

In terms of a sensible future for this, here is my crazy idealistic
plan (some of which overlaps with Kai's appartment work):

A give up pretending we're a multi-threaded application:
   we are not - we are 1 + epsilon threaded.

B handle legacy UNO contracts relied on by StarBasic / Java etc.
  around threading by pushing any UNO method on an object that
  is not on the main-thread into an idle handler, and proxying
  the return [ for now we could just take the Solar mutex there
  - and call that 'entering the main appartment' ;-]
+ the apartment idea ~could/should do this.

C audit / retain the very-few pieces of code that are genuinely
  thread-safe and actually useful that way: low-level pieces
  of the UNO core, package2/ ucb/ configmgr2/ etc. seem
  reasonably plausible: though locking clearly brings a per-call
  cost.

D audit all non-UNO threads (there are not so many - IIRC there
  was one in the gallery). Ensure that they are split into
  non-GUI worker threads and idle callbacks

NB. our 'idle' story is -utterly- lame we need strong
priorities, instead of horrible fixed-time time-outs
cf. the unbelievable VCL re-size/paint timers ;-)

E remove all locking everywhere else ;-)

At this point we finally have a reasonably consistent and sensible
threading story :-) Then we can start to add threading where it actually
makes sense :-) [ something we actually need to do ] - and do it without
using any over-complicated, over-granular, and over-general solutions.

A few places where threading probably makes sense are:

+ the UNO core to meet back-compat guarentees
+ the calc computation core
+ image de-compression / scaling
+ splitting:
I/O - unzip - XML parse + namespage - fast-parser
from - interpreting that XML in the core.
+ cores of applications from their rendering / presentation
[ this is a bigger one - use the Fennec approach to
  have your zoom/pan/scroll code use rendered tiles of
  document data produced by the big uniprocess core ]
[ this way you can make pan / scroll ultra smooth even
  while the core is busy working ].

That at least would be my vision :-) I'd -love- help starting to get
there. Some parts of it can be worked on today with minimal pain.

D - for example would be easy and is nicely separable; indeed someone
building a list of all spawned threads, where they are spawned from, and
what they actually do across the code would be -really- nice and useful
to scope the work. Getting a good 'idle' story would probably help

[Libreoffice-commits] core.git: svl/README

2013-05-16 Thread Michael Meeks

 svl/README |8 
 1 file changed, 8 insertions(+)

New commits:
commit a140350dae5db298094583763daf0a8bed8480cb
Author: Michael Meeks michael.me...@suse.com
Date:   Thu May 16 10:29:20 2013 +0100

add readme for svl.

Change-Id: I20addd47e79bec6a260baf391fbb495da6fdaf57

diff --git a/svl/README b/svl/README
new file mode 100644
index 000..970f51a
--- /dev/null
+++ b/svl/README
@@ -0,0 +1,8 @@
+Contains non-graphical helper code for office applications.
+
+In particular the SfxItemSet is a property-bag like container that
+stores arbitrary sets of properties for everything from text run
+formats, to Chart regression line properties.
+
+There are lots of other useful helpers in here for various office
+tasks; much of this code was originally moved from svx/sfx2.
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Module SVL?

2013-05-16 Thread Michael Meeks


On Thu, 2013-05-16 at 14:39 +0530, Sameer Deshmukh wrote:
 I am trying to solve a bug, and have stumbled across this module
 called 'SVL'.

:-)

 Can someone please tell what it does and what its meant for? It doesnt
 have a README file nor does it have an API listing...

Good point; I just added this:

[snip]
Contains non-graphical helper code for office applications.

In particular the SfxItemSet is a property-bag like container that
stores arbitrary sets of properties for everything from text run
formats, to Chart regression line properties.

There are lots of other useful helpers in here for various office
tasks; much of this code was originally moved from svx/sfx2.
[/snip]

And pushed to master - I hope it's reasonably accurate - but as always
it's a work-in-progress, patches appreciated :-)

ATB,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

Re: SolarMutex: why a sketch plan ...

2013-05-16 Thread Noel Grandin


On 2013-05-16 11:21, Michael Meeks wrote:

Right. So - here are the rules that I'm sticking to:

+ splitting:
I/O - unzip - XML parse + namespage - fast-parser
from - interpreting that XML in the core.
Personally I think that using a pull-style unzipper and xml-parser would 
be just as fast, and way simpler to debug.




That at least would be my vision :-) I'd -love- help starting to get
there. Some parts of it can be worked on today with minimal pain.




Rather than find threading issues by hand, we could abuse the existing code:
(a) define a special configure flag --find-bad-ui-threading
(b) when compiled in that mode, change the SolarMutex code so that it 
whinges loudly if acquired from outside the event thread

(c) Run LO unit tests
(d) Fix places which complain

Obviously, the above is the part I can't do.
But I (and other similarly not-skilled hackers) could help with the 
fixing if someone else could create the checking code and write up some 
basic instructions on how to

(a) create a new thread using the LO way
(b) push a result task onto the LO event thread (you seem to call it the 
idle thread??)



Disclaimer: http://www.peralex.com/disclaimer.html


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

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

2013-05-16 Thread Andre Fischer

 sfx2/source/sidebar/PanelTitleBar.cxx|8 ++-
 sfx2/source/sidebar/Sidebar.hrc  |5 ++--
 sfx2/source/sidebar/Sidebar.src  |5 
 sfx2/source/sidebar/SidebarController.cxx|   28 -
 sfx2/source/sidebar/SidebarDockingWindow.cxx |   30 +++
 sfx2/source/sidebar/SidebarDockingWindow.hxx |4 +++
 6 files changed, 67 insertions(+), 13 deletions(-)

New commits:
commit ca7264d7ab7e8b70693362d60227c7dd7626df8b
Author: Andre Fischer a...@apache.org
Date:   Thu May 16 09:51:11 2013 +

122320: Show closer after docking sidebar.  Prevent sidebar from being 
docked above or below edit view.

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 910e6dd..f2f9a4d 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1022,11 +1022,13 @@ bool SidebarController::CanModifyChildWindowWidth (void)
 
 sal_uInt16 nRow (0x);
 sal_uInt16 nColumn (0x);
-pSplitWindow-GetWindowPos(mpParentWindow, nColumn, nRow);
-
-sal_uInt16 nRowCount (pSplitWindow-GetWindowCount(nColumn));
-
-return nRowCount==1;
+if (pSplitWindow-GetWindowPos(mpParentWindow, nColumn, nRow))
+{
+sal_uInt16 nRowCount (pSplitWindow-GetWindowCount(nColumn));
+return nRowCount==1;
+}
+else
+return false;
 }
 
 
@@ -1078,17 +1080,23 @@ void SidebarController::RestrictWidth (void)
 
 SfxSplitWindow* SidebarController::GetSplitWindow (void)
 {
-if (mpSplitWindow == NULL)
+if (mpParentWindow != NULL)
 {
-if (mpParentWindow != NULL)
+SfxSplitWindow* pSplitWindow = 
dynamic_castSfxSplitWindow*(mpParentWindow-GetParent());
+if (pSplitWindow != mpSplitWindow)
 {
-mpSplitWindow = 
dynamic_castSfxSplitWindow*(mpParentWindow-GetParent());
+if (mpSplitWindow != NULL)
+mpSplitWindow-RemoveEventListener(LINK(this, 
SidebarController, WindowEventHandler));
+
+mpSplitWindow = pSplitWindow;
+
 if (mpSplitWindow != NULL)
 mpSplitWindow-AddEventListener(LINK(this, SidebarController, 
WindowEventHandler));
 }
+return mpSplitWindow;
 }
-
-return mpSplitWindow;
+else
+return NULL;
 }
 
 
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index a119613..1b6dcd8 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -108,4 +108,34 @@ sal_Bool SidebarDockingWindow::Close (void)
 }
 
 
+
+
+SfxChildAlignment SidebarDockingWindow::CheckAlignment (
+SfxChildAlignment eCurrentAlignment,
+SfxChildAlignment eRequestedAlignment)
+{
+switch (eRequestedAlignment)
+{
+case SFX_ALIGN_TOP:
+case SFX_ALIGN_HIGHESTTOP:
+case SFX_ALIGN_LOWESTTOP:
+case SFX_ALIGN_BOTTOM:
+case SFX_ALIGN_LOWESTBOTTOM:
+case SFX_ALIGN_HIGHESTBOTTOM:
+return eCurrentAlignment;
+
+case SFX_ALIGN_LEFT:
+case SFX_ALIGN_RIGHT:
+case SFX_ALIGN_FIRSTLEFT:
+case SFX_ALIGN_LASTLEFT:
+case SFX_ALIGN_FIRSTRIGHT:
+case SFX_ALIGN_LASTRIGHT:
+return eRequestedAlignment;
+
+default:
+return eRequestedAlignment;
+}
+}
+
+
 } } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx 
b/sfx2/source/sidebar/SidebarDockingWindow.hxx
index 55347be..338e31e 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.hxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx
@@ -53,6 +53,10 @@ protected:
 // Window overridables
 virtual void GetFocus (void);
 
+virtual SfxChildAlignment CheckAlignment (
+SfxChildAlignment eCurrentAlignment,
+SfxChildAlignment eRequestedAlignment);
+
 private:
 ::rtl::Referencesfx2::sidebar::SidebarController mpSidebarController;
 
commit e785c5125994bbfdb4e69108b5a73a184b3ced49
Author: Andre Fischer a...@apache.org
Date:   Thu May 16 08:49:36 2013 +

122271: Provide accessible for panels that includes the panel title.

diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx 
b/sfx2/source/sidebar/PanelTitleBar.cxx
index d8bfb25..7a5191e 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -48,7 +48,7 @@ static const sal_Int32 gaRightIconPadding (5);
 PanelTitleBar::PanelTitleBar (
 const ::rtl::OUString rsTitle,
 Window* pParentWindow,
-Panel* pPanel )
+Panel* pPanel)
 : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()),
   mbIsLeftButtonDown(false),
   mpPanel(pPanel),
@@ -57,6 +57,12 @@ PanelTitleBar::PanelTitleBar (
 {
 OSL_ASSERT(mpPanel != NULL);
 
+const ::rtl::OUString sAccessibleName(
+String(SfxResId(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX))
+

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc

2013-05-16 Thread Andras Timar

 instsetoo_native/util/openoffice.lst |8 
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit fe54501e66d0c250f36fae2ebab3b9a22da72aca
Author: Andras Timar ati...@suse.com
Date:   Thu May 16 12:16:01 2013 +0200

Bump for 3.6-23

Change-Id: I71fa49beb2c29a5bbeda9ae47f51f1d562f8b505

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 9194d53..67faf1f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 22
+WINDOWSPATCHLEVEL 23
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-522
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-523
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-522
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-523
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-522
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-523
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 157fd54..9dcc6c8 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:522)
-BUILD=522
+RSCREVISION=360m1(Build:523)
+BUILD=523
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2013-05-16 Thread Tor Lillqvist

 solenv/gbuild/GeneratedPackage.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c6d8cd5f48b3097d8f085318ab86e502f8d4ca15
Author: Tor Lillqvist t...@iki.fi
Date:   Thu May 16 12:05:42 2013 +0300

Use cp -R instead of cp -r for OS X compatibility

In GNU cp, -r and -R are equivalent.

For the cp in OS X: Historic versions of the cp utility had a -r
option. This implementation supports that option; however, its use is
strongly discouraged, as it does not correctly copy special files,
symbolic links, or fifo's.

Using cp -r meant that the symlinks in the LibreOfficePython.framework
were not properly re-created in instdir.

Change-Id: I8367269a77b876c063fd21ceb919936215fb7d37

diff --git a/solenv/gbuild/GeneratedPackage.mk 
b/solenv/gbuild/GeneratedPackage.mk
index 893f929..2c0f992 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -24,7 +24,7 @@ gb_GeneratedPackage__get_destdir = $(firstword $(subst :, 
,$(1)))
 
 define gb_GeneratedPackage__command_cp
 mkdir -p $(dir $(INSTDIR)/$(2))  \
-cp -r $(PACKAGE_SOURCEDIR)/$(1) $(INSTDIR)/$(2)
+cp -R $(PACKAGE_SOURCEDIR)/$(1) $(INSTDIR)/$(2)
 endef
 
 define gb_GeneratedPackage__command
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Tor Lillqvist

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

New commits:
commit d1a5da152a6814a4ee00fd04a2c682cc582e063a
Author: Tor Lillqvist t...@iki.fi
Date:   Thu May 16 13:33:00 2013 +0300

Handle --enable-macosx-code-signing=no properly

Change-Id: Ib080d0317ea0c34e12db27f6ed080b3928cb165d

diff --git a/configure.ac b/configure.ac
index cbd7c79..565aef9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2598,7 +2598,7 @@ if test $_os = Darwin; then
 pretty_name=`security find-identity -p codesigning -v | grep 
$MACOSX_CODESIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'`
 AC_MSG_RESULT([yes, using the identity 
$MACOSX_CODESIGNING_IDENTITY for $pretty_name])
 fi
-elif test -n $enable_macosx_code_signing; then
+elif test -n $enable_macosx_code_signing -a 
$enable_macosx_code_signing != no ; then
 MACOSX_CODESIGNING_IDENTITY=$enable_macosx_code_signing
 pretty_name=`security find-identity -p codesigning -v | grep 
$MACOSX_CODESIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'`
 AC_MSG_RESULT([yes, using the identity $MACOSX_CODESIGNING_IDENTITY 
for $pretty_name])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Tor Lillqvist

 scp2/source/python/file_python.scp |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 87bdc30851af21d9d29b36de07261c682eb70227
Author: Tor Lillqvist t...@iki.fi
Date:   Thu May 16 13:38:39 2013 +0300

Add the Versions/3.3/include/python3.3m directory

Change-Id: If50acc088402487d8185198ee3841e3d82cd904c

diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index 761b5f6..83324ed 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -155,6 +155,18 @@ Directory gid_Dir_PythonFramework_Versions_ver_bin
 Styles = (CREATE);
 End
 
+Directory gid_Dir_PythonFramework_Versions_ver_include
+ParentID = gid_Dir_PythonFramework_Versions_ver;
+HostName = include;
+Styles = (CREATE);
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver_include_pythonver
+ParentID = gid_Dir_PythonFramework_Versions_ver_include;
+HostName = STRING(CONCAT3(python,PYMAJMIN,m));
+Styles = (CREATE);
+End
+
 Directory gid_Dir_PythonFramework_Versions_ver_lib
 ParentID = gid_Dir_PythonFramework_Versions_ver;
 HostName = lib;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Michael Stahl

 sw/source/core/docnode/ndcopy.cxx |   75 +-
 1 file changed, 42 insertions(+), 33 deletions(-)

New commits:
commit c7b883498cb47a7d2a330057dbcd7f74f87a0184
Author: Michael Stahl mst...@redhat.com
Date:   Thu May 16 12:01:30 2013 +0200

SwDoc::CopyImpl: avoid ~SwIndexReg assertions:

These happen when enabling change tracking, deleting a full paragraph
(incl. paragraph break) and then copying the deleted paragraph to the
clipboard; the rPos and aCpyPam SwPositions are registered at a node
that is deleted by lcl_DeleteRedlines.

Change-Id: I3e9e29548d23377807c26fdd401b3c9637fddf25

diff --git a/sw/source/core/docnode/ndcopy.cxx 
b/sw/source/core/docnode/ndcopy.cxx
index bbff535..deefc12 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -31,6 +31,7 @@
 #include fldbas.hxx
 #include swtable.hxx
 #include ddefld.hxx
+#include unocrsr.hxx
 #include undobj.hxx
 #include IMark.hxx
 #include mvsave.hxx
@@ -865,13 +866,15 @@ bool SwDoc::CopyImpl( SwPaM rPam, SwPosition rPos,
 
 // If Undo is enabled, create the UndoCopy object
 SwUndoCpyDoc* pUndo = 0;
-SwPaM aCpyPam( rPos );
+// lcl_DeleteRedlines may delete the start or end node of the cursor when
+// removing the redlines so use cursor that is corrected by PaMCorrAbs
+::boost::scoped_ptrSwUnoCrsr const pCopyPam(pDoc-CreateUnoCrsr(rPos));
 
 SwTblNumFmtMerge aTNFM( *this, *pDoc );
 
 if (pDoc-GetIDocumentUndoRedo().DoesUndo())
 {
-pUndo = new SwUndoCpyDoc( aCpyPam );
+pUndo = new SwUndoCpyDoc(*pCopyPam);
 pDoc-GetIDocumentUndoRedo().AppendUndo( pUndo );
 }
 
@@ -880,21 +883,21 @@ bool SwDoc::CopyImpl( SwPaM rPam, SwPosition rPos,
 
 // Move the PaM one node back from the insert position, so that
 // the position doesn't get moved
-aCpyPam.SetMark();
-sal_Bool bCanMoveBack = aCpyPam.Move( fnMoveBackward, fnGoCntnt );
+pCopyPam-SetMark();
+sal_Bool bCanMoveBack = pCopyPam-Move(fnMoveBackward, fnGoCntnt);
 // If the position was shifted from more than one node, an end node has 
been skipped
 bool bAfterTable = false;
-if ( ( rPos.nNode.GetIndex() - aCpyPam.GetPoint()-nNode.GetIndex() )  1 )
+if ((rPos.nNode.GetIndex() - pCopyPam-GetPoint()-nNode.GetIndex())  1)
 {
 // First go back to the original place
-aCpyPam.GetPoint()-nNode = rPos.nNode;
-aCpyPam.GetPoint()-nContent = rPos.nContent;
+pCopyPam-GetPoint()-nNode = rPos.nNode;
+pCopyPam-GetPoint()-nContent = rPos.nContent;
 
 bCanMoveBack = false;
 bAfterTable = true;
 }
 if( !bCanMoveBack )
-aCpyPam.GetPoint()-nNode--;
+pCopyPam-GetPoint()-nNode--;
 
 SwNodeRange aRg( pStt-nNode, pEnd-nNode );
 SwNodeIndex aInsPos( rPos.nNode );
@@ -969,11 +972,11 @@ bool SwDoc::CopyImpl( SwPaM rPam, SwPosition rPos,
 pDoc-SplitNode( rPos, false );
 }
 
-if( bCanMoveBack  rPos == *aCpyPam.GetPoint() )
+if (bCanMoveBack  rPos == *pCopyPam-GetPoint())
 {
 // after the SplitNode, span the CpyPam correctly again
-aCpyPam.Move( fnMoveBackward, fnGoCntnt );
-aCpyPam.Move( fnMoveBackward, fnGoCntnt );
+pCopyPam-Move( fnMoveBackward, fnGoCntnt );
+pCopyPam-Move( fnMoveBackward, fnGoCntnt );
 }
 
 pDestTxtNd = pDoc-GetNodes()[ aInsPos.GetIndex()-1 
]-GetTxtNode();
@@ -1096,11 +1099,11 @@ bool SwDoc::CopyImpl( SwPaM rPam, SwPosition rPos,
 pDoc-SplitNode( rPos, false );
 }
 
-if( bCanMoveBack  rPos == *aCpyPam.GetPoint() )
+if (bCanMoveBack  rPos == *pCopyPam-GetPoint())
 {
 // after the SplitNode, span the CpyPam correctly again
-aCpyPam.Move( fnMoveBackward, fnGoCntnt );
-aCpyPam.Move( fnMoveBackward, fnGoCntnt );
+pCopyPam-Move( fnMoveBackward, fnGoCntnt );
+pCopyPam-Move( fnMoveBackward, fnGoCntnt );
 }
 
 // Correct the area again
@@ -1122,9 +1125,9 @@ bool SwDoc::CopyImpl( SwPaM rPam, SwPosition rPos,
 // See below, before the SetInsertRange funciton of the undo 
object will be called,
 // the CpyPam would be moved to the next content position. 
This has to be avoided
 // We want to be moved to the table node itself thus we have 
to set bCanMoveBack
-// and to manipulate aCpyPam.
+// and to manipulate pCopyPam.
 bCanMoveBack = false;
-aCpyPam.GetPoint()-nNode--;
+pCopyPam-GetPoint()-nNode--;
 }
 }
 
@@ -1236,7 +1239,7

[Libreoffice-commits] core.git: RepositoryExternal.mk RepositoryModule_build.mk solenv/gbuild

2013-05-16 Thread Matúš Kukan

 RepositoryExternal.mk |   17 +
 RepositoryModule_build.mk |   29 +
 solenv/gbuild/Gallery.mk  |2 +-
 3 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit bae52ee3ef48d58deb6d7ff312b3f3db20c9c0f2
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Thu May 16 09:17:57 2013 +0200

fix cross-compilation of Galleries

- RepositoryModule_build: add modules necessary to build gengal and
libraries used at run-time
- add dependencies to gb_Executable__register_gengal.bin
- use gb_Helper_OUTDIR_FOR_BUILDLIBDIR

Change-Id: I4a88c1786b1ee2ee2b75b1a5dd75009ef70ed353

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 705aacb..042512f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2860,8 +2860,25 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
 )
 endef
 
+# Better duplication with gb_Gallery__UNO_COMPONENTS than nothing.
+# This is used to determine what we need for 'build' platform.
 define gb_Executable__register_gengal.bin
 $(call gb_Executable_add_runtime_dependencies,gengal.bin,\
+   $(foreach component, \
+   comphelper/util/comphelp \
+   configmgr/source/configmgr \
+   fileaccess/source/fileacc \
+   framework/util/fwk \
+   i18npool/util/i18npool \
+   package/source/xstor/xstor \
+   package/util/package2 \
+   sfx2/util/sfx \
+   svx/util/svx \
+   svx/util/svxcore \
+   ucb/source/core/ucb1 \
+   ucb/source/ucp/file/ucpfile1 \
+   unoxml/source/service/unoxml \
+   ,$(call gb_ComponentTarget_get_outdir_target_for_build,$(component))) \
$(call gb_AllLangResTarget_get_target,ofa) \
$(call gb_Configuration_get_target,registry) \
$(call gb_Configuration_get_target,fcfg_langpack) \
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 9c24acd..b69d4b4 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -63,6 +63,35 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
$(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,CPPUNIT,cppunit) \
$(call gb_Helper_optional_for_host,DESKTOP, \
+   $(if $(filter YES,$(WITH_GALLERY_BUILD)), \
+   avmedia \
+   basebmp \
+   basic \
+   canvas \
+   configmgr \
+   cppcanvas \
+   drawinglayer \
+   editeng \
+   fileaccess \
+   framework \
+   harfbuzz \
+   lcms2 \
+   linguistic \
+   nss \
+   package \
+   sfx2 \
+   sot \
+   svl \
+   svtools \
+   svx \
+   toolkit \
+   ucb \
+   unoxml \
+   vcl \
+   $(call gb_Helper_optional,VIGRA,vigra) \
+   xmloff \
+   xmlscript \
+   ) \
helpcompiler \
xmlhelp \
) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 2f330bb..a866a11 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -51,7 +51,7 @@ define gb_Gallery__make_env_args
 -env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\
$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item \
 $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
-   -env:$(dir)=$(call gb_Helper_make_url,$(gb_Helper_OUTDIRLIBDIR)))
+   -env:$(dir)=$(call 
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)))
 endef
 
 define gb_Gallery__command
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk solenv/gbuild

2013-05-16 Thread David Tardon

 RepositoryExternal.mk|3 +--
 solenv/gbuild/TargetLocations.mk |1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ac261bf6dc31a44ff0eabb6dd552ddc934c94ce2
Author: David Tardon dtar...@redhat.com
Date:   Thu May 16 13:38:44 2013 +0200

drop unneeded dep

Change-Id: I9686ef445dde2e2f1e2e88a93ec681251fe3093d

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5005d11..1842538 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2362,7 +2362,6 @@ else # !SYSTEM_PYTHON
 
 # depend on external project because on MACOSX the Package is disabled...
 define gb_LinkTarget__use_python_headers
-$(call gb_LinkTarget_use_package,$(1),python3)
 $(call gb_LinkTarget_use_external_project,$(1),python3)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,python3) \
commit 45a5c26f170b6e6f023c9f0a751b4bc98d36b6a4
Author: David Tardon dtar...@redhat.com
Date:   Thu May 16 13:36:24 2013 +0200

fix dep on python framework on mac

Change-Id: Id80540174ccd141eaf89854da6f80bcc0659b59c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 042512f..5005d11 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2997,7 +2997,7 @@ ifeq ($(OS),MACOSX)
 $(call gb_ExternalExecutable_set_external,python,$(call 
gb_UnpackedTarball_get_dir,python3)/python-inst/@__OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR))
 # the Zip ensures that internal python has been built (cannot use the Package
 # target, as that is not used on Mac)
-$(call gb_ExternalExecutable_add_dependencies,python,$(call 
gb_Zip_get_outdir_target_for_build,LibreOfficePython.framework))
+$(call gb_ExternalExecutable_add_dependencies,python,$(call 
gb_GeneratedPackage_get_target_for_build,python3))
 
 else
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index a91e0b4..6246eb3 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -122,6 +122,7 @@ gb_ExternalProject_get_target = 
$(WORKDIR)/ExternalProject/$(1).done
 gb_Gallery_get_target = $(WORKDIR)/Gallery/$(1).done
 gb_Gallery_get_workdir = $(WORKDIR)/Gallery/$(1)
 gb_GeneratedPackage_get_target = $(WORKDIR)/GeneratedPackage/$(1).filelist
+gb_GeneratedPackage_get_target_for_build = 
$(WORKDIR_FOR_BUILD)/GeneratedPackage/$(1).filelist
 gb_HelpIndexTarget_get_target = $(WORKDIR)/HelpIndexTarget/$(1).done
 gb_HelpJarTarget_get_target = $(WORKDIR)/HelpJarTarget/$(1).done
 gb_HelpLinkTarget_get_preparation_target = 
$(WORKDIR)/HelpLinkTarget/$(1).prepare
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source include/shell scp2/source svl/CppunitTest_svl_lngmisc.mk svl/qa vcl/Library_vclplug_tde.mk

2013-05-16 Thread Michael Meeks

 basctl/source/basicide/linenumberwindow.cxx |3 --
 basctl/source/basicide/linenumberwindow.hxx |3 --
 include/shell/tde_defines.h |   31 
 include/shell/tde_headers.h |   31 
 scp2/source/tde/module_tde.scp  |   31 
 scp2/source/tde/module_tde.ulf  |   31 
 svl/CppunitTest_svl_lngmisc.mk  |2 -
 svl/qa/unit/test_lngmisc.cxx|3 --
 vcl/Library_vclplug_tde.mk  |   25 --
 9 files changed, 41 insertions(+), 119 deletions(-)

New commits:
commit 2b5d1c9bf623a5a4dc019989751197bc31dbf759
Author: Michael Meeks michael.me...@suse.com
Date:   Thu May 16 12:42:36 2013 +0100

Move to MPLv2 license headers, with ESC decision and author's permission.

Change-Id: Ie154eadd9960b159f5a250cde93c4bd7a8a948cf

diff --git a/basctl/source/basicide/linenumberwindow.cxx 
b/basctl/source/basicide/linenumberwindow.cxx
index dfede10..8baa2fe 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -6,9 +6,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-/*
- * Copyright (C) 2011 August Sodora aug...@gmail.com
- */
 
 #include baside2.hxx
 #include linenumberwindow.hxx
diff --git a/basctl/source/basicide/linenumberwindow.hxx 
b/basctl/source/basicide/linenumberwindow.hxx
index b41530a..667ef0a 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -6,9 +6,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-/*
- * Copyright (C) 2011 August Sodora aug...@gmail.com
- */
 
 #ifndef BASCTL_LINENUMBERWINDOW_HXX
 #define BASCTL_LINENUMBERWINDOW_HXX
diff --git a/include/shell/tde_defines.h b/include/shell/tde_defines.h
index 0dc91e9..6030760 100644
--- a/include/shell/tde_defines.h
+++ b/include/shell/tde_defines.h
@@ -1,27 +1,14 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+/*
+ * This file is part of the LibreOffice project.
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an AS IS basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- * Timothy Pearson kb9...@pearsoncomputing.net (C) 2012, All Rights Reserved.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the GPLv3+), or
- * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- *
- /
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+/*
+ * Copyright (C) 2012, Timothy Pearson kb9...@pearsoncomputing.net
+ */
 
 #ifndef INCLUDED_VCL_TDE_DEFINE_HEADERS_H
 #define INCLUDED_VCL_TDE_DEFINE_HEADERS_H
diff --git a/include/shell/tde_headers.h b/include/shell/tde_headers.h
index ed3739e..221f679 100644
--- a/include/shell/tde_headers.h
+++ b/include/shell/tde_headers.h
@@ -1,27 +1,14 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+/*
+ * This file is part of the LibreOffice project.
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an AS IS basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- * Timothy Pearson kb9...@pearsoncomputing.net (C) 2012, All Rights Reserved.
- *
- * Alternatively, the contents of this file may be used under the terms of
- *

[PATCH] fdo#60924 autoinstall - gbuild/scp2: add math module

2013-05-16 Thread Marcos Souza (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3919

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/3919/1

fdo#60924 autoinstall - gbuild/scp2: add math module

Change-Id: I0ee6ac3fc32356dac6b3cc498d98ab71fdea29ad
---
M Repository.mk
A scp2/AutoInstallLibs_math.scp
M scp2/InstallModule_math.mk
M scp2/Module_scp2.mk
M scp2/source/math/module_math.scp
M solenv/gbuild/Helper.mk
6 files changed, 23 insertions(+), 2 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 3cbed03..e3af12e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -240,6 +240,9 @@
 $(if $(ENABLE_KDE4),kde4be1) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,MATH, \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
avmedia \
$(if $(DISABLE_SCRIPTING),,basctl) \
diff --git a/scp2/AutoInstallLibs_math.scp b/scp2/AutoInstallLibs_math.scp
new file mode 100644
index 000..a7ceda8
--- /dev/null
+++ b/scp2/AutoInstallLibs_math.scp
@@ -0,0 +1,12 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call 
gb_AutoInstallLibs_AutoInstallLibs,math,MATH,LIBO_LIB_FILE,auto_Math_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk
index 57f5c2d..e25c25e 100644
--- a/scp2/InstallModule_math.mk
+++ b/scp2/InstallModule_math.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/math))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,math))
+
 $(eval $(call gb_InstallModule_add_templates,scp2/math,\
 scp2/source/templates/module_langpack_math \
 ))
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 9dc1cb6..1c7fdec 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -14,6 +14,7 @@
AutoInstallLibs_tde \
AutoInstallLibs_gnome \
AutoInstallLibs_kde \
+   AutoInstallLibs_math \
AutoInstallLibs_ooo \
AutoInstallLibs_ure \
AutoInstallLibs_writer \
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index f222441..a6fcb62 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -27,6 +27,8 @@
 
 #include macros.inc
 
+#include AutoInstallLibs/math
+
 Module gid_Module_Prg_Math
 MOD_NAME_DESC ( MODULE_PRG_MATH );
 ParentID = gid_Module_Prg;
@@ -42,7 +44,8 @@
 Minimal = YES;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = 
(gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
+Files = (auto_Math_Lib_ALL
+   
gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
 gid_File_Share_Registry_Math_Xcd,
 gid_File_Tmp_Userinstall_Math_Inf);
 End
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index aa87379..5ca9b31 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -118,7 +118,7 @@
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
 gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO 
RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE MATH OOO URE 
WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
 

-- 
To view, visit https://gerrit.libreoffice.org/3919
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ee6ac3fc32356dac6b3cc498d98ab71fdea29ad
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sfx2/inc sfx2/source svx/source

2013-05-16 Thread Andre Fischer

 sfx2/inc/sfx2/sidebar/ControlFactory.hxx  |   29 
 sfx2/inc/sfx2/sidebar/ControllerFactory.hxx   |   16 ++
 sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx  |4 
 sfx2/inc/sfx2/sidebar/Tools.hxx   |3 
 sfx2/source/sidebar/ControlFactory.cxx|5 
 sfx2/source/sidebar/ControllerFactory.cxx |  132 +++---
 sfx2/source/sidebar/Deck.cxx  |   86 +++---
 sfx2/source/sidebar/Deck.hxx  |5 
 sfx2/source/sidebar/FocusManager.cxx  |8 +
 sfx2/source/sidebar/ResourceManager.cxx   |   26 
 sfx2/source/sidebar/ResourceManager.hxx   |3 
 sfx2/source/sidebar/SidebarToolBox.cxx|   28 +++-
 sfx2/source/sidebar/ToolBoxBackground.cxx |   13 +-
 sfx2/source/sidebar/ToolBoxBackground.hxx |4 
 sfx2/source/sidebar/Tools.cxx |   25 
 svx/source/sidebar/insert/InsertPropertyPanel.hxx |2 
 16 files changed, 279 insertions(+), 110 deletions(-)

New commits:
commit 3608a33d8362cbc44a2eb7203b7d1bffe481c7ab
Author: Andre Fischer a...@apache.org
Date:   Thu May 16 11:43:55 2013 +

121960: Improve creation of toolbox/toolbar controllers.

diff --git a/sfx2/inc/sfx2/sidebar/ControlFactory.hxx 
b/sfx2/inc/sfx2/sidebar/ControlFactory.hxx
index 623abf1..f232835 100644
--- a/sfx2/inc/sfx2/sidebar/ControlFactory.hxx
+++ b/sfx2/inc/sfx2/sidebar/ControlFactory.hxx
@@ -32,26 +32,49 @@ namespace sfx2 { namespace sidebar {
 
 class ToolBoxBackground;
 
+/** Factory for controls used in sidebar panels.
+The reason to use this factory instead of creating the controls
+directly is that this way the sidebar has a little more control
+over look and feel of its controls.
+*/
 class SFX2_DLLPUBLIC ControlFactory
 {
 public:
+/** Create the menu button for the task bar.
+*/
 static CheckBox* CreateMenuButton (Window* pParentWindow);
+
 static ImageRadioButton* CreateTabItem (Window* pParentWindow);
 
-/** Create a tool box that does *not* handle its items.
+/** Create a tool box that does *not* handle its items.  The
+caller has to register callbacks to process, among others,
+click and selection events.
 */
 static SidebarToolBox* CreateToolBox (
 Window* pParentWindow,
 const ResId rResId);
 
-/** Create a tool box that *does* handle its items.
+/** Create a tool box that *does* handle its items.  All event
+processing is done by toolbox controllers.
 */
 static SidebarToolBox* CreateToolBox (
 Window* pParentWindow,
 const ResId rResId,
 const ::com::sun::star::uno::Referencecom::sun::star::frame::XFrame 
rxFrame);
 
-static Window* CreateToolBoxBackground (Window* pParentWindow);
+/** Create a window that acts as background of a tool box.
+In general it is slightly larger than the tool box.
+@param pParentWindow
+The parent window of the new background control.
+@param bShowBorder
+When TRUE/ then the background control is made slightly
+larger then its tool box child, once that is created.
+Otherwise the background control will not be visible.
+*/
+static Window* CreateToolBoxBackground (
+Window* pParentWindow,
+const bool bShowBorder = true);
+
 static ImageRadioButton* CreateCustomImageRadionButton(
 Window* pParentWindow,
 const ResId rResId );
diff --git a/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx 
b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
index 8a08050..3f9e45b 100644
--- a/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
@@ -23,8 +23,9 @@
 #define SFX_SIDEBAR_CONTROLLER_FACTORY_HXX
 
 #include sfx2/dllapi.h
-#include com/sun/star/frame/XToolbarController.hpp
+#include com/sun/star/awt/XWindow.hpp
 #include com/sun/star/frame/XFrame.hpp
+#include com/sun/star/frame/XToolbarController.hpp
 
 namespace css = ::com::sun::star;
 namespace cssu = ::com::sun::star::uno;
@@ -33,7 +34,7 @@ class ToolBox;
 
 namespace sfx2 { namespace sidebar {
 
-/** Convenience class for easy creation of toolbox controllers.
+/** Convenience class for the easy creation of toolbox controllers.
 */
 class SFX2_DLLPUBLIC ControllerFactory
 {
@@ -42,7 +43,16 @@ public:
 ToolBox* pToolBox,
 const sal_uInt16 nItemId,
 const ::rtl::OUString rsCommandName,
-const cssu::Referencecss::frame::XFrame rxFrame);
+const cssu::Referencecss::frame::XFrame rxFrame,
+const cssu::Referencecss::awt::XWindow rxParentWindow,
+const sal_Int32 nItemWidth);
+
+private:
+static cssu::Referencecss::frame::XToolbarController 
CreateToolBarController(
+ToolBox* pToolBox,
+const ::rtl::OUString rsCommandName,
+const cssu::Referencecss::frame::XFrame rxFrame,
+const sal_Int32 nWidth);

[PATCH] fdo#64652 remove length restriction of Replace edit box

2013-05-16 Thread Andras Timar (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3920

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/3920/1

fdo#64652 remove length restriction of Replace edit box

Change-Id: Ib35a6c2968c4633b565aaf47bb5358f15890083f
---
M cui/uiconfig/ui/acorreplacepage.ui
1 file changed, 0 insertions(+), 1 deletion(-)



diff --git a/cui/uiconfig/ui/acorreplacepage.ui 
b/cui/uiconfig/ui/acorreplacepage.ui
index aa04bcb..572057f 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -65,7 +65,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=hexpandTrue/property
-property name=max_length30/property
 property name=invisible_char●/property
   /object
   packing

-- 
To view, visit https://gerrit.libreoffice.org/3920
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib35a6c2968c4633b565aaf47bb5358f15890083f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andras Timar ati...@suse.com

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

[Libreoffice-commits] core.git: 6 commits - config_host.mk.in configure.ac harfbuzz/ExternalProject_harfbuzz.mk libcdr/ExternalProject_libcdr.mk libmspub/ExternalPackage_libmspub.mk libmspub/ExternalP

2013-05-16 Thread Michael Stahl

 RepositoryExternal.mk|   16 
 config_host.mk.in|2 ++
 configure.ac |9 -
 harfbuzz/ExternalProject_harfbuzz.mk |6 +-
 libcdr/ExternalProject_libcdr.mk |4 
 libmspub/ExternalPackage_libmspub.mk |6 --
 libmspub/ExternalProject_libmspub.mk |6 --
 libmwaw/ExternalPackage_libmwaw.mk   |6 --
 libvisio/ExternalPackage_libvisio.mk |6 --
 libvisio/ExternalProject_libvisio.mk |4 
 libwpd/ExternalPackage_libwpd.mk |   17 -
 11 files changed, 27 insertions(+), 55 deletions(-)

New commits:
commit 5970aad9c63e541071594242037a815da652ca3c
Author: Michael Stahl mst...@redhat.com
Date:   Thu May 16 14:10:44 2013 +0200

move copy/pasted ICU_CFLAGS/ICU_LIBS to configure

Change-Id: I078cccd57331d40118bcc40fb4eb66b113848caf

diff --git a/config_host.mk.in b/config_host.mk.in
index 1b7ee43..fa85877 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -236,6 +236,8 @@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@
 export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@
 export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@
 export ICECREAM_RUN=@ICECREAM_RUN@
+export ICU_CFLAGS=$(gb_SPACE)@ICU_CFLAGS@
+export ICU_LIBS=$(gb_SPACE)@ICU_LIBS@
 export ICU_MAJOR=@ICU_MAJOR@
 export ICU_MINOR=@ICU_MINOR@
 export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
diff --git a/configure.ac b/configure.ac
index cc42d69..49e8d02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8395,6 +8395,11 @@ else
 AC_MSG_RESULT([internal])
 SYSTEM_ICU=NO
 BUILD_TYPE=$BUILD_TYPE ICU
+# surprisingly set these only for internal (to be used by various other
+# external libs): the system icu-config is quite unhelpful and spits out
+# dozens of weird flags and also default path -I/usr/include
+ICU_CFLAGS=-I${WORKDIR}/UnpackedTarball/icu/source/i18n 
-I${WORKDIR}/UnpackedTarball/icu/source/common
+ICU_LIBS=
 fi
 AC_SUBST(SYSTEM_ICU)
 AC_SUBST(SYSTEM_GENBRK)
@@ -8406,6 +8411,8 @@ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
 AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
 AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)
 AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER)
+AC_SUBST(ICU_CFLAGS)
+AC_SUBST(ICU_LIBS)
 
 dnl ===
 dnl Graphite
diff --git a/harfbuzz/ExternalProject_harfbuzz.mk 
b/harfbuzz/ExternalProject_harfbuzz.mk
index d0a405f..007e3dd 100644
--- a/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/harfbuzz/ExternalProject_harfbuzz.mk
@@ -21,11 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\
 
 $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(call gb_ExternalProject_run,build,\
-   export ICU_LIBS=  \
-export ICU_CFLAGS=$(if $(filter NO,$(SYSTEM_ICU)),\
-   -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-   -I$(call gb_UnpackedTarball_get_dir,icu)/source/common, 
) \
-./configure \
+   ./configure \
--enable-static \
--disable-shared \
--with-pic \
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index f877cba..7a4a246 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -27,10 +27,6 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG= \
-export ICU_LIBS=  \
-export ICU_CFLAGS=$(if $(filter NO,$(SYSTEM_ICU)),\
-   -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-   -I$(call gb_UnpackedTarball_get_dir,icu)/source/common, 
) \
 ./configure \
--with-pic \
--enable-static \
diff --git a/libmspub/ExternalProject_libmspub.mk 
b/libmspub/ExternalProject_libmspub.mk
index 14013cf..5fb3133 100644
--- a/libmspub/ExternalProject_libmspub.mk
+++ b/libmspub/ExternalProject_libmspub.mk
@@ -25,10 +25,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
 $(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG= \
-export ICU_LIBS=  \
-export ICU_CFLAGS=$(if $(filter NO,$(SYSTEM_ICU)),\
-   -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-   -I$(call gb_UnpackedTarball_get_dir,icu)/source/common, 
) \
 ./configure \
--with-pic \
--enable-static \
diff --git a/libvisio/ExternalProject_libvisio.mk 
b/libvisio/ExternalProject_libvisio.mk
index 3a5ce50..f5116e3 100644
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-23'

2013-05-16 Thread Andras Timar

Tag 'suse-3.6-23' created by Andras Timar ati...@suse.com at 2013-05-16 13:29 
-0700

suse-3.6-23

Changes since suse-3.6-22-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-23'

2013-05-16 Thread Libreoffice Gerrit user

Tag 'suse-3.6-23' created by Andras Timar ati...@suse.com at 2013-05-16 13:29 
-0700

suse-3.6-23

Changes since suse-3.6-12:
Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-23'

2013-05-16 Thread Petr Mladek

Tag 'suse-3.6-23' created by Andras Timar ati...@suse.com at 2013-05-16 13:29 
-0700

suse-3.6-23

Changes since suse-3.6-12:
Andras Timar (3):
  updated pt-PT spelling dictionary
  fdo#56130 update Galician dictionary pack
  Update pt-PT dictionary

Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Lior Kaplan (1):
  Update Hebrew dictionary to one created with Hspell 1.2 (taken from 
Fedora 17 64bit)

Olivier Hallot (1):
  Fix for fdo#53520, Portuguese spelling files

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 dictionaries/pt_PT/description.xml |2 
 dictionaries/pt_PT/pt_PT.dic   |  257 -
 2 files changed, 144 insertions(+), 115 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-23'

2013-05-16 Thread Petr Mladek

Tag 'suse-3.6-23' created by Andras Timar ati...@suse.com at 2013-05-16 13:29 
-0700

suse-3.6-23

Changes since suse-3.6-12:
Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-23'

2013-05-16 Thread Andras Timar

Tag 'suse-3.6-23' created by Andras Timar ati...@suse.com at 2013-05-16 13:29 
-0700

suse-3.6-23

Changes since suse-3.6-0-3:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

2013-05-16 Thread David Tardon

 RepositoryExternal.mk  |2 +-
 solenv/gbuild/Gallery.mk   |2 +-
 solenv/gbuild/extensions/pre_BuildTools.mk |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a494a8329f211a37ff2d5b8fe28bbc8a0a3beb66
Author: David Tardon dtar...@redhat.com
Date:   Thu May 16 14:38:39 2013 +0200

use $(OS_FOR_BUILD) to fix mingw cross-compilation

Change-Id: I606e99e80ace5b086210e5a724a3e979e2b98cbf

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d80a22a..2762e4c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2898,7 +2898,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal.bin,\
$(call gb_Configuration_get_target,registry) \
$(call gb_Configuration_get_target,fcfg_langpack) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-   $(if $(filter-out MACOSX WNT,$(OS)), \
+   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)), \
$(call gb_Library_get_target,vclplug_svp) \
) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index a866a11..bf7d72c 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,7 @@ $(call gb_Output_announce,$(2),$(true),GAL,1)
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/*  \
$(call gb_Helper_print_on_error,\
-   $(if $(filter-out MACOSX WNT,$(OS)),SAL_USE_VCLPLUGIN=svp) \
+   $(if $(filter-out MACOSX 
WNT,$(OS_FOR_BUILD)),SAL_USE_VCLPLUGIN=svp) \
$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index 39dd1f5..b48f2c4 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -8,7 +8,7 @@
 #
 
 
-ifeq (,$(filter WNT,$(OS)))
+ifeq (,$(filter WNT,$(OS_FOR_BUILD)))
gb_GENGAL = gengal.bin
 else # windows appends the .exe
gb_GENGAL = gengal
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 51/5de997f69222b06a07ce9a95e8610cc9c7cbcc

2013-05-16 Thread Caolán McNamara

 51/5de997f69222b06a07ce9a95e8610cc9c7cbcc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e1980b24969d49e194c9910302be436d028ffdde
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 14:12:00 2013 +0100

Notes added by 'git notes add'

diff --git a/51/5de997f69222b06a07ce9a95e8610cc9c7cbcc 
b/51/5de997f69222b06a07ce9a95e8610cc9c7cbcc
new file mode 100644
index 000..7a280ae
--- /dev/null
+++ b/51/5de997f69222b06a07ce9a95e8610cc9c7cbcc
@@ -0,0 +1 @@
+prefer: 1857688e1f4ba982d147a9cac69fad948361d1c0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libcmis/libcmis-0.3.0.patch

2013-05-16 Thread Cédric Bosdonnat

 libcmis/libcmis-0.3.0.patch |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 7a6f5186a8e4089181f57af44fa4654fe692856b
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu May 16 15:07:44 2013 +0200

fdo#64577, CMIS: fixed crasher in libcmis

The crash is handled, but the huge files' size won't be properly handled
on 32bits builds: would require a libcmis API change.

Change-Id: I8ef1190a4d1de7d91a67ec20330db9e1747dfdc2

diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index d9dc70f..37644c8 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -20,3 +20,16 @@ index e8efd67..decb79a 100644
  xmlTextWriterEndElement( writer ); // End of Expires
  xmlTextWriterEndElement( writer ); // End of Timestamp
  
+diff --git src/libcmis/document.cxx src/libcmis/document.cxx
+index 7c2a8e6..e7014cb 100644
+--- src/libcmis/document.cxx
 src/libcmis/document.cxx
+@@ -78,7 +78,7 @@ namespace libcmis
+ {
+ long contentLength = 0;
+ map string, libcmis::PropertyPtr ::const_iterator it = 
getProperties( ).find( string( cmis:contentStreamLength ) );
+-if ( it != getProperties( ).end( )  !it-second-getStrings( 
).empty( ) )
++if ( it != getProperties( ).end( )  !it-second-getLongs( ).empty( 
) )
+ contentLength = it-second-getLongs( ).front( );
+ return contentLength;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - scp2/source solenv/bin

2013-05-16 Thread Tor Lillqvist

 scp2/source/python/file_python.scp|  217 --
 solenv/bin/modules/installer/filelists.pm |2 
 solenv/bin/modules/installer/systemactions.pm |9 -
 solenv/bin/modules/installer/worker.pm|   13 +
 4 files changed, 17 insertions(+), 224 deletions(-)

New commits:
commit 32e716528560c22c8ec881ed88fd7a99a27c9efd
Author: Tor Lillqvist t...@iki.fi
Date:   Thu May 16 16:03:03 2013 +0300

Entries for symlinks in the Python framework seem unnecessary now

Change-Id: I63e0ceb42db5c561cafaae160259ee7f2658552c

diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index 83324ed..f57d2d0 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -128,223 +128,6 @@ File gid_File_Share_Registry_Pyuno_Xcd
 Name = pyuno.xcd;
 End
 
-#ifndef SYSTEM_PYTHON
-#ifdef MACOSX
-//directory entries solely to be able to create the symlinks
-Directory gid_Dir_PythonFramework
-ParentID = gid_Brand_Dir_Program;
-HostName = LibreOfficePython.framework;
-Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions
-ParentID = gid_Dir_PythonFramework;
-HostName = Versions;
-Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver
-ParentID = gid_Dir_PythonFramework_Versions;
-HostName = STRING(PYMAJMIN);
-Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_bin
-ParentID = gid_Dir_PythonFramework_Versions_ver;
-HostName = bin;
-Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_include
-ParentID = gid_Dir_PythonFramework_Versions_ver;
-HostName = include;
-Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_include_pythonver
-ParentID = gid_Dir_PythonFramework_Versions_ver_include;
-HostName = STRING(CONCAT3(python,PYMAJMIN,m));
-Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib
-ParentID = gid_Dir_PythonFramework_Versions_ver;
-HostName = lib;
-Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig
-ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
-HostName = pkgconfig;
-Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver
-ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
-HostName = STRING(CONCAT2(python,PYMAJMIN));
-Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config
-ParentID = gid_Dir_PythonFramework_Versions_ver_lib_pythonver;
-HostName = STRING(CONCAT3(config-,PYMAJMIN,m));
-Styles = (CREATE);
-End
-
-Unixlink gid_Unixlink_Python_Headers
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework;
-Name = Headers;
-Target = Versions/Current/Headers;
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_LibreOfficePython
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework;
-Name = LibreOfficePython;
-Target = Versions/Current/LibreOfficePython;
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_Resources
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework;
-Name = Resources;
-Target = Versions/Current/Resources;
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_Versions_Current
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework_Versions;
-Name = Current;
-Target = STRING(PYMAJMIN);
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_Versions_ver_Headers
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework_Versions_ver;
-Name = Headers;
-Target = STRING(CONCAT3(include/python,PYMAJMIN,m));
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_idle
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-Name = idle3;
-Target = STRING(CONCAT2(idle,PYMAJMIN));
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pydoc
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-Name = pydoc3;
-Target = STRING(CONCAT2(pydoc,PYMAJMIN));
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_python
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-Name = python3;
-Target = STRING(CONCAT2(python,PYMAJMIN));
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pythonconfig
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-Name = python3-config;
-Target = STRING(CONCAT3(python,PYMAJMIN,-config));
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pythonw
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-Name = pythonw3;
-Target = STRING(CONCAT2(pythonw,PYMAJMIN));
-Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pyvenv
-BIN_FILE_BODY;
-Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-Name = pyvenv;
-Target = STRING(CONCAT2(pyvenv-,PYMAJMIN));
-Styles = ();
-End
-
-Unixlink

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

2013-05-16 Thread Noel Power

 sc/source/filter/oox/worksheethelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 360e017a7b58cc2c52ee13bca2836040396eabe0
Author: Noel Power noel.po...@suse.com
Date:   Thu May 16 14:22:08 2013 +0100

partial fix for bnc#819865

Imported column widths were wrong because we were iterating
over the wrong column ( due to a typo I guess ) nStartCol - nCol

Change-Id: I0504bca597eb313c2c28d1a26ca03eec41ebbc34

diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index f22c27a..f18ee49 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1183,7 +1183,7 @@ void WorksheetGlobals::convertColumns( OutlineLevelVec 
orColLevels,
 {
 for( SCCOL nCol = nStartCol; nCol = nEndCol; ++nCol )
 {
-rDoc.SetColWidthOnly( nStartCol, nTab, (sal_uInt16)sc::HMMToTwips( 
nWidth ) );
+rDoc.SetColWidthOnly( nCol, nTab, (sal_uInt16)sc::HMMToTwips( 
nWidth ) );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl padmin/source sw/inc sw/source vcl/generic vcl/inc vcl/source

2013-05-16 Thread Noel Grandin

 include/vcl/fontmanager.hxx  |8 -
 include/vcl/print.hxx|2 
 padmin/source/prtsetup.cxx   |2 
 sw/inc/IDocumentSettingAccess.hxx|1 
 sw/source/core/doc/doc.cxx   |4 
 sw/source/filter/xml/xmlimp.cxx  |8 -
 sw/source/ui/uno/SwXDocumentSettings.cxx |   11 -
 vcl/generic/fontmanager/fontmanager.cxx  |  230 +--
 vcl/generic/print/genpspgraphics.cxx |2 
 vcl/inc/salprn.hxx   |3 
 vcl/source/gdi/print.cxx |   11 -
 11 files changed, 17 insertions(+), 265 deletions(-)

New commits:
commit 0fd4d12c6233da2ac1936cd89838b006ffec5192
Author: Noel Grandin n...@peralex.com
Date:   Wed May 8 08:27:27 2013 +0200

Remove code associated with psprint::CompatMetricOverride service

We don't actually have any implementations of this service.

This service was introduced by
   commit 01cf48436df2cc3f01d1c57cc4348fc037ef
   Author: Kurt Zenker k...@openoffice.org
   Date:   Wed Jun 20 09:07:44 2007 +
   INTEGRATION: CWS compmetric (1.77.2); FILE MERGED
   2007/05/09 16:27:46 pl 1.77.2.2: #146890# algorithm is needed
   2007/05/09 12:13:59 pl 1.77.2.1: #146890# backwards compatibility 
service for metrics

Michael Stahl seems to think it was a Sun-internal hack introduced
for a specific customer.

Change-Id: I1b27778f827504c2adb0e27e8d7c0f0dedcaf940
Reviewed-on: https://gerrit.libreoffice.org/3824
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/include/vcl/fontmanager.hxx b/include/vcl/fontmanager.hxx
index cfddd75..2cc0ac9 100644
--- a/include/vcl/fontmanager.hxx
+++ b/include/vcl/fontmanager.hxx
@@ -284,8 +284,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
 
 mutable FontCache*
m_pFontCache;
 
-mutable std::vector fontIDm_aOverrideFonts;
-
 OString getAfmFile( PrintFont* pFont ) const;
 OString getFontFile( PrintFont* pFont ) const;
 
@@ -343,8 +341,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
 */
 bool addFontconfigDir(const OString rDirectory);
 
-bool readOverrideMetrics();
-
 std::setOString m_aPreviousLangSupportRequests;
 std::vectorOString m_aCurrentRequests;
 Timer m_aFontInstallerTimer;
@@ -371,9 +367,9 @@ public:
 // returns the ids of all managed fonts. on pParser != NULL
 // all fonttype::Builtin type fonts are not listed
 // which do not occur in the PPD of pParser
-void getFontList( std::list fontID  rFontIDs, const PPDParser* pParser 
= NULL, bool bUseOverrideMetrics = false );
+void getFontList( std::list fontID  rFontIDs, const PPDParser* pParser 
= NULL );
 // get the font list and fast font info. see getFontList for pParser
-void getFontListWithFastInfo( std::list FastPrintFontInfo  rFonts, 
const PPDParser* pParser = NULL, bool bUseOverrideMetrics = false );
+void getFontListWithFastInfo( std::list FastPrintFontInfo  rFonts, 
const PPDParser* pParser = NULL );
 
 // get font info for a specific font
 bool getFontInfo( fontID nFontID, PrintFontInfo rInfo ) const;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index c40e8bc..c0cb364 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -357,8 +357,6 @@ public:
 voidSetErrorHdl( const Link rLink ) { maErrorHdl 
= rLink; }
 const Link GetErrorHdl() const { return maErrorHdl; }
 
-voidCompat_OldPrinterMetrics( bool bSet );
-
 /** checks the printer list and updates it necessary
 *
 *   sends a DataChanged event of type DATACHANGED_PRINTER
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index d9d87cf..4df90de 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -650,7 +650,7 @@ RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) :
 // fill to box
 PrintFontManager rFontManager = PrintFontManager::get();
 ::std::list FastPrintFontInfo  aFonts;
-rFontManager.getFontListWithFastInfo( aFonts, 
m_pParent-m_aJobData.m_pParser, false );
+rFontManager.getFontListWithFastInfo( aFonts, 
m_pParent-m_aJobData.m_pParser );
 ::std::list FastPrintFontInfo ::const_iterator it;
 ::boost::unordered_map OUString, int, OUStringHash  aToMap, aFromMap;
 for( it = aFonts.begin(); it != aFonts.end(); ++it )
diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index 8214f1a..1203915 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -65,7 +65,6 @@ namespace com { namespace sun { namespace star { namespace 
i18n { struct Forbidd
  CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME,
 
  UNIX_FORCE_ZERO_EXT_LEADING,
- USE_OLD_PRINTER_METRICS,

[PATCH libreoffice-4-0] fdo#64577, CMIS: fixed crasher in libcmis

2013-05-16 Thread Bosdonnat Cedric (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3921

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/3921/1

fdo#64577, CMIS: fixed crasher in libcmis

The crash is handled, but the huge files' size won't be properly handled
on 32bits builds: would require a libcmis API change.

Change-Id: I8ef1190a4d1de7d91a67ec20330db9e1747dfdc2
(cherry picked from commit 7a6f5186a8e4089181f57af44fa4654fe692856b)
---
M libcmis/libcmis-0.3.0.patch
1 file changed, 13 insertions(+), 0 deletions(-)



diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index d9dc70f..37644c8 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -20,3 +20,16 @@
  xmlTextWriterEndElement( writer ); // End of Expires
  xmlTextWriterEndElement( writer ); // End of Timestamp
  
+diff --git src/libcmis/document.cxx src/libcmis/document.cxx
+index 7c2a8e6..e7014cb 100644
+--- src/libcmis/document.cxx
 src/libcmis/document.cxx
+@@ -78,7 +78,7 @@ namespace libcmis
+ {
+ long contentLength = 0;
+ map string, libcmis::PropertyPtr ::const_iterator it = 
getProperties( ).find( string( cmis:contentStreamLength ) );
+-if ( it != getProperties( ).end( )  !it-second-getStrings( 
).empty( ) )
++if ( it != getProperties( ).end( )  !it-second-getLongs( ).empty( 
) )
+ contentLength = it-second-getLongs( ).front( );
+ return contentLength;
+ }

-- 
To view, visit https://gerrit.libreoffice.org/3921
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ef1190a4d1de7d91a67ec20330db9e1747dfdc2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr

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

[PUSHED] Remove code associated with psprint::CompatMetricOverride se...

2013-05-16 Thread Michael Stahl (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3824

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3824
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b27778f827504c2adb0e27e8d7c0f0dedcaf940
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-05-16 Thread bugzilla-daemon

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

Michael Meeks michael.me...@novell.com changed:

   What|Removed |Added

 Depends on|46817   |

-- 
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: configure.ac

2013-05-16 Thread Riccardo Magliocchetti

 configure.ac |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit fbdfd76d357ef82cacafdf12228b0025374fbc20
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date:   Mon May 6 12:55:22 2013 +0200

configure: check libjpeg having JERR_BAD_CROP_SPEC defined

b5a9cc71 introduced the use of JERR_BAD_CROP_SPEC which is not
available in Ubuntu 11.10 version of libjpeg62. So better
catch this at configure time.

Change-Id: I19e4287b0c1a9ddc0baaa70ab61364f99571682c
Reviewed-on: https://gerrit.libreoffice.org/3796
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/configure.ac b/configure.ac
index 49e8d02..556f946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7135,6 +7135,17 @@ if test $with_system_jpeg = yes; then
 [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
 AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
 [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
+AC_MSG_CHECKING([[libjpeg version is 7 or greater]])
+   AC_COMPILE_IFELSE([ AC_LANG_SOURCE(
+ [[
+#include stdio.h
+#include jerror.h
+int main(int c, char**v) { printf(%d\n, JERR_BAD_CROP_SPEC); return 0; }
+ ]]) ],
+ [AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)
+   AC_MSG_ERROR(jpeg library version = 7 required)
+  ])
 libo_MINGW_CHECK_DLL([libjpeg])
 else
 AC_MSG_RESULT([internal])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - libcmis/libcmis-0.3.0.patch

2013-05-16 Thread Cédric Bosdonnat

 libcmis/libcmis-0.3.0.patch |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit e33f51a6bec412e988ab7750309358512a3c0614
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu May 16 15:07:44 2013 +0200

fdo#64577, CMIS: fixed crasher in libcmis

The crash is handled, but the huge files' size won't be properly handled
on 32bits builds: would require a libcmis API change.

Change-Id: I8ef1190a4d1de7d91a67ec20330db9e1747dfdc2
(cherry picked from commit 7a6f5186a8e4089181f57af44fa4654fe692856b)
Reviewed-on: https://gerrit.libreoffice.org/3921
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch
index d9dc70f..37644c8 100644
--- a/libcmis/libcmis-0.3.0.patch
+++ b/libcmis/libcmis-0.3.0.patch
@@ -20,3 +20,16 @@ index e8efd67..decb79a 100644
  xmlTextWriterEndElement( writer ); // End of Expires
  xmlTextWriterEndElement( writer ); // End of Timestamp
  
+diff --git src/libcmis/document.cxx src/libcmis/document.cxx
+index 7c2a8e6..e7014cb 100644
+--- src/libcmis/document.cxx
 src/libcmis/document.cxx
+@@ -78,7 +78,7 @@ namespace libcmis
+ {
+ long contentLength = 0;
+ map string, libcmis::PropertyPtr ::const_iterator it = 
getProperties( ).find( string( cmis:contentStreamLength ) );
+-if ( it != getProperties( ).end( )  !it-second-getStrings( 
).empty( ) )
++if ( it != getProperties( ).end( )  !it-second-getLongs( ).empty( 
) )
+ contentLength = it-second-getLongs( ).front( );
+ return contentLength;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] configure: check libjpeg having JERR_BAD_CROP_SPEC defined

2013-05-16 Thread Michael Stahl (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3796

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3796
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I19e4287b0c1a9ddc0baaa70ab61364f99571682c
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Rene Engelhard r...@debian.org
Gerrit-Reviewer: Riccardo Magliocchetti riccardo.magliocche...@gmail.com

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

[PUSHED libreoffice-4-0] fdo#64577, CMIS: fixed crasher in libcmis

2013-05-16 Thread Michael Stahl (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3921

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3921
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ef1190a4d1de7d91a67ec20330db9e1747dfdc2
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

Re: Cppcheck: uselessAssignmentPtrArg in wrapper.cxx (sdext module)

2013-05-16 Thread Caolán McNamara

On Sun, 2013-05-12 at 09:28 -0700, julien2412 wrote:
 A bunch of similar warnings here:
 error file=basic/source/sbx/sbxbyte.cxx line=215

 These always have part like this:
 491 ref:
 492 aTmp.eType = SbxDataType( p-eType  0x0FFF );
 493 p = aTmp; goto start;
 whereas the function is like this:
 sal_Int64 ImpGetInt64( const SbxValues* p )

I think its simply the case that the goto confuses cppcheck, at start:
the p is used, so its not actually a useless assignment. Although its
pretty hairy stuff.

 error file=rsc/source/rscpp/cpp5.c line=643
 id=uselessAssignmentPtrArg severity=style msg=Assignment of function
 parameter has no effect outside the function./
 This one is a bit different, we have this:
 c = cget();

Yeah, that c is actually unused, so that line can be...
- c = cget();
+ cget();

C.

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

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

2013-05-16 Thread Manal Alhassoun

 sc/source/ui/undo/undotab.cxx  |1 +
 sc/source/ui/view/viewfun2.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 08662568a590bfb20849fce077d8b5aff8b99b57
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date:   Wed May 15 12:59:23 2013 +0300

fix for fdo#53031

Change-Id: I137f2446d08b7b536ded26676132e63489e26e48
Reviewed-on: https://gerrit.libreoffice.org/3914
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 3c1ef77..db101dd 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -355,6 +355,7 @@ void ScUndoDeleteTab::Undo()
 pDoc-SetVisible( nTab, pRefUndoDoc-IsVisible( nTab ) );
 pDoc-SetTabBgColor( nTab, pRefUndoDoc-GetTabBgColor(nTab) );
 pDoc-SetSheetEvents( nTab, pRefUndoDoc-GetSheetEvents( nTab ) );
+pDoc-SetLayoutRTL( nTab, pRefUndoDoc-IsLayoutRTL( nTab ) );
 
 if ( pRefUndoDoc-IsTabProtected( nTab ) )
 pDoc-SetTabProtection(nTab, 
pRefUndoDoc-GetTabProtection(nTab));
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index b61d3ab..0b6f48c 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2170,6 +2170,7 @@ sal_Bool ScViewFunc::DeleteTables(const vectorSCTAB 
TheTabs, sal_Bool bRecord
 pUndoDoc-SetVisible( nTab, pDoc-IsVisible( nTab ) );
 pUndoDoc-SetTabBgColor( nTab, pDoc-GetTabBgColor(nTab) );
 pUndoDoc-SetSheetEvents( nTab, pDoc-GetSheetEvents( nTab ) );
+pUndoDoc-SetLayoutRTL( nTab, pDoc-IsLayoutRTL( nTab ) );
 
 if ( pDoc-IsTabProtected( nTab ) )
 pUndoDoc-SetTabProtection(nTab, pDoc-GetTabProtection(nTab));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fix for fdo#53031

2013-05-16 Thread Bosdonnat Cedric (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3914

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3914
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I137f2446d08b7b536ded26676132e63489e26e48
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa
Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/inc

2013-05-16 Thread Herbert Dürr

 sal/inc/rtl/string.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7f6f4407437933ef1ca9d9d33f921bafda0114ba
Author: Herbert DÃ¼rr h...@apache.org
Date:   Thu May 16 12:53:45 2013 +

fix the long cast to eliminate the little warning

diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index dcd6ca4..ebf3e30 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -947,7 +947,7 @@ struct CStringHash
 size_t operator()( const char* p) const {
 size_t n = 0;
 while( *p)
-n += 4*n + *static_castconst unsigned char*(p++);
+n += 4*n + *reinterpret_castconst unsigned char*(p++);
 return n;
 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] Resolves: rhbz#963276 rhbz#761009 lp#766153 lp#892904 Handle...

2013-05-16 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3922

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/3922/1

Resolves: rhbz#963276 rhbz#761009 lp#766153 lp#892904 HandleFontOptions crash

The mpServerFont member of a ImplServerFontEntry must not be deleted while the
ImplServerFontEntry still exists

see also 39cbce553da1834f78b77f48b2f1be9578d6cc05 for another reason a crash in
the same place can happen.  Its impossible from traces in crashes before
39cbce553da1834f78b77f48b2f1be9578d6cc05 was fixed to distinguish those crashes
from this crash.

This crash is a regression due to 7a416820ab5e03f8b988656e0f6a592cb1e81d07
where we went from modifying pServerFont in X11SalGraphics::setFont directly to
modifying it/a-different-one indirectly via ImplServerFontEntry

The various font caches and font thing lifecycles of LibreOffice are somewhat
confusing.

This crash had eluded me for years, to reproduce:
insert-special chars-select a font with loads of glyphs, i.e. AR PL UKai CN
click on the first row of glyphs and hold down page-down until you hit the
bottom, then page-up until you hit the top. Pre patch it won't survive the
whole down+up (and valgrind will moan quite a bit)

(cherry picked from commit 3d6424a752902bba513102834966868f609d91e6)

Change-Id: Ifde0cb375f487c556b04a640d77765a7dc2f0913
---
M vcl/generic/glyphs/glyphcache.cxx
M vcl/inc/generic/glyphcache.hxx
M vcl/unx/generic/gdi/salgdi3.cxx
3 files changed, 19 insertions(+), 5 deletions(-)



diff --git a/vcl/generic/glyphs/glyphcache.cxx 
b/vcl/generic/glyphs/glyphcache.cxx
index bc3c544..826b4cc 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -410,9 +410,22 @@
 
 // ---
 
+void ImplServerFontEntry::SetServerFont(ServerFont* p)
+{
+if (p == mpServerFont)
+return;
+if (mpServerFont)
+mpServerFont-Release();
+mpServerFont = p;
+if (mpServerFont)
+mpServerFont-AddRef();
+}
+
 ImplServerFontEntry::~ImplServerFontEntry()
 {
 // TODO: remove the ServerFont here instead of in the GlyphCache
+if (mpServerFont)
+mpServerFont-Release();
 }
 
 // ===
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 655f2cd..14af1d3 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -224,6 +224,7 @@
 private:
 friend class GlyphCache;
 friend class ServerFontLayout;
+friend class ImplServerFontEntry;
 friend class X11SalGraphics;
 
 voidAddRef() const  { ++mnRefCount; }
@@ -301,7 +302,7 @@
 public:
ImplServerFontEntry( FontSelectPattern );
 virtual~ImplServerFontEntry();
-void   SetServerFont( ServerFont* p) { mpServerFont = p; }
+void   SetServerFont(ServerFont* p);
 void   HandleFontOptions();
 };
 
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index beaf8fd..21089cc 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -194,10 +194,10 @@
 
 // apply font specific-hint settings if needed
 // TODO: also disable it for reference devices
-if( !bPrinter_ )
-{
-ImplServerFontEntry* pSFE = static_castImplServerFontEntry*( 
pEntry-mpFontEntry );
-pSFE-HandleFontOptions();
+if( !bPrinter_ )
+{
+ImplServerFontEntry* pSFE = static_castImplServerFontEntry*( 
pEntry-mpFontEntry );
+pSFE-HandleFontOptions();
 }
 
 return true;

-- 
To view, visit https://gerrit.libreoffice.org/3922
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifde0cb375f487c556b04a640d77765a7dc2f0913
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

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

2013-05-16 Thread Michael Stahl

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

New commits:
commit cdc87e5f32056da77749304f3148f1c842a958d0
Author: Michael Stahl mst...@redhat.com
Date:   Thu May 16 15:58:27 2013 +0200

configure: tweak the jpeg error messages a bit

Apparently libjpeg-turbo (used on Fedora) has a bunch of emulation
modes for jpeg-6/jpeg-7/jpeg-8 compatibility, and the jpeg-6 one
supports JERR_BAD_CROP_SPEC too, which was added to libjpeg in jpeg-7.

Change-Id: I5ca4deb3ea059996cf72e0e92fc80bd11fc6979a

diff --git a/configure.ac b/configure.ac
index 556f946..12d950b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7135,7 +7135,7 @@ if test $with_system_jpeg = yes; then
 [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
 AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
 [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
-AC_MSG_CHECKING([[libjpeg version is 7 or greater]])
+AC_MSG_CHECKING([[libjpeg supports JERR_BAD_CROP_SPEC (jpeg-7 API)]])
AC_COMPILE_IFELSE([ AC_LANG_SOURCE(
  [[
 #include stdio.h
@@ -7144,7 +7144,7 @@ int main(int c, char**v) { printf(%d\n, 
JERR_BAD_CROP_SPEC); return 0; }
  ]]) ],
  [AC_MSG_RESULT(yes)],
  [AC_MSG_RESULT(no)
-   AC_MSG_ERROR(jpeg library version = 7 required)
+   AC_MSG_ERROR(jpeg library version = 7 or 
jpeg-turbo version = 1.1 required)
   ])
 libo_MINGW_CHECK_DLL([libjpeg])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svl/README

2013-05-16 Thread Eike Rathke

 svl/README |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5e9fe0ff4dfaec04ad821c4347fd8adcb5dfcb5a
Author: Eike Rathke er...@redhat.com
Date:   Thu May 16 16:25:16 2013 +0200

some details

Change-Id: I22b7bef8106dc52a5f1d393805021318ea3d9f07

diff --git a/svl/README b/svl/README
index 970f51a..2ab2f1d 100644
--- a/svl/README
+++ b/svl/README
@@ -1,8 +1,12 @@
 Contains non-graphical helper code for office applications.
 
+Specifically this module does not depend on or use includes from module
+vcl. Originally all code in svtools that did not depend on vcl was split
+off into this svl (svtools light) module.
+
 In particular the SfxItemSet is a property-bag like container that
 stores arbitrary sets of properties for everything from text run
 formats, to Chart regression line properties.
 
 There are lots of other useful helpers in here for various office
-tasks; much of this code was originally moved from svx/sfx2.
\ No newline at end of file
+tasks; much of this code was originally moved from svx/sfx2.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-05-16 Thread Caolán McNamara

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

New commits:
commit 58e72f3a8eb63edc84cfb6141b1e87c436824a14
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 15:28:52 2013 +0100

Updated core
Project: help  6e411048d9eb0628a54cfb23647a181efe85cd92

diff --git a/helpcontent2 b/helpcontent2
index e0c44f8..6e41104 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e0c44f8ece1d3732eeec93b0177b9c1ab1bc37f7
+Subproject commit 6e411048d9eb0628a54cfb23647a181efe85cd92
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text

2013-05-16 Thread Caolán McNamara

 helpers/help_hid.lst |2 -
 source/text/shared/optionen/01020100.xhp |   29 +++-
 source/text/shared/optionen/01060500.xhp |   55 +++
 3 files changed, 41 insertions(+), 45 deletions(-)

New commits:
commit 6e411048d9eb0628a54cfb23647a181efe85cd92
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 15:28:52 2013 +0100

update help ids for proxy options page conversion

Change-Id: Id43a7d02edc9a9c9ba01e29cd894c4c39c549726

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 18ed830..a73fe62 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2668,7 +2668,6 @@ HID_OPTIONS_JAVA_PARAMETER,39998,
 HID_OPTIONS_LINGU,33812,
 HID_OPTIONS_MULTIPATH_LIST,40056,
 HID_OPTIONS_PATHS_SELECTFOLDER,39876,
-HID_OPTIONS_PROXY,33844,
 HID_OPTLOAD_PAGE,53230,
 HID_OPTMAKECHANGES,41151,
 HID_OPTPATH_CTL_PATH,33888,
diff --git a/source/text/shared/optionen/01020100.xhp 
b/source/text/shared/optionen/01020100.xhp
index 13377ac..0d2a016 100644
--- a/source/text/shared/optionen/01020100.xhp
+++ b/source/text/shared/optionen/01020100.xhp
@@ -33,7 +33,7 @@
 bookmark xml-lang=en-US branch=index 
id=bm_id3147577bookmark_valuesettings; proxies/bookmark_value
 bookmark_valueproxy settings/bookmark_value
 /bookmark
-bookmark xml-lang=en-US branch=hid/CUI_HID_OPTIONS_PROXY 
id=bm_id3154927 localize=false/paragraph role=heading id=hd_id3156414 
xml-lang=en-US level=1 l10n=U oldref=1link 
href=text/shared/optionen/01020100.xhp name=ProxyProxy/link/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/optproxypage/OptProxyPage 
id=bm_id3154927 localize=false/paragraph role=heading id=hd_id3156414 
xml-lang=en-US level=1 l10n=U oldref=1link 
href=text/shared/optionen/01020100.xhp name=ProxyProxy/link/paragraph
 /section
 paragraph role=paragraph id=par_id3145090 xml-lang=en-US l10n=U 
oldref=32link href=text/shared/00/0002.xhp#proxy name=Proxy 
serversProxy servers/link for accessing the Internet can be set up manually 
as needed./paragraph
 section id=howtoget
@@ -41,8 +41,8 @@
 /section
 paragraph role=heading id=hd_id3147577 xml-lang=en-US level=2 
l10n=U oldref=3Settings/paragraph
 paragraph role=paragraph id=par_id3153748 xml-lang=en-US l10n=U 
oldref=4Defines the settings for the link 
href=text/shared/00/0002.xhp#proxy name=proxy serverproxy 
server/link./paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE id=bm_id3156347 
localize=false/paragraph role=heading id=hd_id3151110 xml-lang=en-US 
level=3 l10n=U oldref=8Proxy server/paragraph
-paragraph role=paragraph id=par_id3147275 xml-lang=en-US l10n=U 
oldref=9ahelp 
hid=SVX:LISTBOX:RID_SVXPAGE_INET_PROXY:LB_PROXYMODESpecifies the type of 
proxy definition./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/optproxypage/proxymode 
id=bm_id3156347 localize=false/paragraph role=heading id=hd_id3151110 
xml-lang=en-US level=3 l10n=U oldref=8Proxy server/paragraph
+paragraph role=paragraph id=par_id3147275 xml-lang=en-US l10n=U 
oldref=9ahelp hid=cui/ui/optproxypage/proxymodeSpecifies the type of 
proxy definition./ahelp/paragraph
 paragraph role=heading id=hd_id3147574 xml-lang=en-US level=4 
l10n=U oldref=10None/paragraph
 paragraph role=paragraph id=par_id3148685 xml-lang=en-US l10n=U 
oldref=11Accesses the Internet without a proxy server. Allows you to set up 
a connection directly on your computer to an Internet provider that does not 
use a proxy./paragraph
 paragraph role=heading id=hd_id3150984 xml-lang=en-US level=4 
l10n=U oldref=14Manual/paragraph
@@ -50,19 +50,18 @@
 paragraph role=tip id=par_id3148943 xml-lang=en-US l10n=U 
oldref=29Type server names without the protocol prefix. For example, type 
www.example.com, not http://www.example.com./paragraph
 paragraph role=heading id=par_idN10684 xml-lang=en-US level=4 
l10n=NEWSystem/paragraph
 paragraph role=paragraph id=par_idN10688 xml-lang=en-US l10n=NEWOn 
Windows or UNIX systems using GNOME or KDE, this option tells %PRODUCTNAME to 
use the system settings. You must restart %PRODUCTNAME to initiate this 
setting.commentUFI: see spec System-Settings/comment/paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY id=bm_id3154346 
localize=false/paragraph role=heading id=hd_id3148948 xml-lang=en-US 
level=3 l10n=U oldref=16HTTP proxy/paragraph
-paragraph role=paragraph id=par_id3154923 xml-lang=en-US l10n=U 
oldref=17ahelp hid=SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXYType the 
name of the proxy server for link href=text/shared/00/0002.xhp#http 
name=HTTPHTTP/link./ahelp Type the port in the right-hand 
field./paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY id=bm_id431531 
localize=false/paragraph role=heading id=hd_id9971922 xml-lang=en-US 
level=3 l10n=NEWHTTPS proxy/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/optproxypage/http 
id=bm_id3154346

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

2013-05-16 Thread Tor Lillqvist

 vcl/generic/fontmanager/fontmanager.cxx |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit 7689697566016c43a9f633c7383232d152476c0e
Author: Tor Lillqvist t...@iki.fi
Date:   Thu May 16 17:30:26 2013 +0300

WaE: unused functions

Change-Id: I45ae680a89848f32e045a0d3252fe6624decbde7

diff --git a/vcl/generic/fontmanager/fontmanager.cxx 
b/vcl/generic/fontmanager/fontmanager.cxx
index 14f5759..d3adb50 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -2798,26 +2798,4 @@ std::list sal_Unicode   
PrintFontManager::getUnicodeFromAdobeName( const OStri
 return aRet;
 }
 
-// -
-namespace
-{
-OUString getString( const Any rAny )
-{
-OUString aStr;
-rAny = aStr;
-return aStr;
-}
-bool getBool( const Any rAny )
-{
-sal_Bool bBool = sal_False;
-rAny = bBool;
-return static_castbool(bBool);
-}
-sal_Int32 getInt( const Any rAny )
-{
-sal_Int32 n = 0;
-rAny = n;
-return n;
-}
-}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 3c/8d9a3e00bb62a98d375898ff30b8dfcc670ca9 97/863eb43d5a5adadc61ae4cc00c7e1977e9e922

2013-05-16 Thread Caolán McNamara

 3c/8d9a3e00bb62a98d375898ff30b8dfcc670ca9 |1 +
 97/863eb43d5a5adadc61ae4cc00c7e1977e9e922 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 39b910f0f3a526d5ebf5734e5024d11bfee84328
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 15:38:17 2013 +0100

Notes added by 'git notes add'

diff --git a/97/863eb43d5a5adadc61ae4cc00c7e1977e9e922 
b/97/863eb43d5a5adadc61ae4cc00c7e1977e9e922
new file mode 100644
index 000..b7f7e9c
--- /dev/null
+++ b/97/863eb43d5a5adadc61ae4cc00c7e1977e9e922
@@ -0,0 +1 @@
+prefer: 28ca88898c5cd3730ebfcbbf303b68d25150
commit 650b4bd3eda4a03b86ba0af14247a689321753d8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 15:38:08 2013 +0100

Notes added by 'git notes add'

diff --git a/3c/8d9a3e00bb62a98d375898ff30b8dfcc670ca9 
b/3c/8d9a3e00bb62a98d375898ff30b8dfcc670ca9
new file mode 100644
index 000..b7f7e9c
--- /dev/null
+++ b/3c/8d9a3e00bb62a98d375898ff30b8dfcc670ca9
@@ -0,0 +1 @@
+prefer: 28ca88898c5cd3730ebfcbbf303b68d25150
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Miklos Vajna

 sw/qa/README |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit aa741ec6fa269cd64e7a40aa1e323d39db8183cc
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu May 16 17:01:41 2013 +0200

sw/qa: add a README

Change-Id: I4a318274f4b4175af1d4108484670eef9af9684c

diff --git a/sw/qa/README b/sw/qa/README
new file mode 100644
index 000..fba0bdb
--- /dev/null
+++ b/sw/qa/README
@@ -0,0 +1,10 @@
+You can find different types of Writer tests here, the most interesting ones:
+
+- core/filters-test: loads different file types (see SwFiltersTest::testCVEs()
+  for the list of supported filter types), and only makes sure Writer does not
+  crash. To add new tests, you just need to drop in the test files to the
+  relevant directory, no code change is necessary.
+- core/uwriter: this test has access to private Writer symbols, add new tests
+  here if you need that.
+- extras: see its own README -- executes import and export filters and asserts
+  the UNO model to verify the resulting document is the expected one.
___
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' - fe/59ae72e1bfede91de6dc8ee56e4bf04f10e9b0

2013-05-16 Thread Caolán McNamara

 fe/59ae72e1bfede91de6dc8ee56e4bf04f10e9b0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 522724c6a53382c07f50c4bbf7ff9ad4ea0fefc9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:10:20 2013 +0100

Notes added by 'git notes add'

diff --git a/fe/59ae72e1bfede91de6dc8ee56e4bf04f10e9b0 
b/fe/59ae72e1bfede91de6dc8ee56e4bf04f10e9b0
new file mode 100644
index 000..b54aad1
--- /dev/null
+++ b/fe/59ae72e1bfede91de6dc8ee56e4bf04f10e9b0
@@ -0,0 +1 @@
+prefer: 725eba738eae4eee6cd9b833d375db5463833119
___
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' - 2 commits - 0a/731aa083647216a65df8f78c909fb8995cb3a0 a4/d6bd1f44adb7ece8e6f928c60239d875867f96

2013-05-16 Thread Caolán McNamara

 0a/731aa083647216a65df8f78c909fb8995cb3a0 |1 +
 a4/d6bd1f44adb7ece8e6f928c60239d875867f96 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 6648ae553828741661e8d15fff379df166b61a31
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:12:55 2013 +0100

Notes added by 'git notes add'

diff --git a/a4/d6bd1f44adb7ece8e6f928c60239d875867f96 
b/a4/d6bd1f44adb7ece8e6f928c60239d875867f96
new file mode 100644
index 000..5d408df
--- /dev/null
+++ b/a4/d6bd1f44adb7ece8e6f928c60239d875867f96
@@ -0,0 +1 @@
+reject: self-inflicted feature removal
commit a15a1bf4753e9699bcb350e8b12aff7812c2f4a9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:12:44 2013 +0100

Notes added by 'git notes add'

diff --git a/0a/731aa083647216a65df8f78c909fb8995cb3a0 
b/0a/731aa083647216a65df8f78c909fb8995cb3a0
new file mode 100644
index 000..5d408df
--- /dev/null
+++ b/0a/731aa083647216a65df8f78c909fb8995cb3a0
@@ -0,0 +1 @@
+reject: self-inflicted feature removal
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Caolán McNamara

 vcl/generic/glyphs/glyphcache.cxx |   13 +
 vcl/inc/generic/glyphcache.hxx|3 ++-
 vcl/unx/generic/gdi/salgdi3.cxx   |8 
 3 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit b4f4cdc231fb8f35954cd896d95c087933ab96b0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Apr 18 13:13:43 2013 +0100

Resolves: rhbz#963276 rhbz#761009 lp#766153 lp#892904 HandleFontOptions 
crash

The mpServerFont member of a ImplServerFontEntry must not be deleted while 
the
ImplServerFontEntry still exists

see also 39cbce553da1834f78b77f48b2f1be9578d6cc05 for another reason a 
crash in
the same place can happen.  Its impossible from traces in crashes before
39cbce553da1834f78b77f48b2f1be9578d6cc05 was fixed to distinguish those 
crashes
from this crash.

This crash is a regression due to 7a416820ab5e03f8b988656e0f6a592cb1e81d07
where we went from modifying pServerFont in X11SalGraphics::setFont 
directly to
modifying it/a-different-one indirectly via ImplServerFontEntry

The various font caches and font thing lifecycles of LibreOffice are 
somewhat
confusing.

This crash had eluded me for years, to reproduce:
insert-special chars-select a font with loads of glyphs, i.e. AR PL UKai 
CN
click on the first row of glyphs and hold down page-down until you hit the
bottom, then page-up until you hit the top. Pre patch it won't survive the
whole down+up (and valgrind will moan quite a bit)

(cherry picked from commit 3d6424a752902bba513102834966868f609d91e6)

Change-Id: Ifde0cb375f487c556b04a640d77765a7dc2f0913
Reviewed-on: https://gerrit.libreoffice.org/3922
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/generic/glyphs/glyphcache.cxx 
b/vcl/generic/glyphs/glyphcache.cxx
index bc3c544..826b4cc 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -410,9 +410,22 @@ ImplServerFontEntry::ImplServerFontEntry( 
FontSelectPattern rFSD )
 
 // ---
 
+void ImplServerFontEntry::SetServerFont(ServerFont* p)
+{
+if (p == mpServerFont)
+return;
+if (mpServerFont)
+mpServerFont-Release();
+mpServerFont = p;
+if (mpServerFont)
+mpServerFont-AddRef();
+}
+
 ImplServerFontEntry::~ImplServerFontEntry()
 {
 // TODO: remove the ServerFont here instead of in the GlyphCache
+if (mpServerFont)
+mpServerFont-Release();
 }
 
 // ===
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 655f2cd..14af1d3 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -224,6 +224,7 @@ public:
 private:
 friend class GlyphCache;
 friend class ServerFontLayout;
+friend class ImplServerFontEntry;
 friend class X11SalGraphics;
 
 voidAddRef() const  { ++mnRefCount; }
@@ -301,7 +302,7 @@ private:
 public:
ImplServerFontEntry( FontSelectPattern );
 virtual~ImplServerFontEntry();
-void   SetServerFont( ServerFont* p) { mpServerFont = p; }
+void   SetServerFont(ServerFont* p);
 void   HandleFontOptions();
 };
 
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index beaf8fd..21089cc 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -194,10 +194,10 @@ bool X11SalGraphics::setFont( const FontSelectPattern 
*pEntry, int nFallbackLeve
 
 // apply font specific-hint settings if needed
 // TODO: also disable it for reference devices
-if( !bPrinter_ )
-{
-ImplServerFontEntry* pSFE = static_castImplServerFontEntry*( 
pEntry-mpFontEntry );
-pSFE-HandleFontOptions();
+if( !bPrinter_ )
+{
+ImplServerFontEntry* pSFE = static_castImplServerFontEntry*( 
pEntry-mpFontEntry );
+pSFE-HandleFontOptions();
 }
 
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Andre Fischer

 slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx |8 

 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 60169637833bf39f646162ef156347eec4b5da39
Author: Andre Fischer a...@apache.org
Date:   Thu Aug 30 11:32:06 2012 +

Resolves: #i120764# Reduce grid size for snake wipe transition to 8*8.

Patch by: Wang Zhe
Review by: Andre Fischer
(cherry picked from commit 2de9df3bc309f480c68a970b3353b718ca4e9c68)

Change-Id: I33b5d9975d52492d296e77b191ae1a394c8443a0

diff --git 
a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx 
b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
index 64c2a0f..ca1d198 100644
--- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
+++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
@@ -143,7 +143,7 @@ namespace slideshow
 return ParametricPolyPolygonSharedPtr(
 new SnakeWipe(
 // elements:
-64 * 64,
+8 * 8,
 // diagonal:
 nSubType == TOPLEFTDIAGONAL ||
 nSubType == TOPRIGHTDIAGONAL ||
@@ -158,7 +158,7 @@ namespace slideshow
 return ParametricPolyPolygonSharedPtr(
 new ParallelSnakesWipe(
 // elements:
-64 * 64,
+8 * 8,
 // diagonal:
 nSubType == DIAGONALBOTTOMLEFTOPPOSITE ||
 nSubType == DIAGONALTOPLEFTOPPOSITE,
@@ -178,7 +178,7 @@ namespace slideshow
 return ParametricPolyPolygonSharedPtr(
 new SpiralWipe(
 // elements:
-64 * 64,
+8 * 8,
 // flipOnYAxis:
 nSubType == TOPLEFTCOUNTERCLOCKWISE ||
 nSubType == TOPRIGHTCOUNTERCLOCKWISE ||
@@ -188,7 +188,7 @@ namespace slideshow
 return ParametricPolyPolygonSharedPtr(
 new BoxSnakesWipe(
 // elements:
-64 * 64,
+8 * 8,
 // fourBox:
 nSubType == FOURBOXVERTICAL ||
 nSubType == FOURBOXHORIZONTAL ) );
___
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' - 2d/e9df3bc309f480c68a970b3353b718ca4e9c68

2013-05-16 Thread Caolán McNamara

 2d/e9df3bc309f480c68a970b3353b718ca4e9c68 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 97fe60605f4c97521fdad581c758c3449d0a59bf
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:18:24 2013 +0100

Notes added by 'git notes add'

diff --git a/2d/e9df3bc309f480c68a970b3353b718ca4e9c68 
b/2d/e9df3bc309f480c68a970b3353b718ca4e9c68
new file mode 100644
index 000..624a369
--- /dev/null
+++ b/2d/e9df3bc309f480c68a970b3353b718ca4e9c68
@@ -0,0 +1 @@
+merged as: 60169637833bf39f646162ef156347eec4b5da39
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] Resolves: rhbz#963276 rhbz#761009 lp#766153 lp#892904 Handle...

2013-05-16 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3922

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3922
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifde0cb375f487c556b04a640d77765a7dc2f0913
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8a/32f50ba7a50ff621ffc6609e97a0823baf7979

2013-05-16 Thread Caolán McNamara

 8a/32f50ba7a50ff621ffc6609e97a0823baf7979 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 56db3f6f7e3cb1718c27f4f9c27019c0d3e75492
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:21:58 2013 +0100

Notes added by 'git notes add'

diff --git a/8a/32f50ba7a50ff621ffc6609e97a0823baf7979 
b/8a/32f50ba7a50ff621ffc6609e97a0823baf7979
new file mode 100644
index 000..d5a2292
--- /dev/null
+++ b/8a/32f50ba7a50ff621ffc6609e97a0823baf7979
@@ -0,0 +1 @@
+prefer: 3d50039170b91428f7fd81521feb1dbde4c83666
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Jian Fang Zhang

 sw/source/core/fields/docufld.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 31d898853e6898227c3416db0107285e2590d297
Author: Jian Fang Zhang zhan...@apache.org
Date:   Tue Sep 4 04:19:55 2012 +

Resolves: #i120735# free the para object or editengine object...

attached to textfield object explicitly

Found by: zhangjf
Patch by: zhangjf
(cherry picked from commit e2005137e019864578196d06be8ef63aa32a4e96)

Change-Id: I5b7f240d0131017dc9fc35e6e1d14c553de8eacf

diff --git a/sw/source/core/fields/docufld.cxx 
b/sw/source/core/fields/docufld.cxx
index 521cdcec..a7aa86a 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1751,6 +1751,8 @@ SwPostItField::~SwPostItField()
 m_pTextObject-DisposeEditSource();
 m_pTextObject-release();
 }
+
+delete mpText;
 }
 
 const SwFmtFld* SwPostItField::GetByName(SwDoc* pDoc, const OUString rName)
___
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' - e2/005137e019864578196d06be8ef63aa32a4e96

2013-05-16 Thread Caolán McNamara

 e2/005137e019864578196d06be8ef63aa32a4e96 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 79ffb65896181a3faec1e085ec19a506fbaa5eaa
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:25:19 2013 +0100

Notes added by 'git notes add'

diff --git a/e2/005137e019864578196d06be8ef63aa32a4e96 
b/e2/005137e019864578196d06be8ef63aa32a4e96
new file mode 100644
index 000..39792b8
--- /dev/null
+++ b/e2/005137e019864578196d06be8ef63aa32a4e96
@@ -0,0 +1 @@
+merged as: 31d898853e6898227c3416db0107285e2590d297
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2013-05-16 Thread Michael Meeks

* Present
+ Norbert, Thorsten, Stephan, David, Eike, Michael M, Andras,
  Joel, Ahmad, Kendy, Cedric, Bjoern, Lionel, Christian,
  Caolan, Tsahi, Petr

* Completed Action Items
+ look into Windows gallery builds (Michael)
+ look into clipart issues (Caolan)
+ switch on on-line update for 4.0.3 (Kendy)
+ look into Gnome-VFS / URI mangling / path issues (Michael)
  https://bugs.freedesktop.org/show_bug.cgi?id=64311
[ fix back-ported to -4-0 thanks to Fridrich ]
+ mail the ux-advise list + Caolan with button order feedback (Astron)
+ connect Joel with Andreas to get contact details for ext'n devs 
(Thorsten)
+ get status of coretext in 4.1 (Tor, Abdulmajid, Khaled)
+ look at crash-on-start on Mac (Stephan / David)

* Pending Action Items
+ look at gradient issues (Michael)
+ double check Lionel's list-box / API change (Eike)
+ need design for copying styles between templates (Astron/UX)
+ either in that dialog or a new dialog
+ also issue with only editing templates that are in the mgr
+ feedback on stepped-lines dialog (Astron)
+ buy Windows build hardware / hosting (Norbert)
+ buy gamer boxes, and ship them to people's homes
+ alternatives too expensive / slow throughput
AI: + buy fast Windows build hardware (Norbert, Thorsten, 
Michael)
+ Mac hardware is up  installed  running 24/7
AI: + setup Mac hardware tinderbox slave (Norbert)
+ find a good public ? test / webdav server for QA (Thorsten)
+ kill calc / inherited number formatting for 4.1 (Markus)
+ revive writer default templates discussion - pwrt. incremental change 
(Ahmad)

* Release Engineering update (Petr)
+ 3.6.7 schedule - deadline: June 24th for rc1
+ 4.0.4 rc1 - May 27th - ~two weeks out
+ 4.1 - feature-freeze: May 20th
 Feature Freeze Monday 
+ build on Tuesday pre-tagging
+ experience of Alpha1 not so wonderful, but everything should
  be fixed now.
+ 4.1 MABs:
+ 
https://bugs.freedesktop.org/showdependencytree.cgi?id=60270hide_resolved=1
AI: + Can't progress through the database wizard (Caolan)
+ https://bugs.freedesktop.org/show_bug.cgi?id=62937
AI: + Mac: open/save of odt broken (Caolan)
+ https://bugs.freedesktop.org/show_bug.cgi?id=58978
+ 4.1 pending / watch features / issues
+ gallery building (Michael)
AI: + disable gallery building on Mac (Norbert)
+ wiki page needs updating with features:
+ http://wiki.documentfoundation.org/ReleaseNotes/4.1
+ uno type database re-work (Stephan)
+ pushed it just now: size much smaller, and
  callgrind looks sensible.
+ IDL compiler generates the old format, so the SDK
  will still generate the old format for extensions
+ during the build - we generate new format .rdbs
+ can read old  new formats.
+ query about updating doxygen (Norbert)
+ still using autodoc internally, but Michael S. has
  taught doxygen about our IDL format, waiting on a
  release there.
+ coretext (Tor/Khaled)
+ selection problems on Mac for now
+ looks decent, but has selection / font-highlighting
  problems
+ overall - big improvement, not obviously broken,
  fixes a number of Arabic issues.
AI: + enable it for 4.1 betas and see how we go (Norbert)

* Hamburg hack-fest (Thorsten)
+ Reminder to book travel
+ https://wiki.documentfoundation.org/Hackfest/Hamburg2013
+ it's going to be good.

* QA update (Joel)
+ Need_Advice Bugs
+ These bugs seem to absolutely need developer input or
  some special knowledge/setup to move forward.
+ We will be careful about using this whiteboard status
  but hope that once it gets the status, it can be triaged
  quickly by a developer
+ Currently only 2 bugs there, probably will increase as we
  triage but in general should stay quite low
+ http://tinyurl.com/ce6d8km
+ https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html
+ rather more bugs opened than closed
+190 -147
+ bug count

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

2013-05-16 Thread Jian Fang Zhang

 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |   61 
++
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |6 
 2 files changed, 48 insertions(+), 19 deletions(-)

New commits:
commit 3d8a7a435c2e97a02ccca30352a71e68ab112dfc
Author: Jian Fang Zhang zhan...@apache.org
Date:   Tue Sep 4 01:46:03 2012 +

Resolves: #i120675# the certificate store handles need to be closed

after closing the document

Found by: zhangjf
Patch by: zhangjf
(cherry picked from commit 33d9584bb6d285de1d935bf23adbb2c756f4)

Change-Id: I131a17276f33059eb944fc34272c50f838b6973f

diff --git 
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 3bdcd56..ef23b20 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -104,7 +104,7 @@ void traceTrustStatus(DWORD err)
 }
 }
 
-SecurityEnvironment_MSCryptImpl :: SecurityEnvironment_MSCryptImpl( const 
Reference XMultiServiceFactory  aFactory ) : m_hProv( NULL ) , 
m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore( NULL ), 
m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( 
aFactory ), m_bEnableDefault( sal_False ) {
+SecurityEnvironment_MSCryptImpl :: SecurityEnvironment_MSCryptImpl( const 
Reference XMultiServiceFactory  aFactory ) : m_hProv( NULL ) , 
m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore( NULL ), 
m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( 
aFactory ), m_bEnableDefault( sal_False ), m_hMySystemStore(NULL), 
m_hRootSystemStore(NULL), m_hTrustSystemStore(NULL), m_hCaSystemStore(NULL){
 
 }
 
@@ -130,6 +130,27 @@ SecurityEnvironment_MSCryptImpl :: 
~SecurityEnvironment_MSCryptImpl() {
 m_hKeyStore = NULL ;
 }
 
+//i120675, close the store handles
+if( m_hMySystemStore != NULL ) {
+CertCloseStore( m_hMySystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+m_hMySystemStore = NULL ;
+}
+
+if( m_hRootSystemStore != NULL ) {
+CertCloseStore( m_hRootSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+m_hRootSystemStore = NULL ;
+}
+
+if( m_hTrustSystemStore != NULL ) {
+CertCloseStore( m_hTrustSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+m_hTrustSystemStore = NULL ;
+}
+
+if( m_hCaSystemStore != NULL ) {
+CertCloseStore( m_hCaSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+m_hCaSystemStore = NULL ;
+}
+
 if( !m_tSymKeyList.empty()  ) {
 std::list HCRYPTKEY ::iterator symKeyIt ;
 
@@ -1210,40 +1231,42 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl :: 
createKeysManager() throw(
  * Adopt system default certificate store.
  */
 if( defaultEnabled() ) {
-HCERTSTORE hSystemStore ;
-
 //Add system key store into the keys manager.
-hSystemStore = CertOpenSystemStore( 0, MY ) ;
-if( hSystemStore != NULL ) {
-if( xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore( pKeysMngr, 
hSystemStore )  0 ) {
-CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+m_hMySystemStore = CertOpenSystemStore( 0, MY ) ;
+if( m_hMySystemStore != NULL ) {
+if( xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore( pKeysMngr, 
m_hMySystemStore )  0 ) {
+CertCloseStore( m_hMySystemStore, CERT_CLOSE_STORE_CHECK_FLAG 
) ;
+m_hMySystemStore = NULL;
 throw RuntimeException() ;
 }
 }
 
 //Add system root store into the keys manager.
-hSystemStore = CertOpenSystemStore( 0, Root ) ;
-if( hSystemStore != NULL ) {
-if( xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore( pKeysMngr, 
hSystemStore )  0 ) {
-CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+m_hRootSystemStore = CertOpenSystemStore( 0, Root ) ;
+if( m_hRootSystemStore != NULL ) {
+if( xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore( pKeysMngr, 
m_hRootSystemStore )  0 ) {
+CertCloseStore( m_hRootSystemStore, 
CERT_CLOSE_STORE_CHECK_FLAG ) ;
+m_hRootSystemStore = NULL;
 throw RuntimeException() ;
 }
 }
 
 //Add system trusted store into the keys manager.
-hSystemStore = CertOpenSystemStore( 0, Trust ) ;
-if( hSystemStore != NULL ) {
-if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, 
hSystemStore )  0 ) {
-CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+m_hTrustSystemStore = CertOpenSystemStore( 0, Trust ) ;
+if( m_hTrustSystemStore != NULL ) {
+if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, 
m_hTrustSystemStore )  0 ) {
+

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 33/d9584bb6d285de1d935bf23adbb2c7666656f4

2013-05-16 Thread Caolán McNamara

 33/d9584bb6d285de1d935bf23adbb2c756f4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 01310a7dcbfdf2733347a40f15050c4869a94bc2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:27:28 2013 +0100

Notes added by 'git notes add'

diff --git a/33/d9584bb6d285de1d935bf23adbb2c756f4 
b/33/d9584bb6d285de1d935bf23adbb2c756f4
new file mode 100644
index 000..76632d8
--- /dev/null
+++ b/33/d9584bb6d285de1d935bf23adbb2c756f4
@@ -0,0 +1 @@
+merged as: 3d8a7a435c2e97a02ccca30352a71e68ab112dfc
___
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' - 32/754ae9b1b1e399e2371c4b7d349c60f994a034

2013-05-16 Thread Caolán McNamara

 32/754ae9b1b1e399e2371c4b7d349c60f994a034 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0b1d8b60338098f9b6a946e97b12139f66799e18
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:31:18 2013 +0100

Notes added by 'git notes add'

diff --git a/32/754ae9b1b1e399e2371c4b7d349c60f994a034 
b/32/754ae9b1b1e399e2371c4b7d349c60f994a034
new file mode 100644
index 000..50d3ca2
--- /dev/null
+++ b/32/754ae9b1b1e399e2371c4b7d349c60f994a034
@@ -0,0 +1 @@
+prefer: c8dc7372088a13187865cd0d69b64af6b4b5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Andras Timar

 cui/uiconfig/ui/acorreplacepage.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit e601660b89768dc01d0ef73ec3e6579d26b30f96
Author: Andras Timar ati...@suse.com
Date:   Thu May 16 12:44:27 2013 +0200

fdo#64652 remove length restriction of Replace edit box

Change-Id: Ib35a6c2968c4633b565aaf47bb5358f15890083f
Reviewed-on: https://gerrit.libreoffice.org/3920
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/cui/uiconfig/ui/acorreplacepage.ui 
b/cui/uiconfig/ui/acorreplacepage.ui
index aa04bcb..572057f 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -65,7 +65,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=hexpandTrue/property
-property name=max_length30/property
 property name=invisible_charâ/property
   /object
   packing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Miklos Vajna

 writerfilter/source/dmapper/SdtHelper.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d0edc4e4c3709a3d0300e0b2b035e10493f583f9
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu May 16 17:27:49 2013 +0200

bnc#779630 DOCX import: improve w:sdt size guessing

The problem was that when border was enabled (and the importer leaves it
unchanged, and it's on by default), there was not enough space for the
text.

Change-Id: I3ce770eb523389bcf7c5e83d4e76155e2c45de6d

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index a1b215b..35f4d93 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -53,8 +53,13 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr 
pStyleSheet, OUString rDefault
 sal_Int32 nWidth = pOut-GetTextWidth(aLongest);
 
 pOut-Pop();
+
+// Border: see PDFWriterImpl::drawFieldBorder(), border size is font 
height / 4,
+// so additional width / height needed is height / 2.
+sal_Int32 nBorder = nHeight / 2;
+
 // Width: space for the text + the square having the dropdown arrow.
-return awt::Size(nWidth + nHeight, nHeight);
+return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder);
 }
 
 SdtHelper::SdtHelper(DomainMapper_Impl rDM_Impl):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#64652 remove length restriction of Replace edit box

2013-05-16 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3920

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3920
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib35a6c2968c4633b565aaf47bb5358f15890083f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

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

2013-05-16 Thread Miklos Vajna

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

New commits:
commit 3d1297419fa4f5d6ce6b07ee61594db1e9bdf038
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu May 16 17:48:46 2013 +0200

readio group - radio group

Change-Id: I3a849fddeb977f4184a69af7fa35c452cf39472a

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 937eb84..3c7b186 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5462,7 +5462,7 @@ bool PDFWriterImpl::emitWidgetAnnotations()
 // for radio buttons only the RadioButton field, not the
 // CheckBox children should have a value, else acrobat 
reader
 // does not always check the right button
-// of course real check boxes (not belonging to a readio 
group)
+// of course real check boxes (not belonging to a radio 
group)
 // need their values, too
 if( rWidget.m_eType == PDFWriter::RadioButton || 
rWidget.m_nRadioGroup  0 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 51/788964960e1e225170b8fcc7ef453c09c46ca7

2013-05-16 Thread Caolán McNamara

 51/788964960e1e225170b8fcc7ef453c09c46ca7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0291ad556da156b45fce55c68e569a864216463f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:49:45 2013 +0100

Notes added by 'git notes add'

diff --git a/51/788964960e1e225170b8fcc7ef453c09c46ca7 
b/51/788964960e1e225170b8fcc7ef453c09c46ca7
new file mode 100644
index 000..76fb84d
--- /dev/null
+++ b/51/788964960e1e225170b8fcc7ef453c09c46ca7
@@ -0,0 +1 @@
+prefer: a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe
___
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' - 34/74351e99b95a5915ca2b64dcbc061ff6fd445a

2013-05-16 Thread Caolán McNamara

 34/74351e99b95a5915ca2b64dcbc061ff6fd445a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2259e2d93d1e591cff8bab063a25297baa9da5d6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 16:55:23 2013 +0100

Notes added by 'git notes add'

diff --git a/34/74351e99b95a5915ca2b64dcbc061ff6fd445a 
b/34/74351e99b95a5915ca2b64dcbc061ff6fd445a
new file mode 100644
index 000..de2ec8c
--- /dev/null
+++ b/34/74351e99b95a5915ca2b64dcbc061ff6fd445a
@@ -0,0 +1 @@
+prefer: 63be6df7988404687c9f52cf03eba946990fe7b1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'tinderbox' - local_conf/Error_Parse.pm

2013-05-16 Thread Christian Lohmaier

 local_conf/Error_Parse.pm |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1e0608d641334fe9a27dc862b73ce446cf7ebde8
Author: Christian Lohmaier lohmaier+git...@googlemail.com
Date:   Thu May 16 17:53:45 2013 +0200

silence two false-positive errors

suggested by Philipp Riemer, but done differently.
silences
Running ./configure with --enable-werror and --enable-option-checking=fatal
and
checking whether compiler supports pragma GCC diagnostic 
error/ignored/warning...

diff --git a/local_conf/Error_Parse.pm b/local_conf/Error_Parse.pm
index 211bea2..18d1b87 100644
--- a/local_conf/Error_Parse.pm
+++ b/local_conf/Error_Parse.pm
@@ -280,8 +280,10 @@ sub line_type {
 ($line =~ 
m#^commons-lang-2\.3-src/src/(java|test)/org/apache/commons/lang/exception/#) ||
 ($line =~ 
m#^commons-httpclient-3\.1/docs/exception-handling\.html#) ||
 # annoying configure messages
+($line =~ m#^Running \./configure with#) ||
 ($line =~ m#^checking (if|whether).*/bin/rm: cannot remove 
`conftest\*Â´: No such file or directory$#) ||
 ($line =~ m#^checking for -Bsymbolic-functions linker 
support \.\.\. not found#) ||
+($line =~ m#^\s*checking whether .* supports pragma GCC 
diagnostic error/ignored/warning\.\.\.#) ||
 # cppunit
 ($line =~ m#^\s*CXX\s*Exception.lo#) ||
 # gettext related
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Where to find the sources for the tinderbox status?

2013-05-16 Thread Christian Lohmaier

Hi Philipp,  *,

On Tue, May 14, 2013 at 11:18 PM, Philipp Riemer ruderphil...@gmail.com wrote:

 Could you please take care of integrating the changes?

Did apply parts of it, but also those parts slightly differently :-)
see 
http://cgit.freedesktop.org/libreoffice/website/commit/local_conf/Error_Parse.pm?h=tinderboxid=1e0608d641334fe9a27dc862b73ce446cf7ebde8

I didn't add the part re the warnings (as they are just given a
different color, but don't count into the errors) and also don't
ignore the If this does not - seems too unspecific to me to ignore
like that.

There's also an entry for checking for a sed that does not truncate
output - so if that is too restrictive, that line should be changed
instead of adding another one.

 PS: Next week - Linuxtag in Berlin! Will you be there?

unfortunately not..

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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - writerfilter/source

2013-05-16 Thread Miklos Vajna

 writerfilter/source/dmapper/SdtHelper.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 3ac737503d44d16a2519342893ef40cbc18acf23
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu May 16 17:27:49 2013 +0200

bnc#779630 DOCX import: improve w:sdt size guessing

The problem was that when border was enabled (and the importer leaves it
unchanged, and it's on by default), there was not enough space for the
text.

Change-Id: I3ce770eb523389bcf7c5e83d4e76155e2c45de6d
(cherry picked from commit d0edc4e4c3709a3d0300e0b2b035e10493f583f9)

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 41c6181..e773ff9 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -53,8 +53,13 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr 
pStyleSheet, rtl::OUString rDe
 sal_Int32 nWidth = pOut-GetTextWidth(aLongest);
 
 pOut-Pop();
+
+// Border: see PDFWriterImpl::drawFieldBorder(), border size is font 
height / 4,
+// so additional width / height needed is height / 2.
+sal_Int32 nBorder = nHeight / 2;
+
 // Width: space for the text + the square having the dropdown arrow.
-return awt::Size(nWidth + nHeight, nHeight);
+return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder);
 }
 
 SdtHelper::SdtHelper(DomainMapper_Impl rDM_Impl):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Armin Le Grand

 svgio/source/svgreader/svgcharacternode.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit c2b5f0eedcc0fb7e0175e81b6f6127b99b8b7499
Author: Armin Le Grand a...@apache.org
Date:   Thu May 16 14:53:56 2013 +

i122324 detect own re-import of EmbeddedFonts and correct font name

diff --git a/svgio/source/svgreader/svgcharacternode.cxx 
b/svgio/source/svgreader/svgcharacternode.cxx
index 7d3592f..eb337f0 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -248,9 +248,19 @@ namespace svgio
 if(nLength)
 {
 // prepare FontAttribute
-const rtl::OUString aFontFamily = 
rSvgStyleAttributes.getFontFamily().empty() ?
+rtl::OUString aFontFamily = 
rSvgStyleAttributes.getFontFamily().empty() ?
 rtl::OUString(rtl::OUString::createFromAscii(Times New 
Roman)) :
 rSvgStyleAttributes.getFontFamily()[0];
+
+// #122324# if the FontFamily name ends on ' embedded' it is 
probably a re-import
+// of a SVG export with fiont embedding. Remove this to make 
font matching work. This
+// is pretty safe since there should be no font family names 
ending on ' embedded'.
+// Remove again when FontEmbedding is implemented in SVG import
+if(aFontFamily.endsWithAsciiL( embedded, 9))
+{
+aFontFamily = aFontFamily.copy(0, aFontFamily.getLength() 
- 9);
+}
+
 const ::FontWeight 
nFontWeight(getVclFontWeight(rSvgStyleAttributes.getFontWeight()));
 bool bSymbol(false);
 bool bVertical(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Drop String.AppendAscii in editeng

2013-05-16 Thread Ricardo Montania (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3923

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/3923/1

Drop String.AppendAscii in editeng

Change-Id: I25df0e20e2da50e91139cefba74af2741e5fffb5
---
M editeng/source/misc/svxacorr.cxx
M editeng/source/outliner/outlvw.cxx
M include/editeng/svxacorr.hxx
3 files changed, 10 insertions(+), 13 deletions(-)



diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index eebf87c..c2f76ae 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1604,8 +1604,8 @@
 {
 OSL_ENSURE(pLangTable-find(eLang) == pLangTable-end(), Language already 
exists );
 
-String sUserDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False ));
-String sShareDirFile( sUserDirFile );
+OUString sUserDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False ));
+OUString sShareDirFile( sUserDirFile );
 
 SvxAutoCorrectLanguageListsPtr pLists = 0;
 
@@ -1909,13 +1909,12 @@
 return sal_False;
 }
 
-String SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
+OUString SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
 sal_Bool bNewFile, sal_Bool bTst ) 
const
 {
-String sRet, sExt( LanguageTag( eLang ).getBcp47() );
+OUString sRet, sExt( LanguageTag( eLang ).getBcp47() );
 
-sExt.Insert('_', 0);
-sExt.AppendAscii( .dat );
+sExt = _ + sExt + .dat;
 if( bNewFile )
 ( sRet = sUserAutoCorrFile )  += sExt;
 else if( !bTst )
diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index a76419e..2229857 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1312,7 +1312,7 @@
 const EditView rEditView )
 {
 // get text and locale for thesaurus look up
-String aText;
+OUString aText;
 EditEngine *pEditEngine = rEditView.GetEditEngine();
 ESelection aTextSel( rEditView.GetSelection() );
 if (!aTextSel.HasRange())
@@ -1320,17 +1320,15 @@
 aText = pEditEngine-GetText( aTextSel );
 aTextSel.Adjust();
 LanguageType nLang = pEditEngine-GetLanguage( aTextSel.nStartPara, 
aTextSel.nStartPos );
-String aLangText( LanguageTag( nLang ).getBcp47() );
+OUString aLangText( LanguageTag( nLang ).getBcp47() );
 
 // set word and locale to look up as status value
-String aStatusVal( aText );
-aStatusVal.AppendAscii( # );
-aStatusVal += aLangText;
+OUString aStatusVal= aText + # + aLangText;
 
 rStatusVal  = aStatusVal;
 rLang   = nLang;
 
-return aText.Len()  0;
+return aText.getLength()  0;
 }
 
 
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 4f54d8f..9d5774a 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -327,7 +327,7 @@
 
 // Query/Set the name of the AutoCorrect file
 // the default is autocorr.dat
-String GetAutoCorrFileName( LanguageType eLang = LANGUAGE_SYSTEM,
+OUString GetAutoCorrFileName( LanguageType eLang = LANGUAGE_SYSTEM,
 sal_Bool bNewFile = sal_False,
 sal_Bool bTstUserExist = sal_False ) const;
 

-- 
To view, visit https://gerrit.libreoffice.org/3923
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25df0e20e2da50e91139cefba74af2741e5fffb5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br

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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - writerfilter/source

2013-05-16 Thread Miklos Vajna

 writerfilter/source/dmapper/SdtHelper.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d4a628a1ecbbf52c94e7924f17d6163cb34e1135
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu May 16 17:27:49 2013 +0200

bnc#779630 DOCX import: improve w:sdt size guessing

The problem was that when border was enabled (and the importer leaves it
unchanged, and it's on by default), there was not enough space for the
text.

Change-Id: I3ce770eb523389bcf7c5e83d4e76155e2c45de6d
(cherry picked from commit d0edc4e4c3709a3d0300e0b2b035e10493f583f9)

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index a1b215b..35f4d93 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -53,8 +53,13 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr 
pStyleSheet, OUString rDefault
 sal_Int32 nWidth = pOut-GetTextWidth(aLongest);
 
 pOut-Pop();
+
+// Border: see PDFWriterImpl::drawFieldBorder(), border size is font 
height / 4,
+// so additional width / height needed is height / 2.
+sal_Int32 nBorder = nHeight / 2;
+
 // Width: space for the text + the square having the dropdown arrow.
-return awt::Size(nWidth + nHeight, nHeight);
+return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder);
 }
 
 SdtHelper::SdtHelper(DomainMapper_Impl rDM_Impl):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Caolán McNamara

 padmin/source/prtsetup.cxx |   22 +-
 1 file changed, 9 insertions(+), 13 deletions(-)

New commits:
commit 2df3ff140e5f803c3bb22fd621045e416c84c587
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 17:33:37 2013 +0100

replace %s in printer settings dialog with printername

Change-Id: I9594d929316b917b47b40324e3e043ddc1fe

diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 4df90de..f3f42a1 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -91,9 +91,10 @@ RTSDialog::RTSDialog( const PrinterInfo rJobData, const 
String rPrinter, bool
 get(m_pCancelButton, cancel);
 get(m_pTabControl, notebook);
 
-String aTitle( GetText() );
-aTitle.SearchAndReplace( String( %s ), m_aJobData.m_aPrinterName );
-SetText( aTitle );
+setDeferredProperties();
+
+OUString aTitle(GetText());
+SetText(aTitle.replaceAll(%s, m_aJobData.m_aPrinterName));
 
 if( ! bAllPages )
 {
@@ -117,16 +118,11 @@ RTSDialog::RTSDialog( const PrinterInfo rJobData, const 
String rPrinter, bool
 
 RTSDialog::~RTSDialog()
 {
-if( m_pPaperPage )
-delete m_pPaperPage;
-if( m_pDevicePage )
-delete m_pDevicePage;
-if( m_pOtherPage )
-delete m_pOtherPage;
-if( m_pFontSubstPage )
-delete m_pFontSubstPage;
-if( m_pCommandPage )
-delete m_pCommandPage;
+delete m_pPaperPage;
+delete m_pDevicePage;
+delete m_pOtherPage;
+delete m_pFontSubstPage;
+delete m_pCommandPage;
 }
 
 // --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] mso-dumper.git: src/docrecord.py src/docstream.py

2013-05-16 Thread Miklos Vajna

 src/docrecord.py |   47 +++
 src/docstream.py |5 -
 2 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 353f15fa0823ae02b8f0d47333a1e1f734322d82
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu May 16 19:09:18 2013 +0200

dump PlcftxbxBkd

diff --git a/src/docrecord.py b/src/docrecord.py
index 04bf1d0..fec80fe 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -2735,6 +2735,53 @@ class PlcftxbxTxt(DOCDirStream, PLC):
 print '/aCP'
 print '/plcftxbxTxt'
 
+class Tbkd(DOCDirStream):
+The Tbkd structure is used by the PlcftxbxBkd and PlcfTxbxHdrBkd 
structures to associate ranges of
+text from the Textboxes Document and the Header Textboxes Document with 
FTXBXS objects.
+size = 6 # 2.9.309
+def __init__(self, parent, offset):
+DOCDirStream.__init__(self, parent.bytes)
+self.parent = parent
+self.pos = self.posOrig = offset
+
+def dump(self):
+print 'aTbkd type=Tbkd offset=%d size=%d bytes' % (self.pos, 
Tbkd.size)
+self.printAndSet(itxbxs, self.readuInt16())
+self.printAndSet(dcpDepend, self.readuInt16())
+buf = self.readuInt16()
+self.printAndSet(reserved1, buf  0x03ff) # 1..10th bits
+self.printAndSet(fMarkDelete, self.getBit(buf, 10))
+self.printAndSet(fUnk, self.getBit(buf, 11))
+self.printAndSet(fTextOverflow, self.getBit(buf, 12))
+self.printAndSet(reserved2, (buf  0xe000)  13) # 14..16th bits
+print '/aTbkd'
+assert self.posOrig + Tbkd.size == self.pos
+
+class PlcftxbxBkd(DOCDirStream, PLC):
+Specifies which ranges of text go inside which textboxes.
+def __init__(self, mainStream):
+DOCDirStream.__init__(self, 
mainStream.doc.getDirectoryStreamByName(1Table).bytes, mainStream = 
mainStream)
+PLC.__init__(self, mainStream.lcbPlcfTxbxBkd, 6)
+self.pos = mainStream.fcPlcfTxbxBkd
+self.size = mainStream.lcbPlcfTxbxBkd
+
+def dump(self):
+print 'plcftxbxBkd type=PlcftxbxBkd offset=%d size=%d bytes' % 
(self.pos, self.size)
+offset = self.mainStream.ccpText + self.mainStream.ccpFtn
+pos = self.pos
+for i in range(self.getElements()):
+# aCp
+start = self.getuInt32(pos = pos)
+end = self.getuInt32(pos = pos + 4)
+print 'aCP index=%d start=%d end=%d' % (i, start, end)
+pos += 4
+
+# aTbkd
+Tbkd(self, self.getOffset(self.pos, i)).dump()
+print 'transformed value=%s/' % 
self.quoteAttr(self.mainStream.retrieveCPs(offset + start, offset + end))
+print '/aCP'
+print '/plcftxbxBkd'
+
 class PlcfSpa(DOCDirStream, PLC):
 The PlcfSpa structure is a PLC structure in which the data elements are
 SPA structures.
diff --git a/src/docstream.py b/src/docstream.py
index 158748e..849dc19 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -399,7 +399,7 @@ class WordDocumentStream(DOCDirStream):
 [fcPlfLfo],
 [lcbPlfLfo, self.handleLcbPlfLfo],
 [fcPlcfTxbxBkd],
-[lcbPlcfTxbxBkd],
+[lcbPlcfTxbxBkd, self.handleLcbPlcfTxbxBkd],
 [fcPlcfTxbxHdrBkd],
 [lcbPlcfTxbxHdrBkd],
 [fcDocUndoWord9],
@@ -601,6 +601,9 @@ class WordDocumentStream(DOCDirStream):
 def handleLcbSttbfBkmk(self):
 docrecord.SttbfBkmk(self).dump()
 
+def handleLcbPlcfTxbxBkd(self):
+docrecord.PlcftxbxBkd(self).dump()
+
 def dumpFibRgFcLcb97(self, name):
 print '%s type=FibRgFcLcb97 size=744 bytes' % name
 self.__dumpFibRgFcLcb97()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] mso-dumper.git: src/docrecord.py src/docstream.py

2013-05-16 Thread Miklos Vajna

 src/docrecord.py |   11 ++-
 src/docstream.py |6 ++
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit ddc6ca725bc05bdc82a00a30fe52bfea81dd97ad
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu May 16 19:17:36 2013 +0200

factor out duplicated code

diff --git a/src/docrecord.py b/src/docrecord.py
index fec80fe..dac6d83 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1067,7 +1067,7 @@ class PlcfHdd(DOCDirStream, PLC):
 
 def dump(self):
 print 'plcfHdd type=PlcfHdd offset=%d size=%d bytes' % 
(self.pos, self.size)
-offset = self.mainStream.ccpText + self.mainStream.ccpFtn
+offset = self.mainStream.getHeaderOffset()
 pos = self.pos
 for i in range(self.getElements() - 1):
 start = self.getuInt32(pos = pos)
@@ -1088,7 +1088,7 @@ class PlcfandTxt(DOCDirStream, PLC):
 
 def dump(self):
 print 'plcfandTxt type=PlcfandTxt offset=%d size=%d bytes' % 
(self.pos, self.size)
-offset = self.mainStream.ccpText + self.mainStream.ccpFtn + 
self.mainStream.ccpHdd
+offset = self.mainStream.getCommentOffset()
 pos = self.pos
 for i in range(self.getElements() - 1):
 start = self.getuInt32(pos = pos)
@@ -2706,7 +2706,8 @@ class FTXBXS(DOCDirStream):
 self.printAndSet(lid, self.readuInt32())
 self.printAndSet(txidUndo, self.readuInt32())
 print '/aFTXBXS'
-assert self.posOrig + FTXBXS.size == self.pos
+if not self.fReusable:
+assert self.posOrig + FTXBXS.size == self.pos
 
 class PlcftxbxTxt(DOCDirStream, PLC):
 Specifies which ranges of text are contained in which textboxes.
@@ -2718,7 +2719,7 @@ class PlcftxbxTxt(DOCDirStream, PLC):
 
 def dump(self):
 print 'plcftxbxTxt type=PlcftxbxTxt offset=%d size=%d bytes' % 
(self.pos, self.size)
-offset = self.mainStream.ccpText + self.mainStream.ccpFtn
+offset = self.mainStream.getHeaderOffset()
 pos = self.pos
 for i in range(self.getElements() - 1):
 # aCp
@@ -2767,7 +2768,7 @@ class PlcftxbxBkd(DOCDirStream, PLC):
 
 def dump(self):
 print 'plcftxbxBkd type=PlcftxbxBkd offset=%d size=%d bytes' % 
(self.pos, self.size)
-offset = self.mainStream.ccpText + self.mainStream.ccpFtn
+offset = self.mainStream.getHeaderOffset()
 pos = self.pos
 for i in range(self.getElements()):
 # aCp
diff --git a/src/docstream.py b/src/docstream.py
index 849dc19..e888299 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -893,4 +893,10 @@ class WordDocumentStream(DOCDirStream):
 i += 1
 return .join(ret)
 
+def getHeaderOffset(self):
+return self.ccpText + self.ccpFtn
+
+def getCommentOffset(self):
+return self.getHeaderOffset() + self.ccpHdd
+
 # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

2013-05-16 Thread Kohei Yoshida

 sc/inc/clipcontext.hxx  |   10 +++--
 sc/source/core/data/clipcontext.cxx |   65 +---
 sc/source/core/data/document.cxx|   19 +-
 3 files changed, 32 insertions(+), 62 deletions(-)

New commits:
commit a38e13f50998d9cc50f737f0352e2676af96f44a
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu May 16 13:52:33 2013 -0400

Cleaned up a bit to remove the need to initialize the block positions.

Change-Id: Iad2e69e4eb61167ad85581a83b19e3798c5edfd0

diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 8b1f261..53f2110 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -27,6 +27,8 @@ class CopyFromClipContext
 
 TablesType maTables;
 
+ScDocument mrDoc;
+
 ScDocument* mpRefUndoDoc;
 ScDocument* mpClipDoc;
 sal_uInt16  mnInsertFlag;
@@ -36,16 +38,16 @@ class CopyFromClipContext
 boolmbSkipAttrForEmptyCells:1;
 
 CopyFromClipContext(); // disabled
+
 public:
-CopyFromClipContext(
+CopyFromClipContext(ScDocument rDoc,
 ScDocument* pRefUndoDoc, ScDocument* pClipDoc, sal_uInt16 nInsertFlag,
 bool bAsLink, bool bSkipAttrForEmptyCells);
 
-bool initBlockPositions(ScDocument rDoc, SCCOL nCol1, SCCOL nCol2);
-void setTabRange(SCTAB nStart, SCTAB nEnd);
-
 ~CopyFromClipContext();
 
+void setTabRange(SCTAB nStart, SCTAB nEnd);
+
 ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
 
 ScDocument* getUndoDoc();
diff --git a/sc/source/core/data/clipcontext.cxx 
b/sc/source/core/data/clipcontext.cxx
index e3e66a2..1d19dd1 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -12,9 +12,10 @@
 
 namespace sc {
 
-CopyFromClipContext::CopyFromClipContext(
+CopyFromClipContext::CopyFromClipContext(ScDocument rDoc,
 ScDocument* pRefUndoDoc, ScDocument* pClipDoc, sal_uInt16 nInsertFlag,
 bool bAsLink, bool bSkipAttrForEmptyCells) :
+mrDoc(rDoc),
 mpRefUndoDoc(pRefUndoDoc), mpClipDoc(pClipDoc), mnInsertFlag(nInsertFlag),
 mnTabStart(-1), mnTabEnd(-1),
 mbAsLink(bAsLink), mbSkipAttrForEmptyCells(bSkipAttrForEmptyCells) {}
@@ -23,44 +24,6 @@ CopyFromClipContext::~CopyFromClipContext()
 {
 }
 
-bool CopyFromClipContext::initBlockPositions(ScDocument rDoc, SCCOL nCol1, 
SCCOL nCol2)
-{
-if (mnTabStart  0 || mnTabEnd  0 || mnTabStart  mnTabEnd)
-return false;
-
-size_t nSize = mnTabEnd - mnTabStart + 1;
-if (maTables.size()  nSize)
-maTables.resize(nSize);
-
-for (size_t i = 0; i  nSize; ++i)
-{
-SCTAB nTab = i + mnTabStart;
-ColumnsType rCols = maTables[i];
-for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
-{
-ColumnsType::iterator it = rCols.find(nCol);
-if (it != rCols.end())
-// This column has already been initialized. Skip it.
-continue;
-
-std::pairColumnsType::iterator,bool r =
-rCols.insert(
-ColumnsType::value_type(nCol, ColumnBlockPosition()));
-
-if (!r.second)
-// insertion failed.
-return false;
-
-it = r.first;
-
-if (!rDoc.InitColumnBlockPosition(it-second, nTab, nCol))
-return false;
-}
-}
-
-return true;
-}
-
 void CopyFromClipContext::setTabRange(SCTAB nStart, SCTAB nEnd)
 {
 mnTabStart = nStart;
@@ -69,14 +32,34 @@ void CopyFromClipContext::setTabRange(SCTAB nStart, SCTAB 
nEnd)
 
 ColumnBlockPosition* CopyFromClipContext::getBlockPosition(SCTAB nTab, SCCOL 
nCol)
 {
+if (mnTabStart  0 || mnTabEnd  0 || mnTabStart  mnTabEnd)
+return NULL;
+
 size_t nTabIndex = nTab - mnTabStart;
 if (nTabIndex = maTables.size())
-return NULL;
+maTables.resize(nTabIndex+1);
 
 ColumnsType rCols = maTables[nTabIndex];
+
 ColumnsType::iterator it = rCols.find(nCol);
+if (it != rCols.end())
+// Block position for this column has already been fetched.
+return it-second;
+
+std::pairColumnsType::iterator,bool r =
+rCols.insert(
+ColumnsType::value_type(nCol, ColumnBlockPosition()));
+
+if (!r.second)
+// insertion failed.
+return NULL;
+
+it = r.first;
+
+if (!mrDoc.InitColumnBlockPosition(it-second, nTab, nCol))
+return NULL;
 
-return it == rCols.end() ? NULL : it-second;
+return it-second;
 }
 
 ScDocument* CopyFromClipContext::getUndoDoc()
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 213b4f5..b8d4497 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2515,7 +2515,7 @@ void ScDocument::CopyFromClip( const ScRange rDestRange, 
const ScMarkData rMar
 if ( ( nInsFlag  IDF_ATTRIB )  !bSkipAttrForEmpty )
 nDelFlag |= IDF_ATTRIB;
 
-sc::CopyFromClipContext aCxt(pRefUndoDoc, pClipDoc,

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

2013-05-16 Thread Pavel Janík

 svgio/source/svgreader/svgstyleattributes.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4b07fb34d00c9e7292d66658f4f6ff040c2267c2
Author: Pavel JanÃk pavelja...@apache.org
Date:   Thu May 16 16:56:38 2013 +

Unname unused argument to prevent compiler warnings.

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index c9d181d..8484859 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1187,7 +1187,7 @@ namespace svgio
 {
 }
 
-void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString 
rTokenName, SVGToken aSVGToken, const rtl::OUString aContent)
+void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString /* 
rTokenName */, SVGToken aSVGToken, const rtl::OUString aContent)
 {
 switch(aSVGToken)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Armin Le Grand

 vcl/source/gdi/bitmapex.cxx |   14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)

New commits:
commit e52f636aa44615b180bf799b2d664de9244c3138
Author: Armin Le Grand a...@apache.org
Date:   Thu Sep 6 10:06:38 2012 +

assertion removed: allow BitmapEx constructors with empty Mask or AlphaMask

(cherry picked from commit c66db94a90efe954691da4ac6bb1ce82ff99e22f)

Change-Id: Ifd4c734fee97d7b8f904a1f32c1367a13dde92b2

assertion corrected: BitmapEx constructors with Mask or AlphaMask...

needed more checks

(cherry picked from commit 560ab48c4b4453ffdd316d8db5dbda111f08650c)

Change-Id: Ib6d41bf3349ee89458e06c632342bff43d7a233c

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index e160cb0..61edab7 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -117,14 +117,10 @@ BitmapEx::BitmapEx( const Bitmap rBmp, const Bitmap 
rMask ) :
 eTransparent( !rMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
 bAlpha  ( sal_False )
 {
-if(!rMask)
-{
-OSL_ENSURE(false, Empty mask given (!));
-}
-else if(rBmp.GetSizePixel() != rMask.GetSizePixel())
+if(!!aBitmap  !!aMask  aBitmap.GetSizePixel() != aMask.GetSizePixel())
 {
 OSL_ENSURE(false, Mask size differs from Bitmap size, corrected Mask 
(!));
-aMask.Scale(rBmp.GetSizePixel());
+aMask.Scale(aBitmap.GetSizePixel());
 }
 
 // Ensure a mask is exactly one bit deep
@@ -142,11 +138,7 @@ BitmapEx::BitmapEx( const Bitmap rBmp, const AlphaMask 
rAlphaMask ) :
 eTransparent( !rAlphaMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP 
),
 bAlpha  ( !rAlphaMask ? sal_False : sal_True )
 {
-if(!rAlphaMask)
-{
-OSL_ENSURE(false, Empty alpha given (!));
-}
-else if(rBmp.GetSizePixel() != rAlphaMask.GetSizePixel())
+if(!!aBitmap  !!aMask  aBitmap.GetSizePixel() != aMask.GetSizePixel())
 {
 OSL_ENSURE(false, Alpha size differs from Bitmap size, corrected Mask 
(!));
 aMask.Scale(rBmp.GetSizePixel());
___
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' - 2 commits - 56/0ab48c4b4453ffdd316d8db5dbda111f08650c c6/6db94a90efe954691da4ac6bb1ce82ff99e22f

2013-05-16 Thread Caolán McNamara

 56/0ab48c4b4453ffdd316d8db5dbda111f08650c |1 +
 c6/6db94a90efe954691da4ac6bb1ce82ff99e22f |1 +
 2 files changed, 2 insertions(+)

New commits:
commit a2f5263324d6f231d73c2c299319d86f031c23a7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 20:01:27 2013 +0100

Notes added by 'git notes add'

diff --git a/56/0ab48c4b4453ffdd316d8db5dbda111f08650c 
b/56/0ab48c4b4453ffdd316d8db5dbda111f08650c
new file mode 100644
index 000..effa7c0
--- /dev/null
+++ b/56/0ab48c4b4453ffdd316d8db5dbda111f08650c
@@ -0,0 +1 @@
+merged as: e52f636aa44615b180bf799b2d664de9244c3138
commit 878cc96e9ccd84af79957d87a2890efbf00fe5b7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 16 20:01:17 2013 +0100

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: redland/ExternalProject_redland.mk

2013-05-16 Thread Stephan Bergmann

 redland/ExternalProject_redland.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b89d4c7fb1c3dd3a4af42380eb8de92d60a102e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 16 21:29:08 2013 +0200

fdo#58978 Typo

...leading to macosx-change-install-names not doing its work, and librdf
referencing libraptor and librasqal with bogus paths on Mac OS X, and thus
cannot be dlopen'ed.

Change-Id: I187ce9a0ddc453157bf8666df4d385a07a8762f7

diff --git a/redland/ExternalProject_redland.mk 
b/redland/ExternalProject_redland.mk
index 6034534..8e3 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 $(MAKE) \
$(if $(filter MACOSX,$(OS)), $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
-   
$(gb_Package_SOURCEDIR_redland)/librdf/.libs/librdf-lo.$(RASQAL_MAJOR).dylib) \
+   
$(gb_Package_SOURCEDIR_redland)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \
)
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2013-05-16 Thread Stephan Bergmann

 solenv/bin/macosx-change-install-names.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b281ffde21c44578f110531e469a8c0f02cdd958
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 16 21:53:02 2013 +0200

Make sure macosx-change-install-names fails if otool -L fails

Change-Id: Ic3d3abc5404446ca378fda9ccfc12d741a560594

diff --git a/solenv/bin/macosx-change-install-names.pl 
b/solenv/bin/macosx-change-install-names.pl
index a6c3eb7..a7984cb 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -94,7 +94,7 @@ foreach $file (@ARGV)
 $change .=  -change $1  . action($type, $loc, $4) . $6;
 }
 }
-close(IN);
+close(IN) or die got $? from $call;
 if ($change ne )
 {
 $call = $ENV{'XCRUN'} install_name_tool$change $file;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-16 Thread Julien Nabet

 rsc/source/rscpp/cpp5.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96c2986dd46d963dae1c3b9fa3a8f2ebf05e8f65
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu May 16 21:57:26 2013 +0200

Quiet cppcheck

Change-Id: Ib860b6dc3b7ace5f737d283778827bfb0783b362

diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 37b2c11..92587fe 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -640,7 +640,7 @@ evalnum(int c)
 c = cget();
 }
 if (c == 'u' || c == 'U')   /* Unsigned nonsense*/
-c = cget();
+cget();
 unget();
 return (value);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Cppcheck: uselessAssignmentPtrArg in wrapper.cxx (sdext module)

2013-05-16 Thread Julien Nabet


On 16/05/2013 15:58, Caolán McNamara wrote:

On Sun, 2013-05-12 at 09:28 -0700, julien2412 wrote:
...
I think its simply the case that the goto confuses cppcheck, at start:
the p is used, so its not actually a useless assignment. Although its
pretty hairy stuff.
As usual, you're absolutely right! :-) I created a tracker for cppcheck 
(see https://sourceforge.net/apps/trac/cppcheck/ticket/4802)

...
Yeah, that c is actually unused, so that line can be... - c = cget(); 
+ cget();
Fixed on master with 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=96c2986dd46d963dae1c3b9fa3a8f2ebf05e8f65


Any idea for initial post (sdext/source/pdfimport/wrapper/wrapper.cxx, 
line 475) ?

Meanwhile and as usual too, thank you Caolán! :-)

Julien

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

[ABANDONED] coverity#983032: Resource leak

2013-05-16 Thread Julien Nabet (via Code Review)

Julien Nabet has abandoned this change.

Change subject: coverity#983032: Resource leak
..


Patch Set 1: Abandoned

Hopefully you noticed this Michael. I was obviously too confident with this 
patch :-) Thank you for your review!

-- 
To view, visit https://gerrit.libreoffice.org/3820
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I0f2b245c98d80a009076494a232229c19cc034a9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

1 2 3 4 >

1 - 100 of 349 matches

Mail list logo