LibreOffice Gerrit News for core on 2014-06-03
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + MD_UPDATE_BASELINKS conversion to .ui in https://gerrit.libreoffice.org/9620 from Szymon Kłos about module cui + fdo#79256 Line Style with Long Dashes and dots is getting corrupt after R in https://gerrit.libreoffice.org/9559 from Dinesh Patil about module oox, sw End of freshness * Merged changes on master for project core changed in the last 25 hours: + fdo#68849: Add header guards to all include files in https://gerrit.libreoffice.org/9615 from Jens Carl + fdo#76934 : DOCX: Preservation: AutoSpacing property not getting preserve in https://gerrit.libreoffice.org/9561 from Pallavi Jadhav * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Upgrade public api of OfficeKit to use OfficeKit instead of LO/LibLO. in https://gerrit.libreoffice.org/9475 from Andrzej Hunt + Rename officekit-OfficeKit. in https://gerrit.libreoffice.org/9474 from Andrzej Hunt + Move liblibreoffice into officekit. in https://gerrit.libreoffice.org/9473 from Andrzej Hunt + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#78590: Fix for Corruption of para with framePr drawing object into in https://gerrit.libreoffice.org/9389 from Rohit Deshmukh + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - filter/source include/filter include/svx sc/source svx/source
filter/source/msfilter/dffpropset.cxx | 10 +-
include/filter/msfilter/dffpropset.hxx |8
include/svx/rulritem.hxx |4 ++--
sc/source/filter/excel/impop.cxx |2 +-
sc/source/filter/excel/xipivot.cxx |2 +-
sc/source/filter/excel/xltools.cxx |2 +-
sc/source/filter/inc/imp_op.hxx|2 +-
sc/source/filter/inc/xltools.hxx |2 +-
svx/source/dialog/rulritem.cxx |8
svx/source/fmcomp/gridcell.cxx |4 +++-
10 files changed, 23 insertions(+), 21 deletions(-)
New commits:
commit b447687292334687a371b66d7ad56ba9662b898e
Author: Noel Grandin n...@peralex.com
Date: Mon Jun 2 10:44:30 2014 +0200
cid#1194914 Overflowed return value
Change-Id: I0f06d0c631632e2dcbba706a17830033aae6f365
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index fa7dcc3..4168322 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -4237,7 +4237,9 @@ sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos()
throw( RuntimeException,
if (m_pBox)
{
UpdateFromColumn();
-return m_pBox-GetSelectEntryPos();
+sal_Int32 nPos = m_pBox-GetSelectEntryPos();
+assert(nPos SHRT_MAX);
+return nPos;
}
return 0;
}
commit 2537d2dd496c0d05042ca33b99760de79df67682
Author: Noel Grandin n...@peralex.com
Date: Mon Jun 2 10:41:35 2014 +0200
convert some sal_uInt8 fields to bool
Change-Id: Icd5845367157cc0b0c9342c6037b199c49432a76
diff --git a/filter/source/msfilter/dffpropset.cxx
b/filter/source/msfilter/dffpropset.cxx
index 189ff08..99b33d5 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -1146,11 +1146,11 @@ void DffPropSet::ReadPropSet( SvStream rIn, bool
bSetUninitializedOnly )
{
bool bSetProperty = !bSetUninitializedOnly || ( !IsProperty(
nRecType ) || !IsHardAttribute( nRecType ) );
-DffPropFlags aPropFlag = { 1, 0, 0, 0 };
+DffPropFlags aPropFlag = { true, false, false, false };
if ( nTmp 0x4000 )
-aPropFlag.bBlip = sal_True;
+aPropFlag.bBlip = true;
if ( nTmp 0x8000 )
-aPropFlag.bComplex = sal_True;
+aPropFlag.bComplex = true;
if ( aPropFlag.bComplex nContent ( nComplexDataFilePos
aHd.GetRecEndFilePos() ) )
{
// normally nContent is the complete size of the complex
property,
@@ -1201,7 +1201,7 @@ void DffPropSet::ReadPropSet( SvStream rIn, bool
bSetUninitializedOnly )
nComplexDataFilePos += nContent;//
store filepos, that is used for the next complex property
}
else// a
complex property needs content
-aPropFlag.bSet = sal_False; //
otherwise something is wrong
+aPropFlag.bSet = false; //
otherwise something is wrong
}
if ( bSetProperty )
{
@@ -1272,7 +1272,7 @@ bool DffPropSet::IsHardAttribute( sal_uInt32 nId ) const
bRetValue = (mpPropSetEntries[nId | 0x3f].nComplexIndexOrFlagsHAttr
(1 (0xf - (nId 0xf != 0;
else
-bRetValue = ( mpPropSetEntries[ nId ].aFlags.bSoftAttr == 0 );
+bRetValue = ( mpPropSetEntries[ nId ].aFlags.bSoftAttr == false );
return bRetValue;
};
diff --git a/include/filter/msfilter/dffpropset.hxx
b/include/filter/msfilter/dffpropset.hxx
index 6489cc4..19f7749 100644
--- a/include/filter/msfilter/dffpropset.hxx
+++ b/include/filter/msfilter/dffpropset.hxx
@@ -26,10 +26,10 @@
struct DffPropFlags
{
-sal_uInt8 bSet: 1;
-sal_uInt8 bComplex: 1;
-sal_uInt8 bBlip : 1;
-sal_uInt8 bSoftAttr : 1;
+bool bSet: 1;
+bool bComplex: 1;
+bool bBlip : 1;
+bool bSoftAttr : 1;
};
struct DffPropSetEntry
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index f1b7268..56074ee 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -155,8 +155,8 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
long nRight;// Right edge for the table; for columns always
// equal to the surrounding frame
sal_uInt16 nActColumn; // the current column
-sal_uInt8 bTable; // table?
-sal_uInt8 bOrtho; // evenly spread columns
+bool bTable; // table?
+bool bOrtho; // evenly spread columns
protected:
virtual bool operator==( const SfxPoolItem ) const SAL_OVERRIDE;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index ba281b8..4ee35b2 100644
--- a/sc/source/filter/excel/impop.cxx
+++
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.2-5'
Tag 'cp-4.2-5' created by Andras Timar andras.ti...@collabora.com at 2014-06-03 07:27 -0700 cp-4.2-5 Changes since cp-4.2-3-2: --- 0 files changed --- ___ 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/cp-4.2-5'
Tag 'cp-4.2-5' created by Andras Timar andras.ti...@collabora.com at 2014-06-03 07:27 -0700 cp-4.2-5 Changes since libreoffice-4-2-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.2-5'
Tag 'cp-4.2-5' created by Andras Timar andras.ti...@collabora.com at 2014-06-03 07:27 -0700 cp-4.2-5 Changes since cp-4.2-4-55: --- 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/cp-4.2-5'
Tag 'cp-4.2-5' created by Andras Timar andras.ti...@collabora.com at 2014-06-03 07:27 -0700 cp-4.2-5 Changes since cp-4.2-4: Andras Timar (1): update translations for 4.2.5 rc1 --- source/ast/svx/source/unodialogs/textconversiondlgs.po | 10 source/ast/sw/source/ui/inc.po | 14 source/bg/scaddins/source/pricing.po | 12 source/bg/sfx2/uiconfig/ui.po | 10 source/bg/sw/source/ui/inc.po | 14 source/br/padmin/source.po | 8 source/br/sc/source/core/src.po| 11 source/br/sc/source/ui/src.po | 6 source/br/scp2/source/accessories.po | 21 source/br/sfx2/source/dialog.po| 8 source/br/svx/source/dialog.po | 10 source/br/svx/source/unodialogs/textconversiondlgs.po | 9 source/br/sw/source/ui/config.po | 12 source/br/sw/source/ui/inc.po | 14 source/br/sw/uiconfig/swriter/ui.po| 6 source/br/vcl/uiconfig/ui.po | 10 source/cs/cui/uiconfig/ui.po | 12 source/cs/helpcontent2/source/text/shared/00.po| 6 source/cs/helpcontent2/source/text/shared/01.po| 30 source/cs/scaddins/source/pricing.po | 10 source/cs/svtools/source/misc.po | 8 source/cs/sw/source/ui/inc.po | 14 source/cs/vcl/qa/cppunit/builder.po| 12 source/cy/dictionaries/pt_BR/dialog.po | 14 source/cy/scp2/source/accessories.po | 9 source/da/cui/uiconfig/ui.po | 10 source/de/cui/source/dialogs.po| 10 source/de/dictionaries/hu_HU/dialog.po | 11 source/de/sc/source/ui/src.po | 10 source/de/scaddins/source/pricing.po | 14 source/de/sfx2/source/doc.po | 10 source/de/sfx2/uiconfig/ui.po | 12 source/de/svtools/source/misc.po | 8 source/de/sw/source/ui/inc.po | 14 source/de/sw/uiconfig/swriter/ui.po| 8 source/de/vcl/source/src.po| 12 source/el/sfx2/uiconfig/ui.po | 10 source/el/svtools/source/misc.po | 8 source/el/sw/source/ui/inc.po | 14 source/el/sw/uiconfig/swriter/ui.po| 10 source/es/basctl/source/basicide.po| 2 source/es/chart2/source/controller/dialogs.po | 2 source/es/cui/source/dialogs.po| 2 source/es/cui/source/tabpages.po | 2 source/es/cui/uiconfig/ui.po | 2 source/es/dbaccess/source/ui/dlg.po| 2 source/es/dbaccess/source/ui/querydesign.po| 2 source/es/extensions/source/abpilot.po | 2 source/es/extensions/source/propctrlr.po | 2 source/es/helpcontent2/source/text/sbasic/guide.po | 10 source/es/helpcontent2/source/text/sbasic/shared.po| 18 source/es/helpcontent2/source/text/sbasic/shared/01.po | 10 source/es/helpcontent2/source/text/scalc/01.po | 28 source/es/helpcontent2/source/text/scalc/guide.po | 20 source/es/helpcontent2/source/text/shared/00.po| 10 source/es/helpcontent2/source/text/shared/01.po| 28
[Libreoffice-commits] core.git: 4 commits - download.lst external/libebook external/libetonyek external/libodfgen external/librevenge
download.lst | 16 external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch | 87 - external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch | 58 external/libebook/UnpackedTarball_libebook.mk |5 external/libetonyek/0001-fix-v.3-version-string.patch | 26 external/libetonyek/UnpackedTarball_libetonyek.mk |4 external/libodfgen/0001-properly-export-API-symbols.patch | 170 -- external/libodfgen/ExternalPackage_libodfgen.mk |2 external/libodfgen/UnpackedTarball_libodfgen.mk |4 external/librevenge/0001-nested-iterator-classes-need-to-be-exported-too.patch | 53 external/librevenge/0001-properly-export-API-symbols.patch | 752 -- external/librevenge/ExternalPackage_librevenge.mk |2 external/librevenge/UnpackedTarball_librevenge.mk |5 13 files changed, 10 insertions(+), 1174 deletions(-) New commits: commit e2d53032f4e99ce0ec80c73a4ce073aa28fffc17 Author: David Tardon dtar...@redhat.com Date: Tue Jun 3 08:20:57 2014 +0200 upload libetonyek 0.1.1 Change-Id: If71250029229cfc167a2ec5ef0d6aea9bc57018c diff --git a/download.lst b/download.lst index f50149f..9b37e1b 100644 --- a/download.lst +++ b/download.lst @@ -32,8 +32,8 @@ export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22 export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz -export ETONYEK_MD5SUM := 9d4de5e3b0846dc53b9d18908557fb02 -export ETONYEK_TARBALL := libetonyek-0.1.0.tar.bz2 +export ETONYEK_MD5SUM := 805f941b06448212a988cb65f0691a7a +export ETONYEK_TARBALL := libetonyek-0.1.1.tar.bz2 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz export FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2 diff --git a/external/libetonyek/0001-fix-v.3-version-string.patch b/external/libetonyek/0001-fix-v.3-version-string.patch deleted file mode 100644 index d344259..000 --- a/external/libetonyek/0001-fix-v.3-version-string.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 16b7bf009a06ac48c69f94b778a09151aa20fa53 Mon Sep 17 00:00:00 2001 -From: David Tardon dtar...@redhat.com -Date: Thu, 29 May 2014 17:04:05 +0200 -Subject: [PATCH] fix v.3 version string - -Change-Id: I689fd53bedeccb8d1cda5275832f36333fe1d108 - src/lib/KEY2Token.gperf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/KEY2Token.gperf b/src/lib/KEY2Token.gperf -index d1bf501..483ca97 100644 a/src/lib/KEY2Token.gperf -+++ b/src/lib/KEY2Token.gperf -@@ -25,7 +25,7 @@ struct Token - 1,_1 - 2004102100,VERSION_STR_2 - 2005092101,COMPATIBLE_VERSION_STR_3, --2005140600,VERSION_STR_3 -+2005112100,VERSION_STR_3 - 72007061400,VERSION_STR_4 - 92008102400,VERSION_STR_5 - BGBuildChunk,BGBuildChunk --- -1.9.3 - diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 4655cbb..7a8746c 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -13,8 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1)) -$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ - external/libetonyek/0001-fix-v.3-version-string.patch \ -)) - # vim: set noet sw=4 ts=4: commit 9496d573340d965dfe180733988a156bb182d39f Author: David Tardon dtar...@redhat.com Date: Tue Jun 3 08:19:48 2014 +0200 upload libe-book 0.1.1 Change-Id: I48f67b203c3362ff87e41635e1212e0024a982f0 diff --git a/download.lst b/download.lst index 067b09d..f50149f 100644 --- a/download.lst +++ b/download.lst @@ -29,8 +29,8 @@ export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3. export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4 export CURL_TARBALL := curl-7.36.0.tar.bz2 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll -export EBOOK_MD5SUM := 3244af3faf9e8334b8c45d1107ba8ca2 -export EBOOK_TARBALL := libe-book-0.1.0.tar.bz2 +export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22 +export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz export ETONYEK_MD5SUM := 9d4de5e3b0846dc53b9d18908557fb02 export ETONYEK_TARBALL := libetonyek-0.1.0.tar.bz2 diff --git a/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch b/external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch deleted file mode 100644
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 4 commits - download.lst external/libebook external/libetonyek external/libodfgen external/librevenge
download.lst | 16 external/libebook/0001-blind-attempt-to-workaround-MSVC-bug.patch | 87 - external/libebook/0001-parse-zipped-FictionBook-2-files-again.patch | 58 external/libebook/UnpackedTarball_libebook.mk |5 external/libetonyek/0001-fix-v.3-version-string.patch | 26 external/libetonyek/UnpackedTarball_libetonyek.mk |4 external/libodfgen/0001-properly-export-API-symbols.patch | 170 -- external/libodfgen/ExternalPackage_libodfgen.mk |2 external/libodfgen/UnpackedTarball_libodfgen.mk |4 external/librevenge/0001-nested-iterator-classes-need-to-be-exported-too.patch | 53 external/librevenge/0001-properly-export-API-symbols.patch | 752 -- external/librevenge/ExternalPackage_librevenge.mk |2 external/librevenge/UnpackedTarball_librevenge.mk |5 13 files changed, 10 insertions(+), 1174 deletions(-) New commits: commit 314d1059bfdfb3f600d94e40049b3d0f130283be Author: David Tardon dtar...@redhat.com Date: Tue Jun 3 08:20:57 2014 +0200 upload libetonyek 0.1.1 Change-Id: If71250029229cfc167a2ec5ef0d6aea9bc57018c (cherry picked from commit e2d53032f4e99ce0ec80c73a4ce073aa28fffc17) diff --git a/download.lst b/download.lst index b0ee9fe..aeda567 100644 --- a/download.lst +++ b/download.lst @@ -33,8 +33,8 @@ export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22 export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz -export ETONYEK_MD5SUM := 9d4de5e3b0846dc53b9d18908557fb02 -export ETONYEK_TARBALL := libetonyek-0.1.0.tar.bz2 +export ETONYEK_MD5SUM := 805f941b06448212a988cb65f0691a7a +export ETONYEK_TARBALL := libetonyek-0.1.1.tar.bz2 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz export FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2 diff --git a/external/libetonyek/0001-fix-v.3-version-string.patch b/external/libetonyek/0001-fix-v.3-version-string.patch deleted file mode 100644 index d344259..000 --- a/external/libetonyek/0001-fix-v.3-version-string.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 16b7bf009a06ac48c69f94b778a09151aa20fa53 Mon Sep 17 00:00:00 2001 -From: David Tardon dtar...@redhat.com -Date: Thu, 29 May 2014 17:04:05 +0200 -Subject: [PATCH] fix v.3 version string - -Change-Id: I689fd53bedeccb8d1cda5275832f36333fe1d108 - src/lib/KEY2Token.gperf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/KEY2Token.gperf b/src/lib/KEY2Token.gperf -index d1bf501..483ca97 100644 a/src/lib/KEY2Token.gperf -+++ b/src/lib/KEY2Token.gperf -@@ -25,7 +25,7 @@ struct Token - 1,_1 - 2004102100,VERSION_STR_2 - 2005092101,COMPATIBLE_VERSION_STR_3, --2005140600,VERSION_STR_3 -+2005112100,VERSION_STR_3 - 72007061400,VERSION_STR_4 - 92008102400,VERSION_STR_5 - BGBuildChunk,BGBuildChunk --- -1.9.3 - diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 4655cbb..7a8746c 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -13,8 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1)) -$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ - external/libetonyek/0001-fix-v.3-version-string.patch \ -)) - # vim: set noet sw=4 ts=4: commit b440f319070e9ce77902fce6cf30f81331469140 Author: David Tardon dtar...@redhat.com Date: Tue Jun 3 08:19:48 2014 +0200 upload libe-book 0.1.1 Change-Id: I48f67b203c3362ff87e41635e1212e0024a982f0 (cherry picked from commit 9496d573340d965dfe180733988a156bb182d39f) diff --git a/download.lst b/download.lst index 0301eae..b0ee9fe 100644 --- a/download.lst +++ b/download.lst @@ -30,8 +30,8 @@ export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3. export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4 export CURL_TARBALL := curl-7.36.0.tar.bz2 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll -export EBOOK_MD5SUM := 3244af3faf9e8334b8c45d1107ba8ca2 -export EBOOK_TARBALL := libe-book-0.1.0.tar.bz2 +export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22 +export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz export ETONYEK_MD5SUM := 9d4de5e3b0846dc53b9d18908557fb02 export ETONYEK_TARBALL := libetonyek-0.1.0.tar.bz2 diff --git
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 81/614e1cb8e300b1c586eb747539546fd65c11db
81/614e1cb8e300b1c586eb747539546fd65c11db |1 + 1 file changed, 1 insertion(+) New commits: commit 36abfeab3fa9ec3964ac9764b6a162e61eff66f8 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 08:47:58 2014 +0100 Notes added by 'git notes add' diff --git a/81/614e1cb8e300b1c586eb747539546fd65c11db b/81/614e1cb8e300b1c586eb747539546fd65c11db new file mode 100644 index 000..146b15f --- /dev/null +++ b/81/614e1cb8e300b1c586eb747539546fd65c11db @@ -0,0 +1 @@ +prefer: 5c32ac5104e9cade52c8a373033644282de9ceff ___ 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' - 77/e79c411fd1961cbdf0b8e07e85a8019b7d7350
77/e79c411fd1961cbdf0b8e07e85a8019b7d7350 |1 + 1 file changed, 1 insertion(+) New commits: commit a6eef7910792e95861da7162d20c5837f1a96641 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 08:51:36 2014 +0100 Notes added by 'git notes add' diff --git a/77/e79c411fd1961cbdf0b8e07e85a8019b7d7350 b/77/e79c411fd1961cbdf0b8e07e85a8019b7d7350 new file mode 100644 index 000..a5c0c77 --- /dev/null +++ b/77/e79c411fd1961cbdf0b8e07e85a8019b7d7350 @@ -0,0 +1 @@ +ignore: googletest ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - configure.ac writerperfect/Module_writerperfect.mk writerperfect/qa writerperfect/source
configure.ac |
2
writerperfect/Module_writerperfect.mk |
3
writerperfect/qa/unit/data/writer/libmwaw/indeterminate/GreatWorks_v2.hqx |
180 ++
writerperfect/qa/unit/data/writer/libmwaw/pass/GreatWorks_v2.hqx |
180 --
writerperfect/source/common/WPXSvInputStream.cxx |
6
writerperfect/source/writer/MSWorksImportFilter.cxx |
2
writerperfect/source/writer/WordPerfectImportFilter.cxx |
8
7 files changed, 190 insertions(+), 191 deletions(-)
New commits:
commit 7b91c6aaf9e0ef09ba31dee564dcee4def545549
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 10:13:32 2014 +0200
do not disable complete test, just the one file
Change-Id: I1acccba8c2ef44d76c13eadb97d03119f08baa1d
diff --git a/writerperfect/Module_writerperfect.mk
b/writerperfect/Module_writerperfect.mk
index 0321d06..9c30697 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -35,9 +35,8 @@ $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
CppunitTest_writerperfect_calc \
CppunitTest_writerperfect_draw \
CppunitTest_writerperfect_impress \
+ CppunitTest_writerperfect_writer \
StaticLibrary_writerperfect_importtestbase \
))
-#disabled, breaks on Windows: CppunitTest_writerperfect_writer \
-
# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/indeterminate/.gitignore
b/writerperfect/qa/unit/data/writer/libmwaw/indeterminate/.gitignore
deleted file mode 100644
index e69de29..000
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/GreatWorks_v2.hqx
b/writerperfect/qa/unit/data/writer/libmwaw/indeterminate/GreatWorks_v2.hqx
similarity index 100%
rename from writerperfect/qa/unit/data/writer/libmwaw/pass/GreatWorks_v2.hqx
rename to
writerperfect/qa/unit/data/writer/libmwaw/indeterminate/GreatWorks_v2.hqx
commit d3ddcbaeef9648cff78069b8ed443d7d3d611546
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 10:11:53 2014 +0200
drop useless const_cast
Change-Id: Ie5e6f519a511931b383b6131a4a188abb3396946
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx
b/writerperfect/source/common/WPXSvInputStream.cxx
index e2bcdc8..185ae17 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -439,7 +439,7 @@ private:
bool mbCheckedZip;
public:
sal_Int64 mnLength;
-unsigned char *mpReadBuffer;
+const unsigned char *mpReadBuffer;
unsigned long mnReadBufferLength;
unsigned long mnReadBufferPos;
};
@@ -865,7 +865,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long
numBytes, unsigned lon
mpImpl-mnReadBufferLength = numBytes;
unsigned long tmpNumBytes(0);
-mpImpl-mpReadBuffer = const_castunsigned
char*(mpImpl-read(mpImpl-mnReadBufferLength, tmpNumBytes));
+mpImpl-mpReadBuffer = mpImpl-read(mpImpl-mnReadBufferLength,
tmpNumBytes);
if (tmpNumBytes != mpImpl-mnReadBufferLength)
mpImpl-mnReadBufferLength = tmpNumBytes;
commit 9533611f410dd36950c69a45fb6abe7e8760b281
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 10:00:23 2014 +0200
drop useless const_cast
Change-Id: I8a14faf56303b986c3e6c8e9bec53210ae86fc87
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx
b/writerperfect/source/common/WPXSvInputStream.cxx
index b5786bf..e2bcdc8 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -876,7 +876,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long
numBytes, unsigned lon
numBytesRead = numBytes;
mpImpl-mnReadBufferPos += numBytesRead;
-return const_castconst unsigned char *(mpImpl-mpReadBuffer);
+return mpImpl-mpReadBuffer;
}
long WPXSvInputStream::tell()
commit 1031dba9e205a80de5011931b52c628881f62372
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 09:59:10 2014 +0200
getDataStream() returns non-const ptr now
Change-Id: I6d1e811622cda61575464df8e4036b388a4ab706
diff --git a/configure.ac b/configure.ac
index 8346945..7dab4cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7696,7 +7696,7 @@ AS_IF([test $COM = MSC],
[librevenge_libdir=${WORKDIR}/LinkTarget/Library],
[librevenge_libdir=${WORKDIR}/UnpackedTarball/librevenge/src/lib/.libs]
)
-libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0],[-I${WORKDIR}/UnpackedTarball/librevenge/inc],[-L${librevenge_libdir}
-lrevenge-0.0])
+libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 =
0.0.1],[-I${WORKDIR}/UnpackedTarball/librevenge/inc],[-L${librevenge_libdir}
-lrevenge-0.0])
dnl ===
dnl Check for system libe-book
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salgdiutils.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ee9dd6c086f7bda615d5b28d3319a83ce1673607 Author: Herbert Dürr h...@apache.org Date: Mon Jun 2 11:47:23 2014 + #i125020# fix rounding error in AquaSalGraphics::RefreshRect() Rounding left and width down can accumulate a rounding error of almost two in the calculation of right. The existing code compensates for this by increasing the width by two, but since left has been decremented by one to accommodate for antialiasing artifacts this compensation is one to few by itself and two to few when accounting for antialiasing artifacts on the right. Y-pos and height have the same problems and get the matching fix. (cherry picked from commit 073ec69fb970830d39c8700317ee74dbbdfd1fda) diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx index c251203..639398f 100644 --- a/vcl/quartz/salgdiutils.cxx +++ b/vcl/quartz/salgdiutils.cxx @@ -184,8 +184,8 @@ void AquaSalGraphics::RefreshRect(float lX, float lY, float lWidth, float lHeigh // this helps with antialiased rendering const Rectangle aVclRect(Point(static_castlong int(lX-1), static_castlong int(lY-1) ), - Size( static_castlong int(lWidth+2), -static_castlong int(lHeight+2) ) ); + Size( static_castlong int(lWidth+3), +static_castlong int(lHeight+3) ) ); mpFrame-maInvalidRect.Union( aVclRect ); } } ___ 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' - 07/3ec69fb970830d39c8700317ee74dbbdfd1fda
07/3ec69fb970830d39c8700317ee74dbbdfd1fda |1 + 1 file changed, 1 insertion(+) New commits: commit 55f596df99bcaea55b067e04e15477149703d4ee Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 09:15:29 2014 +0100 Notes added by 'git notes add' diff --git a/07/3ec69fb970830d39c8700317ee74dbbdfd1fda b/07/3ec69fb970830d39c8700317ee74dbbdfd1fda new file mode 100644 index 000..3a2927a --- /dev/null +++ b/07/3ec69fb970830d39c8700317ee74dbbdfd1fda @@ -0,0 +1 @@ +merged as: ee9dd6c086f7bda615d5b28d3319a83ce1673607 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 4 commits - configure.ac writerperfect/qa writerperfect/source
configure.ac |
2
writerperfect/qa/unit/data/writer/libmwaw/indeterminate/GreatWorks_v2.hqx |
180 ++
writerperfect/qa/unit/data/writer/libmwaw/pass/GreatWorks_v2.hqx |
180 --
writerperfect/source/common/WPXSvInputStream.cxx |
6
writerperfect/source/writer/MSWorksImportFilter.cxx |
2
writerperfect/source/writer/WordPerfectImportFilter.cxx |
8
6 files changed, 189 insertions(+), 189 deletions(-)
New commits:
commit a16adc1d7d9be7434f6629b5695c69042136af0a
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 10:13:32 2014 +0200
do not disable complete test, just the one file
Change-Id: I1acccba8c2ef44d76c13eadb97d03119f08baa1d
(cherry picked from commit 7b91c6aaf9e0ef09ba31dee564dcee4def545549)
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/indeterminate/.gitignore
b/writerperfect/qa/unit/data/writer/libmwaw/indeterminate/.gitignore
deleted file mode 100644
index e69de29..000
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/GreatWorks_v2.hqx
b/writerperfect/qa/unit/data/writer/libmwaw/indeterminate/GreatWorks_v2.hqx
similarity index 100%
rename from writerperfect/qa/unit/data/writer/libmwaw/pass/GreatWorks_v2.hqx
rename to
writerperfect/qa/unit/data/writer/libmwaw/indeterminate/GreatWorks_v2.hqx
commit f20b6d26f728d863f62b61af251e160499972953
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 10:11:53 2014 +0200
drop useless const_cast
Change-Id: Ie5e6f519a511931b383b6131a4a188abb3396946
(cherry picked from commit d3ddcbaeef9648cff78069b8ed443d7d3d611546)
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx
b/writerperfect/source/common/WPXSvInputStream.cxx
index e2bcdc8..185ae17 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -439,7 +439,7 @@ private:
bool mbCheckedZip;
public:
sal_Int64 mnLength;
-unsigned char *mpReadBuffer;
+const unsigned char *mpReadBuffer;
unsigned long mnReadBufferLength;
unsigned long mnReadBufferPos;
};
@@ -865,7 +865,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long
numBytes, unsigned lon
mpImpl-mnReadBufferLength = numBytes;
unsigned long tmpNumBytes(0);
-mpImpl-mpReadBuffer = const_castunsigned
char*(mpImpl-read(mpImpl-mnReadBufferLength, tmpNumBytes));
+mpImpl-mpReadBuffer = mpImpl-read(mpImpl-mnReadBufferLength,
tmpNumBytes);
if (tmpNumBytes != mpImpl-mnReadBufferLength)
mpImpl-mnReadBufferLength = tmpNumBytes;
commit c5b6eb836fdcc273a50ec4fc997eec61c8b79091
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 10:00:23 2014 +0200
drop useless const_cast
Change-Id: I8a14faf56303b986c3e6c8e9bec53210ae86fc87
(cherry picked from commit 9533611f410dd36950c69a45fb6abe7e8760b281)
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx
b/writerperfect/source/common/WPXSvInputStream.cxx
index b5786bf..e2bcdc8 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -876,7 +876,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long
numBytes, unsigned lon
numBytesRead = numBytes;
mpImpl-mnReadBufferPos += numBytesRead;
-return const_castconst unsigned char *(mpImpl-mpReadBuffer);
+return mpImpl-mpReadBuffer;
}
long WPXSvInputStream::tell()
commit d7217e91ed6f611e01532883b2b2363c21b791cd
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 09:59:10 2014 +0200
getDataStream() returns non-const ptr now
Change-Id: I6d1e811622cda61575464df8e4036b388a4ab706
(cherry picked from commit 1031dba9e205a80de5011931b52c628881f62372)
diff --git a/configure.ac b/configure.ac
index 1b60e74..27070ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7704,7 +7704,7 @@ AS_IF([test $COM = MSC],
[librevenge_libdir=${WORKDIR}/LinkTarget/Library],
[librevenge_libdir=${WORKDIR}/UnpackedTarball/librevenge/src/lib/.libs]
)
-libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0],[-I${WORKDIR}/UnpackedTarball/librevenge/inc],[-L${librevenge_libdir}
-lrevenge-0.0])
+libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 =
0.0.1],[-I${WORKDIR}/UnpackedTarball/librevenge/inc],[-L${librevenge_libdir}
-lrevenge-0.0])
dnl ===
dnl Check for system libe-book
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 2d253fb..9217cc6 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -28,7 +28,7 @@ static bool handleEmbeddedWKSObject(const
librevenge::RVNGBinaryData data, OdfD
{
OdsGenerator exporter;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - svx/source
svx/source/tbxctrls/tbcontrl.cxx |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 5786c0b932e3a9cc900fa14ab17fb48f75581629 Author: Michael Stahl mst...@redhat.com Date: Tue Jan 28 20:45:20 2014 +0100 fix bad cast in SvxStyleBox_Impl::StateChanged() This causes various JunitTest crashes on Windows, regression from 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec. Change-Id: Iab24e0d39375ac1e5ac63d32470dca1e54d518c5 Reviewed-on: https://gerrit.libreoffice.org/9621 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com (cherry picked from commit 3b41dc58dc3689d4506dec0825834fbec0d1ed60) Reviewed-on: https://gerrit.libreoffice.org/9622 Reviewed-by: Maxim Monastirsky momonas...@gmail.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 91b6a66..5621dc1 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -598,7 +598,10 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent rUDEvt ) Size aPixelSize( pDevice-LogicToPixel( aFontSize, pShell-GetMapUnit() ) ); // setup the font properties -Font aFont( pFontItem-GetFamilyName(), pFontItem-GetStyleName(), aPixelSize ); +SvxFont aFont; +aFont.SetName(pFontItem-GetFamilyName()); +aFont.SetStyleName(pFontItem-GetStyleName()); +aFont.SetSize(aPixelSize); const SfxPoolItem *pItem = aItemSet.GetItem( SID_ATTR_CHAR_WEIGHT ); if ( pItem ) @@ -634,7 +637,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent rUDEvt ) pItem = aItemSet.GetItem( SID_ATTR_CHAR_CASEMAP ); if ( pItem ) -((SvxFont )aFont).SetCaseMap( static_cast const SvxCaseMapItem* ( pItem )-GetCaseMap() ); +aFont.SetCaseMap(static_castconst SvxCaseMapItem*(pItem)-GetCaseMap()); pItem = aItemSet.GetItem( SID_ATTR_CHAR_EMPHASISMARK ); if ( pItem ) ___ 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' - 11/18f619fd1680a18a1dbfda156f7e97d121386f
11/18f619fd1680a18a1dbfda156f7e97d121386f |1 + 1 file changed, 1 insertion(+) New commits: commit 3f51ac28139240ac39220e4387015cdf4ee2396d Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 09:22:32 2014 +0100 Notes added by 'git notes add' diff --git a/11/18f619fd1680a18a1dbfda156f7e97d121386f b/11/18f619fd1680a18a1dbfda156f7e97d121386f new file mode 100644 index 000..a5c0c77 --- /dev/null +++ b/11/18f619fd1680a18a1dbfda156f7e97d121386f @@ -0,0 +1 @@ +ignore: googletest ___ 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' - a9/b9ceff86f35be1eeff5f251d24e338db760a1e
a9/b9ceff86f35be1eeff5f251d24e338db760a1e |1 + 1 file changed, 1 insertion(+) New commits: commit 952540f8723b816bad82bf5405ad0b30058d46a1 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 09:23:42 2014 +0100 Notes added by 'git notes add' diff --git a/a9/b9ceff86f35be1eeff5f251d24e338db760a1e b/a9/b9ceff86f35be1eeff5f251d24e338db760a1e new file mode 100644 index 000..2df2496 --- /dev/null +++ b/a9/b9ceff86f35be1eeff5f251d24e338db760a1e @@ -0,0 +1 @@ +merged as: 687f0c9300d499b78deea2890b4c2019adb2d67d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/ctlayout.cxx | 35 +++
1 file changed, 27 insertions(+), 8 deletions(-)
New commits:
commit 687f0c9300d499b78deea2890b4c2019adb2d67d
Author: Herbert Dürr h...@apache.org
Date: Tue May 20 12:00:50 2014 +
Resolves: #i124935# fix expanded/condensed text breaking...
in the CoreText engine
the concept of an extra-width per code-unit was obsolete at least since apps
supported unicode with its different normalization forms, diacritical marks,
surrogate-pairs, non-printing characters such as ZWJ/ZWNJ/RLM, etc. so of
course modern engines like CoreText don't aid this typographical crime.
The fix here extends the CTLayout::GetTextBreak() method to handle the
obsolete
semantic of per code-unit extra-widths by successively approximating the
number
of involved code-units.
(cherry picked from commit a9b9ceff86f35be1eeff5f251d24e338db760a1e)
Conflicts:
vcl/aqua/source/gdi/ctlayout.cxx
Change-Id: I52a7f7488a9e8a303ed7271df2a24a3c85098ce3
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 347cc5e..8c42cc8 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -580,20 +580,39 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
return nPixWidth;
}
-sal_Int32 CTLayout::GetTextBreak( long nMaxWidth, long /*nCharExtra*/, int
nFactor ) const
+sal_Int32 CTLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor
) const
{
if( !mpCTLine )
return -1;
CTTypesetterRef aCTTypeSetter = CTTypesetterCreateWithAttributedString(
mpAttrString );
-const double fCTMaxWidth = (double)nMaxWidth / nFactor;
-CFIndex nIndex = CTTypesetterSuggestClusterBreak( aCTTypeSetter, 0,
fCTMaxWidth );
-CFRelease( aCTTypeSetter );
-
-if( nIndex = mnCharCount )
-return -1;
+CFIndex nBestGuess = (nCharExtra = 0) ? 0 : mnCharCount;
+for( int i = 1; i = mnCharCount; i *= 2 )
+{
+// guess the target width considering char-extra expansion/condensation
+const double nTargetWidth = nMaxWidth - nBestGuess * nCharExtra;
+const double fCTMaxWidth = nTargetWidth / nFactor;
+// calculate the breaking index for the guessed target width
+const CFIndex nNewIndex = CTTypesetterSuggestClusterBreak(
aCTTypeSetter, 0, fCTMaxWidth );
+if( nNewIndex = mnCharCount ) {
+CFRelease( aCTTypeSetter );
+return -1;
+}
+// check if the original extra-width guess was good
+if( !nCharExtra )
+nBestGuess = nNewIndex;
+if( nBestGuess == nNewIndex )
+break;
+// prepare another round for a different number of characters
+CFIndex nNewGuess = (nNewIndex + nBestGuess + 1) / 2;
+if( nNewGuess == nBestGuess )
+nNewGuess += (nNewIndex nBestGuess) ? +1 : -1;
+nBestGuess = nNewGuess;
+}
-nIndex += mnMinCharPos;
+// suggest the best fitting cluster break as breaking position
+CFRelease( aCTTypeSetter );
+const int nIndex = nBestGuess + mnMinCharPos;
return nIndex;
}
___
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' - 5a/be28ae3af726e94f62c5bcdc22d6b7f48a1a57
5a/be28ae3af726e94f62c5bcdc22d6b7f48a1a57 |1 + 1 file changed, 1 insertion(+) New commits: commit 7404d52597369dbbf251f6cb98d0f1f324dc4eab Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 09:25:09 2014 +0100 Notes added by 'git notes add' diff --git a/5a/be28ae3af726e94f62c5bcdc22d6b7f48a1a57 b/5a/be28ae3af726e94f62c5bcdc22d6b7f48a1a57 new file mode 100644 index 000..a5c0c77 --- /dev/null +++ b/5a/be28ae3af726e94f62c5bcdc22d6b7f48a1a57 @@ -0,0 +1 @@ +ignore: googletest ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/guide/protection.xhp|2 +- source/text/shared/guide/redlining_protect.xhp |2 +- source/text/swriter/guide/protection.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 99e6e19c88313251a236ef25150d339b930c7f9a Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net Date: Mon Jun 2 16:19:51 2014 +0200 fdo#79530 Update help for minimum length of password Since some time, password only required 1 character (as indicated in UI) instead of 5 as indicated in help Change-Id: Id7fef69ee273ee622365b4077d83cd46368475c6 Reviewed-on: https://gerrit.libreoffice.org/9624 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/shared/guide/protection.xhp b/source/text/shared/guide/protection.xhp index 7774929..3313cb5 100644 --- a/source/text/shared/guide/protection.xhp +++ b/source/text/shared/guide/protection.xhp @@ -73,7 +73,7 @@ paragraph xml-lang=en-US id=par_id3154684 role=paragraph l10n=U oldref=12Turning on protection/paragraph /tablecell tablecell - paragraph xml-lang=en-US id=par_id3153104 role=paragraph l10n=U oldref=13Choose emphEdit - Changes - Protect Records/emph. Enter and confirm a password of at least 5 characters./paragraph + paragraph xml-lang=en-US id=par_id3153104 role=paragraph l10n=U oldref=13Choose emphEdit - Changes - Protect Records/emph. Enter and confirm a password of at least one character./paragraph /tablecell /tablerow tablerow diff --git a/source/text/shared/guide/redlining_protect.xhp b/source/text/shared/guide/redlining_protect.xhp index 16139ab..13f4b94 100644 --- a/source/text/shared/guide/redlining_protect.xhp +++ b/source/text/shared/guide/redlining_protect.xhp @@ -47,7 +47,7 @@ paragraph xml-lang=en-US id=par_id3147088 role=listitem l10n=U oldref=3Choose emphProtect Records/emph. This opens the link href=text/shared/01/password_dlg.xhp name=PasswordemphPassword/emph/link dialog./paragraph /listitem listitem -paragraph xml-lang=en-US id=par_id3153345 role=listitem l10n=U oldref=4Enter a password consisting of at least 5 characters and confirm it. Click emphOK/emph./paragraph +paragraph xml-lang=en-US id=par_id3153345 role=listitem l10n=U oldref=4Enter a password consisting of at least one character and confirm it. Click emphOK/emph./paragraph /listitem /list embed href=text/shared/00/0004.xhp#related/ diff --git a/source/text/swriter/guide/protection.xhp b/source/text/swriter/guide/protection.xhp index 177acd2..fafd547 100644 --- a/source/text/swriter/guide/protection.xhp +++ b/source/text/swriter/guide/protection.xhp @@ -48,7 +48,7 @@ paragraph xml-lang=en-US id=par_id3166413 role=tablecontent l10n=U oldref=31Turning on protection/paragraph /tablecell tablecell - paragraph xml-lang=en-US id=par_id3144764 role=tablecontent l10n=U oldref=32Select the text. Choose emphInsert - Section - Section/emph, then under emphWrite protection/emph mark the emphProtect/emph and emphWith password/emph check boxes. (If the section already exists: emphFormat - Sections/emph.) Enter and confirm a password of at least 5 characters./paragraph + paragraph xml-lang=en-US id=par_id3144764 role=tablecontent l10n=U oldref=32Select the text. Choose emphInsert - Section - Section/emph, then under emphWrite protection/emph mark the emphProtect/emph and emphWith password/emph check boxes. (If the section already exists: emphFormat - Sections/emph.) Enter and confirm a password of at least one character./paragraph /tablecell /tablerow tablerow ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source
sw/qa/core/data/rtf/pass/fdo79384.rtf |5 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 4cd095db39f5631379245c171e82e373833b2e11
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Jun 2 20:14:16 2014 +0200
fdo#79384 RTF import: allow { without } in style names
This is not valid, but LO 3.4 supported it, so add a workaround...
(cherry picked from commit 6092e2eba3f74c9632f7862b2368b0fcf7732f85)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: Ib8eefdf41fe9801db6f7e5873eaa1436518912fb
Reviewed-on: https://gerrit.libreoffice.org/9625
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/core/data/rtf/pass/fdo79384.rtf
b/sw/qa/core/data/rtf/pass/fdo79384.rtf
new file mode 100644
index 000..84875a9
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo79384.rtf
@@ -0,0 +1,5 @@
+{\rtf1
+{\stylesheet
+{\*\cs35\snext35\hich\af5\dbch\af5\loch\f5 Mp{u y{p;}
+}
+\par }
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 816595d..e8316ff 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -939,7 +939,12 @@ int RTFDocumentImpl::resolveChars(char ch)
bool bUnicodeChecked = false;
bool bSkipped = false;
-while(!Strm().IsEof() (m_aStates.top().nInternalState == INTERNAL_HEX
|| (ch != '{' ch != '}' ch != '\\')))
+
+// Workaround for buggy input: if we're inside a style entry, then ignore
+// the fact that '{' without a matching '}' is invalid.
+bool bStyleEntry = m_aStates.top().nDestinationState ==
DESTINATION_STYLEENTRY;
+
+while(!Strm().IsEof() (m_aStates.top().nInternalState == INTERNAL_HEX
|| ((ch != '{' || bStyleEntry) ch != '}' ch != '\\')))
{
if (m_aStates.top().nInternalState == INTERNAL_HEX || (ch != 0x0d
ch != 0x0a))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 33b4cd4f8e7ac42e206f13b565868a89d946957a Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net Date: Mon Jun 2 16:19:51 2014 +0200 Updated core Project: help 99e6e19c88313251a236ef25150d339b930c7f9a fdo#79530 Update help for minimum length of password Since some time, password only required 1 character (as indicated in UI) instead of 5 as indicated in help Change-Id: Id7fef69ee273ee622365b4077d83cd46368475c6 Reviewed-on: https://gerrit.libreoffice.org/9624 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 10178deb..99e6e19 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 10178deb770a99a29e299e0f3e553e25f1d3ad36 +Subproject commit 99e6e19c88313251a236ef25150d339b930c7f9a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - sc/source
sc/source/filter/xml/xmlexprt.cxx | 40 --
1 file changed, 26 insertions(+), 14 deletions(-)
New commits:
commit 9c2f1677aa4048f0ce2a744bb28d8cd8774216e7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri May 30 22:02:01 2014 -0400
fdo#78927: Use different XML attribute names for asian and complex fonts.
Change-Id: I96a26bd495d6a78fffd0854b5084f69b5db84ee6
(cherry picked from commit 1b35c7ea4f7fe1473dbe08ab93b7259403b290ff)
Reviewed-on: https://gerrit.libreoffice.org/9588
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
(cherry picked from commit 282227a81df90dfe11f0b57a4d7558d7faa56836)
Reviewed-on: https://gerrit.libreoffice.org/9623
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 885b5bc..058e719 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1075,6 +1075,27 @@ void ScXMLExport::ExportExternalRefCacheStyles()
namespace {
+void handleFont(
+std::vectorXMLPropertyState rPropStates,
+const SfxPoolItem* p, const UniReferenceXMLPropertySetMapper xMapper,
const OUString rXMLName )
+{
+sal_Int32 nEntryCount = xMapper-GetEntryCount();
+
+// Apparently font info needs special handling.
+const SvxFontItem* pItem = static_castconst SvxFontItem*(p);
+
+sal_Int32 nIndexFontName = xMapper-GetEntryIndex(XML_NAMESPACE_STYLE,
rXMLName, 0);
+
+if (nIndexFontName == -1 || nIndexFontName = nEntryCount)
+return;
+
+uno::Any aAny;
+if (!pItem-QueryValue(aAny, MID_FONT_FAMILY_NAME))
+return;
+
+rPropStates.push_back(XMLPropertyState(nIndexFontName, aAny));
+}
+
const SvxFieldData* toXMLPropertyStates(
std::vectorXMLPropertyState rPropStates, const std::vectorconst
SfxPoolItem* rSecAttrs,
const UniReferenceXMLPropertySetMapper xMapper, const
ScXMLEditAttributeMap rAttrMap )
@@ -1106,22 +1127,13 @@ const SvxFieldData* toXMLPropertyStates(
switch (p-Which())
{
case EE_CHAR_FONTINFO:
+handleFont(rPropStates, p, xMapper, font-name);
+break;
case EE_CHAR_FONTINFO_CJK:
+handleFont(rPropStates, p, xMapper, font-name-asian);
+break;
case EE_CHAR_FONTINFO_CTL:
-{
-// Apparently font info needs special handling.
-const SvxFontItem* pItem = static_castconst SvxFontItem*(p);
-
-sal_Int32 nIndexFontName =
xMapper-GetEntryIndex(XML_NAMESPACE_STYLE, font-name, 0);
-
-if (nIndexFontName == -1 || nIndexFontName = nEntryCount)
-break;
-
-if (!pItem-QueryValue(aAny, MID_FONT_FAMILY_NAME))
-break;
-
-rPropStates.push_back(XMLPropertyState(nIndexFontName, aAny));
-}
+handleFont(rPropStates, p, xMapper, font-name-complex);
break;
case EE_CHAR_WEIGHT:
case EE_CHAR_WEIGHT_CJK:
___
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/3225be9cbadee6d8f7fd4e9910e10fc5ff571b
51/3225be9cbadee6d8f7fd4e9910e10fc5ff571b |1 + 1 file changed, 1 insertion(+) New commits: commit 86cfdaaa6f115fecc1f4e2c63d974bc2079145f6 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 09:47:35 2014 +0100 Notes added by 'git notes add' diff --git a/51/3225be9cbadee6d8f7fd4e9910e10fc5ff571b b/51/3225be9cbadee6d8f7fd4e9910e10fc5ff571b new file mode 100644 index 000..ad5918f --- /dev/null +++ b/51/3225be9cbadee6d8f7fd4e9910e10fc5ff571b @@ -0,0 +1 @@ +merged as: bcc7086ebf447449489edef2adc3b158a0198cff ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salgdiutils.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit bcc7086ebf447449489edef2adc3b158a0198cff
Author: Herbert Dürr h...@apache.org
Date: Mon Jun 2 11:54:15 2014 +
#i125020# allow antialiasing on all update borders for Aqua graphics
(cherry picked from commit 513225be9cbadee6d8f7fd4e9910e10fc5ff571b)
diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index 639398f..704fef5 100644
--- a/vcl/quartz/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -182,10 +182,13 @@ void AquaSalGraphics::RefreshRect(float lX, float lY,
float lWidth, float lHeigh
{
// update a little more around the designated rectangle
// this helps with antialiased rendering
+// Rounding down x and width can accumulate a rounding error of up to 2
+// The decrementing of x, the rounding error and the antialiasing
border
+// require that the width and the height need to be increased by four
const Rectangle aVclRect(Point(static_castlong int(lX-1),
static_castlong int(lY-1) ),
- Size( static_castlong int(lWidth+3),
-static_castlong int(lHeight+3) ) );
+ Size( static_castlong int(lWidth+4),
+static_castlong int(lHeight+4) ) );
mpFrame-maInvalidRect.Union( aVclRect );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu | 17 -- 1 file changed, 17 deletions(-) New commits: commit 35610714c114e7fcea09dad0e395c69b8a9bdfbe Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Sun Jun 1 03:45:34 2014 +0200 don't add the changes toolbar to the forms window, fdo#76752 Change-Id: I1a5d62b0995343a73fd8d6941f0fa380bb19e783 Reviewed-on: https://gerrit.libreoffice.org/9606 Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu index 49f3fe3..7d02379 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu @@ -697,23 +697,6 @@ valuetrue/value /prop /node - node oor:name=private:resource/toolbar/changes oor:op=replace -prop oor:name=UIName oor:type=xs:string - value xml:lang=en-USChanges/value -/prop -prop oor:name=Docked oor:type=xs:boolean - valuetrue/value -/prop -prop oor:name=DockingArea oor:type=xs:int - value2/value -/prop -prop oor:name=DockPos oor:type=xs:string - value0,0/value -/prop -prop oor:name=Visible oor:type=xs:boolean - valuetrue/value -/prop - /node /node /node /oor:component-data ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - editeng/source
editeng/source/editeng/editdoc.cxx | 39 -
editeng/source/editeng/editdoc.hxx | 17 --
editeng/source/editeng/impedit.hxx |1
editeng/source/editeng/impedit4.cxx | 42
4 files changed, 29 insertions(+), 70 deletions(-)
New commits:
commit 029b24297ade84b6bf72ce1dec37d9ca9ac4b740
Author: Michael Stahl mst...@redhat.com
Date: Sat May 31 00:03:44 2014 +0200
fdo#64956: editeng: fix RTF color table export
The editengine RTF export produces this:
{\colortbl\red255\green255\blue255;;}
... and then it proceeds to map COL_AUTO to \cf0 i.e. the white entry
that is the result of erroneously writing out the 0th entry regardless
of whether it is COL_AUTO or not.
Fix the color table export to always put COL_AUTO first (as the Writer
RTF export already does), and simplify the code a bit.
(cherry picked from commit 55070972b32e719e4855855797263d6342a3625f)
Conflicts:
editeng/source/editeng/editdoc.cxx
editeng/source/editeng/editdoc.hxx
editeng/source/editeng/impedit4.cxx
Change-Id: Ia8ce19f387e3627a1b4a26bcc723edcf5b1ffdf8
Reviewed-on: https://gerrit.libreoffice.org/9585
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit edfd206f65afb9afb5b0e9842453ba0cc085a0b5)
Reviewed-on: https://gerrit.libreoffice.org/9618
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index f02990b..7eb4398 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -3011,45 +3011,6 @@ bool CharAttribList::DbgCheckAttribs() const
#endif
-SvxColorList::SvxColorList()
-{
-}
-
-SvxColorList::~SvxColorList()
-{
-for ( size_t i = 0, n = aColorList.size(); i n; ++i )
-delete aColorList[ i ];
-aColorList.clear();
-}
-
-size_t SvxColorList::GetId( const SvxColorItem rColorItem )
-{
-for ( size_t i = 0, n = aColorList.size(); i n; ++i )
-if ( *aColorList[ i ] == rColorItem )
-return i;
-DBG_WARNING( Color not found: GetId() );
-return 0;
-}
-
-void SvxColorList::Insert( SvxColorItem* pItem, size_t nIndex )
-{
-if ( nIndex = aColorList.size() )
-{
-aColorList.push_back( pItem );
-}
-else
-{
-DummyColorList::iterator it = aColorList.begin();
-::std::advance( it, nIndex );
-aColorList.insert( it, pItem );
-}
-}
-
-SvxColorItem* SvxColorList::GetObject( size_t nIndex )
-{
-return ( nIndex = aColorList.size() ) ? NULL : aColorList[ nIndex ];
-}
-
EditEngineItemPool::EditEngineItemPool( sal_Bool bPersistenRefCounts )
: SfxItemPool( OUString( EditEngineItemPool ), EE_ITEMS_START,
EE_ITEMS_END,
aItemInfos, 0, bPersistenRefCounts )
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index 40676d5..dd04503 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -131,23 +131,8 @@ public:
// --
// class SvxColorList
-// --
-
-class SvxColorList
-{
-private:
-typedef std::vectorSvxColorItem* DummyColorList;
-DummyColorList aColorList;
-public:
-SvxColorList();
-~SvxColorList();
-
-size_t GetId( const SvxColorItem rColor );
-size_t Count() { return aColorList.size(); };
-voidInsert( SvxColorItem* pItem, size_t nIndex );
-SvxColorItem* GetObject( size_t nIndex );
-};
+typedef std::vectorColor SvxColorList;
// --
// class ItemList
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 31b72db..6efe921 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -76,7 +76,6 @@ DBG_NAMEEX( EditEngine )
class EditView;
class EditEngine;
-class SvxColorList;
class SvxSearchItem;
class SvxLRSpaceItem;
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index a0f54df..b4ff56e 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -431,30 +431,40 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
// Write out ColorList ...
SvxColorList aColorList;
+// COL_AUTO should be the default color, always put it first
+aColorList.push_back(COL_AUTO);
+SvxColorItem const rDefault(static_castSvxColorItem const(
+aEditDoc.GetItemPool().GetDefaultItem(EE_CHAR_COLOR)));
+if (rDefault.GetValue() != COL_AUTO) // is the default always AUTO?
+{
+
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/ctlayout.cxx | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit d2bbef3d3d6c7be096175ddbdb788ece5067f5fc
Author: Herbert Dürr h...@apache.org
Date: Mon Jun 2 11:30:49 2014 +
Related: #i125020# fix the calculation of the text-update rectangle...
in CoreText
by doing the calculation before CTLineDraw() updates the text position.
Requesting the update early is possible because that update region is
not used until AquaSalInstance::Yield().
(cherry picked from commit ee042661b996fd00d5504caf4f4be60f77bf880f)
Conflicts:
vcl/aqua/source/gdi/ctlayout.cxx
Change-Id: I317a2068071a2f6d33f34c81e104e30beedc33db
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 8c42cc8..46c55a3 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -356,14 +356,8 @@ void CTLayout::drawCTLine(AquaSalGraphics rAquaGraphics,
CTLineRef ctline, cons
SAL_INFO( vcl.ct, CGContextSetTextPosition( rAquaGraphics.mrContext
, aTextPos ) );
CGContextSetTextPosition( rAquaGraphics.mrContext, aTextPos.x, aTextPos.y
);
-// set the text color as fill color (see
kCTForegroundColorFromContextAttributeName)
-CGContextSetFillColor( rAquaGraphics.mrContext,
rAquaGraphics.maTextColor.AsArray() );
-
-SAL_INFO( vcl.ct, CTLineDraw( ctline ,
rAquaGraphics.mrContext ) );
-// draw the text
-CTLineDraw( ctline, rAquaGraphics.mrContext );
#ifndef IOS
-// request an update of the changed window area
+// request an update of the to-be-changed window area
if( rAquaGraphics.IsWindowGraphics() )
{
const CGRect aInkRect = CTLineGetImageBounds( mpCTLine,
rAquaGraphics.mrContext );
@@ -371,6 +365,14 @@ void CTLayout::drawCTLine(AquaSalGraphics rAquaGraphics,
CTLineRef ctline, cons
rAquaGraphics.RefreshRect( aRefreshRect );
}
#endif
+
+// set the text color as fill color (see
kCTForegroundColorFromContextAttributeName)
+CGContextSetFillColor( rAquaGraphics.mrContext,
rAquaGraphics.maTextColor.AsArray() );
+
+SAL_INFO( vcl.ct, CTLineDraw( ctline ,
rAquaGraphics.mrContext ) );
+// draw the text
+CTLineDraw( ctline, rAquaGraphics.mrContext );
+
// restore the original graphic context transformations
SAL_INFO( vcl.ct, CGContextRestoreGState( rAquaGraphics.mrContext
) );
CGContextRestoreGState( rAquaGraphics.mrContext );
___
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' - ee/042661b996fd00d5504caf4f4be60f77bf880f
ee/042661b996fd00d5504caf4f4be60f77bf880f |1 + 1 file changed, 1 insertion(+) New commits: commit a9b7e967e8c441ba7800abb4c86f54f5078358e2 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 09:52:11 2014 +0100 Notes added by 'git notes add' diff --git a/ee/042661b996fd00d5504caf4f4be60f77bf880f b/ee/042661b996fd00d5504caf4f4be60f77bf880f new file mode 100644 index 000..a876a22 --- /dev/null +++ b/ee/042661b996fd00d5504caf4f4be60f77bf880f @@ -0,0 +1 @@ +merged as: d2bbef3d3d6c7be096175ddbdb788ece5067f5fc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/tml/cp-4.2-ia2'
New branch 'private/tml/cp-4.2-ia2' available with the following commits: commit bdee198e06a8c8e8d8667dfc77b6f57e7c151105 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Dec 16 15:04:09 2013 -0500 Check IsRefMode() before accessing the ref range. Else you'd end up with wrong ref range values. Also in selectAllAccessibleChildren(), the code is probably meant to select all sheet, rather than setting the top-left reference position twice in a row. Change-Id: I895896418476ffea0862e8df4e03f6efc4c91dd2 commit c1cfa959483a3958ff5e31e1b85cf041bf9410ef Author: Michael Stahl mst...@redhat.com Date: Mon Dec 16 18:51:18 2013 +0100 sw: revert PaintArea change in SwAccessibleFrame 76c549eb01dcb7b5bf28a271ce00e386f3d388ba changes some calls to SwAccessibleChildSList to use the PaintArea() of the given SwFrm instead of the given rVisArea, which makes SwAccessibleFrame::GetChildCount() and GetChildIndex() inconsistent with other methods such as GetChild(), GetChildAtPixel() etc. Not sure which way is better, but it should be consistent; revert the partial change for now and see. Change-Id: I7d7edf2ec3dd0860ac2331d36757096186185e4f commit d4adc6246b061dcae8fe4219ab40474297864929 Author: Isamu Mogi saturda...@gmail.com Date: Wed Dec 18 20:52:45 2013 +0900 --disable-atl disables winaccessibility Change-Id: I548ea294e6c632b8ae95e6745a51d9b12c7e5297 Reviewed-on: https://gerrit.libreoffice.org/7130 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com commit 7f536a748c5184bb0518cf01d34a14048aa8fd33 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Mon Feb 3 19:08:31 2014 +0100 fdo#39944: Add DOCUMENT_* accessibility UNO roles Added a set of UNO accessibility roles for specific kinds of documents: * DOCUMENT_PRESENTATION for Impress * DOCUMENT_SPREADSHEET for Calc * DOCUMENT_TEXT for Writer The other applications still use the existing DOCUMENT role. These roles translates directly to ATK but in the other toolkits we keep using the same association that DOCUMENT role had. Change-Id: Ibac47527e5effdecb28d2314cde8558cf4fb010a Reviewed-on: https://gerrit.libreoffice.org/7847 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com commit b5b175fc70f86d156c83f0199f383cd02385b4ab Author: Niklas Johansson sleeping.pil...@gmail.com Date: Thu Mar 20 18:27:39 2014 +0100 Improve Accessibility mapping of roles for Mac Since role Heading now is exposed to A11y we need to give it a better role then unknown, otherwise it gets inaccessible to VoiceOver. Until I get a better grip on how to best expose AXHeading, let's map it to textAreaRole so we at least get back to the behaviour before IA2 integration. Header and Footer is probably best mapped to AXGroup. Change-Id: I6353f4d25c18e6e550df289ca2e999ad1c01f2a8 Reviewed-on: https://gerrit.libreoffice.org/8682 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com commit fc09c1e5310c57a8ff8d88f76268eae1c58fd33a Author: Michael Stahl mst...@redhat.com Date: Mon Feb 10 21:08:07 2014 +0100 accessibility: add some missing locks in new code Change-Id: Ic38a07c592a89973ca1df807505f87910e84a17f commit 3dd7abea4fd6472bf2d0c55338f935e01a5d1d6c Author: Michael Stahl mst...@redhat.com Date: Tue Jan 28 20:45:20 2014 +0100 fix bad cast in SvxStyleBox_Impl::StateChanged() This causes various JunitTest crashes on Windows, regression from 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec. Change-Id: Iab24e0d39375ac1e5ac63d32470dca1e54d518c5 commit 446487d8eabca319eb1955d4614cd27fc03284ec Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 2 16:00:10 2013 + restore SdrMarkView::HasMarkableObj, etc. Change-Id: Ib5c0d5028792708bc0ac0e756aa47d486443bbb7 commit 629fa9160b9fb0409a60f05dc8f51688c3aad176 Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 28 12:10:35 2013 + we will need getColorConfig, etc. again Change-Id: Ie7f8d37b550c788fd6235a5de4bbcc51ac6f8150 commit 06d8eaac4592802a577ec3860c4e88660c99822b Author: Tor Lillqvist t...@collabora.com Date: Fri May 30 23:38:34 2014 +0300 Typo fix Change-Id: I64d20fc0a9d7459823dd98afeeb37faa0fd61699 commit c3449e6e2973d7b0d4f7235d6aec93fa24380969 Author: Steve Yin stev...@apache.org Date: Tue Mar 11 05:53:58 2014 + Resolves: #i123622# [ia2] Calc: No focus event fired on cell... when new spreadsheet is created (cherry picked from commit 572001d5865e4d11523e72a506e9a6eca7f23786) Change-Id: I10212bf9ddeb9eb06c1d9105951a5eb9d8578029 commit 579e3901c5b9ddd5c6613dec28d1c4d8b311d3f3 Author: Michael Stahl mst...@redhat.com Date: Mon
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - dbaccess/source
dbaccess/source/ui/browser/brwctrlr.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e8567278f06e957fcdc0e5afb9aa9d423ef1f55a
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sat May 31 05:52:00 2014 +0200
fdo#73352 don't crash if clearWarnings throws an SQLException
Change-Id: If67bda43589834e4c922056145bc60884728cb8a
Reviewed-on: https://gerrit.libreoffice.org/9592
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx
b/dbaccess/source/ui/browser/brwctrlr.cxx
index cae373c..fd19148 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -600,7 +600,16 @@ void SbaXDataBrowserController::onStartLoading( const
Reference XLoadable _r
Reference XWarningsSupplier xWarnings( _rxLoadable, UNO_QUERY );
if ( xWarnings.is() )
-xWarnings-clearWarnings();
+{
+try
+{
+xWarnings-clearWarnings();
+}
+catch(const SQLException e)
+{
+DBG_UNHANDLED_EXCEPTION();
+}
+}
}
void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const
SQLExceptionInfo _rError )
@@ -666,7 +675,7 @@ bool SbaXDataBrowserController::reloadForm( const
Reference XLoadable _rxLoa
}
catch(const SQLException e)
{
-(void)e;
+DBG_UNHANDLED_EXCEPTION();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - sc/source
sc/source/core/data/document.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 8a4737360ea28296f7ac1d3cddf2e27b3ac25915
Author: Eike Rathke er...@redhat.com
Date: Tue May 27 12:31:30 2014 +0200
resolved rhbz#1101224 do not attempt to obtain names for NULL tabs
This happened when the HTML export via clipboard tried to resolve
conditional formats, where we have a temporary instance of a document
containing only the sheet to be exported.
Change-Id: Ic7498a1cab3eabede74773868287a2cc3edef052
(cherry picked from commit 17979abf4fde202cae231be19a218be3fe27d04c)
Reviewed-on: https://gerrit.libreoffice.org/9510
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 47164be..2ec7d68 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -259,9 +259,14 @@ std::vectorOUString ScDocument::GetAllTableNames() const
TableContainer::const_iterator it = maTabs.begin(), itEnd = maTabs.end();
for (; it != itEnd; ++it)
{
+// Positions need to be preserved for ScCompiler and address convention
+// context, so still push an empty string for NULL tabs.
OUString aName;
-const ScTable rTab = **it;
-rTab.GetName(aName);
+if (*it)
+{
+const ScTable rTab = **it;
+rTab.GetName(aName);
+}
aNames.push_back(aName);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source
dbaccess/source/ui/browser/brwctrlr.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 11f54c327592080e3d918283bd7804ef6d704613
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sat May 31 05:52:00 2014 +0200
fdo#73352 don't crash if clearWarnings throws an SQLException
Change-Id: If67bda43589834e4c922056145bc60884728cb8a
Reviewed-on: https://gerrit.libreoffice.org/9593
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx
b/dbaccess/source/ui/browser/brwctrlr.cxx
index 3e5a3c7..f1e2780 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -623,7 +623,16 @@ void SbaXDataBrowserController::onStartLoading( const
Reference XLoadable _r
Reference XWarningsSupplier xWarnings( _rxLoadable, UNO_QUERY );
if ( xWarnings.is() )
-xWarnings-clearWarnings();
+{
+try
+{
+xWarnings-clearWarnings();
+}
+catch(const SQLException e)
+{
+DBG_UNHANDLED_EXCEPTION();
+}
+}
}
void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const
SQLExceptionInfo _rError )
@@ -690,7 +699,7 @@ sal_Bool SbaXDataBrowserController::reloadForm( const
Reference XLoadable _r
}
catch(const SQLException e)
{
-(void)e;
+DBG_UNHANDLED_EXCEPTION();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Text Background Color in Draw - Report 02/06/2014
Matteo Campanelli wrote: I am still trying to debug some misbehavior in (2) and i had no successful experiment in with transparency so far. Fixing these two issues and writing more layout attribute-related code are my core goals of the current week. Hi Matteo, sounds excellent - and don't be put off by the initial bumps, editeng vcl is rather old code, with lots of bugfix and feature sedimentations. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk|1
cui/source/dialogs/linkdlg.cxx | 196 -
cui/source/dialogs/svuidlg.hrc | 21 -
cui/source/dialogs/svuidlg.src | 198 +++--
cui/source/inc/linkdlg.hxx | 42 ---
cui/uiconfig/ui/baselinksdialog.ui | 412 +
6 files changed, 554 insertions(+), 316 deletions(-)
New commits:
commit d1f2e4d798b75f819d234912eb8ff9149eeaca42
Author: sk94 eszka...@gmail.com
Date: Mon Jun 2 14:58:37 2014 +0200
MD_UPDATE_BASELINKS conversion to .ui
Change-Id: I98b47dc20b341375c9caae264c2213aeba6e066a
Reviewed-on: https://gerrit.libreoffice.org/9620
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index cd18592..8fb9657 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/autocorrectdialog \
cui/uiconfig/ui/backgroundpage \
+ cui/uiconfig/ui/baselinksdialog \
cui/uiconfig/ui/bitmaptabpage \
cui/uiconfig/ui/borderbackgrounddialog \
cui/uiconfig/ui/borderpage \
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 043de03..1c62c1f 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -78,27 +78,7 @@ static long nTabs[] =
SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool
bHtml )
-: ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ),
-aFtFiles( this, CUI_RES( FT_FILES ) ),
-aFtLinks( this, CUI_RES( FT_LINKS ) ),
-aFtType( this, CUI_RES( FT_TYPE ) ),
-aFtStatus( this, CUI_RES( FT_STATUS ) ),
-aTbLinks( this, CUI_RES(TB_LINKS ) ),
-aFtFiles2( this, CUI_RES( FT_FILES2 ) ),
-aFtFullFileName( this, CUI_RES( FT_FULL_FILE_NAME ) ),
-aFtSource2( this, CUI_RES( FT_SOURCE2 ) ),
-aFtFullSourceName( this, CUI_RES( FT_FULL_SOURCE_NAME ) ),
-aFtType2( this, CUI_RES( FT_TYPE2 ) ),
-aFtFullTypeName( this, CUI_RES( FT_FULL_TYPE_NAME ) ),
-aFtUpdate( this, CUI_RES( FT_UPDATE ) ),
-aRbAutomatic( this, CUI_RES( RB_AUTOMATIC ) ),
-aRbManual( this, CUI_RES( RB_MANUAL ) ),
-aCancelButton1( this, CUI_RES( 1 ) ),
-aHelpButton1( this, CUI_RES( 1 ) ),
-aPbUpdateNow( this, CUI_RES( PB_UPDATE_NOW ) ),
-aPbOpenSource( this, CUI_RES( PB_OPEN_SOURCE ) ),
-aPbChangeSource( this, CUI_RES( PB_CHANGE_SOURCE ) ),
-aPbBreakLink( this, CUI_RES( PB_BREAK_LINK ) ),
+: ModalDialog( pParent, BaseLinksDialog, cui/ui/baselinksdialog.ui),
aStrAutolink( CUI_RES( STR_AUTOLINK ) ),
aStrManuallink( CUI_RES( STR_MANUALLINK ) ),
aStrBrokenlink( CUI_RES( STR_BROKENLINK ) ),
@@ -110,34 +90,44 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent,
LinkManager* pMgr, bool bHtml
pLinkMgr( NULL ),
bHtmlMode(bHtml)
{
-FreeResource();
-
-aTbLinks.SetHelpId(HID_LINKDLG_TABLB);
-aTbLinks.SetSelectionMode( MULTIPLE_SELECTION );
-aTbLinks.SetTabs( nTabs[0], MAP_APPFONT );
-aTbLinks.Resize(); // OS: hack for correct selection
+get(m_pFtFiles, FILES);
+get(m_pTbLinks, TB_LINKS);
+get(m_pFtFullFileName, FULL_FILE_NAME);
+get(m_pFtFullSourceName, FULL_SOURCE_NAME);
+get(m_pFtFullTypeName, FULL_TYPE_NAME);
+get(m_pRbAutomatic, AUTOMATIC);
+get(m_pRbManual, MANUAL);
+get(m_pPbUpdateNow, UPDATE_NOW);
+get(m_pPbOpenSource, OPEN);
+get(m_pPbChangeSource, CHANGE_SOURCE);
+get(m_pPbBreakLink, BREAK_LINK);
+
+m_pTbLinks-SetHelpId(HID_LINKDLG_TABLB);
+m_pTbLinks-SetSelectionMode( MULTIPLE_SELECTION );
+m_pTbLinks-SetTabs( nTabs[0], MAP_APPFONT );
+m_pTbLinks-Resize(); // OS: hack for correct selection
// UpdateTimer for DDE-/Grf-links, which are waited for
aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl )
);
aUpdateTimer.SetTimeout( 1000 );
// Set the ZOrder, and accessible name to the dialog's title
-aTbLinks.SetZOrder(0, WINDOW_ZORDER_FIRST);
-aTbLinks.SetAccessibleName(this-GetText());
-aTbLinks.SetAccessibleRelationLabeledBy(aFtFiles);
-
-OpenSource().Hide();
-
-Links().SetSelectHdl( LINK( this, SvBaseLinksDlg, LinksSelectHdl ) );
-Links().SetDoubleClickHdl( LINK( this, SvBaseLinksDlg, LinksDoubleClickHdl
) );
-Automatic().SetClickHdl( LINK( this, SvBaseLinksDlg, AutomaticClickHdl ) );
-Manual().SetClickHdl( LINK( this, SvBaseLinksDlg, ManualClickHdl ) );
-UpdateNow().SetClickHdl( LINK( this, SvBaseLinksDlg, UpdateNowClickHdl ) );
-ChangeSource().SetClickHdl( LINK( this, SvBaseLinksDlg,
ChangeSourceClickHdl ) );
+m_pTbLinks-SetZOrder(0, WINDOW_ZORDER_FIRST);
+m_pTbLinks-SetAccessibleName(this-GetText());
+m_pTbLinks-SetAccessibleRelationLabeledBy(m_pFtFiles);
+
+m_pPbOpenSource-Hide();
+
+
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/dialogs/linkdlg.cxx | 16 ++-
cui/source/inc/helpid.hrc |1
cui/source/inc/linkdlg.hxx |1
cui/uiconfig/ui/baselinksdialog.ui | 50 +++--
4 files changed, 36 insertions(+), 32 deletions(-)
New commits:
commit 07561068fecbaeabe49fd01df4d08f90c5c66212
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 3 10:48:41 2014 +0100
rather than use pixel widths, use appfont units
Change-Id: If9551f63ac59ffedd0bd614e4f4fe05c9047e1dc
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 1c62c1f..9155325 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -90,8 +90,10 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent,
LinkManager* pMgr, bool bHtml
pLinkMgr( NULL ),
bHtmlMode(bHtml)
{
-get(m_pFtFiles, FILES);
get(m_pTbLinks, TB_LINKS);
+Size aSize(LogicToPixel(Size(257, 87), MAP_APPFONT));
+m_pTbLinks-set_width_request(aSize.Width());
+m_pTbLinks-set_height_request(aSize.Height());
get(m_pFtFullFileName, FULL_FILE_NAME);
get(m_pFtFullSourceName, FULL_SOURCE_NAME);
get(m_pFtFullTypeName, FULL_TYPE_NAME);
@@ -102,20 +104,20 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent,
LinkManager* pMgr, bool bHtml
get(m_pPbChangeSource, CHANGE_SOURCE);
get(m_pPbBreakLink, BREAK_LINK);
-m_pTbLinks-SetHelpId(HID_LINKDLG_TABLB);
m_pTbLinks-SetSelectionMode( MULTIPLE_SELECTION );
m_pTbLinks-SetTabs( nTabs[0], MAP_APPFONT );
+FixedText *pFtFiles = getFixedText(FILES);
+pFtFiles-set_width_request(LogicToPixel(Size(nTabs[2] - nTabs[1] - 2, 0),
MAP_APPFONT).Width());
+FixedText *pFtLinks = getFixedText(LINKS);
+pFtLinks-set_width_request(LogicToPixel(Size(nTabs[3] - nTabs[2] - 2, 0),
MAP_APPFONT).Width());
+FixedText *pFtTypes = getFixedText(TYPE);
+pFtTypes-set_width_request(LogicToPixel(Size(nTabs[4] - nTabs[3] - 2, 0),
MAP_APPFONT).Width());
m_pTbLinks-Resize(); // OS: hack for correct selection
// UpdateTimer for DDE-/Grf-links, which are waited for
aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl )
);
aUpdateTimer.SetTimeout( 1000 );
-// Set the ZOrder, and accessible name to the dialog's title
-m_pTbLinks-SetZOrder(0, WINDOW_ZORDER_FIRST);
-m_pTbLinks-SetAccessibleName(this-GetText());
-m_pTbLinks-SetAccessibleRelationLabeledBy(m_pFtFiles);
-
m_pPbOpenSource-Hide();
m_pTbLinks-SetSelectHdl( LINK( this, SvBaseLinksDlg, LinksSelectHdl ) );
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index bc15fab6..deec50c 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -75,7 +75,6 @@
#define HID_HYPERLINK_MARKWND_APPLY CUI_HID_HYPERLINK_MARKWND_APPLY
#define HID_HYPERLINK_MARKWND_CLOSE CUI_HID_HYPERLINK_MARKWND_CLOSE
#define HID_HYPERLINK_MARKWND_TREE CUI_HID_HYPERLINK_MARKWND_TREE
-#define HID_LINKDLG_TABLB CUI_HID_LINKDLG_TABLB
#define HID_MACRO_HEADERTABLISTBOX CUI_HID_MACRO_HEADERTABLISTBOX
#define HID_HYPERLINK_DIALOG
CUI_HID_HYPERLINK_DIALOG
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 6c045ce..f428895 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -41,7 +41,6 @@ class SvBaseLinksDlg : public ModalDialog
{
using Window::SetType;
-FixedText *m_pFtFiles;
SvTabListBox *m_pTbLinks;
FixedText *m_pFtFullFileName;
FixedText *m_pFtFullSourceName;
diff --git a/cui/uiconfig/ui/baselinksdialog.ui
b/cui/uiconfig/ui/baselinksdialog.ui
index 8fb8b83..1d77a0a 100644
--- a/cui/uiconfig/ui/baselinksdialog.ui
+++ b/cui/uiconfig/ui/baselinksdialog.ui
@@ -1,6 +1,7 @@
?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.1 --
interface
- !-- interface-requires gtk+ 3.0 --
+ requires lib=gtk+ version=3.0/
!-- interface-requires LibreOffice 1.0 --
object class=GtkDialog id=BaseLinksDialog
property name=can_focusFalse/property
@@ -22,8 +23,9 @@
property name=use_action_appearanceFalse/property
property name=visibleTrue/property
property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
property name=use_stockTrue/property
/object
packing
@@ -39,7 +41,6 @@
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
property name=use_stockTrue/property
/object
packing
@@ -55,7 +56,6 @@
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a605b971a08965e9925eeff8762e333b7a31d43 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 10:54:56 2014 +0100 Updated core Project: help 0ff06dc9b3b3635d6fda133d352ae4e6b3ede68d diff --git a/helpcontent2 b/helpcontent2 index 99e6e19..0ff06dc 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 99e6e19c88313251a236ef25150d339b930c7f9a +Subproject commit 0ff06dc9b3b3635d6fda133d352ae4e6b3ede68d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |8 source/text/shared/01/0218.xhp | 28 ++-- 2 files changed, 14 insertions(+), 22 deletions(-) New commits: commit 0ff06dc9b3b3635d6fda133d352ae4e6b3ede68d Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 10:54:56 2014 +0100 update helpids for update links dialog .ui conversion Change-Id: Ifc837de26053ba300a646be847315cf612a3127f diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index b64e9dd..d12e0ff 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1958,7 +1958,6 @@ HID_LINGU_PARA_LANGUAGE,53438, HID_LINGU_REPLACE,53434, HID_LINGU_SPELLING_DLG,53432, HID_LINGU_WORD_LANGUAGE,53437, -HID_LINKDLG_TABLB,34869, HID_LISTWIZARD_CANCEL,34819, HID_LISTWIZARD_FINISH,34820, HID_LISTWIZARD_NEXT,34818, @@ -5768,7 +5767,6 @@ svx_ModalDialog_MD_ICONCHANGE,1080606720, svx_ModalDialog_MD_INSERT_OBJECT_APPLET,1598177280, svx_ModalDialog_MD_INSERT_OBJECT_IFRAME,1598210048, svx_ModalDialog_MD_LINKEDIT,1598095360, -svx_ModalDialog_MD_UPDATE_BASELINKS,1598062592, svx_ModalDialog_RID_DEFAULTABOUT,1078001664, svx_ModalDialog_RID_OFADLG_OPTIONS_TREE_HINT,1346011136, svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872, @@ -5794,10 +5792,6 @@ svx_PushButton_MD_ICONSELECTOR_BTN_DELETE,1080136601, svx_PushButton_MD_ICONSELECTOR_BTN_IMPORT,1080136589, svx_PushButton_MD_INSERT_OBJECT_APPLET_BTN_CLASS,1598181901, svx_PushButton_MD_INSERT_OBJECT_IFRAME_BT_FILEOPEN,1598214663, -svx_PushButton_MD_UPDATE_BASELINKS_PB_BREAK_LINK,1598067238, -svx_PushButton_MD_UPDATE_BASELINKS_PB_CHANGE_SOURCE,1598067237, -svx_PushButton_MD_UPDATE_BASELINKS_PB_OPEN_SOURCE,1598067236, -svx_PushButton_MD_UPDATE_BASELINKS_PB_UPDATE_NOW,1598067235, svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_CREATE,1241813509, svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_DEL,1241813512, svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_EDIT,1241813510, @@ -5844,8 +5838,6 @@ svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_ON,1598210578, svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGAUTO,1598210575, svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGOFF,1598210574, svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGON,1598210573, -svx_RadioButton_MD_UPDATE_BASELINKS_RB_AUTOMATIC,1598063146, -svx_RadioButton_MD_UPDATE_BASELINKS_RB_MANUAL,1598063147, svx_RadioButton_RID_OFA_TP_INTERNATIONAL_RB_TXTDIR_LEFT2RIGHT,811336194, svx_RadioButton_RID_OFA_TP_INTERNATIONAL_RB_TXTDIR_RIGHT2LEFT,811336195, svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_CENTERALIGN,703775264, diff --git a/source/text/shared/01/0218.xhp b/source/text/shared/01/0218.xhp index fc57c04..28cb03a 100644 --- a/source/text/shared/01/0218.xhp +++ b/source/text/shared/01/0218.xhp @@ -27,7 +27,6 @@ /topic /meta body -!-- removed HID SO3:MODALDIALOG:MD_UPDATE_BASELINKS -- bookmark xml-lang=en-US branch=hid/.uno:LinkDialog id=bm_id199976 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:LinkDialog id=bm_id3150008 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:EditLinks id=bm_id5458456 localize=false/ @@ -39,6 +38,7 @@ bookmark_valueupdating; links, on opening/bookmark_value bookmark_valuelinks; opening files with/bookmark_value /bookmarkcommentMW changed opening;.../comment +bookmark xml-lang=en-US branch=hid/cui/ui/baselinksdialog/BaseLinksDialog id=bm_id4889980 localize=false/ paragraph xml-lang=en-US id=hd_id3150279 role=heading level=1 l10n=U oldref=1Edit Links/paragraph paragraph xml-lang=en-US id=par_id3150774 role=paragraph l10n=U oldref=2variable id=verknuepfungentextahelp hid=.uno:ManageLinksLets you edit the properties of each link in the current document, including the path to the source file. This command is not available if the current document does not contain links to other files./ahelp /variable/paragraph @@ -47,8 +47,8 @@ /section paragraph xml-lang=en-US id=par_id3156156 role=note l10n=U oldref=27When you open a file that contains links, you are prompted to update the links. Depending on where the linked files are stored, the update process can take several minutes to complete./paragraph paragraph xml-lang=en-US id=par_id3143270 role=note l10n=U oldref=28If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server./paragraph -bookmark xml-lang=en-US branch=hid/CUI_HID_LINKDLG_TABLB id=bm_id4889980 localize=false/ -paragraph xml-lang=en-US id=par_idN10646 role=paragraph l10n=NEWahelp hid=34869Double-click a link in the list to open a file dialog where you can select another object for this link./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/baselinksdialog/TB_LINKS id=bm_id4889980 localize=false/ +paragraph xml-lang=en-US id=par_idN10646 role=paragraph l10n=NEWahelp
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source
cui/source/options/personalization.cxx |4 1 file changed, 4 insertions(+) New commits: commit e28749854b89a596f4da7aa710b2a5daf588c4f7 Author: Jan Holesovsky ke...@collabora.com Date: Sun Jun 1 13:15:02 2014 +0200 Acquire the solar mutex, otherwise we cannot access vcl in the thread. Change-Id: I02fdbbfd4c9516597df395163e28f1d616aa390d diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 9c8d345..c619624 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -371,6 +371,10 @@ void SearchAndParseThread::execute() Bitmap aBmp = aGraphic.GetBitmap(); vResultList.push_back( Image( aBmp ) ); } + +// for VCL to be able to do visual changes in the thread +SolarMutexGuard aGuard; + m_pPersonaDialog-SetImages( vResultList ); sProgress = ; m_pPersonaDialog-SetProgress( sProgress ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - sw/source
sw/source/core/fields/ddefld.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit eb3709fd1f94213336d9bbd444b6e054721632a5
Author: Michael Stahl mst...@redhat.com
Date: Tue May 27 20:30:19 2014 +0200
fdo#78332: sw: fix separators in SwDDEFieldType::PutValue()
Setting 3 separators instead of 2 does not work.
(regression from 263153842741d7ce21cc0bf1c5296a55a1138024)
Change-Id: Id0b4649404b8a49a7f89a237c46106bce4e146ff
(cherry picked from commit 747bcdc14386978f2a98a452e52c8dcc2459d319)
Reviewed-on: https://gerrit.libreoffice.org/9513
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 090c66b2c91378a83e294e872d6c8cb2a497eb80)
Reviewed-on: https://gerrit.libreoffice.org/9530
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 9b0bf97..37d6f50 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -367,7 +367,8 @@ bool SwDDEFieldType::PutValue( const uno::Any rVal,
sal_uInt16 nWhichId )
{
rVal = sToken;
}
-sNewCmd += sToken + OUString(sfx2::cTokenSeparator);
+sNewCmd += (i 2)
+? sToken + OUString(sfx2::cTokenSeparator) : sToken;
}
SetCmd( sNewCmd );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_1.0.hqx | 61 ++ writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_1.0.hqx | 61 -- 2 files changed, 61 insertions(+), 61 deletions(-) New commits: commit 1a6aae7ddd496121d9478d5004c465d0e3b45d38 Author: David Tardon dtar...@redhat.com Date: Tue Jun 3 12:30:09 2014 +0200 yet another test file that fails to load on windows Change-Id: I5e8b171e4603ce45ae8f31c6a3d7264f597d8898 diff --git a/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/.gitignore b/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/.gitignore deleted file mode 100644 index e69de29..000 diff --git a/writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_1.0.hqx b/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_1.0.hqx similarity index 100% rename from writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_1.0.hqx rename to writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_1.0.hqx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_2.0.hqx | 125 ++ writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_2.0.hqx | 125 -- 2 files changed, 125 insertions(+), 125 deletions(-) New commits: commit d758fb4d34a6f524b05fca6342a8e6a80e99d9e9 Author: David Tardon dtar...@redhat.com Date: Tue Jun 3 12:35:02 2014 +0200 and another one... Change-Id: I24c146c7372bedf9a70b9739e44968f09b0ba77a diff --git a/writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_2.0.hqx b/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_2.0.hqx similarity index 100% rename from writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_2.0.hqx rename to writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_2.0.hqx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 78801, which changed state. Bug 78801 Summary: Copying HTML from web browser - only plain text is pasted https://bugs.freedesktop.org/show_bug.cgi?id=78801 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 78801, which changed state. Bug 78801 Summary: Copying HTML from web browser - only plain text is pasted https://bugs.freedesktop.org/show_bug.cgi?id=78801 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 sw/source/uibase/wrtsh/wrtsh1.cxx| 11 +++ 2 files changed, 15 insertions(+) New commits: commit e2b260fc98e833d4e64426b90992094f2da0498c Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Jun 3 12:44:37 2014 +0200 sw: let layout not mark embedded object as modified The problem was that right after the import, the document wasn't marked as modified, but as layout settled, it got marked as modified. Given that we already have code to avoid modification when updating the replacement image, do something similar here: when setting the view area, make sure the embedded object's component is not marked as modified. Change-Id: I88a42829ec48db54178553661863a571cd2a268b diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index a24c3ab..fe9c686 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -2118,6 +2118,10 @@ DECLARE_OOXMLIMPORT_TEST(testChartSize, chart-size.docx) uno::Referencecontainer::XIndexAccess xEmbeddedObjects(xTextEmbeddedObjectsSupplier-getEmbeddedObjects(), uno::UNO_QUERY); // This was 10954. CPPUNIT_ASSERT_EQUAL(sal_Int32(6008), getPropertysal_Int32(xEmbeddedObjects-getByIndex(0), Width)); + +// Layout modified the document when it had this chart. +uno::Referenceutil::XModifiable xModifiable(mxComponent, uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(false, bool(xModifiable-isModified())); } DECLARE_OOXMLIMPORT_TEST(testInlineGroupshape, inline-groupshape.docx) diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index dbd8c05..6c03ee9 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -650,7 +650,18 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef xObj, awt::Size aSz; aSz.Width = aSize.Width(); aSz.Height = aSize.Height(); + +// Action 'setVisualAreaSize' doesn't have to change the +// modified state of the document, either. +bool bModified = false; +uno::Referenceutil::XModifiable xModifiable(xObj-getComponent(), uno::UNO_QUERY); +if (xModifiable.is()) +bModified = xModifiable-isModified(); xObj-setVisualAreaSize( nAspect, aSz ); +xModifiable.set(xObj-getComponent(), uno::UNO_QUERY); +if (xModifiable.is()) +xModifiable-setModified(bModified); + // #i48419# - action 'UpdateReplacement' doesn't // have to change the modified state of the document. // This is only a workaround for the defect, that this action ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Presentation Video Bug - Need Dev/QA Feedback
On Sat, 2014-05-31 at 11:17 -0700, Joel Madero wrote: https://bugs.freedesktop.org/show_bug.cgi?id=56847 So QA has some questions: 1. Should we close this particular bug as INVALID because it's a disaster with comments and lots of different issues being posted? Its got 67 comments in it, its way too big with different issues in it. 2. Is this our bug at all? 3. Should we open individual bugs for each format that does not work? 4. Are there particular codecs that we should try to install? For Linux, we're using gstreamer under Linux to play back video, so I suggest if there's an issue playing back video under Linux that the reporter checks if it works in totem which typically defaults to having gstreamer as its backend. So as a rule of thumb if it doesn't work in totem then its definitely not our bug and we're not interested, if it does work in totem then its potentially of interest. For MacOSX I wonder if Tor knows of a basic/built-in video viewer on MacOSX which uses the same route we are using to render video which can be used as an example program to compare against to filter out missing codecs vs libreoffice-side bustate ? 5. Should we make a new bug report for each platform as there seems to be difference between platforms (for instance no one has succeeded with OSX but Jay had success with Xubuntu) Different platforms have different implementation (some have multiple implementations) of the video/audio stuff, so there are typically different issues there. So yeah, different platforms are different bugs normally. So split things up per platform as a start. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GSoC Dialog Widget Conversion - Week 1-2
On Mon, 2014-06-02 at 10:40 +0200, Mihály Palenik wrote: Hello, In the last two week I convert DLG_PUBLISHING dialog. This is a wizard that contains 6 pages and the second pages consists of 4 parts. Yup, that is an immense dialog. Normally with those multi page dialog each page can be converted one a time and the dialog converted over incrementally. In that one every page had to be converted in one go, so that was a really tough dialog to tackle. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Presentation Video Bug - Need Dev/QA Feedback
For MacOSX I wonder if Tor knows of a basic/built-in video viewer on MacOSX which uses the same route we are using to render video which can be used as an example program to compare against to filter out missing codecs vs libreoffice-side bustate ? No idea. I would just double-click on the video file;) I don't really use video files at all... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Presentation Video Bug - Need Dev/QA Feedback
The few movie files I have on my Mac are taken with my Canon DSLR, named *.mov, encoded in H.264 I think, and open with QuickTime Player. One of those files was the one I successfully inserted in a Writer doc when I tested the recent Mac patches to avmedia. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[libreoffice] allow passing FilterOptions via cli
Hi all,
I wrote a patch to allow passing FilterOptions via cli,
which fixes https://bugs.freedesktop.org/show_bug.cgi?id=36313.
The patch is attached.
The patch takes the FilterOptions from --infilter and --convert-to args
using : as a delimiter. This should hopefully not be a problem,
it is current separator used in --convert-to and I am not aware of a filter
name containing that character. If that is a problem, the separator could
be easily changed to a different character.
The patch was written on top of libreoffice-4-3-branch-point tag
(which compiled for me without serious problems).
Would it be possible to cherry-pick the bug fix also to a fresh 4.2.X
release?
I have tested the change manually and as discussed on the mailing
list last week, there is no easy way to write a test case for
this kind of stuff currently.
Thank you,
Tomas
From 843fefde549b2e3254d95325cc173622e4544eef Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty tomas.hlav...@knowledgetools.de
Date: Tue, 3 Jun 2014 12:42:47 +0200
Subject: [PATCH] allow passing FilterOptions via cli
fixes https://bugs.freedesktop.org/show_bug.cgi?id=36313
Examples:
--infilter=Text (encoded):UTF8,LF,,,
--convert-to html:XHTML Writer File:UTF8
--convert-to txt:Text (encoded):UTF8
Change-Id: I69a0524ef63f6d486637d68280331528d1001b56
---
desktop/source/app/cmdlinehelp.cxx |7 +--
desktop/source/app/dispatchwatcher.cxx | 31 ---
2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 756dcab..a956038 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -109,14 +109,17 @@ namespace desktop
--unaccept=accept-string\n\
Close an acceptor that was created with --accept=accept-string\n\
Use --unnaccept=all to close all open acceptors\n\
---infilter=filter\n\
+--infilter=filter[:filter_options]\n\
Force an input filter type if possible\n\
Eg. --infilter=\Calc Office Open XML\\n\
---convert-to output_file_extension[:output_filter_name] [--outdir output_dir] files\n\
+ --infilter=\Text (encoded):UTF8,LF,,,\\n\
+--convert-to output_file_extension[:output_filter_name[:output_filter_options]] [--outdir output_dir] files\n\
Batch convert files.\n\
If --outdir is not specified then current working dir is used as output_dir.\n\
Eg. --convert-to pdf *.doc\n\
--convert-to pdf:writer_pdf_Export --outdir /home/user *.doc\n\
+ --convert-to \html:XHTML Writer File:UTF8\ *.doc\n\
+ --convert-to \txt:Text (encoded):UTF8\ *.doc\n\
--print-to-file [-printer-name printer_name] [--outdir output_dir] files\n\
Batch print files to file.\n\
If --outdir is not specified then current working dir is used as output_dir.\n\
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index abdbe38..77e5857 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -375,7 +375,21 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList aDispatchRequ
sal_Int32 nIndex = aArgs.getLength();
aArgs.realloc(nIndex+1);
aArgs[nIndex].Name = FilterName;
-aArgs[nIndex].Value = aForcedInputFilter;
+
+sal_Int32 nFilterOptionsIndex = aForcedInputFilter.indexOf( ':' );
+if( 0 nFilterOptionsIndex )
+{
+aArgs[nIndex].Value = aForcedInputFilter.copy( 0, nFilterOptionsIndex );
+
+nIndex = aArgs.getLength();
+aArgs.realloc(nIndex+1);
+aArgs[nIndex].Name = FilterOptions;
+aArgs[nIndex].Value = aForcedInputFilter.copy( nFilterOptionsIndex+1 );
+}
+else
+{
+aArgs[nIndex].Value = aForcedInputFilter;
+}
}
// This is a synchron loading of a component so we don't have to deal with our statusChanged listener mechanism.
@@ -449,12 +463,23 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList aDispatchRequ
aFilter = impl_GuessFilter( aName, aOutFile );
}
-SequencePropertyValue conversionProperties( 2 );
+sal_Int32 nFilterOptionsIndex = aFilter.indexOf( ':' );
+SequencePropertyValue conversionProperties( 0 nFilterOptionsIndex ? 3 : 2 );
conversionProperties[0].Name = Overwrite;
conversionProperties[0].Value = sal_True;
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/line/LineWidthControl.cxx | 14 +++---
svx/source/sidebar/line/LineWidthControl.hxx |2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 59371dfca363601b051ebd289d695ca040a97531
Author: Noel Grandin n...@peralex.com
Date: Tue Jun 3 14:13:22 2014 +0200
fix spelling of field name mbColseByEdit-mbCloseByEdit
Change-Id: I640491dff8378e89d37596c5fcd9e9281c6e7874
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx
b/svx/source/sidebar/line/LineWidthControl.cxx
index 2533852..77fcea5 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -50,7 +50,7 @@ LineWidthControl::LineWidthControl (
mstrPT(SVX_RESSTR(STR_PT)),
mnCustomWidth(0),
mbCustom(false),
- mbColseByEdit(false),
+ mbCloseByEdit(false),
mnTmpCusomWidth(0),
mbVSFocus(true),
maIMGCus(SVX_RES(IMG_WIDTH_CUSTOM)),
@@ -198,7 +198,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool
bValuable, SfxMapUnit e
{
mbVSFocus = true;
maVSWidth.SetSelItem(0);
-mbColseByEdit = false;
+mbCloseByEdit = false;
meMapUnit = eMapUnit;
SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE );
if ( aWinOpt.Exists() )
@@ -277,7 +277,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
mpBindings-GetDispatcher()-Execute(SID_ATTR_LINE_WIDTH,
SFX_CALLMODE_RECORD, aWidthItem, 0L);
mrLinePropertyPanel.SetWidthIcon(iPos);
mrLinePropertyPanel.SetWidth(nVal);
-mbColseByEdit = false;
+mbCloseByEdit = false;
mnTmpCusomWidth = 0;
}
else if(iPos == 9)
@@ -290,7 +290,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
XLineWidthItem aWidthItem( nVal );
mpBindings-GetDispatcher()-Execute(SID_ATTR_LINE_WIDTH,
SFX_CALLMODE_RECORD, aWidthItem, 0L);
mrLinePropertyPanel.SetWidth(nVal);
-mbColseByEdit = false;
+mbCloseByEdit = false;
mnTmpCusomWidth = 0;
}
else
@@ -328,13 +328,13 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl)
XLineWidthItem aWidthItem(nNewWidth);
mpBindings-GetDispatcher()-Execute(SID_ATTR_LINE_WIDTH,
SFX_CALLMODE_RECORD, aWidthItem, 0L);
-mbColseByEdit = true;
+mbCloseByEdit = true;
mnTmpCusomWidth = nTmp;
/*for(sal_uInt16 i = 0; i 8; i++)
{
if(nTmp == (sal_Int32)maVSWidth.GetItemData(i))
{
-mbColseByEdit = false;
+mbCloseByEdit = false;
break;
}
}*/
@@ -348,7 +348,7 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl)
bool LineWidthControl::IsCloseByEdit()
{
-return mbColseByEdit;
+return mbCloseByEdit;
}
diff --git a/svx/source/sidebar/line/LineWidthControl.hxx
b/svx/source/sidebar/line/LineWidthControl.hxx
index 867bd67..99a1d98 100644
--- a/svx/source/sidebar/line/LineWidthControl.hxx
+++ b/svx/source/sidebar/line/LineWidthControl.hxx
@@ -58,7 +58,7 @@ private:
OUStringmstrPT;
longmnCustomWidth;
boolmbCustom;
-boolmbColseByEdit;
+boolmbCloseByEdit;
longmnTmpCusomWidth;
boolmbVSFocus;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 68849] Other: Add header guards to all include files
https://bugs.freedesktop.org/show_bug.cgi?id=68849 --- Comment #31 from Thomas Arnhold thomas-l...@arnhold.org --- Thanks, Carl. Great work! :) -- 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
removing SAL_THROW
Hi Any objections to doing a mass remove of SAL_THROW? It is defined at http://opengrok.libreoffice.org/xref/core/include/sal/types.h#350 which says: /** Exception specification documentation. The original intent of this macro was to control whether or not actual exception specifications are emitted, based on how much they impact code size etc. in a specific scenario. But it ended up always being disabled (except for MSVC, which effectively ignored it even though being enabled), and used in ways that would make enabling it illegal (e.g., in the cppu::ComponentFactoryFunc typedef, or with necessarily incomplete com::sun::star::uno::RuntimeException in com/sun/star/uno/Reference.h), so has officially been demoted to pure documentation now. @deprecated do not use in new code. */ #define SAL_THROW(x) i.e. it's not doing anything useful. Regards, Noel 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: 4 commits - i18nlangtag/qa i18nlangtag/source include/i18nlangtag svx/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |4 +++
i18nlangtag/source/languagetag/languagetag.cxx| 15 +++--
i18nlangtag/source/languagetag/simple-langtag.cxx | 24 ++
include/i18nlangtag/languagetag.hxx |8 ++-
svx/source/dialog/langbox.cxx |2 -
5 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit a8c5adabb98d4152527b553f904c1841c7393748
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 3 14:47:47 2014 +0200
disallow private use language tags in combo box edit
Change-Id: I75f0b93507d31a12b07e4bb7d2c86671aa074486
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 194a0d8..de8c251 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -736,7 +736,7 @@ IMPL_LINK( SvxLanguageComboBox, EditModifyHdl,
SvxLanguageComboBox*, /*pEd*/ )
else
{
OUString aCanonicalized;
-bool bValid = LanguageTag::isValidBcp47( aStr, aCanonicalized);
+bool bValid = LanguageTag::isValidBcp47( aStr, aCanonicalized,
true);
meEditedAndValid = (bValid ? EDITED_VALID : EDITED_INVALID);
if (bValid aCanonicalized != aStr)
{
commit 4516b18f9a2e9c1bbbf013ccaedf0a526ba69dea
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 3 14:43:27 2014 +0200
and some replacement code for lt_tag_get_privateuse(), sigh..
Change-Id: Ida5064f32a16269b16ec16c0ce9f42ea895641f9
diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx
b/i18nlangtag/source/languagetag/simple-langtag.cxx
index 7693c3a..8afa42d 100644
--- a/i18nlangtag/source/languagetag/simple-langtag.cxx
+++ b/i18nlangtag/source/languagetag/simple-langtag.cxx
@@ -141,6 +141,12 @@ struct lt_variant_t : public my_t_impl
virtual ~lt_variant_t() {}
};
+struct lt_string_t : public my_t_impl
+{
+explicit lt_string_t() : my_t_impl() {}
+virtual ~lt_string_t() {}
+};
+
struct lt_list_t : public my_t_impl
{
lt_list_t* mpPrev;
@@ -260,6 +266,7 @@ struct lt_tag_t : public my_t_impl
lt_script_t maScript;
lt_region_t maRegion;
my_t_list maVariants;
+lt_string_t maPrivateUse;
explicit lt_tag_t() : my_t_impl(), maLanguage(), maScript(), maRegion(),
maVariants() {}
virtual ~lt_tag_t() {}
explicit lt_tag_t( const lt_tag_t r )
@@ -354,6 +361,13 @@ static lt_bool_t lt_tag_parse(lt_tag_t *tag,
{
(*ppSub)-assign( pStart, p);
bPrivate = true;
+if (*pStart == 'x')
+{
+// Simply copy all to privateuse field, we
+// do not care here what part actually is
+// private.
+tag-maPrivateUse.assign( pStart, pEnd);
+}
}
else
return 0; // bad
@@ -531,6 +545,11 @@ static const lt_list_t *lt_tag_get_variants(const lt_tag_t
*tag)
return tag ? tag-maVariants.mpList : NULL;
}
+static const lt_string_t *lt_tag_get_privateuse(const lt_tag_t *tag)
+{
+return tag tag-maPrivateUse.mpStr ? tag-maPrivateUse : NULL;
+}
+
static const char *lt_lang_get_tag(const lt_lang_t *lang)
{
return lang ? lang-mpStr : NULL;
@@ -551,6 +570,11 @@ static const char *lt_variant_get_tag(const lt_variant_t
*variant)
return variant ? variant-mpStr : NULL;
}
+static size_t lt_string_length(const lt_string_t *string)
+{
+return string ? strlen(string-mpStr) : 0;
+}
+
#ifdef erDEBUG
static void lt_tag_dump(const lt_tag_t *tag)
{
commit a31f53d0587b39bec9dca62b49a63cee0f08f3fe
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 3 14:18:45 2014 +0200
add unit test for LanguageTag::isValidBcp47() with bDisallowPrivate
Change-Id: I58089bc00c640bb1d8461d8f482ad623f9566e76
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index b86e263..2bbad1c 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -592,7 +592,11 @@ void TestLanguageTag::testAllTags()
OUString aCanonicalized;
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( en-US, aCanonicalized)
aCanonicalized == en-US );
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( x-foobar,
aCanonicalized) aCanonicalized == x-foobar );
+CPPUNIT_ASSERT( LanguageTag::isValidBcp47( qaa, aCanonicalized)
aCanonicalized == qaa );
CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( unreg-and-bad,
aCanonicalized) );
+CPPUNIT_ASSERT( LanguageTag::isValidBcp47( en-US, aCanonicalized,
true) aCanonicalized == en-US );
+CPPUNIT_ASSERT(
[Libreoffice-commits] core.git: Branch 'private/tml/cp-4.2-ia2' - 4 commits - sw/source
sw/source/core/access/accdoc.cxx | 12 --
sw/source/core/access/acctable.cxx | 44 ++---
sw/source/core/access/acctable.hxx |9 ---
sw/source/core/layout/tabfrm.cxx | 22 --
4 files changed, 42 insertions(+), 45 deletions(-)
New commits:
commit cbfee5d07d6f6be9d8c7c341e8d4c139762277aa
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jun 3 15:54:39 2014 +0300
Fix compilation error after conflict mis-resolution
Change-Id: I33510133dc984e9a7ddc6f2c42749d35c7cbe2b7
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index 4df1166..c004e67 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1792,7 +1792,8 @@ void SwAccessibleTable::ClearSelectionCellCache()
m_vecCellRemove.clear();
}
-void SwAccessibleTable::AddSelectionCell(const SwAccessibleContext* pAccCell
,sal_Bool bAddOrRemove)
+void SwAccessibleTable::AddSelectionCell(
+SwAccessibleContext *const pAccCell, sal_Bool bAddOrRemove)
{
uno::ReferenceXAccessible const xTmp(pAccCell);
if (bAddOrRemove)
diff --git a/sw/source/core/access/acctable.hxx
b/sw/source/core/access/acctable.hxx
index 2a239ea..9842acc 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -269,7 +269,7 @@ public:
Cells_t m_vecCellRemove;
void FireSelectionEvent( );
void ClearSelectionCellCache();
-void AddSelectionCell(const SwAccessibleContext* ,sal_Bool bAddOrRemove);
+void AddSelectionCell(SwAccessibleContext* ,sal_Bool bAddOrRemove);
};
inline SwAccessibleTableData_Impl SwAccessibleTable::GetTableData()
commit 0e3847bcae0a80c74a61ee10594ed2b48edd507d
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 13 22:10:17 2013 +0100
sw: SwAccessibleDocument: fix crashes
Add missing SolarMutexGuards and also GetMap() may be 0 if it's
disposed. (regression from 76c549eb01dcb7b5bf28a271ce00e386f3d388ba)
Change-Id: I65312098e3d4cc6f686c3fc9e05dc8a6c4da34ce
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index f530184..2d62e80 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -205,8 +205,10 @@ OUString SAL_CALL
SwAccessibleDocumentBase::getAccessibleDescription (void)
OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
OUString sAccName = GetResource( STR_ACCESS_DOC_WORDPROCESSING );
-SwDoc *pDoc = GetShell()-GetDoc();
+SwDoc *pDoc = GetMap() ? GetShell()-GetDoc() : 0;
if ( pDoc )
{
OUString sFileName = pDoc-getDocAccTitle();
@@ -574,6 +576,8 @@ void SwAccessibleDocument::deselectAccessibleChild(
void SAL_CALL SwAccessibleDocument::notifyEvent( const
::com::sun::star::document::EventObject Event )
throw (::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
if ( Event.EventName.equalsAscii( FirstPageShows ) )
{
FireStateChangedEvent( AccessibleStateType::FOCUSED,sal_True );
@@ -605,8 +609,10 @@ void SAL_CALL SwAccessibleDocument::disposing( const
::com::sun::star::lang::Eve
uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
uno::Any anyAtrribute;
-SwDoc *pDoc = GetShell()-GetDoc();
+SwDoc *pDoc = GetMap() ? GetShell()-GetDoc() : 0;
if (!pDoc)
return anyAtrribute;
@@ -854,6 +860,8 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
SAL_CALL SwAccessibleDocument::get_AccFlowTo(const
::com::sun::star::uno::Any rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException )
{
+SolarMutexGuard g;
+
const sal_Int32 FORSPELLCHECKFLOWTO = 1;
const sal_Int32 FORFINDREPLACEFLOWTO = 2;
SwAccessibleMap* pAccMap = GetMap();
commit 5aa4e58d8ec9ccfa2a7eb2aab2fceeefbe3ac94d
Author: Michael Stahl mst...@redhat.com
Date: Mon May 5 15:23:35 2014 +0200
fdo#57197: sw: check that cells are still alive ...
... before firing events from them; use a thread-safe WeakReference.
(regression from 76c549eb01dcb7b5bf28a271ce00e386f3d388ba)
Conflicts:
sw/source/core/access/acctable.cxx
sw/source/core/access/acctable.hxx
Change-Id: Ie060d27cc44415e9a75b75027f5510577ac17a6e
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index 18c5ad3..4df1166 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1749,26 +1749,33 @@ void SwAccessibleTable::FireSelectionEvent( )
aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_REMOVE;
-//int nRemove = m_vecCellRemove.size();
-//int nAdd = m_vecCellAdd.size();
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 4 commits - i18nlangtag/qa i18nlangtag/source include/i18nlangtag svx/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |4 +++
i18nlangtag/source/languagetag/languagetag.cxx| 15 +++--
i18nlangtag/source/languagetag/simple-langtag.cxx | 24 ++
include/i18nlangtag/languagetag.hxx |8 ++-
svx/source/dialog/langbox.cxx |2 -
5 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit e3ce0437b61b19f6a53d0224e4266ed6c8d277ad
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 3 14:47:47 2014 +0200
disallow private use language tags in combo box edit
Change-Id: I75f0b93507d31a12b07e4bb7d2c86671aa074486
(cherry picked from commit a8c5adabb98d4152527b553f904c1841c7393748)
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index fc6262c..533ae4e 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -733,7 +733,7 @@ IMPL_LINK( SvxLanguageComboBox, EditModifyHdl,
SvxLanguageComboBox*, /*pEd*/ )
else
{
OUString aCanonicalized;
-bool bValid = LanguageTag::isValidBcp47( aStr, aCanonicalized);
+bool bValid = LanguageTag::isValidBcp47( aStr, aCanonicalized,
true);
meEditedAndValid = (bValid ? EDITED_VALID : EDITED_INVALID);
if (bValid aCanonicalized != aStr)
{
commit 94d290da466e94c7c14becfa2da716fa0df5e25e
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 3 14:43:27 2014 +0200
and some replacement code for lt_tag_get_privateuse(), sigh..
Change-Id: Ida5064f32a16269b16ec16c0ce9f42ea895641f9
(cherry picked from commit 4516b18f9a2e9c1bbbf013ccaedf0a526ba69dea)
diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx
b/i18nlangtag/source/languagetag/simple-langtag.cxx
index 7693c3a..8afa42d 100644
--- a/i18nlangtag/source/languagetag/simple-langtag.cxx
+++ b/i18nlangtag/source/languagetag/simple-langtag.cxx
@@ -141,6 +141,12 @@ struct lt_variant_t : public my_t_impl
virtual ~lt_variant_t() {}
};
+struct lt_string_t : public my_t_impl
+{
+explicit lt_string_t() : my_t_impl() {}
+virtual ~lt_string_t() {}
+};
+
struct lt_list_t : public my_t_impl
{
lt_list_t* mpPrev;
@@ -260,6 +266,7 @@ struct lt_tag_t : public my_t_impl
lt_script_t maScript;
lt_region_t maRegion;
my_t_list maVariants;
+lt_string_t maPrivateUse;
explicit lt_tag_t() : my_t_impl(), maLanguage(), maScript(), maRegion(),
maVariants() {}
virtual ~lt_tag_t() {}
explicit lt_tag_t( const lt_tag_t r )
@@ -354,6 +361,13 @@ static lt_bool_t lt_tag_parse(lt_tag_t *tag,
{
(*ppSub)-assign( pStart, p);
bPrivate = true;
+if (*pStart == 'x')
+{
+// Simply copy all to privateuse field, we
+// do not care here what part actually is
+// private.
+tag-maPrivateUse.assign( pStart, pEnd);
+}
}
else
return 0; // bad
@@ -531,6 +545,11 @@ static const lt_list_t *lt_tag_get_variants(const lt_tag_t
*tag)
return tag ? tag-maVariants.mpList : NULL;
}
+static const lt_string_t *lt_tag_get_privateuse(const lt_tag_t *tag)
+{
+return tag tag-maPrivateUse.mpStr ? tag-maPrivateUse : NULL;
+}
+
static const char *lt_lang_get_tag(const lt_lang_t *lang)
{
return lang ? lang-mpStr : NULL;
@@ -551,6 +570,11 @@ static const char *lt_variant_get_tag(const lt_variant_t
*variant)
return variant ? variant-mpStr : NULL;
}
+static size_t lt_string_length(const lt_string_t *string)
+{
+return string ? strlen(string-mpStr) : 0;
+}
+
#ifdef erDEBUG
static void lt_tag_dump(const lt_tag_t *tag)
{
commit b823b0ade538a3b415a6d6be88839d92064a536e
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 3 14:18:45 2014 +0200
add unit test for LanguageTag::isValidBcp47() with bDisallowPrivate
Change-Id: I58089bc00c640bb1d8461d8f482ad623f9566e76
(cherry picked from commit a31f53d0587b39bec9dca62b49a63cee0f08f3fe)
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index b86e263..2bbad1c 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -592,7 +592,11 @@ void TestLanguageTag::testAllTags()
OUString aCanonicalized;
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( en-US, aCanonicalized)
aCanonicalized == en-US );
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( x-foobar,
aCanonicalized) aCanonicalized == x-foobar );
+CPPUNIT_ASSERT( LanguageTag::isValidBcp47( qaa, aCanonicalized)
aCanonicalized == qaa );
Re: Some checkings related to
Hi julien2412, On Sunday, 2014-06-01 04:32:16 -0700, julien2412 wrote: Taking a look at https://bugs.freedesktop.org/show_bug.cgi?id=79499, I opengroked xub_StrLen and found some references. Most of them are just comments but there are associated checks See http://opengrok.libreoffice.org/search?q=xub_StrLenproject=coredefs=refs=path=hist= I wonder if these checks may be wrong now. May be wrong, but given the context maybe not.. but even if not, the code could be adapted to better handle reality. I'll take care of digitgroupingiterator.hxx and interpr4.cxx The outdevgrind.cxx case is just a left-over of how code previously was, it would be nice to have the comment adapted to reality as well.. if you want to take care of that? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpprs2Dve38k.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[libreoffice] allow passing FilterOptions via cli
Hi all,
I wrote a patch to allow passing FilterOptions via cli,
which fixes https://bugs.freedesktop.org/show_bug.cgi?id=36313.
The patch is attached.
The patch takes the FilterOptions from --infilter and --convert-to args
using : as a delimiter. This should hopefully not be a problem,
it is current separator used in --convert-to and I am not aware of a filter
name containing that character. If that is a problem, the separator could
be easily changed to a different character.
The patch was written on top of libreoffice-4-3-branch-point tag
(which compiled for me without serious problems).
Would it be possible to cherry-pick the bug fix also to a fresh 4.2.X
release?
I have tested the change manually and as discussed on the mailing
list last week, there is no easy way to write a test case for
this kind of stuff currently.
Thank you,
Tomas
From 843fefde549b2e3254d95325cc173622e4544eef Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty tomas.hlav...@knowledgetools.de
Date: Tue, 3 Jun 2014 12:42:47 +0200
Subject: [PATCH] allow passing FilterOptions via cli
fixes https://bugs.freedesktop.org/show_bug.cgi?id=36313
Examples:
--infilter=Text (encoded):UTF8,LF,,,
--convert-to html:XHTML Writer File:UTF8
--convert-to txt:Text (encoded):UTF8
Change-Id: I69a0524ef63f6d486637d68280331528d1001b56
---
desktop/source/app/cmdlinehelp.cxx |7 +--
desktop/source/app/dispatchwatcher.cxx | 31 ---
2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 756dcab..a956038 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -109,14 +109,17 @@ namespace desktop
--unaccept=accept-string\n\
Close an acceptor that was created with --accept=accept-string\n\
Use --unnaccept=all to close all open acceptors\n\
---infilter=filter\n\
+--infilter=filter[:filter_options]\n\
Force an input filter type if possible\n\
Eg. --infilter=\Calc Office Open XML\\n\
---convert-to output_file_extension[:output_filter_name] [--outdir output_dir] files\n\
+ --infilter=\Text (encoded):UTF8,LF,,,\\n\
+--convert-to output_file_extension[:output_filter_name[:output_filter_options]] [--outdir output_dir] files\n\
Batch convert files.\n\
If --outdir is not specified then current working dir is used as output_dir.\n\
Eg. --convert-to pdf *.doc\n\
--convert-to pdf:writer_pdf_Export --outdir /home/user *.doc\n\
+ --convert-to \html:XHTML Writer File:UTF8\ *.doc\n\
+ --convert-to \txt:Text (encoded):UTF8\ *.doc\n\
--print-to-file [-printer-name printer_name] [--outdir output_dir] files\n\
Batch print files to file.\n\
If --outdir is not specified then current working dir is used as output_dir.\n\
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index abdbe38..77e5857 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -375,7 +375,21 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList aDispatchRequ
sal_Int32 nIndex = aArgs.getLength();
aArgs.realloc(nIndex+1);
aArgs[nIndex].Name = FilterName;
-aArgs[nIndex].Value = aForcedInputFilter;
+
+sal_Int32 nFilterOptionsIndex = aForcedInputFilter.indexOf( ':' );
+if( 0 nFilterOptionsIndex )
+{
+aArgs[nIndex].Value = aForcedInputFilter.copy( 0, nFilterOptionsIndex );
+
+nIndex = aArgs.getLength();
+aArgs.realloc(nIndex+1);
+aArgs[nIndex].Name = FilterOptions;
+aArgs[nIndex].Value = aForcedInputFilter.copy( nFilterOptionsIndex+1 );
+}
+else
+{
+aArgs[nIndex].Value = aForcedInputFilter;
+}
}
// This is a synchron loading of a component so we don't have to deal with our statusChanged listener mechanism.
@@ -449,12 +463,23 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList aDispatchRequ
aFilter = impl_GuessFilter( aName, aOutFile );
}
-SequencePropertyValue conversionProperties( 2 );
+sal_Int32 nFilterOptionsIndex = aFilter.indexOf( ':' );
+SequencePropertyValue conversionProperties( 0 nFilterOptionsIndex ? 3 : 2 );
conversionProperties[0].Name = Overwrite;
conversionProperties[0].Value = sal_True;
Re: [Libreoffice-qa] Presentation Video Bug - Need Dev/QA Feedback
On 06/03/2014 03:24 PM, Caolán McNamara wrote: For Linux, we're using gstreamer under Linux to play back video, so I suggest if there's an issue playing back video under Linux that the reporter checks if it works in totem which typically defaults to having gstreamer as its backend. So as a rule of thumb if it doesn't work in totem then its definitely not our bug and we're not interested, if it does work in totem then its potentially of interest. In my testing of a fresh install of Ubuntu 14.04, after installing gstreamer 0.10 ugly, bad, bad-multiverse, all videos would play fine in totem but not in impress until i also installed libav-tools. I found the simplest means of getting everything needed installed is simply to install the ubuntu-restricted-extras package from the software center. For MacOSX I wonder if Tor knows of a basic/built-in video viewer on MacOSX which uses the same route we are using to render video which can be used as an example program to compare against to filter out missing codecs vs libreoffice-side bustate ? Do you know how playback is implemented on windows as i wanted to do testing on it. Someone mentioned that if i plays in windows media player, then it should play in impress, but unfortunately that is not the case. I plan to set up a wiki page with Joel's help to provide details of how to get audio/video playback to work correctly on different distros/platforms and would appreciate any contributions. Jay ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/android-viewer'
New branch 'feature/android-viewer' available with the following commits: commit e28a1465a371ccd258067153577c0ed8ddfeaeec Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Tue Jun 3 15:23:39 2014 +0200 Initial commit of Android Viewer project Project was created with Android Studio. Currently includes the base of Fennec's LayerView and dependencies. Change-Id: I5c3ae253d153f659eb92bd0ca17ef95372b71b23 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/unotools sc/source
include/unotools/digitgroupingiterator.hxx | 11 ---
sc/source/core/tool/interpr4.cxx | 14 +++---
2 files changed, 11 insertions(+), 14 deletions(-)
New commits:
commit 06127e06e1d9d99e58b32e618c93667f70929249
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 3 15:55:28 2014 +0200
eliminate xub_StrLen left-over
Change-Id: I02e7700536f5a7fcc836a035aa0767b2a34be887
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index f0f7c3a..c59431c 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -720,12 +720,12 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW
nRow1, SCTAB nTab1,
{
OString aTmp(OUStringToOString(aStr,
osl_getThreadTextEncoding()));
-// In case the xub_StrLen will be longer than USHORT
-// one day, and room for pad byte check.
+// Old Add-Ins are limited to sal_uInt16 string
+// lengths, and room for pad byte check.
if ( aTmp.getLength() SAL_MAX_UINT16 - 2 )
return false;
// Append a 0-pad-byte if string length is odd
-//! MUST be sal_uInt16 and not xub_StrLen
+//! MUST be sal_uInt16
sal_uInt16 nStrLen = (sal_uInt16) aTmp.getLength();
sal_uInt16 nLen = ( nStrLen + 2 ) ~1;
@@ -843,12 +843,12 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW
nRow1, SCTAB nTab1,
{
OString aTmp(OUStringToOString(aStr,
osl_getThreadTextEncoding()));
-// In case the xub_StrLen will be longer than
USHORT
-// one day, and room for pad byte check.
-if ( aTmp.getLength() ((sal_uInt16)(~0)) - 2 )
+// Old Add-Ins are limited to sal_uInt16 string
+// lengths, and room for pad byte check.
+if ( aTmp.getLength() SAL_MAX_UINT16 - 2 )
return false;
// Append a 0-pad-byte if string length is odd
-//! MUST be sal_uInt16 and not xub_StrLen
+//! MUST be sal_uInt16
sal_uInt16 nStrLen = (sal_uInt16) aTmp.getLength();
sal_uInt16 nLen = ( nStrLen + 2 ) ~1;
if ( ((sal_uLong)nPos + 2 + nLen) MAXARRSIZE)
commit 85d1b74fd0866dc54a3745743acd1aa76ef30aaf
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 3 15:39:05 2014 +0200
eliminate xub_StrLen left-over
Change-Id: I4862481d69ac86bf082e35b28d6326444deafee8
diff --git a/include/unotools/digitgroupingiterator.hxx
b/include/unotools/digitgroupingiterator.hxx
index d7bca11..ce1cf84 100644
--- a/include/unotools/digitgroupingiterator.hxx
+++ b/include/unotools/digitgroupingiterator.hxx
@@ -31,9 +31,8 @@ namespace utl {
digits per group. If the last group was encountered the iterator will
always return the last grouping.
-Grouping values are sanitized to be 0 = value = SAL_MAX_UINT16, even if
-originally Int32, to be able to easily cast it down to String's xub_StrLen.
-This shouldn't make any difference in practice.
+Grouping values are sanitized to be = 0, even if originally signed
+sal_Int32.
Usage example with a string buffer containing a decimal representation of
an integer number. Note that of course this loop could be optimized to not
@@ -81,11 +80,9 @@ class DigitGroupingIterator
if (mnGroup maGroupings.getLength())
{
sal_Int32 n = maGroupings[mnGroup];
-OSL_ENSURE( 0 = n n = SAL_MAX_UINT16,
DigitGroupingIterator::getGrouping: far out);
+SAL_WARN_IF( n 0, unotools,
DigitGroupingIterator::getGrouping: negative grouping);
if (n 0)
-n = 0; // sanitize ...
-else if (n SAL_MAX_UINT16)
-n = SAL_MAX_UINT16; // limit for use with xub_StrLen
+n = 0; // sanitize ...
return n;
}
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/odfexport/data/textbox-rounded-corners.odt |binary
sw/qa/extras/odfexport/odfexport.cxx| 15 +
sw/source/core/doc/textboxhelper.cxx|4 +
sw/source/core/unocore/unoframe.cxx |6 +-
writerfilter/source/ooxml/todo.xsl | 46
5 files changed, 24 insertions(+), 47 deletions(-)
New commits:
commit 183721a9b2f2847b1cdeb7286a07f631359cae6d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Jun 3 15:55:45 2014 +0200
writerfilter: remove unused todo.xsl
Change-Id: Icd0ab345619fea029a63bafae9077a729852
diff --git a/writerfilter/source/ooxml/todo.xsl
b/writerfilter/source/ooxml/todo.xsl
deleted file mode 100644
index 62155de..000
--- a/writerfilter/source/ooxml/todo.xsl
+++ /dev/null
@@ -1,46 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
---
-
-xsl:stylesheet version=1.0
- xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
- xmlns:rng=http://relaxng.org/ns/structure/1.0;
-
-xsl:output method=xml indent=yes/
-
-xsl:template match=/
-todo
-xsl:for-each select=/stage3
-xsl:for-each select=attribute|element
-xsl:choose
-xsl:when test=@qname and @resource='Properties' and
not(file)
-xsl:copy-of select=./
-/xsl:when
-xsl:when test=@qname and file/status[number(@done) lt; 100
and number(@planned) gt; 0]
-xsl:copy
-xsl:copy-of select=@*/
-xsl:copy-of select=file[status[number(@done) lt;
100 and number(@planned) gt; 0]]/
-/xsl:copy
-/xsl:when
-/xsl:choose
-/xsl:for-each
-/xsl:for-each
-/todo
-/xsl:template
-
-/xsl:stylesheet
\ No newline at end of file
commit 2cbd2abf1c26639edde6e0f9823e349b6edfab79
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Jun 3 15:02:57 2014 +0200
ODF loext:text-box import/export testcase
There is a lot more to test here, but for now just test that we can have
tables and rounded corners at the same time.
Change-Id: Ia9a4877202d1d040209f49a428b83633c58fc7c7
diff --git a/sw/qa/extras/odfexport/data/textbox-rounded-corners.odt
b/sw/qa/extras/odfexport/data/textbox-rounded-corners.odt
new file mode 100644
index 000..3851850
Binary files /dev/null and
b/sw/qa/extras/odfexport/data/textbox-rounded-corners.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 1284435..b5010bf 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -364,6 +364,21 @@ DECLARE_ODFEXPORT_TEST(testShapeRelsize,
shape-relsize.odt)
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xShape, RelativeHeightRelation));
}
+DECLARE_ODFEXPORT_TEST(testTextboxRoundedCorners,
textbox-rounded-corners.odt)
+{
+uno::Referencedrawing::XShape xShape = getShape(1);
+comphelper::SequenceAsHashMap aCustomShapeGeometry =
comphelper::SequenceAsHashMap(getProperty uno::Sequencebeans::PropertyValue
(xShape, CustomShapeGeometry));
+
+// Test that the shape is a rounded rectangle.
+CPPUNIT_ASSERT_EQUAL(OUString(round-rectangle),
aCustomShapeGeometry[Type].getOUString());
+
+// The shape text should start with a table, with a in its A1 cell.
+uno::Referencetext::XText xText =
uno::Referencetext::XTextRange(xShape, uno::UNO_QUERY)-getText();
+uno::Referencetext::XTextTable xTable(getParagraphOrTable(1, xText),
uno::UNO_QUERY);
+uno::Referencetext::XTextRange xCell(xTable-getCellByName(A1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(a), xCell-getString());
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
commit 445b58a829ecc3868b79997480958571312cbc4a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Jun 3 15:35:22 2014 +0200
SwTextBoxHelper::queryInterface: handle css::text::XTextRange as well
Change-Id: If56d7cab269a76062ee75bb1a9484f154b72c4d7
diff --git a/sw/source/core/doc/textboxhelper.cxx
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - writerperfect/qa
writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_1.0.hqx | 61 writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_2.0.hqx | 125 ++ writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_1.0.hqx | 61 writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_2.0.hqx | 125 -- 4 files changed, 186 insertions(+), 186 deletions(-) New commits: commit 7c5afbf494873ea2729e3db3f8bef5d960d1ca75 Author: David Tardon dtar...@redhat.com Date: Tue Jun 3 12:35:02 2014 +0200 and another one... Change-Id: I24c146c7372bedf9a70b9739e44968f09b0ba77a (cherry picked from commit d758fb4d34a6f524b05fca6342a8e6a80e99d9e9) diff --git a/writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_2.0.hqx b/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_2.0.hqx similarity index 100% rename from writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_2.0.hqx rename to writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_2.0.hqx commit 6f1fa2af6648e9721a7bfd8122e7ebdc56a0e57d Author: David Tardon dtar...@redhat.com Date: Tue Jun 3 12:30:09 2014 +0200 yet another test file that fails to load on windows Change-Id: I5e8b171e4603ce45ae8f31c6a3d7264f597d8898 (cherry picked from commit 1a6aae7ddd496121d9478d5004c465d0e3b45d38) diff --git a/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/.gitignore b/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/.gitignore deleted file mode 100644 index e69de29..000 diff --git a/writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_1.0.hqx b/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_1.0.hqx similarity index 100% rename from writerperfect/qa/unit/data/calc/libmwaw/pass/GreatWorks_1.0.hqx rename to writerperfect/qa/unit/data/calc/libmwaw/indeterminate/GreatWorks_1.0.hqx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo69649.docx|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +++
sw/qa/extras/ooxmlimport/data/fdo69649.docx|binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 17 +++-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 87 +++--
writerfilter/source/dmapper/DomainMapper_Impl.hxx |4
writerfilter/source/dmapper/ModelEventListener.cxx | 10 --
7 files changed, 113 insertions(+), 18 deletions(-)
New commits:
commit 7bbfdfdac302d766325bd3476f52eb35854d7c38
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Mon Dec 30 16:22:30 2013 +0530
fdo#79547 fdo#69649 Fix for pre-rendered Table Of Contents
Added Import and Export Uts for the same
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7207
(cherry picked from commit 9679e9c23216decb5f9f25f85b04cb3f2521)
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: I966b3d268dd407aa05823e29fe1da4d097091265
diff --git a/sw/qa/extras/ooxmlexport/data/fdo69649.docx
b/sw/qa/extras/ooxmlexport/data/fdo69649.docx
new file mode 100644
index 000..cb0f789
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo69649.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ef0fa56..ccb299d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -42,6 +42,7 @@
#include unotools/tempfile.hxx
#include unotools/ucbstreamhelper.hxx
#include rtl/strbuf.hxx
+#include com/sun/star/text/XDocumentIndex.hpp
#include libxml/xpathInternals.h
#include libxml/parserInternals.h
@@ -2066,6 +2067,18 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79008, fdo79008.docx)
return;
}
+DECLARE_OOXMLEXPORT_TEST(testFdo69649, fdo69649.docx)
+{
+// The DOCX containing the Table of Contents was not exported with correct
page nos
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,/w:document/w:body/w:p[21]/w:hyperlink/w:r[2]/w:t);
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+OUString contents = OUString::createFromAscii((const
char*)((pXmlNode-children[0]).content));
+CPPUNIT_ASSERT(contents.match(15));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ooxmlimport/data/fdo69649.docx
b/sw/qa/extras/ooxmlimport/data/fdo69649.docx
new file mode 100644
index 000..cb0f789
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo69649.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7f7078c..47c499a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -42,7 +42,7 @@
#include com/sun/star/table/TableBorder2.hpp
#include com/sun/star/text/SizeType.hpp
#include com/sun/star/xml/dom/XDocument.hpp
-
+#include com/sun/star/text/XDocumentIndex.hpp
#include vcl/svapp.hxx
#include unotools/fltrcfg.hxx
@@ -1677,6 +1677,21 @@ DECLARE_OOXMLIMPORT_TEST(testBnc875718, bnc875718.docx)
CPPUNIT_ASSERT_EQUAL( OUString( Text\n ), text-getString());
}
+DECLARE_OOXMLIMPORT_TEST(testFdo69649, fdo69649.docx)
+{
+// The DOCX containing the Table of Contents was not imported with correct
page nos
+uno::Referencetext::XDocumentIndexesSupplier xIndexSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xIndexes(xIndexSupplier-getDocumentIndexes( ), uno::UNO_QUERY);
+uno::Referencetext::XDocumentIndex xTOCIndex(xIndexes-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetext::XTextRange xTextRange(xTOCIndex-getAnchor(),
uno::UNO_QUERY);
+uno::Referencetext::XText xText(xTextRange-getText( ), uno::UNO_QUERY);
+uno::Referencetext::XTextCursor xTextCursor(xText-createTextCursor( ),
uno::UNO_QUERY);
+xTextCursor-gotoRange(xTextRange-getStart(),false);
+xTextCursor-gotoRange(xTextRange-getEnd(),true);
+OUString xTocString(xTextCursor-getString());
+xTocString = xTocString.copy(256);
+CPPUNIT_ASSERT(xTocString.startsWithIgnoreAsciiCase( Heading 15.1:\t15 )
);
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2e6538a..89472c6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -56,6 +56,7 @@
#include com/sun/star/container/XIndexContainer.hpp
#include com/sun/star/awt/XControlModel.hpp
#include com/sun/star/drawing/XControlShape.hpp
+#include com/sun/star/text/ControlCharacter.hpp
#include oox/mathml/import.hxx
#ifdef DEBUG_DOMAINMAPPER
@@ -152,6 +153,8 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsFirstSection( true ),
[Libreoffice-commits] help.git: Branch 'libreoffice-4-3' - source/text
source/text/shared/guide/protection.xhp|2 +- source/text/shared/guide/redlining_protect.xhp |2 +- source/text/swriter/guide/protection.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 0040595dcb207b21f81349af1b71fcd854f3b589 Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net Date: Mon Jun 2 16:19:51 2014 +0200 fdo#79530 Update help for minimum length of password Since some time, password only required 1 character (as indicated in UI) instead of 5 as indicated in help Change-Id: Id7fef69ee273ee622365b4077d83cd46368475c6 Reviewed-on: https://gerrit.libreoffice.org/9624 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 99e6e19c88313251a236ef25150d339b930c7f9a) Reviewed-on: https://gerrit.libreoffice.org/9630 diff --git a/source/text/shared/guide/protection.xhp b/source/text/shared/guide/protection.xhp index 7774929..3313cb5 100644 --- a/source/text/shared/guide/protection.xhp +++ b/source/text/shared/guide/protection.xhp @@ -73,7 +73,7 @@ paragraph xml-lang=en-US id=par_id3154684 role=paragraph l10n=U oldref=12Turning on protection/paragraph /tablecell tablecell - paragraph xml-lang=en-US id=par_id3153104 role=paragraph l10n=U oldref=13Choose emphEdit - Changes - Protect Records/emph. Enter and confirm a password of at least 5 characters./paragraph + paragraph xml-lang=en-US id=par_id3153104 role=paragraph l10n=U oldref=13Choose emphEdit - Changes - Protect Records/emph. Enter and confirm a password of at least one character./paragraph /tablecell /tablerow tablerow diff --git a/source/text/shared/guide/redlining_protect.xhp b/source/text/shared/guide/redlining_protect.xhp index 16139ab..13f4b94 100644 --- a/source/text/shared/guide/redlining_protect.xhp +++ b/source/text/shared/guide/redlining_protect.xhp @@ -47,7 +47,7 @@ paragraph xml-lang=en-US id=par_id3147088 role=listitem l10n=U oldref=3Choose emphProtect Records/emph. This opens the link href=text/shared/01/password_dlg.xhp name=PasswordemphPassword/emph/link dialog./paragraph /listitem listitem -paragraph xml-lang=en-US id=par_id3153345 role=listitem l10n=U oldref=4Enter a password consisting of at least 5 characters and confirm it. Click emphOK/emph./paragraph +paragraph xml-lang=en-US id=par_id3153345 role=listitem l10n=U oldref=4Enter a password consisting of at least one character and confirm it. Click emphOK/emph./paragraph /listitem /list embed href=text/shared/00/0004.xhp#related/ diff --git a/source/text/swriter/guide/protection.xhp b/source/text/swriter/guide/protection.xhp index 177acd2..fafd547 100644 --- a/source/text/swriter/guide/protection.xhp +++ b/source/text/swriter/guide/protection.xhp @@ -48,7 +48,7 @@ paragraph xml-lang=en-US id=par_id3166413 role=tablecontent l10n=U oldref=31Turning on protection/paragraph /tablecell tablecell - paragraph xml-lang=en-US id=par_id3144764 role=tablecontent l10n=U oldref=32Select the text. Choose emphInsert - Section - Section/emph, then under emphWrite protection/emph mark the emphProtect/emph and emphWith password/emph check boxes. (If the section already exists: emphFormat - Sections/emph.) Enter and confirm a password of at least 5 characters./paragraph + paragraph xml-lang=en-US id=par_id3144764 role=tablecontent l10n=U oldref=32Select the text. Choose emphInsert - Section - Section/emph, then under emphWrite protection/emph mark the emphProtect/emph and emphWith password/emph check boxes. (If the section already exists: emphFormat - Sections/emph.) Enter and confirm a password of at least one character./paragraph /tablecell /tablerow tablerow ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 72614, which changed state. Bug 72614 Summary: Impress hangs on creating new style https://bugs.freedesktop.org/show_bug.cgi?id=72614 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: removing SAL_THROW
On 06/03/2014 02:24 PM, Noel Grandin wrote: Any objections to doing a mass remove of SAL_THROW? It is defined at http://opengrok.libreoffice.org/xref/core/include/sal/types.h#350 which says: /** Exception specification documentation. The original intent of this macro was to control whether or not actual exception specifications are emitted, based on how much they impact code size etc. in a specific scenario. But it ended up always being disabled (except for MSVC, which effectively ignored it even though being enabled), and used in ways that would make enabling it illegal (e.g., in the cppu::ComponentFactoryFunc typedef, or with necessarily incomplete com::sun::star::uno::RuntimeException in com/sun/star/uno/Reference.h), so has officially been demoted to pure documentation now. @deprecated do not use in new code. */ #define SAL_THROW(x) i.e. it's not doing anything useful. ...besides serving as documentation (using some glorified syntax) of what certain functions may actually throw (or what somebody once thought they might). In the end, I would be fine either way, keeping them or removing them. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Presentation Video Bug - Need Dev/QA Feedback
snip Do you know how playback is implemented on windows as i wanted to do testing on it. Someone mentioned that if i plays in windows media player, then it should play in impress, but unfortunately that is not the case. I plan to set up a wiki page with Joel's help to provide details of how to get audio/video playback to work correctly on different distros/platforms and would appreciate any contributions. What I would be interested to know is if we could bundle codes which VLC uses into Libreoffice that way we support formats that are not necessarily native to windows itself as well. -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Guaranteed Top 10 Google Placements mail-archive.com In 100 Days
Free SEO Evaluation! Most business developers do not realize that every website has two kind of audiences: a) People who read the website, click, and take in the look and feel of the site b) Search engines that crawl, index, and evaluate the site. Our free SEO evaluation pack looks at your website from a search engines perspective and will tell you what all we need to do to make it more Google friendly. We will explain you in detail that how your website is doing in terms of SEO and what are your strengths and weaknesses. Why Local SEO matters? Tell us one thing when was the last time you used the yellow pages? In todays scenario when consumers let their fingers do the walking, it means keying in Google search. So the visibility on web is very important for every business, not only this but being on first page is of utmost importance to drive traffic. Having a good website is not enough to be found on web, you need to opt for an effective SEO strategy to achieve visibility on web. According to the statistics To find local businesses 68% of the local consumers uses search engines Total number of local searches grew by 65% in last 2 years Local MAP listings get 10 times more clicks than organic listings only 10%-12% of businesses have claimed their Google Places local listings Here we offer a complete and proven Search Engine Placement strategy to generate more traffic, more leads and grow your business. Each day many people search for your product or your services online, but poor rankings on search engines is keeping them away from dealing with you. We offer Local SEO (Search engine optimization) packages that fit in every pocket. Our main goal is to understand your needs and requirements and make you reach the consumers who are looking for the product or services that you offer. Presently we are offering Local SEO to more than 500 websites and all rank page 1 for their related keywords. Please send us your website for free evaluation. Looking ahead working with you. Regards Miss Lara kaur SEO Manager : T.O.B 7 B Green Avenue, Amritsar Punjab Our email above is not intended to waste your time or fill your inbox with spam. If you would not like to hear from us, email us back with NOT INTERESTED. We will never email you again. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/layout/paintfrm.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit fcc24448899577e220db70f265bad59f0ffa8428
Author: Armin Le Grand a...@apache.org
Date: Tue Jun 3 16:43:56 2014 +
i124638 Corrected paints of Writer Frames with DrawingLayer FillAttributes
for all systems and AA/nonAA
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 318986e..081ad1a 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1649,12 +1649,9 @@ bool MA_FASTCALL DrawFillAttributes(
if(bUseNew rFillAttributes.get() rFillAttributes-isUsed())
{
-// Need to substract a half logical pixel unit from TopLeft to get
the correct
-// layering for AAed paints
-const basegfx::B2DVector
aHalfSingleUnit(rOut.GetInverseViewTransformation() * basegfx::B2DVector(0.5,
0.5));
-const basegfx::B2DRange aPaintRange(
-rPaintRect.Left() - aHalfSingleUnit.getX(),
-rPaintRect.Top() - aHalfSingleUnit.getY(),
+basegfx::B2DRange aPaintRange(
+rPaintRect.Left(),
+rPaintRect.Top(),
rPaintRect.Right(),
rPaintRect.Bottom());
@@ -1662,6 +1659,14 @@ bool MA_FASTCALL DrawFillAttributes(
!basegfx::fTools::equalZero(aPaintRange.getWidth())
!basegfx::fTools::equalZero(aPaintRange.getHeight()))
{
+// need to expand for correct AAed and non-AAed visualization
as primitive; move
+// bounds to half-(logical)pixel bounds and add a width/height of
one pixel that is missing
+// from SwRect/Rectangle integer handling
+const basegfx::B2DVector
aSingleUnit(rOut.GetInverseViewTransformation() * basegfx::B2DVector(0.5, 0.5));
+
+aPaintRange.expand(aPaintRange.getMinimum() - (aSingleUnit * 0.5));
+aPaintRange.expand(aPaintRange.getMaximum() + (aSingleUnit * 1.5));
+
const basegfx::B2DRange aDefineRange(
rOriginalLayoutRect.Left(),
rOriginalLayoutRect.Top(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/outdevgrind.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8d69ec4912c4d5bb8eb03e2dece8cbba0910f11b Author: Julien Nabet serval2...@yahoo.fr Date: Tue Jun 3 20:23:40 2014 +0200 Remove xub_StrLen refs Change-Id: Iea8c3f881a3ddfeaed4f4dca5d66dbe1716b8ce0 diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 8e592dc..648c52b 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -139,8 +139,8 @@ void setupMethodStubs( functor_vector_type res ) /* void DrawTextArray( const Point rStartPt, const OUString rStr, const sal_Int32* pDXAry = NULL, - xub_StrLen nIndex = 0, - xub_StrLen nLen = STRING_LEN ); + sal_uInt16 nIndex = 0, + sal_Int32 nLen = STRING_LEN ); */ add(res, DrawTextArray, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/unotools
include/unotools/digitgroupingiterator.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cc520b6eb73de907570efbed44bbe3146fe87b1a
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 3 20:23:14 2014 +0200
unknown log area [loplugin:sallogareas]
Change-Id: Ic749d5e8c22d14c0c1160c30b4813226c3962236
diff --git a/include/unotools/digitgroupingiterator.hxx
b/include/unotools/digitgroupingiterator.hxx
index ce1cf84..d5a5bc1 100644
--- a/include/unotools/digitgroupingiterator.hxx
+++ b/include/unotools/digitgroupingiterator.hxx
@@ -80,7 +80,7 @@ class DigitGroupingIterator
if (mnGroup maGroupings.getLength())
{
sal_Int32 n = maGroupings[mnGroup];
-SAL_WARN_IF( n 0, unotools,
DigitGroupingIterator::getGrouping: negative grouping);
+SAL_WARN_IF( n 0, unotools.i18n,
DigitGroupingIterator::getGrouping: negative grouping);
if (n 0)
n = 0; // sanitize ...
return n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 9 commits - lingucomponent/source vcl/inc vcl/osx
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |2
vcl/inc/osx/salframeview.h |6 +-
vcl/osx/salframe.cxx|5 +
vcl/osx/salframeview.mm | 35 ++--
vcl/osx/salinst.cxx |6 +-
vcl/osx/salmenu.cxx |4 +
vcl/osx/salprn.cxx |5 +
7 files changed, 38 insertions(+), 25 deletions(-)
New commits:
commit 96840ff0ce697c5c05b59d53409b3cf27ac35e5f
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jun 3 11:35:24 2014 +0300
WaE: 'guessesForWord:' is deprecated: first deprecated in OS X 10.6
Change-Id: I861d4012c12096958c73c7008b0a9dfa6934fda2
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 567062d..9294525 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -350,7 +350,7 @@ Reference XSpellAlternatives
aLang = [aLang stringByAppendingString:aTaggedCountry];
}
[macSpell setLanguage:aLang];
-NSArray *guesses = [macSpell guessesForWord:aNSStr];
+NSArray *guesses = [macSpell guessesForWordRange:NSMakeRange(0,
[aNSStr length]) inString:aNSStr language:aLang inSpellDocumentWithTag:0];
count = [guesses count];
if (count)
{
commit 2116b92f0266685430d31470c9914ce05b44f130
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jun 3 10:26:34 2014 +0300
WaE: 'convertBaseToScreen:' is deprecated: first deprecated in OS X 10.7
Change-Id: I04cc155e69d25021d294bccc588450b1f20e1fde
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 303c1fe..59b7651 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -880,8 +880,12 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel(
sal_uInt16 i_nItemId, SalFrame
if( ! pNSWin )
return Rectangle();
+#if MACOSX_SDK_VERSION = 1070
+NSRect aRect = [pNSWin convertRectToScreen:[pNSWin frame]];
+#else
NSRect aRect = [pNSWin frame];
aRect.origin = [pNSWin convertBaseToScreen: NSMakePoint( 0, 0 )];
+#endif
// make coordinates relative to reference frame
static_castAquaSalFrame*(i_pReferenceFrame)-CocoaToVCL( aRect.origin );
commit 74ae541c328cffb168a98faa746d0faceffb3e84
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jun 3 10:21:38 2014 +0300
WaE: 'scrollerWidth' is deprecated: first deprecated in OS X 10.7
Change-Id: I2451687c10f91e7d5242b04974cb7bdd745de51c
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index b3a1015..c799407 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1250,8 +1250,11 @@ void AquaSalFrame::UpdateSettings( AllSettings
rSettings )
getAppleScrollBarVariant(aStyleSettings);
// set scrollbar size
+#if MACOSX_SDK_VERSION = 1070
+aStyleSettings.SetScrollBarSize( static_castlong int([NSScroller
scrollerWidthForControlSize:NSRegularControlSize
scrollerStyle:NSScrollerStyleLegacy]) );
+#else
aStyleSettings.SetScrollBarSize( static_castlong int([NSScroller
scrollerWidth]) );
-
+#endif
// images in menus false for MacOSX
aStyleSettings.SetPreferredUseImagesInMenus( false );
aStyleSettings.SetHideDisabledMenuItems( true );
commit e1d82a7e2db1ea837303c072913cd52cacf75b3d
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jun 3 10:16:26 2014 +0300
WaE: 'NSPrintSavePath' is deprecated: first deprecated in OS X 10.6
Change-Id: I810b42da1d62c66c2ab6fb7bb6f71d1d00115dfa
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index f1dd2fa..9440bb3 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -462,7 +462,7 @@ bool AquaSalInfoPrinter::StartJob( const OUString*
i_pFileName,
{
[mpPrintInfo setJobDisposition: NSPrintSaveJob];
NSString* pPath = CreateNSString( *i_pFileName );
-[pPrintDict setObject: pPath forKey: NSPrintSavePath];
+[pPrintDict setObject:[NSURL fileURLWithPath:pPath]
forKey:NSPrintJobSavingURL];
[pPath release];
}
commit 5f27a6864420815d0d0abc409333fec963536faf
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jun 3 10:10:19 2014 +0300
WaE: comparison of two values with different enumeration types
Change-Id: I611eefd20043386d00984f76a28d111e1c0495f1
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 93e52e7..f1dd2fa 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -66,10 +66,11 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const
SalPrinterQueueInfo i_rQueue ) :
{
mpPrintInfo = [pShared copy];
[mpPrintInfo setPrinter: mpPrinter];
-mePageOrientation = ([mpPrintInfo orientation] ==
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - editeng/source
editeng/source/editeng/editeng.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit c52d374be19130c123d8316be6dac51219296abd Author: matteocam matteo.campane...@gmail.com Date: Tue Jun 3 14:43:40 2014 -0400 ItemSet includes Background Color in SetFontInfoInItemSet Change-Id: I0a5f5cebccc73eb3c0877fae0086861ac5b93d3d diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 20c55c6..7b4d94a 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2600,6 +2600,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet rSet, const SvxFont rFont ) rSet.Put( SvxEscapementItem( rFont.GetEscapement(), rFont.GetPropr(), EE_CHAR_ESCAPEMENT ) ); rSet.Put( SvxWeightItem( rFont.GetWeight(), EE_CHAR_WEIGHT ) ); rSet.Put( SvxColorItem( rFont.GetColor(), EE_CHAR_COLOR ) ); +rSet.Put( SvxBackgroundColorItem( rFont.GetFillColor(), EE_CHAR_COLOR ) ); rSet.Put( SvxUnderlineItem( rFont.GetUnderline(), EE_CHAR_UNDERLINE ) ); rSet.Put( SvxOverlineItem( rFont.GetOverline(), EE_CHAR_OVERLINE ) ); rSet.Put( SvxCrossedOutItem( rFont.GetStrikeout(), EE_CHAR_STRIKEOUT ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] buildbot.git: tb/tb_internals.sh
tb/tb_internals.sh |3 +++
1 file changed, 3 insertions(+)
New commits:
commit c900dd47e4eabc6a8b977ff012379a52f6a7c43c
Author: Thorsten Behrens t...@documentfoundation.org
Date: Tue Jun 3 20:50:52 2014 +0200
Add libreoffice-4-3 branch to tb.
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 5114824..3e3ae9a 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -182,6 +182,9 @@ determine_default_tinderbox_branch()
libreoffice-4-2)
echo ${b?}
;;
+libreoffice-4-3)
+echo ${b?}
+;;
esac
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c18998d53ad9b1d33173a2004e7086abb98e33f Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Jun 3 20:51:17 2014 +0200 bring back dictionaries to 4-3 branch Change-Id: Ie1bfde604aa336ff38701fbc80d7f366e8e12410 diff --git a/dictionaries b/dictionaries index 5abbb92..a2bcaea 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 5abbb92955feb9b88be7dd5edd665b5cc1838448 +Subproject commit a2bcaea4b328260a5a15cf7cb23f8fde0a8760b1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sw/qa writerfilter/source
sw/qa/core/data/rtf/pass/fdo79384.rtf |1
sw/qa/extras/rtfimport/data/fdo79384.rtf |9 +++
sw/qa/extras/rtfimport/rtfimport.cxx |8 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 72 ++---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 +
5 files changed, 75 insertions(+), 19 deletions(-)
New commits:
commit c087b60b0dd70c4a711ba1b4d556206a136fa468
Author: Michael Stahl mst...@redhat.com
Date: Tue Jun 3 20:32:13 2014 +0200
(related: bnc#823675) RTF import: get rid of hacks for \f in LISTLEVEL
These weird hacks are apparently needed only because the \loch \hich
\dbch were mapped wrongly; for the list level destination it's only
important that the existing fonts are not overwritten.
Change-Id: Ie2b9adf332b74c2744e9b1dbc4e878638e5ee078
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 89d2294..77f0379 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3518,14 +3518,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
{
RTFSprms aFontAttributes;
aFontAttributes.set(nSprm, RTFValue::Pointer_t(new
RTFValue(m_aFontNames[getFontIndex(nParam)])));
-// In the context of listlevels, \af seems to imply \f.
-if (nKeyword == RTF_AF)
-aFontAttributes.set(NS_ooxml::LN_CT_Fonts_ascii,
RTFValue::Pointer_t(new RTFValue(m_aFontNames[getFontIndex(nParam)])));
RTFSprms aRunPropsSprms;
aRunPropsSprms.set(NS_ooxml::LN_EG_RPrBase_rFonts,
RTFValue::Pointer_t(new RTFValue(aFontAttributes)));
-// If there are multiple \f or \af tokens, only handle the first
one.
-if (!m_aStates.top().aTableSprms.find(NS_ooxml::LN_CT_Lvl_rPr))
-m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_rPr,
RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms)));
+m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_rPr,
+RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms)),
+OVERWRITE_NO_APPEND);
}
else
{
commit 36246aa9fb57c9fe4e546c91a8274d8828b1424e
Author: Michael Stahl mst...@redhat.com
Date: Tue Jun 3 20:18:59 2014 +0200
RTF import: fix handling of \loch \hich \dbch \ltrch \rtlch
The logic is not immediately obvious from the RTF spec; let's do what
the editengine RTF import does, but without the unnecessary complexity.
Change-Id: I60e69130e6e5aed1f5d237f64b1656c3141e402a
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 6334031..89d2294 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2825,8 +2825,10 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
break;
case RTF_LTRCH:
// dmapper does not support this.
+m_aStates.top().isRightToLeft = false;
break;
case RTF_RTLCH:
+m_aStates.top().isRightToLeft = true;
if (m_aDefaultState.nCurrentEncoding == RTL_TEXTENCODING_MS_1255)
m_aStates.top().nCurrentEncoding =
m_aDefaultState.nCurrentEncoding;
break;
@@ -3493,11 +3495,20 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
{
case RTF_F:
case RTF_AF:
-if (nKeyword == RTF_F)
-nSprm = NS_ooxml::LN_CT_Fonts_ascii;
+if (m_aStates.top().isRightToLeft
+|| m_aStates.top().eRunType == RTFParserState::HICH)
+{
+nSprm = NS_ooxml::LN_CT_Fonts_cs;
+}
+else if (m_aStates.top().eRunType == RTFParserState::DBCH)
+{
+nSprm = NS_ooxml::LN_CT_Fonts_eastAsia;
+}
else
-nSprm = (m_aStates.top().eRunType == RTFParserState::HICH
-? NS_ooxml::LN_CT_Fonts_eastAsia : NS_ooxml::LN_CT_Fonts_cs);
+{
+assert(m_aStates.top().eRunType == RTFParserState::LOCH);
+nSprm = NS_ooxml::LN_CT_Fonts_ascii;
+}
if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE ||
m_aStates.top().nDestinationState == DESTINATION_FONTENTRY)
{
m_aFontIndexes.push_back(nParam);
@@ -3521,7 +3532,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_nCurrentFontIndex = getFontIndex(nParam);
RTFValue::Pointer_t pValue(new
RTFValue(getFontName(m_nCurrentFontIndex)));
lcl_putNestedAttribute(m_aStates.top().aCharacterSprms,
NS_ooxml::LN_EG_RPrBase_rFonts, nSprm, pValue);
-m_aStates.top().nCurrentEncoding =
getEncoding(m_nCurrentFontIndex);
+if (nKeyword == RTF_F)
+m_aStates.top().nCurrentEncoding =
getEncoding(m_nCurrentFontIndex);
[Libreoffice-commits] core.git: 5 commits - framework/inc framework/source offapi/com pyuno/source
framework/inc/uiconfiguration/imagemanager.hxx |5 -
framework/inc/uiconfiguration/moduleimagemanager.hxx|5 -
framework/source/uiconfiguration/imagemanager.cxx |5 +++--
framework/source/uiconfiguration/moduleimagemanager.cxx |4 +++-
offapi/com/sun/star/ui/XImageManager.idl|2 +-
pyuno/source/module/pyuno_callable.cxx |2 +-
pyuno/source/module/pyuno_runtime.cxx |4 ++--
7 files changed, 18 insertions(+), 9 deletions(-)
New commits:
commit 86598a4e185007958117d2fbf1a2200c7b982808
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 3 17:08:49 2014 +0100
coverity#982753 Dereference null return value
Change-Id: I011a600a27c801dca32734e680ea5a13dfebdfe3
diff --git a/pyuno/source/module/pyuno_callable.cxx
b/pyuno/source/module/pyuno_callable.cxx
index f91aa75..22b8cd1 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -115,7 +115,7 @@ PyObject* PyUNO_callable_call(
PyRef temp = runtime.any2PyObject (ret_value);
if( aOutParam.getLength() )
{
-PyRef return_list( PyTuple_New (1+aOutParam.getLength()),
SAL_NO_ACQUIRE );
+PyRef return_list( PyTuple_New (1+aOutParam.getLength()),
SAL_NO_ACQUIRE, NOT_NULL );
PyTuple_SetItem (return_list.get(), 0, temp.getAcquired());
// initialize with defaults in case of exceptions
commit 2ca70c3b5c1959c4aa052dbfae1db25a379b0579
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 3 17:08:06 2014 +0100
coverity#982755 Dereference null return value
Change-Id: I652b308d087c1ee9fff95f81297b079e3f816e07
diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
index a4b81fc..cb2ba90 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -156,7 +156,7 @@ static void getRuntimeImpl( PyRef globalDict, PyRef
runtimeImpl )
static PyRef importUnoModule( ) throw ( RuntimeException )
{
// import the uno module
-PyRef module( PyImport_ImportModule( uno ), SAL_NO_ACQUIRE );
+PyRef module( PyImport_ImportModule( uno ), SAL_NO_ACQUIRE, NOT_NULL );
if( PyErr_Occurred() )
{
PyRef excType, excValue, excTraceback;
commit b75b626ee52b7dec91f48271aa58d66b27604e51
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 3 17:07:18 2014 +0100
coverity#982756 Dereference null return value
Change-Id: Ia29c6167df0ce061fae88d81bef9a98ca37fcce3
diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
index 5ef20df..a4b81fc 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -524,7 +524,7 @@ PyRef Runtime::any2PyObject (const Any a ) const
Reference XTypeConverter tc = getImpl()-cargo-xTypeConverter;
Reference XSingleServiceFactory ssf =
getImpl()-cargo-xInvocation;
tc-convertTo (a, ::getCppuType (s)) = s;
-PyRef tuple( PyTuple_New (s.getLength()), SAL_NO_ACQUIRE);
+PyRef tuple( PyTuple_New (s.getLength()), SAL_NO_ACQUIRE,
NOT_NULL);
int i=0;
try
{
commit 229abf40ac4ee551063cdefabede3c9b31146e07
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 3 16:51:48 2014 +0100
coverity#1219794 Uncaught exception
Change-Id: Icc9e5faf9ef15840c359b7766112278094d52dea
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index b156470..f241969 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -206,8 +206,6 @@ namespace dbaui
void IndexFieldsControl::Init(const Sequence OUString
_rAvailableFields)
{
-fprintf(stderr, _rAvailableFields len is %d\n,
_rAvailableFields.getLength());
-
RemoveColumns();
// for the width: both columns together should be somewhat smaller
than the whole window (without the scrollbar)
@@ -237,9 +235,6 @@ namespace dbaui
m_pSortingCell-InsertEntry(m_sAscendingText);
m_pSortingCell-InsertEntry(m_sDescendingText);
m_pSortingCell-SetHelpId( HID_DLGINDEX_INDEXDETAILS_SORTORDER );
-m_pSortingCell-Show();
-
-fprintf(stderr, created m_pSortingCell %p\n, m_pSortingCell);
nFieldNameWidth -= nSortOrderColumnWidth;
}
@@ -258,11 +253,7 @@ namespace dbaui
const OUString* pFields = _rAvailableFields.getConstArray();
const OUString* pFieldsEnd = pFields + _rAvailableFields.getLength();
for (;pFields pFieldsEnd; ++pFields)
-{
-fprintf(stderr, foo is %s\n, OUStringToOString(*pFields,
RTL_TEXTENCODING_UTF8).getStr());
m_pFieldNameCell-InsertEntry(*pFields);
-}
-
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/ui/envelp/envfmt.cxx|6 +++---
sw/source/ui/envelp/envprt.cxx|5 +++--
sw/source/ui/envelp/labfmt.cxx|4 ++--
sw/source/ui/envelp/labprt.cxx|5 +++--
sw/source/ui/fldui/fldedt.cxx |6 +++---
sw/source/ui/frmdlg/frmpage.cxx | 11 +--
sw/source/ui/index/cnttab.cxx | 12 ++--
sw/source/ui/index/swuiidxmrk.cxx |4 ++--
sw/source/ui/lingu/cvdata.mac | 19 ---
sw/source/ui/misc/docfnote.cxx| 11 +--
sw/source/ui/misc/glossary.cxx| 11 ---
sw/source/ui/misc/outline.cxx | 11 +--
12 files changed, 41 insertions(+), 64 deletions(-)
New commits:
commit 7883992dd5f8561b6eb192fce864b76c3034b1c5
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Jun 4 04:11:15 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: I45929aae52fa106b5f5c0199f8ce8b60c0ac5438
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 760c9c2..c816fe9 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -44,6 +44,7 @@
#include vector
#include algorithm
+#include boost/scoped_array.hpp
#include boost/scoped_ptr.hpp
#include swabstdlg.hxx
@@ -352,12 +353,11 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl*
pColl, bool bSender)
std::vectorsal_uInt16 pVec = ::lcl_convertRangesToList(pRanges);
std::vectorsal_uInt16 aVec = ::lcl_convertRangesToList(aRanges);
pVec.insert(pVec.end(), aVec.begin(), aVec.end());
-sal_uInt16 *pNewRanges = ::lcl_convertListToRanges(pVec);
+boost::scoped_arraysal_uInt16
pNewRanges(::lcl_convertListToRanges(pVec));
pAddrSet = new
SfxItemSet(GetParentSwEnvDlg()-pSh-GetView().GetCurShell()-GetPool(),
-pNewRanges);
+ pNewRanges.get());
pAddrSet-Put(pColl-GetAttrSet());
-delete[] pNewRanges;
}
return pAddrSet;
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 6978b045..252cf04 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -27,6 +27,7 @@
#include uitool.hxx
#include envprt.hrc
+#include boost/scoped_ptr.hpp
SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet rSet)
: SfxTabPage(pParent, EnvPrinterPage,
@@ -98,10 +99,10 @@ IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn )
// Call printer setup
if (pPrt)
{
-PrinterSetupDialog* pDlg = new PrinterSetupDialog(this );
+boost::scoped_ptrPrinterSetupDialog pDlg(new
PrinterSetupDialog(this));
pDlg-SetPrinter(pPrt);
pDlg-Execute();
-delete pDlg;
+pDlg.reset();
GrabFocus();
m_pPrinterInfo-SetText(pPrt-GetName());
}
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index ae27b71..49593db 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -34,6 +34,7 @@
#include ../../uibase/envelp/label.hrc
#include labfmt.hrc
#include unomid.h
+#include boost/scoped_ptr.hpp
using namespace utl;
using namespace ::com::sun::star::uno;
@@ -557,7 +558,7 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl)
aRec.lPWidth = static_cast long (GETFLDVAL(*m_pPWidthField ));
aRec.lPHeight = static_cast long (GETFLDVAL(*m_pPHeightField));
aRec.bCont = aItem.bCont;
-SwSaveLabelDlg* pSaveDlg = new SwSaveLabelDlg(this, aRec);
+boost::scoped_ptrSwSaveLabelDlg pSaveDlg(new SwSaveLabelDlg(this, aRec));
pSaveDlg-SetLabel(aItem.aLstMake, aItem.aLstType);
pSaveDlg-Execute();
if(pSaveDlg-GetLabel(aItem))
@@ -572,7 +573,6 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl)
m_pMakeFI-SetText(aItem.aMake);
m_pTypeFI-SetText(aItem.aType);
}
-delete pSaveDlg;
return 0;
}
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 454660d..cc5a9e3 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -27,6 +27,7 @@
#include swuilabimp.hxx
#include cmdid.h
+#include boost/scoped_ptr.hpp
SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet rSet)
: SfxTabPage(pParent, LabelOptionsPage,
@@ -73,10 +74,10 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
if (!pPrinter)
pPrinter = new Printer;
-PrinterSetupDialog* pDlg = new PrinterSetupDialog(this );
+boost::scoped_ptrPrinterSetupDialog pDlg(new
PrinterSetupDialog(this));
pDlg-SetPrinter(pPrinter);
pDlg-Execute();
-delete pDlg;
+pDlg.reset();
GrabFocus();
m_pPrinterInfo-SetText(pPrinter-GetName());
return 0;
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 45bf150..54b938b 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - editeng/source
editeng/source/editeng/editdoc.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit a7f27d468dd92a2ffbe114a5bdedf423f657f1ad Author: matteocam matteo.campane...@gmail.com Date: Tue Jun 3 15:18:30 2014 -0400 CreateFont supports Background Color Change-Id: I3413c77db8e822aeb957909a661d175320555f6d diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 8750f2d..472e400 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1927,6 +1927,8 @@ void CreateFont( SvxFont rFont, const SfxItemSet rSet, bool bSearchInParent, s rFont.SetLanguage( ((const SvxLanguageItem)rSet.Get( nWhich_Language )).GetLanguage() ); if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_COLOR ) == SFX_ITEM_ON ) ) rFont.SetColor( ((const SvxColorItem)rSet.Get( EE_CHAR_COLOR )).GetValue() ); +if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_BKGCOLOR ) == SFX_ITEM_ON ) ) +rFont.SetColor( ((const SvxBackgroundColorItem)rSet.Get( EE_CHAR_BKGCOLOR )).GetValue() ); if ( bSearchInParent || ( rSet.GetItemState( nWhich_FontHeight ) == SFX_ITEM_ON ) ) rFont.SetSize( Size( rFont.GetSize().Width(), ((const SvxFontHeightItem)rSet.Get( nWhich_FontHeight ) ).GetHeight() ) ); if ( bSearchInParent || ( rSet.GetItemState( nWhich_Weight ) == SFX_ITEM_ON ) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/ui/XImageManager.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4d3afa3dfafb34a3864e70bea38bc404d2d19da8 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 3 20:36:56 2014 +0100 fixup coverity#1219801 Change-Id: I2bc26296d11c49036ffcb0de661d22a8c2f45338 diff --git a/offapi/com/sun/star/ui/XImageManager.idl b/offapi/com/sun/star/ui/XImageManager.idl index 73eef67..6a99b99 100644 --- a/offapi/com/sun/star/ui/XImageManager.idl +++ b/offapi/com/sun/star/ui/XImageManager.idl @@ -49,7 +49,7 @@ interface XImageManager This means that all user images of the instance will be removed. /p */ -void reset() raises ( com::sun::star::lang::IllegalArgumentException ); +void reset() raises ( com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalAccessException ); /** retrieves the list of command URLs which have images associated. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: 3 commits - configure.ac src/lib
configure.ac|2 +-
src/lib/CDRContentCollector.cpp |5 -
src/lib/CDRParser.cpp |8
src/lib/CDRParser.h |4 ++--
4 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 6448d30053f59f1b71cd841629d053f6bf071d82
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 18:56:41 2014 +0200
coverity#1219654 avoid possible out-of-bounds access
Change-Id: I44de7037a9e3a65b539f452aace782683121ba83
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 853c5e0..70fa511 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -483,7 +483,7 @@ void
libcdr::CDRParser::readWaldoLoda(librevenge::RVNGInputStream *input, unsign
input-seek(startPosition + length, librevenge::RVNG_SEEK_SET);
}
-bool libcdr::CDRParser::parseRecords(librevenge::RVNGInputStream *input,
unsigned *blockLengths, unsigned level)
+bool libcdr::CDRParser::parseRecords(librevenge::RVNGInputStream *input, const
std::vectorunsigned blockLengths, unsigned level)
{
if (!input)
{
@@ -498,7 +498,7 @@ bool
libcdr::CDRParser::parseRecords(librevenge::RVNGInputStream *input, unsigne
return true;
}
-bool libcdr::CDRParser::parseRecord(librevenge::RVNGInputStream *input,
unsigned *blockLengths, unsigned level)
+bool libcdr::CDRParser::parseRecord(librevenge::RVNGInputStream *input, const
std::vectorunsigned blockLengths, unsigned level)
{
if (!input)
{
@@ -516,7 +516,7 @@ bool
libcdr::CDRParser::parseRecord(librevenge::RVNGInputStream *input, unsigned
return true;
unsigned fourCC = readU32(input);
unsigned length = readU32(input);
-if (blockLengths)
+if (blockLengths.size() length)
length=blockLengths[length];
unsigned long position = input-tell();
unsigned listType(0);
@@ -576,7 +576,7 @@ bool
libcdr::CDRParser::parseRecord(librevenge::RVNGInputStream *input, unsigned
CDRInternalStream tmpBlocksStream(input, blocksLength, compressed);
while (!tmpBlocksStream.isEnd())
tmpBlockLengths.push_back(readU32(tmpBlocksStream));
-if (!parseRecords(tmpStream, tmpBlockLengths.size() ?
tmpBlockLengths[0] : 0, level+1))
+if (!parseRecords(tmpStream, tmpBlockLengths, level+1))
return false;
}
}
diff --git a/src/lib/CDRParser.h b/src/lib/CDRParser.h
index d959507..31f7ec7 100644
--- a/src/lib/CDRParser.h
+++ b/src/lib/CDRParser.h
@@ -29,7 +29,7 @@ class CDRParser : protected CommonParser
public:
explicit CDRParser(const std::vectorlibrevenge::RVNGInputStream *
externalStreams, CDRCollector *collector);
virtual ~CDRParser();
- bool parseRecords(librevenge::RVNGInputStream *input, unsigned *blockLengths
= 0, unsigned level = 0);
+ bool parseRecords(librevenge::RVNGInputStream *input, const
std::vectorunsigned blockLengths = std::vectorunsigned(), unsigned level =
0);
bool parseWaldo(librevenge::RVNGInputStream *input);
private:
@@ -44,7 +44,7 @@ private:
std::mapunsigned, WaldoRecordInfo records6,
std::mapunsigned, WaldoRecordInfo records7,
std::mapunsigned, WaldoRecordInfo records8,
std::mapunsigned, WaldoRecordInfo recordsOther);
void readWaldoRecord(librevenge::RVNGInputStream *input, const
WaldoRecordInfo info);
- bool parseRecord(librevenge::RVNGInputStream *input, unsigned *blockLengths
= 0, unsigned level = 0);
+ bool parseRecord(librevenge::RVNGInputStream *input, const
std::vectorunsigned blockLengths = std::vectorunsigned(), unsigned level =
0);
void readRecord(unsigned fourCC, unsigned length,
librevenge::RVNGInputStream *input);
double readRectCoord(librevenge::RVNGInputStream *input);
CDRColor readColor(librevenge::RVNGInputStream *input);
commit b29f874bb1e8c15b2c77e094d4431a59662e0283
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 18:42:16 2014 +0200
coverity#1219811 dereference null return value
Change-Id: I2cff394e32ce6bc7bf39fae09d91a9730ad8f656
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 5c4ea97..af26ad7 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -1186,6 +1186,9 @@ void libcdr::CDRContentCollector::collectSpnd(unsigned
spnd)
void libcdr::CDRContentCollector::collectVectorPattern(unsigned id, const
librevenge::RVNGBinaryData data)
{
librevenge::RVNGInputStream *input = data.getDataStream();
+ if (!input)
+return;
+
input-seek(0, librevenge::RVNG_SEEK_SET);
if (!libcdr::CMXDocument::isSupported(input))
return;
commit f8c8a0d09c0614d7b0794b09b5d3fcaba84294b1
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 3 18:39:53 2014 +0200
the const_cast is no longer necessary
Change-Id: I802fd594660761e5ee112fa096f6f4c8fcc97cbb
diff --git a/configure.ac b/configure.ac
index ec7cd3a..a216684 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 4 commits - sw/qa writerfilter/source
sw/qa/core/data/rtf/pass/fdo79384.rtf |1
sw/qa/extras/rtfimport/data/fdo79384.rtf |9 +++
sw/qa/extras/rtfimport/rtfimport.cxx |8 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 72 ++---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 +
5 files changed, 75 insertions(+), 19 deletions(-)
New commits:
commit 2c4c6daee00eb7a0b209f6a93518961a3ac5beb3
Author: Michael Stahl mst...@redhat.com
Date: Tue Jun 3 20:32:13 2014 +0200
(related: bnc#823675) RTF import: get rid of hacks for \f in LISTLEVEL
These weird hacks are apparently needed only because the \loch \hich
\dbch were mapped wrongly; for the list level destination it's only
important that the existing fonts are not overwritten.
Change-Id: Ie2b9adf332b74c2744e9b1dbc4e878638e5ee078
(cherry picked from commit c087b60b0dd70c4a711ba1b4d556206a136fa468)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2b346ba..9b6229c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3518,14 +3518,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
{
RTFSprms aFontAttributes;
aFontAttributes.set(nSprm, RTFValue::Pointer_t(new
RTFValue(m_aFontNames[getFontIndex(nParam)])));
-// In the context of listlevels, \af seems to imply \f.
-if (nKeyword == RTF_AF)
-aFontAttributes.set(NS_ooxml::LN_CT_Fonts_ascii,
RTFValue::Pointer_t(new RTFValue(m_aFontNames[getFontIndex(nParam)])));
RTFSprms aRunPropsSprms;
aRunPropsSprms.set(NS_ooxml::LN_EG_RPrBase_rFonts,
RTFValue::Pointer_t(new RTFValue(aFontAttributes)));
-// If there are multiple \f or \af tokens, only handle the first
one.
-if (!m_aStates.top().aTableSprms.find(NS_ooxml::LN_CT_Lvl_rPr))
-m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_rPr,
RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms)));
+m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_rPr,
+RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms)),
+OVERWRITE_NO_APPEND);
}
else
{
commit eb0505ef3507876781ff7fadae2b1d1cd1348220
Author: Michael Stahl mst...@redhat.com
Date: Tue Jun 3 20:18:59 2014 +0200
RTF import: fix handling of \loch \hich \dbch \ltrch \rtlch
The logic is not immediately obvious from the RTF spec; let's do what
the editengine RTF import does, but without the unnecessary complexity.
Change-Id: I60e69130e6e5aed1f5d237f64b1656c3141e402a
(cherry picked from commit 36246aa9fb57c9fe4e546c91a8274d8828b1424e)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7c99b85..2b346ba 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2825,8 +2825,10 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
break;
case RTF_LTRCH:
// dmapper does not support this.
+m_aStates.top().isRightToLeft = false;
break;
case RTF_RTLCH:
+m_aStates.top().isRightToLeft = true;
if (m_aDefaultState.nCurrentEncoding == RTL_TEXTENCODING_MS_1255)
m_aStates.top().nCurrentEncoding =
m_aDefaultState.nCurrentEncoding;
break;
@@ -3493,11 +3495,20 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
{
case RTF_F:
case RTF_AF:
-if (nKeyword == RTF_F)
-nSprm = NS_ooxml::LN_CT_Fonts_ascii;
+if (m_aStates.top().isRightToLeft
+|| m_aStates.top().eRunType == RTFParserState::HICH)
+{
+nSprm = NS_ooxml::LN_CT_Fonts_cs;
+}
+else if (m_aStates.top().eRunType == RTFParserState::DBCH)
+{
+nSprm = NS_ooxml::LN_CT_Fonts_eastAsia;
+}
else
-nSprm = (m_aStates.top().eRunType == RTFParserState::HICH
-? NS_ooxml::LN_CT_Fonts_eastAsia : NS_ooxml::LN_CT_Fonts_cs);
+{
+assert(m_aStates.top().eRunType == RTFParserState::LOCH);
+nSprm = NS_ooxml::LN_CT_Fonts_ascii;
+}
if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE ||
m_aStates.top().nDestinationState == DESTINATION_FONTENTRY)
{
m_aFontIndexes.push_back(nParam);
@@ -3521,7 +3532,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_nCurrentFontIndex = getFontIndex(nParam);
RTFValue::Pointer_t pValue(new
RTFValue(getFontName(m_nCurrentFontIndex)));
lcl_putNestedAttribute(m_aStates.top().aCharacterSprms,
NS_ooxml::LN_EG_RPrBase_rFonts, nSprm, pValue);
-m_aStates.top().nCurrentEncoding =
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - editeng/source
editeng/source/editeng/editdbg.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 2bcaa1ca791ff64a1629d2451bd52323e7e814e3
Author: matteocam matteo.campane...@gmail.com
Date: Tue Jun 3 15:55:26 2014 -0400
DbgOutItem supports Font Background Color
Change-Id: I1067e73593fdd116c3fc264b07f8bfd77057af0f
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 442bda2..4e4f55b 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -177,6 +177,17 @@ OString DbgOutItem(const SfxItemPool rPool, const
SfxPoolItem rItem)
aDebStr.append(static_castsal_Int32(aColor.GetBlue()));
}
break;
+case EE_CHAR_BKGCOLOR:
+{
+aDebStr.append(FillColor= );
+Color aColor( ((SvxColorBackgroundItem)rItem).GetValue() );
+aDebStr.append(static_castsal_Int32(aColor.GetRed()));
+aDebStr.append(, );
+aDebStr.append(static_castsal_Int32(aColor.GetGreen()));
+aDebStr.append(, );
+aDebStr.append(static_castsal_Int32(aColor.GetBlue()));
+}
+break;
case EE_CHAR_FONTINFO:
case EE_CHAR_FONTINFO_CJK:
case EE_CHAR_FONTINFO_CTL:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ModuleUIConfigurationManager
Le 30/05/14 12:47, Richard PALO a écrit : Le 30/05/14 10:45, Stephan Bergmann a écrit : ... For libfwklo.so, the relevant symbol that needs to be exported is fwk_component_getFactory (denoting a C function). Stephan Hmm, that seems to be okay: richard@devzone:/opt/local/libreoffice4-4.2.4.2/program$ elfdump -s libfwklo.so |grep fwk_component_getFactory [957] 0x001e3ab0 0x2408 FUNC GLOB D1 .text fwk_component_getFactory [23029] 0x001e3ab0 0x2408 FUNC GLOB D0 .text fwk_component_getFactory !indexvalue size type bind oth ver shndx name In relooking at services.rdb, thought I'd try seeing if the many references to $LO_LIB_DIR was a necessary external env variable... (is this documented?) This is now the failure: richard@devzone:~$ export LO_LIB_DIR=/opt/local/libreoffice4-4.2.4.2/ure-link/lib richard@devzone:~$ /opt/local/bin/soffice terminate called after throwing an instance of 'com::sun::star::loader::CannotActivateFactoryException' Guess I'll have to build a debug kit later this week... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ModuleUIConfigurationManager
Le 03/06/14 22:33, Richard PALO a écrit : Le 30/05/14 12:47, Richard PALO a écrit : Le 30/05/14 10:45, Stephan Bergmann a écrit : ... For libfwklo.so, the relevant symbol that needs to be exported is fwk_component_getFactory (denoting a C function). Stephan Hmm, that seems to be okay: richard@devzone:/opt/local/libreoffice4-4.2.4.2/program$ elfdump -s libfwklo.so |grep fwk_component_getFactory [957] 0x001e3ab0 0x2408 FUNC GLOB D1 .text fwk_component_getFactory [23029] 0x001e3ab0 0x2408 FUNC GLOB D0 .text fwk_component_getFactory !indexvalue size type bind oth ver shndx name In relooking at services.rdb, thought I'd try seeing if the many references to $LO_LIB_DIR was a necessary external env variable... (is this documented?) This is now the failure: richard@devzone:~$ export LO_LIB_DIR=/opt/local/libreoffice4-4.2.4.2/ure-link/lib richard@devzone:~$ /opt/local/bin/soffice terminate called after throwing an instance of 'com::sun::star::loader::CannotActivateFactoryException' Guess I'll have to build a debug kit later this week... I notice after closer inspection that LO_LIB_DIR looks for libraries in the 'program' directory and not in 'ure-link/lib'... unfortunately setting these variable(s) (also a LO_JAVA_DIR one) seem to do nothing (actually, the result is the same as the attachment in my original post) so back to the initial square. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - include/vcl ios/experimental vcl/source
include/vcl/metaact.hxx |
3
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |
38
vcl/source/gdi/metaact.cxx |
81 +-
3 files changed, 120 insertions(+), 2 deletions(-)
New commits:
commit e909cf1b226d94791b523234779c22a38439e869
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jun 3 18:55:27 2014 +0300
Add more source files for debugging convenience
Change-Id: I305870bd067d015d975b7a887bece91819810ec4
diff --git
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 3872449..ca5108f 100644
---
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -741,6 +741,16 @@
BECAB371186054DE00F814F9 /* lo.mm */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = lo.mm;
sourceTree = group; };
BED2593E18F6B87900C94C72 /* ImageIO.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework;
sourceTree = SDKROOT; };
BED2594018F6B89000C94C72 /* MobileCoreServices.framework */ =
{isa = PBXFileReference; lastKnownFileType = wrapper.framework; name =
MobileCoreServices.framework; path =
System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+ BED53168193738D800830918 /* bitmapaction.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
bitmapaction.cxx; path =
../../../cppcanvas/source/mtfrenderer/bitmapaction.cxx; sourceTree = group;
};
+ BED53169193738D800830918 /* cachedprimitivebase.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
cachedprimitivebase.cxx; path =
../../../cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx; sourceTree =
group; };
+ BED5316A193738D800830918 /* emfplus.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = emfplus.cxx;
path = ../../../cppcanvas/source/mtfrenderer/emfplus.cxx; sourceTree =
group; };
+ BED5316B193738D800830918 /* implrenderer.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
implrenderer.cxx; path =
../../../cppcanvas/source/mtfrenderer/implrenderer.cxx; sourceTree = group;
};
+ BED5316C193738D800830918 /* lineaction.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
lineaction.cxx; path = ../../../cppcanvas/source/mtfrenderer/lineaction.cxx;
sourceTree = group; };
+ BED5316D193738D800830918 /* mtftools.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mtftools.cxx;
path = ../../../cppcanvas/source/mtfrenderer/mtftools.cxx; sourceTree =
group; };
+ BED5316E193738D800830918 /* pointaction.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
pointaction.cxx; path = ../../../cppcanvas/source/mtfrenderer/pointaction.cxx;
sourceTree = group; };
+ BED5316F193738D800830918 /* polypolyaction.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
polypolyaction.cxx; path =
../../../cppcanvas/source/mtfrenderer/polypolyaction.cxx; sourceTree =
group; };
+ BED53170193738D800830918 /* textaction.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
textaction.cxx; path = ../../../cppcanvas/source/mtfrenderer/textaction.cxx;
sourceTree = group; };
+ BED53171193738D800830918 /* transparencygroupaction.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
transparencygroupaction.cxx; path =
../../../cppcanvas/source/mtfrenderer/transparencygroupaction.cxx; sourceTree =
group; };
BEDB0F08185B7537009A6F26 /* lo.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
lo.xcconfig; path = ../../../lo.xcconfig; sourceTree = group; };
BEEE02CE1860ABB700FBDE67 /* program */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = program; path =
Resources/program; sourceTree = SOURCE_ROOT; };
BEEE02CF1860ABB700FBDE67 /* share */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = share; path = Resources/share; sourceTree =
SOURCE_ROOT; };
@@ -802,10 +812,11 @@
BE0898E61860D3CD0021A679 /* LibreOffice source files */ = {
isa = PBXGroup;
children = (
- BE82C47118CA18D70050EB79 /* drawinglayer */,
Re: GSoC 2014 Weekly Report - Improvements To The Template Manager [Week 2]
Hi, this is already looking very nice. One thing that I feel could make it more intuitive to use would be to move from filetype filtering to having separate folders for each filetype. In my opinion that would make the hierarchy more clear and e.g. Presentation Backgrounds won't appear when viewing Writer documents etc. Cheers, Alex -- View this message in context: http://nabble.documentfoundation.org/GSoC-2014-Weekly-Report-Improvements-To-The-Template-Manager-Week-2-tp4111054p4111282.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/tml/cp-4.2-ia2' - 2 commits - sfx2/qa vcl/inc vcl/win
sfx2/qa/complex/sfx2/UndoManager.java |4 ++--
vcl/inc/win/saldata.hxx |2 ++
vcl/win/source/gdi/salgdi.cxx |7 +++
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit cc29ff5f3435b3bcd028f551b654d44d7c137b57
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jun 3 23:36:18 2014 +0300
Avoid accessing freed memory and freeing already freed resources
Seen in smoketest a 4.2-based branch, but might perhaps happen in master
too. Should not hurt in any case to be more careful. ImplFreeSalGDI() is
called both from SalAbort() and from DestroySalInstance().
Change-Id: Ifac37e8ecfb432848bd3451dbda8634c59a06fba
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index d1464d5..1d54637 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -70,6 +70,8 @@ public:
// checks if the menuhandle was created by VCL
sal_BoolIsKnownMenuHandle( HMENU hMenu );
+boolmbResourcesAlreadyFreed;
+
public:
HINSTANCE mhInst; // default instance handle
HINSTANCE mhPrevInst; // previous instance handle
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index e3a660f..5d1cd35 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -136,6 +136,8 @@ void ImplInitSalGDI()
{
SalData* pSalData = GetSalData();
+pSalData-mbResourcesAlreadyFreed = false;
+
// init stock brushes
pSalData-maStockPenColorAry[0] = PALETTERGB( 0, 0, 0 );
pSalData-maStockPenColorAry[1] = PALETTERGB( 0xFF, 0xFF, 0xFF );
@@ -315,6 +317,9 @@ void ImplFreeSalGDI()
{
SalData*pSalData = GetSalData();
+if (pSalData-mbResourcesAlreadyFreed)
+return;
+
// destroy stock objects
int i;
for ( i = 0; i pSalData-mnStockPenCount; i++ )
@@ -381,6 +386,8 @@ void ImplFreeSalGDI()
// delete temporary font list
ImplReleaseTempFonts( *pSalData );
+
+pSalData-mbResourcesAlreadyFreed = true;
}
// ---
commit 02a9c1a3b3ecb07d3b4b9db4d86dba2fefbd187d
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 26 23:08:21 2013 +0100
adapt sfx2 UndoManager test to renaming from click to press
RID_STR_ACC_ACTION_CLICK in efb23f29983f87104a684e7fab00b84fc59d131d
Change-Id: If684816602db38fa87b6272c0491ab2ac910aece
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java
b/sfx2/qa/complex/sfx2/UndoManager.java
index 69c9dd2..901c6c4 100644
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -429,13 +429,13 @@ public class UndoManager
final XAccessibleAction controlActions = UnoRuntime.queryInterface(
XAccessibleAction.class, accessible.getAccessibleContext() );
for ( int i=0; icontrolActions.getAccessibleActionCount(); ++i )
{
-if ( controlActions.getAccessibleActionDescription(i).equals(
click ) )
+if
(controlActions.getAccessibleActionDescription(i).equals(press))
{
controlActions.doAccessibleAction(i);
return;
}
}
-fail( did not find the accessible action named 'click' );
+fail(did not find the accessible action named 'press');
}
//
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ModuleUIConfigurationManager
On 03/06/14 22:46, Richard PALO wrote:
Le 03/06/14 22:33, Richard PALO a écrit :
Le 30/05/14 12:47, Richard PALO a écrit :
Le 30/05/14 10:45, Stephan Bergmann a écrit :
...
For libfwklo.so, the relevant symbol that needs to be exported is
fwk_component_getFactory (denoting a C function).
Stephan
Hmm, that seems to be okay:
richard@devzone:/opt/local/libreoffice4-4.2.4.2/program$ elfdump -s
libfwklo.so |grep fwk_component_getFactory
[957] 0x001e3ab0 0x2408 FUNC GLOB D1 .text
fwk_component_getFactory
[23029] 0x001e3ab0 0x2408 FUNC GLOB D0 .text
fwk_component_getFactory
!indexvalue size type bind oth ver shndx name
In relooking at services.rdb, thought I'd try seeing if the many
references to $LO_LIB_DIR was a necessary external env variable... (is
this documented?)
This is now the failure:
richard@devzone:~$ export
LO_LIB_DIR=/opt/local/libreoffice4-4.2.4.2/ure-link/lib
richard@devzone:~$ /opt/local/bin/soffice
terminate called after throwing an instance of
'com::sun::star::loader::CannotActivateFactoryException'
Guess I'll have to build a debug kit later this week...
I notice after closer inspection that LO_LIB_DIR looks for libraries in
the 'program' directory and not in 'ure-link/lib'... unfortunately
setting these variable(s) (also a LO_JAVA_DIR one) seem to do nothing
(actually, the result is the same as the attachment in my original post)
so back to the initial square.
the values of those variables come from configuration files usually, and
are not paths but URLs.
you should have this value in instdir/program/fundamentalrc:
LO_LIB_DIR=${BRAND_BASE_DIR}/program
probably best to do a debug build and run in gdb via make debugrun,
then set a breakpoint in
cppuhelper::detail::loadSharedLibComponentFactory and see why that
fails for the fwk library.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 634f647912c07d366e31bfc168fa1294f1613cd6
Author: Michael Stahl mst...@redhat.com
Date: Tue Jun 3 23:24:14 2014 +0200
writerfilter: fix log area
Change-Id: Iddedd58dbcdd122ec4177bfdd5e97b9ceca18435
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 77f0379..0758ee7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -987,7 +987,7 @@ int RTFDocumentImpl::resolveChars(char ch)
// fdo#79384: Word will reject Shift-JIS following \loch
// but apparently OOo could read and (worse) write such documents
SAL_INFO_IF(m_aStates.top().eRunType != RTFParserState::DBCH,
-writerfilter.rtftok, invalid Shift-JIS without DBCH);
+writerfilter.rtf, invalid Shift-JIS without DBCH);
unsigned char uch = ch;
if ((uch = 0x80 uch = 0x9F) || uch = 0xE0)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1946977939e4941429383e3a0649ce20ae758930
Author: Michael Stahl mst...@redhat.com
Date: Tue Jun 3 23:24:14 2014 +0200
writerfilter: fix log area
Change-Id: Iddedd58dbcdd122ec4177bfdd5e97b9ceca18435
(cherry picked from commit 634f647912c07d366e31bfc168fa1294f1613cd6)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9b6229c..c5cf23f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -987,7 +987,7 @@ int RTFDocumentImpl::resolveChars(char ch)
// fdo#79384: Word will reject Shift-JIS following \loch
// but apparently OOo could read and (worse) write such documents
SAL_INFO_IF(m_aStates.top().eRunType != RTFParserState::DBCH,
-writerfilter.rtftok, invalid Shift-JIS without DBCH);
+writerfilter.rtf, invalid Shift-JIS without DBCH);
unsigned char uch = ch;
if ((uch = 0x80 uch = 0x9F) || uch = 0xE0)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45789] automatic row height in reports
https://bugs.freedesktop.org/show_bug.cgi?id=45789 Jacob jacobm...@gmail.com changed: What|Removed |Added CC||jacobm...@gmail.com --- Comment #19 from Jacob jacobm...@gmail.com --- Is this still being worked on? I'm honestly really surprised it's not a feature, it would make the reporting engine so much more useful. -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||78477 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #152 from Joel Madero jmadero@gmail.com --- Added bug 78477 - regression It appears likes some fonts make it so that LibreOffice won't start up. Example font attached to the bug. Bibisected -- 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: vcl/inc vcl/win
vcl/inc/win/saldata.hxx |2 ++
vcl/win/source/gdi/salgdi.cxx |7 +++
2 files changed, 9 insertions(+)
New commits:
commit dacab84536f61f79a5422e1d8d394019ec62f3ec
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jun 3 23:36:18 2014 +0300
Avoid accessing freed memory and freeing already freed resources
Seen in smoketest in a 4.2-based branch, but might perhaps happen in master
too. Should not hurt in any case to be more careful. ImplFreeSalGDI() is
called both from SalAbort() and from DestroySalInstance().
Change-Id: Ifac37e8ecfb432848bd3451dbda8634c59a06fba
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index ec4b39a..f0c5e33 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -70,6 +70,8 @@ public:
// checks if the menuhandle was created by VCL
boolIsKnownMenuHandle( HMENU hMenu );
+boolmbResourcesAlreadyFreed;
+
public:
HINSTANCE mhInst; // default instance handle
HINSTANCE mhPrevInst; // previous instance handle
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 31af876..50c0f8e 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -113,6 +113,8 @@ void ImplInitSalGDI()
{
SalData* pSalData = GetSalData();
+pSalData-mbResourcesAlreadyFreed = false;
+
// init stock brushes
pSalData-maStockPenColorAry[0] = PALETTERGB( 0, 0, 0 );
pSalData-maStockPenColorAry[1] = PALETTERGB( 0xFF, 0xFF, 0xFF );
@@ -290,6 +292,9 @@ void ImplFreeSalGDI()
{
SalData*pSalData = GetSalData();
+if (pSalData-mbResourcesAlreadyFreed)
+return;
+
// destroy stock objects
int i;
for ( i = 0; i pSalData-mnStockPenCount; i++ )
@@ -356,6 +361,8 @@ void ImplFreeSalGDI()
// delete temporary font list
ImplReleaseTempFonts( *pSalData );
+
+pSalData-mbResourcesAlreadyFreed = true;
}
static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] Is there any way to map bugs to commits.
Hi, Various bugs identified in LibreOffice are listed at https://bugs.freedesktop.org; with specific id's. I want to map those bugs to specific commits, so that i can know which files were changed because of that bug. Usually, developers specify those bug id's during the comment of a commit, which is not specified in case of LibreOffice. So, can you suggest me any other way by which i can map bugs to commits. Thanks and Regards, Aniket Jain ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Is there any way to map bugs to commits.
Hi, On Tue, Jun 03, 2014 at 01:42:52PM +0800, ANiKET JAiN wrote: Hi, Various bugs identified in LibreOffice are listed at https://bugs.freedesktop.org; with specific id's. I want to map those bugs to specific commits, so that i can know which files were changed because of that bug. Usually, developers specify those bug id's during the comment of a commit, which is not specified in case of LibreOffice. Why do you think we do not do that? Have you even looked? We even have a git hook that adds a link to the commit as a comment to the bug... So, can you suggest me any other way by which i can map bugs to commits. Yes. You can use git bisect to find the commit that fixed the problem described in a bug report. D. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Suggested Triage Order
Excellent idea! Sorting by priority and separating by OS does speed up selecting where to start. Well done! -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Suggested-Triage-Order-tp435p4111205.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Presentation Video Bug - Need Dev/QA Feedback
On Sat, 2014-05-31 at 11:17 -0700, Joel Madero wrote: https://bugs.freedesktop.org/show_bug.cgi?id=56847 So QA has some questions: 1. Should we close this particular bug as INVALID because it's a disaster with comments and lots of different issues being posted? Its got 67 comments in it, its way too big with different issues in it. 2. Is this our bug at all? 3. Should we open individual bugs for each format that does not work? 4. Are there particular codecs that we should try to install? For Linux, we're using gstreamer under Linux to play back video, so I suggest if there's an issue playing back video under Linux that the reporter checks if it works in totem which typically defaults to having gstreamer as its backend. So as a rule of thumb if it doesn't work in totem then its definitely not our bug and we're not interested, if it does work in totem then its potentially of interest. For MacOSX I wonder if Tor knows of a basic/built-in video viewer on MacOSX which uses the same route we are using to render video which can be used as an example program to compare against to filter out missing codecs vs libreoffice-side bustate ? 5. Should we make a new bug report for each platform as there seems to be difference between platforms (for instance no one has succeeded with OSX but Jay had success with Xubuntu) Different platforms have different implementation (some have multiple implementations) of the video/audio stuff, so there are typically different issues there. So yeah, different platforms are different bugs normally. So split things up per platform as a start. C. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
