LibreOffice Gerrit News for core on 2014-05-16
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Patch on bug https://bugs.freedesktop.org/show_bug.cgi?id=39631 in https://gerrit.libreoffice.org/9358 from Michal Strnad about module include + Correct common misspellings, and remove some ASCII art along the way. in https://gerrit.libreoffice.org/9356 from Chris Laplante about module comphelper, compilerplugins, connectivity, cui, dbaccess, drawinglayer, editeng, embeddedobj, filter, framework, helpcompiler, i18nlangtag, i18npool, include, odk, offapi, oox, package, reportbuilder, reportdesign, sc, scripting, sd, sfx2, solenv, svtools, svx, sw, udkapi, vcl, wizards, writerfilter, xmloff + fdo#78654 LO was exporting corrupt docx file. in https://gerrit.libreoffice.org/9364 from Sushil Shinde about module sw + fdo78474:Corruption a:graphicData has no info for the image. in https://gerrit.libreoffice.org/9363 from Sourav Mahajan about module oox, sw End of freshness + libgltf: Update to the new version. in https://gerrit.libreoffice.org/9333 from Jan Holesovsky about module avmedia, build, external + fdo#78651 DOCX Incorrect export of nested Tables in https://gerrit.libreoffice.org/9361 from Vinaya Mandke about module sw + fdo#67544 Slide transistion sound(other sound) is not included in present in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt about module include, sd, sfx2 * Merged changes on master for project core changed in the last 25 hours: + fdo#55582 Writer: Dont overwrite from even when selected, from writer. in https://gerrit.libreoffice.org/5857 from Lennard Wasserthal + -fsanitize=address does not like -z defs in https://gerrit.libreoffice.org/9334 from Markus Mohrhard + Resolves fdo#70681: fixincludeguards.pl: all that's left in https://gerrit.libreoffice.org/9360 from Thomas Arnhold + fdo#78549 PDF Import: fix incorrect transformation matrix writing in https://gerrit.libreoffice.org/9310 from Vort + fdo#78300 File Corrupt:drawing objects into a text box. in https://gerrit.libreoffice.org/9325 from Priyanka Gaikwad + Misspelled property in SwAuthenticationSettingsDialog (seperate = separa in https://gerrit.libreoffice.org/9357 from Chris Laplante * Abandoned changes on master for project core changed in the last 25 hours: + fdo#78718 fix freeze of calc when typing in formula in https://gerrit.libreoffice.org/9359 from Winfried Donkers * Open changes needing tweaks, but being untouched for more than a week: + 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 + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt 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
Re: Configure fail on OS X 10.9 - Cannot create Makefile - Claims Ant too old and doesn't work
(Adding the developer list back. When responding to a message from the mailing list, please respond to the list, too. The point of having a public mailing list is that the complete discussions are public to benefit others.) No, I don't have fink or macport or anything else similar installed. OK, good. The Java situation now is go and grab the latest binary from Oracle, Apple stopped rolling its own. Yes, I know, and that is complicated enough that I really don't like having to enforce that on potential new developers who might not be the least interested in Java. Ideally we would want LibreOffice to be buildable without any 3rd-party software that has to be separately installed. Half-jokingly, I would say that typically there are two kinds of new developers who run into trouble when attempting to build LibreOffice the first time on OS X: 1) those who know too little and get confused by some trivial hickup, and 2) those who know too much and have too new or otherwise non-standard tools installed that the build mechanism doesn't expect and get confused by. Without Java can I still run LibreOffice? Sure. You will miss the built-in HSQLDB in Base and some other less important functionality, I don't remember exactly. (Of course it is a matter of opinion whether some functionality is important or not... but for what I think is the core functionality, normal Writer, Calc and Impress use, it shouldn't hurt if you don't have the Java bits enabled.) PS: I have experience in C and OpenMP. Is there any part of LO where I can immediately put my experience in them to work? Our code is C++ (and not necessarily very cleanly designed and written C++, although that is of course a matter of opinion). There are only a handful of files in C. We don't use OpenMP, and I thought Clang doesn't support OpenMP? To get something to work on, have a look at our Easy Hacks, which is a set of hopefully easy tasks that beginners can work on to get to know the codebase. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 33467] Mac: Default printer should be taken from the OS when printing
https://bugs.freedesktop.org/show_bug.cgi?id=33467 --- Comment #6 from Hussian Alamri husain.a...@gmail.com --- I want to volunteer and fix this. Should I use OS X (Cocoa) APIs to find out the default printer? I think LibreOffice aims for cross-platform portability so unlike NeoOffice it doesn't include OS X specific code. I will attempt fixing it using CUPS, maybe it can be fixed and maybe it is a CUPS limitation. If I can use OS X specific API/syscalls let me know. One last question, where can I find the code related to printing? Thank you. -- Alamri Hussian -- 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 33467] Mac: Default printer should be taken from the OS when printing
https://bugs.freedesktop.org/show_bug.cgi?id=33467 --- Comment #7 from Tor Lillqvist t...@iki.fi --- Nah, feel free to use OS X -specific code if it helps, obviously putting it inside an appropriare ifdef. After all, the U in CUPS stands for Unix, and our most important platform is Windows (number of users, and especially paying customers;). So it isn't as if using CUPS would be cross-platform either. I would start looking in vcl. I think printing related functionality already *is* in platform-specific code in vcl. -- 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: chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5a9399a62873dae10e6486e8a6764b163283c0e1 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri May 16 08:40:11 2014 +0200 small hickup diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 68c9093..3697903 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -100,8 +100,8 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vectorVDataSeries rDataSer float nXPos = nIndex * (nBarSizeX + nBarDistanceX); -glm::mat4 aScaleMatrix = glm::scale(nBarSizeX, nBarSizeY, static_castfloat(0)); -glm::mat4 aTranslationMatrix = glm::translate(nXPos, nYPos, nVal); +glm::mat4 aScaleMatrix = glm::scale(nBarSizeX, nBarSizeY, nVal); +glm::mat4 aTranslationMatrix = glm::translate(nXPos, nYPos, static_castfloat(0)); glm::mat4 aBarPosition = aTranslationMatrix * aScaleMatrix; maShapes.push_back(new opengl3D::Bar(mpRenderer.get(), aBarPosition, nColor, nId++)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: patchview in gerrit - everyone happy or needs some bigger revamp?
On Thu, May 15, 2014 at 03:12:21PM +0200, Christian Lohmaier lohma...@googlemail.com wrote: Any burning topics that you hate about gerrit's interface? I guess the most burning issue right now is that sometimes the submission gets stuck and you need to manually push the change + mark the review as abandoned, which is ugly -- and IIRC this was fine in the past, it came in after some upgrade. I think Norbert has the exact details, sounds like an upstream bug. UI annoyance is much less problematic, at least for me. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Configure fail on OS X 10.9 - Cannot create Makefile - Claims Ant too old and doesn't work
I noticed you are looking at bug #33467. Sure, that is good too, but if you are interested, there is another printing-related thing that needs fixing for OS X: We use the deprecated setAccessoryView method of NSPrintOperation in vcl/osx/printaccessoryview.mm. It would be good to update the code to use current API. We would like to not use any deprecated APIs, and this setAccessoryView was deprecated already in 10.5... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 33467] Mac: Default printer should be taken from the OS when printing
https://bugs.freedesktop.org/show_bug.cgi?id=33467 --- Comment #8 from Hussian Alamri husain.a...@gmail.com --- Okay. I'm on it. I'm reading Apple Developer guide regarding printing right now. git grep NSPrint revealed a number of files that I need to look into. Is there a top-level view of the source code that can help me see how the source files are connected to one another? I will reply back with progress updates. -- Alamri Hussian. -- 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: Configure fail on OS X 10.9 - Cannot create Makefile - Claims Ant too old and doesn't work
Ok. I'm on it. It should not be too difficult. Since this one affects only one file, I will fix it before looking at bug #33467. -- Alamri Hussian On May 16, 2014, at 2:56 AM, Tor Lillqvist t...@iki.fi wrote: I noticed you are looking at bug #33467. Sure, that is good too, but if you are interested, there is another printing-related thing that needs fixing for OS X: We use the deprecated setAccessoryView method of NSPrintOperation in vcl/osx/printaccessoryview.mm. It would be good to update the code to use current API. We would like to not use any deprecated APIs, and this setAccessoryView was deprecated already in 10.5... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Configure fail on OS X 10.9 - Cannot create Makefile - Claims Ant too old and doesn't work
On 05/16/2014 08:21 AM, Tor Lillqvist wrote: Without Java can I still run LibreOffice? Sure. You will miss the built-in HSQLDB in Base and some other less important functionality, I don't remember exactly. (Of course it is a matter of opinion whether some functionality is important or not... but for what I think is the core functionality, normal Writer, Calc and Impress use, it shouldn't hurt if you don't have the Java bits enabled.) But note that --without-java unfortunately also disables many of the checks done by make check, so it is not an ideal option if you plan to make changes to existing code, where make check can be vital. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - comphelper/source embeddedobj/source
comphelper/source/misc/mimeconfighelper.cxx|7 ++-
embeddedobj/source/commonembedding/persistence.cxx | 18 ++
2 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit da62ab5783e548c5785b3950c03d078b1f3e849d
Author: Michael Stahl mst...@redhat.com
Date: Thu May 15 23:28:55 2014 +0200
fdo#78159: fix import of OOoXML embedded objects
MimeConfigurationHelper::GetDefaultFilterFromServiceName() checks that
there is both an import and an export filter, and for OOoXML the export
has been removed; tweak the check to require only import for OOoXML.
Currently it still works invoke the OOoXML filter, but it is clearly
better to store the embedded documents only in ODF, so tweak
OCommonEmbeddedObject::store* methods to do that.
(regression from aeeaccf59abbc485d7786486f1accc1cb4d4dbf7)
Change-Id: Ib71f23fd110cbd4b570517f2dde2c53e3aa6301d
(cherry picked from commit 0b3d0fb2d9256dc6bae6af69ed494487004def75)
Reviewed-on: https://gerrit.libreoffice.org/9365
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/comphelper/source/misc/mimeconfighelper.cxx
b/comphelper/source/misc/mimeconfighelper.cxx
index 0c6ffb7..6e09603 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -743,7 +743,12 @@ OUString
MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUStrin
sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault(
Flags, (sal_Int32)0 );
// that should be import, export, own filter and not a
template filter ( TemplatePath flag )
-sal_Int32 nRequired = ( SFX_FILTER_OWN |
SFX_FILTER_EXPORT | SFX_FILTER_IMPORT );
+sal_Int32 const nRequired = (SFX_FILTER_OWN
+// fdo#78159 for OOoXML, there is code to convert
+// to ODF in OCommonEmbeddedObject::store*
+// so accept it even though there's no export
+| (SOFFICE_FILEFORMAT_60 == nVersion ? 0 :
SFX_FILTER_EXPORT)
+| SFX_FILTER_IMPORT );
if ( ( ( nFlags nRequired ) == nRequired ) !(
nFlags SFX_FILTER_TEMPLATEPATH ) )
{
// if there are more than one filter the preffered
one should be used
diff --git a/embeddedobj/source/commonembedding/persistence.cxx
b/embeddedobj/source/commonembedding/persistence.cxx
index b3e9208..36741eb 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1169,6 +1169,12 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const
uno::Reference embed::
{
SAL_WARN( embeddedobj.common, Can not retrieve target storage media
type! );
}
+if (nTargetStorageFormat == SOFFICE_FILEFORMAT_60)
+{
+SAL_INFO(embeddedobj.common, fdo#78159: Storing OOoXML as ODF);
+nTargetStorageFormat = SOFFICE_FILEFORMAT_CURRENT;
+// setting MediaType is done later anyway, no need to do it here
+}
try
{
@@ -1300,6 +1306,12 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const
uno::Reference embed::
{
SAL_WARN( embeddedobj.common, Can not retrieve target storage media
type! );
}
+if (nTargetStorageFormat == SOFFICE_FILEFORMAT_60)
+{
+SAL_INFO(embeddedobj.common, fdo#78159: Storing OOoXML as ODF);
+nTargetStorageFormat = SOFFICE_FILEFORMAT_CURRENT;
+// setting MediaType is done later anyway, no need to do it here
+}
try
{
@@ -1589,6 +1601,12 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
{
SAL_WARN( embeddedobj.common, Can not retrieve storage media
type! );
}
+if (nStorageFormat == SOFFICE_FILEFORMAT_60)
+{
+SAL_INFO(embeddedobj.common, fdo#78159: Storing OOoXML as ODF);
+nStorageFormat = SOFFICE_FILEFORMAT_CURRENT;
+// setting MediaType is done later anyway, no need to do it here
+}
aGuard.clear();
StoreDocToStorage_Impl( m_xObjectStorage, nStorageFormat,
GetBaseURL_Impl(), m_aEntryName, sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-2' - en/pythonpath hu_HU/pythonpath pt_BR/pythonpath
en/pythonpath/lightproof_impl_en.py |2 +- hu_HU/pythonpath/lightproof_impl_hu_HU.py |2 +- pt_BR/pythonpath/lightproof_impl_pt_BR.py |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 0a68bdc3b29237ab76bce445f3cdc535b1482307 Author: László Németh nem...@numbertext.org Date: Thu May 15 13:03:17 2014 +0200 fix LightProof measurement conversion for Python 3 Change-Id: I6d36bc804271956e1c8649df0832615311fcf5e1 Reviewed-on: https://gerrit.libreoffice.org/#/c/9367 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/en/pythonpath/lightproof_impl_en.py b/en/pythonpath/lightproof_impl_en.py index 2c7072c..ac668dc 100644 --- a/en/pythonpath/lightproof_impl_en.py +++ b/en/pythonpath/lightproof_impl_en.py @@ -328,7 +328,7 @@ def measurement(mnum, min, mout, mstr, decimal, remove): mnum = mnum.replace( 1/2, .5).replace(u \xbd, .5).replace(u\xbd,.5) m = calc(CONVERT_ADD, (float(eval(mnum.replace(remove, ).replace(decimal, .).replace(u\u2212, -))), min, mout)) a = list(set([str(calc(ROUND, (m, 0)))[:-2], str(calc(ROUND, (m, 1))), str(calc(ROUND, (m, 2))), str(m)])) # remove duplicated rounded items -a.sort(lambda x, y: len(x) - len(y)) # sort by string length +a.sort(key=lambda x: len(x)) # sort by string length return (mstr + \n).join(a).replace(., decimal).replace(-, u\u2212) + mstr diff --git a/hu_HU/pythonpath/lightproof_impl_hu_HU.py b/hu_HU/pythonpath/lightproof_impl_hu_HU.py index 62e0025..d88c136 100644 --- a/hu_HU/pythonpath/lightproof_impl_hu_HU.py +++ b/hu_HU/pythonpath/lightproof_impl_hu_HU.py @@ -244,7 +244,7 @@ paralcap = re.compile(u(?u)^[a-z\xf6\xfc\xf3\u0151\xfa\xe9\xe1\u0171\xed].*[.?! def measurement(mnum, min, mout, mstr): m = calc(CONVERT_ADD, (float(mnum.replace(,, .).replace(u\u2212, -)), min, mout)) a = list(set([str(calc(ROUND, (m, 0)))[:-2], str(calc(ROUND, (m, 1))), str(calc(ROUND, (m, 2))), str(m)])) # remove duplicated rounded items -a.sort(lambda x, y: len(x) - len(y)) # sort by string length +a.sort(key=lambda x: len(x)) # sort by string length return (mstr + |).join(a).replace(., ,).replace(-, u\u2212) + mstr diff --git a/pt_BR/pythonpath/lightproof_impl_pt_BR.py b/pt_BR/pythonpath/lightproof_impl_pt_BR.py index 8d0100f..8611ee5 100644 --- a/pt_BR/pythonpath/lightproof_impl_pt_BR.py +++ b/pt_BR/pythonpath/lightproof_impl_pt_BR.py @@ -24417,7 +24417,7 @@ def measurement(mnum, min, mout, mstr, decimal, remove): mnum = mnum.replace( 1/2, .5).replace(u \xbd, .5).replace(u\xbd,.5) m = calc(CONVERT_ADD, (float(eval(mnum.replace(remove, ).replace(decimal, .).replace(u\u2212, -))), min, mout)) a = list(set([str(calc(ROUND, (m, 0)))[:-2], str(calc(ROUND, (m, 1))), str(calc(ROUND, (m, 2))), str(m)])) # remove duplicated rounded items -a.sort(lambda x, y: len(x) - len(y)) # sort by string length +a.sort(key=lambda x: len(x)) # sort by string length return (mstr + \n).join(a).replace(., decimal).replace(-, u\u2212) + mstr ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/gtkbmptiledviewer'
New branch 'feature/gtkbmptiledviewer' available with the following commits: commit 0c6ce99ab9b32749b580c6f6ed4a3b568f2dd1b7 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri May 16 09:22:09 2014 +0100 Add the full sofficerc for LibLO. This gets rid of various ucb.ucp.gio warnings when doing tiled rendering, but doesn't seem to affect the display of the basic document so perhaps not necessary. Change-Id: I86e13192ddb5904afabca38d3a201f17f145de09 commit ea27d312b77daded62b90749d985500f433f430d Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri May 16 09:08:41 2014 +0100 Use bitmap buffers in the gtktiledviewer. Looks pretty decent now -- however the vertical flipping isn't ideal. Change-Id: I6ffa9d2b8fced142308781e06e8f161228f1db26 commit 60817ac1527b30de3a983f4bf2903c0377e66a83 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri May 16 09:07:52 2014 +0100 Return a bitmap buffer for tiled rendering from LibLO. We still need some way of managing the buffers properly rather than just keeping a static reference to the last buffer that was rendered. Change-Id: I17940c758948aa9418f4e0216ecd253d128cd04f commit 6dc8edcdc7bb5e681a0eb265c56cf28c792400ae Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri May 9 14:39:55 2014 +0100 Add some rendering to our gtktiledviewer. Just a hardcoded single tile for now. Change-Id: I9bfae4243e0083aa8fca38ae98dc369fe6de36fb commit 750f6f1b804cb4e36d270ad5ead37e51740a5b5a Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri May 9 14:37:27 2014 +0100 Add tiled rendering via liblibreoffice. We still need to add functions for getting dimensions of documents etc. for this to be truly useful, this is also only usable for writer documents for now. Change-Id: I07812c9b72caca71dfd509705af48c1d355cb2f8 ___ 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' - sc/source
sc/source/filter/excel/read.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8f1f935beee8495168b19f4b5e02bde8a9399154
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 13 14:02:45 2014 -0400
fdo#78471: Don't forget to record the ID of the last record for BIFF5.
Shared formula import code depends on this.
Change-Id: Iecb009252c56673df33e0d681de825911154903a
(cherry picked from commit 286760359bae7e21a772dd104ab17a1df69a57b0)
Reviewed-on: https://gerrit.libreoffice.org/9347
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index a8f0fe6..4c69155 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -90,7 +90,7 @@ FltError ImportExcel::Read( void )
sal_Size nProgressBasePos = 0;
sal_Size nProgressBaseSize = 0;
-while( eAkt != Z_Ende )
+for (; eAkt != Z_Ende; mnLastRecId = nOpcode)
{
if( eAkt == Z_Biff5E )
{
___
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' - sc/source
sc/source/core/data/conditio.cxx | 29 +++--
sc/source/core/tool/interpr4.cxx |8 +---
sc/source/ui/undo/undoblk.cxx| 15 +++
3 files changed, 47 insertions(+), 5 deletions(-)
New commits:
commit 0a47daf3175ec16d48669535a34823be47fbb42a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 13 12:35:24 2014 -0400
fdo#78402: Adjust references of validity entries as appropriate.
Change-Id: I7fd62153c7267a3d606b86d74bebecf6b8d75250
(cherry picked from commit a93bb27aa46c84410c8848a6118d5d63d47be92c)
Reviewed-on: https://gerrit.libreoffice.org/9345
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index ae5e098..5e8e549 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -510,13 +510,38 @@ void ScConditionEntry::UpdateReference(
sc::RefUpdateContext rCxt )
if (pFormula1)
{
-sc::RefUpdateResult aRes = pFormula1-AdjustReferenceInName(rCxt,
aOldSrcPos);
+sc::RefUpdateResult aRes;
+switch (rCxt.meMode)
+{
+case URM_INSDEL:
+aRes = pFormula1-AdjustReferenceOnShift(rCxt, aOldSrcPos);
+break;
+case URM_MOVE:
+aRes = pFormula1-AdjustReferenceOnMove(rCxt, aOldSrcPos,
aSrcPos);
+break;
+default:
+;
+}
+
if (aRes.mbReferenceModified || bChangedPos)
DELETEZ(pFCell1); // is created again in IsValid
}
+
if (pFormula2)
{
-sc::RefUpdateResult aRes = pFormula2-AdjustReferenceInName(rCxt,
aOldSrcPos);
+sc::RefUpdateResult aRes;
+switch (rCxt.meMode)
+{
+case URM_INSDEL:
+aRes = pFormula2-AdjustReferenceOnShift(rCxt, aOldSrcPos);
+break;
+case URM_MOVE:
+aRes = pFormula2-AdjustReferenceOnMove(rCxt, aOldSrcPos,
aSrcPos);
+break;
+default:
+;
+}
+
if (aRes.mbReferenceModified || bChangedPos)
DELETEZ(pFCell2); // is created again in IsValid
}
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c5ebbd3..4239001 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1843,6 +1843,8 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef xMat,
short rRetTypeExpr, sal_
{
if (xMat)
{
+SCSIZE nCols, nRows;
+xMat-GetDimensions(nCols, nRows);
ScMatrixValue nMatVal = xMat-Get(0, 0);
ScMatValType nMatValType = nMatVal.nType;
if (ScMatrix::IsNonValueType( nMatValType))
@@ -1850,14 +1852,14 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef xMat,
short rRetTypeExpr, sal_
if ( xMat-IsEmptyPath( 0, 0))
{ // result of empty FALSE jump path
FormulaTokenRef xRes = new FormulaDoubleToken( 0.0);
-PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
+PushTempToken( new ScMatrixFormulaCellToken(nCols, nRows,
xMat, xRes.get()));
rRetTypeExpr = NUMBERFORMAT_LOGICAL;
}
else
{
svl::SharedString aStr( nMatVal.GetString());
FormulaTokenRef xRes = new FormulaStringToken( aStr);
-PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
+PushTempToken( new ScMatrixFormulaCellToken(nCols, nRows,
xMat, xRes.get()));
rRetTypeExpr = NUMBERFORMAT_TEXT;
}
}
@@ -1869,7 +1871,7 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef xMat,
short rRetTypeExpr, sal_
xRes = new FormulaErrorToken( nErr);
else
xRes = new FormulaDoubleToken( nMatVal.fVal);
-PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
+PushTempToken( new ScMatrixFormulaCellToken(nCols, nRows, xMat,
xRes.get()));
if ( rRetTypeExpr != NUMBERFORMAT_LOGICAL )
rRetTypeExpr = NUMBERFORMAT_NUMBER;
}
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index cb4f25a..634e1f6 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -48,6 +48,8 @@
#include clipparam.hxx
#include sc.hrc
#include refhint.hxx
+#include refupdatecontext.hxx
+#include validat.hxx
#include set
@@ -1265,6 +1267,19 @@ void ScUndoDragDrop::Undo()
SCTAB nTabDelta = aSrcRange.aStart.Tab() - aDestRange.aStart.Tab();
sc::RefMovedHint aHint(aDestRange, ScAddress(nColDelta, nRowDelta,
nTabDelta));
pDoc-BroadcastRefMoved(aHint);
+
+ScValidationDataList* pValidList = pDoc-GetValidationList();
+if (pValidList)
+{
+
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78432.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 27 +
sw/source/filter/ww8/docxsdrexport.cxx | 35 ++--
3 files changed, 60 insertions(+), 2 deletions(-)
New commits:
commit a05e5016287fdf06378e8b854a40db32d2da7204
Author: Pallavi Jadhav pallavi.jad...@synerzip.com
Date: Mon May 12 15:33:08 2014 +0530
fdo#78432 : DOCX: File gets corrupt after RoundTrip
Issue :
- In RT in document.xml, value of Absolute Position Offset
wp:posOffset was going out of bounds.
- wp:posOffset is of type Int(32-bits), hence it's value
should not cross the MAX and MIN limits of Int.
Implementation :
- Added check for wp:posOffset should not cross
Maximum/Minimum limit of Int.
- Written Export Unit test case.
Reviewed on:
https://gerrit.libreoffice.org/9328
Change-Id: I22e75d7e603ebbf6a49e764fb1a3e6a4d2fd8b23
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78432.docx
b/sw/qa/extras/ooxmlexport/data/fdo78432.docx
new file mode 100644
index 000..343e76a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78432.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index cb89ac3..014c3b9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3310,6 +3310,33 @@
DECLARE_OOXMLEXPORT_TEST(testPageBreakInFirstPara,fdo77727.docx)
assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[2]/w:br,type,page);
}
+DECLARE_OOXMLEXPORT_TEST(testAbsolutePositionOffsetValue,fdo78432.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+sal_Int32 IntMax = 2147483647;
+
+xmlNodeSetPtr pXmlNodes[6];
+pXmlNodes[0] =
getXPathNode(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:positionH[1]/wp:posOffset[1]);
+pXmlNodes[1] =
getXPathNode(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:positionV[1]/wp:posOffset[1]);
+
+pXmlNodes[2] =
getXPathNode(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[2]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:positionH[1]/wp:posOffset[1]);
+pXmlNodes[3] =
getXPathNode(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[2]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:positionV[1]/wp:posOffset[1]);
+
+pXmlNodes[4] =
getXPathNode(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[3]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:positionH[1]/wp:posOffset[1]);
+pXmlNodes[5] =
getXPathNode(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[3]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:positionV[1]/wp:posOffset[1]);
+
+for(sal_Int32 index = 0; index6; ++index)
+{
+CPPUNIT_ASSERT(pXmlNodes[index] != 0);
+xmlNodePtr pXmlNode = pXmlNodes[index]-nodeTab[0];
+OUString contents = OUString::createFromAscii((const
char*)((pXmlNode-children[0]).content));
+CPPUNIT_ASSERT( contents.toInt64() = IntMax );
+}
+}
+
DECLARE_OOXMLEXPORT_TEST(testFDO78284, fdo78284.docx)
{
xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index dff5310..e377a36 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -44,6 +44,8 @@
#include writerhelper.hxx
#include comphelper/seqstream.hxx
+#include climits
+
using namespace com::sun::star;
using namespace oox;
@@ -422,7 +424,27 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
else
{
m_pImpl-m_pSerializer-startElementNS(XML_wp, XML_posOffset,
FSEND);
-m_pImpl-m_pSerializer-write(TwipsToEMU(aPos.X));
+sal_Int64 nTwipstoEMU = TwipsToEMU(aPos.X);
+
+/* Absolute Position Offset Value is of type Int. Hence it should
not be greater than
+ * Maximum value for Int OR Less than the Minimum value for Int.
+ * - Maximum value for Int = 2147483647
+ * - Minimum value for Int = -2147483648
+ *
+ * As per ECMA Specification : ECMA-376, Second Edition,
+ * Part 1 - Fundamentals And Markup Language Reference[20.4.3.3
ST_PositionOffset (Absolute Position Offset Value)]
+ *
+ * Please refer :
http://www.schemacentral.com/sc/xsd/t-xsd_int.html
+ */
+if (nTwipstoEMU INT_MAX)
+{
+nTwipstoEMU = INT_MAX;
+}
+else if (nTwipstoEMU INT_MIN)
+{
+nTwipstoEMU = INT_MIN;
+}
+m_pImpl-m_pSerializer-write(nTwipstoEMU);
[Libreoffice-commits] core.git: unotools/source
unotools/source/ucbhelper/tempfile.cxx | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 0bc869459b8dfc05923249ec07ccfd4f0ddd2c2c
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri May 16 11:05:41 2014 +0200
Consolidate CreateTempName_Impl and lcl_createName more faithfully
This is a follow-up to fcf455d4efde077bb2b092b607de12ebfc350275 Consolidate
CreateTempName_Impl and lcl_createName, which apparently lead to hard-to-
diagnose sporadic make check failures on some machines. Hope is that
bLock
now more carefully tracking the behavior of the original two functions fixes
that.
Change-Id: I37ba00545f5921fd603ff9f1ea46927c42e88899
diff --git a/unotools/source/ucbhelper/tempfile.cxx
b/unotools/source/ucbhelper/tempfile.cxx
index a62e68d..3d5814f 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -160,13 +160,13 @@ OUString ConstructTempDir_Impl( const OUString* pParent )
}
OUString lcl_createName(
-const OUString rLeadingChars, unsigned long nSeed, bool bFirst,
-const OUString* pExtension, const OUString* pParent, bool bDirectory,
-bool bKeep)
+const OUString rLeadingChars, unsigned long nSeed, sal_Int16 nRadix,
+bool bFirst, const OUString* pExtension, const OUString* pParent,
+bool bDirectory, bool bKeep, bool bLock)
{
// 36 ** 6 == 2176782336
-unsigned const nRadix = 36;
-unsigned long const nMax = (nRadix*nRadix*nRadix*nRadix*nRadix*nRadix);
+unsigned long const nMaxRadix = 36;
+unsigned long const nMax =
(nMaxRadix*nMaxRadix*nMaxRadix*nMaxRadix*nMaxRadix*nMaxRadix);
nSeed %= nMax;
// get correct directory
@@ -179,7 +179,7 @@ OUString lcl_createName(
{
OUString aTmp( aName );
if ( bUseNumber )
-aTmp += OUString::number( i );
+aTmp += OUString::number(i, nRadix);
bUseNumber = true;
if ( pExtension )
aTmp += *pExtension;
@@ -208,11 +208,11 @@ OUString lcl_createName(
/* RW permission for the user only! */
mode_t old_mode = umask(077);
#endif
-FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
+FileBase::RC err = aFile.open(osl_File_OpenFlag_Create | (bLock ?
0 : osl_File_OpenFlag_NoLock));
#ifdef UNX
umask(old_mode);
#endif
-if ( err == FileBase::E_None || err == FileBase::E_NOLCK )
+if ( err == FileBase::E_None || (bLock err ==
FileBase::E_NOLCK) )
{
aFile.close();
return aTmp;
@@ -250,7 +250,8 @@ OUString CreateTempName_Impl( const OUString* pParent, bool
bKeep, bool bDir = t
#endif
#endif
return lcl_createName(
-aEyeCatcher, Time::GetSystemTicks(), true, 0, pParent, bDir, bKeep);
+aEyeCatcher, Time::GetSystemTicks(), 36, true, 0, pParent, bDir, bKeep,
+false);
}
OUString TempFile::CreateTempName()
@@ -277,7 +278,7 @@ TempFile::TempFile( const OUString rLeadingChars, bool
_bStartWithZero, const O
, bIsDirectory( bDirectory )
, bKillingFileEnabled( false )
{
-aName = lcl_createName(rLeadingChars, 0, _bStartWithZero, pExtension,
pParent, bDirectory, true);
+aName = lcl_createName(rLeadingChars, 0, 10, _bStartWithZero, pExtension,
pParent, bDirectory, true, true);
}
TempFile::~TempFile()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/passsequencebyref.cxx | 63 --
compilerplugins/clang/passstringbyref.cxx | 71 -
compilerplugins/clang/passstuffbyref.cxx| 78
3 files changed, 78 insertions(+), 134 deletions(-)
New commits:
commit 97d50c425f83f05bb395956e1f855db00b979f27
Author: Noel Grandin n...@peralex.com
Date: Fri May 16 11:18:12 2014 +0200
combine the pass-by-ref clang plugins
Change-Id: Idac24afb7cb67fa2d539553fb9fa049c2d61ecf0
diff --git a/compilerplugins/clang/passsequencebyref.cxx
b/compilerplugins/clang/passsequencebyref.cxx
deleted file mode 100644
index 851307b..000
--- a/compilerplugins/clang/passsequencebyref.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include string
-
-#include plugin.hxx
-
-// Find places where com::sun::star::uno::Sequence is passed by value.
-// It's not very efficient, because that copies a whole list
-// They should rather be passed by reference.
-
-namespace {
-
-class PassSequenceByRef:
-public RecursiveASTVisitorPassSequenceByRef, public loplugin::Plugin
-{
-public:
-explicit PassSequenceByRef(InstantiationData const data): Plugin(data) {}
-
-virtual void run() override {
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
-
-bool VisitFunctionDecl(const FunctionDecl * decl);
-};
-
-bool PassSequenceByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
-if (ignoreLocation(functionDecl)) {
-return true;
-}
-// only warn on the definition/prototype of the function,
-// not on the function implementation
-if (functionDecl-isThisDeclarationADefinition()
functionDecl-getPreviousDecl() != nullptr) {
-return true;
-}
-unsigned n = functionDecl-getNumParams();
-for (unsigned i = 0; i != n; ++i) {
-const ParmVarDecl * pvDecl = functionDecl-getParamDecl(i);
-QualType t1 { pvDecl-getType() };
-if (!t1-isClassType()) {
-continue;
-}
-string typeName =
t1.getUnqualifiedType().getCanonicalType().getAsString();
-if (typeName.find(class com::sun::star::uno::Sequence) == 0) {
-report(
-DiagnosticsEngine::Warning,
-passing css::uno::Sequence by value, rather pass by reference
.e.g. 'const css::uno::Sequence' + typeName,
-pvDecl-getSourceRange().getBegin())
- pvDecl-getSourceRange();
-}
-}
-return true;
-}
-
-loplugin::Plugin::Registration PassSequenceByRef X(passsequencebyref);
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/passstringbyref.cxx
b/compilerplugins/clang/passstuffbyref.cxx
similarity index 72%
rename from compilerplugins/clang/passstringbyref.cxx
rename to compilerplugins/clang/passstuffbyref.cxx
index 50e1a85..c4951e8 100644
--- a/compilerplugins/clang/passstringbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -11,25 +11,25 @@
#include plugin.hxx
-// Find places where OUString and OString are passed by value.
+// Find places where various things are passed by value.
// It's not very efficient, because we generally end up copying it twice -
once into the parameter and
-// again into the destination OUString.
+// again into the destination.
// They should rather be passed by reference.
namespace {
-class PassStringByRef:
-public RecursiveASTVisitorPassStringByRef, public loplugin::Plugin
+class PassStuffByRef:
+public RecursiveASTVisitorPassStuffByRef, public loplugin::Plugin
{
public:
-explicit PassStringByRef(InstantiationData const data): Plugin(data) {}
+explicit PassStuffByRef(InstantiationData const data): Plugin(data) {}
virtual void run() override {
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
bool VisitFunctionDecl(const FunctionDecl * decl);
};
-bool PassStringByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
+bool PassStuffByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
if (ignoreLocation(functionDecl)) {
return true;
}
@@ -60,11 +60,18 @@ bool PassStringByRef::VisitFunctionDecl(const FunctionDecl
* functionDecl) {
pvDecl-getSourceRange().getBegin())
pvDecl-getSourceRange();
}
+else if (typeName.find(class com::sun::star::uno::Sequence) == 0) {
+report(
+DiagnosticsEngine::Warning,
+passing css::uno::Sequence by value, rather pass by reference
.e.g. 'const css::uno::Sequence' + typeName,
+
Re: Access2Base - New release
On 15/05/2014 12:30, Lionel Elie Mamane wrote: one might hope that when loading the library, one source is always preferred over the other. After a test the behaviour of LibreOffice is found sane: when installing an extension with the same name as a pre-installed one, the extension gets INSTALLED but cannot be ENABLED. So the pre-existing one keeps the precedence. (BTW I tried 6 months ago upgrading (LO 4.1 + A2B extension) to LO 4.2 = the conclusion was that A2B needed to be uninstalled before the upgrade.) I presume it is compliant with the LO release policy to push the same patch also to the LO 4.2 branch ? I don't think so; no new features, only bugfixes. So, what do you recommend ? Thanks for your feedback. JP. --- This email is free from viruses and malware because avast! Antivirus protection is active. http://www.avast.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - avmedia/Module_avmedia.mk avmedia/source postprocess/Rdb_services.mk scp2/source
avmedia/Module_avmedia.mk |3 ---
avmedia/source/macavf/macavfcommon.hxx | 16 +---
avmedia/source/macavf/player.mm| 16 +++-
avmedia/source/macavf/window.mm|6 --
postprocess/Rdb_services.mk|4 +---
scp2/source/ooo/file_library_ooo.scp |2 --
6 files changed, 21 insertions(+), 26 deletions(-)
New commits:
commit d2397ab0ad61b6331d41880ba896e28fa8fcb98d
Author: Tor Lillqvist t...@collabora.com
Date: Fri May 16 11:36:25 2014 +0300
Use correct header guard name in comment at #endif
Change-Id: I2df05054c4108cb173f80ce6fa66f30c713b70cd
diff --git a/avmedia/source/macavf/macavfcommon.hxx
b/avmedia/source/macavf/macavfcommon.hxx
index 618a566..78bd6d1 100644
--- a/avmedia/source/macavf/macavfcommon.hxx
+++ b/avmedia/source/macavf/macavfcommon.hxx
@@ -92,6 +92,6 @@ public:
}}
-#endif // MACAVF_COMMON_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_MACAVF_MACAVFCOMMON_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7822b553568e5b454d04a66a6b4f27675ec6
Author: Tor Lillqvist t...@collabora.com
Date: Fri May 16 10:59:13 2014 +0300
Make the MacAVF code build also as 32-bit
When compiling 32-bit OS X code, the code will use the legacy
Objective-C runtime, which means that instance variables of an
Objective-C class must be declared in the @interface block, not in the
@implementation.
CGRect and NSRect are not the same for 32-bit code.
Also, use boost::unordered_map.
Change-Id: Icc56ff298203565a7568714b0e9f42c7c6b89737
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 06bbef7..bd0382d 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -44,15 +44,12 @@ endif
endif
ifeq ($(OS),MACOSX)
-ifeq ($(CPUNAME),X86_64)
-# The macavf code is a bit x86_64 dependent...
ifneq (1060,$(MACOSX_SDK_VERSION))
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaMacAVF \
))
endif
endif
-endif
ifneq ($(ENABLE_DIRECTX),)
$(eval $(call gb_Module_add_targets,avmedia,\
diff --git a/avmedia/source/macavf/macavfcommon.hxx
b/avmedia/source/macavf/macavfcommon.hxx
index 7082724..618a566 100644
--- a/avmedia/source/macavf/macavfcommon.hxx
+++ b/avmedia/source/macavf/macavfcommon.hxx
@@ -20,12 +20,13 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_MACAVF_MACAVFCOMMON_HXX
#define INCLUDED_AVMEDIA_SOURCE_MACAVF_MACAVFCOMMON_HXX
-#ifdef MACOSX
#include premac.h
#import Cocoa/Cocoa.h
#import AVFoundation/AVFoundation.h
#include postmac.h
-#endif
+
+#include boost/unordered_map.hpp
+
#include osl/mutex.hxx
#include rtl/ustring.hxx
#include tools/debug.hxx
@@ -64,7 +65,16 @@
// MacAVObserver handles the notifications used in the AVFoundation framework
+namespace avmedia { namespace macavf {
+class MacAVObserverHandler;
+} }
+
+typedef boost::unordered_mapNSObject*,avmedia::macavf::MacAVObserverHandler*
HandlersForObject;
+
@interface MacAVObserverObject : NSObject
+{
+HandlersForObject maHandlersForObject;
+}
- (void)observeValueForKeyPath:(NSString*)pKeyPath ofObject:(id)pObject
change:(NSDictionary*)pChangeDict context:(void*)pContext;
- (void)onNotification:(NSNotification*)pNotification;
@end
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 6c348e0..14f8a07 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -25,18 +25,8 @@
using namespace ::com::sun::star;
-#ifdef _LIBCPP_VERSION
-#include unordered_map
-typedef std::unordered_mapNSObject*,avmedia::macavf::MacAVObserverHandler*
HandlersForObject;
-#else
-#include ext/hash_map
-typedef std::hash_mapNSObject*,avmedia::macavf::MacAVObserverHandler*
HandlersForObject;
-#endif
-
@implementation MacAVObserverObject
-{
-HandlersForObject maHandlersForObject;
-}
+
- (void)observeValueForKeyPath:(NSString*)pKeyPath ofObject:(id)pObject
change:(NSDictionary*)pChangeDict context:(void*)pContext
{
(void) pObject;
@@ -387,7 +377,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
NSArray* pVideoTracks = [pMovie tracksWithMediaType:AVMediaTypeVideo];
if ([pVideoTracks count] 0)
{
-AVAssetTrack* pFirstVideoTrack =(AVAssetTrack*)pVideoTracks[0];
+AVAssetTrack* pFirstVideoTrack = (AVAssetTrack*) [pVideoTracks
objectAtIndex:0];
const CGSize aPrefSize = [pFirstVideoTrack naturalSize];
aSize = awt::Size( aPrefSize.width, aPrefSize.height );
}
@@ -405,7 +395,7 @@ uno::Reference ::media::XPlayerWindow SAL_CALL
Player::createPlayerWindow( co
OSL_TRACE( Player::createPlayerWindow %dx%d argsLength: %d, aSize.Width,
aSize.Height, aArguments.getLength() );
// get the parent view
-sal_IntPtr nNSViewPtr = NULL;
+sal_IntPtr nNSViewPtr = 0;
aArguments[0] = nNSViewPtr;
NSView* pParentView = reinterpret_castNSView*(nNSViewPtr);
diff --git a/avmedia/source/macavf/window.mm
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/excel/xestream.cxx |2 +- sc/source/filter/qpro/qpro.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit f12631e960a2b4123c96e96d2af7d43741d8e6a5 Author: LuboÅ¡ LuÅák l.lu...@collabora.com Date: Wed Mar 12 13:44:29 2014 +0100 std::strlen requires cstring include to build Or, even simpler, don't bother with the needless namespacing. Change-Id: I4bbb115c1c2c89881a0bf88ccd54b0f5cb8b3518 (cherry picked from commit da9bd301c6f62e829daadb2af6a6b9633d4f1cb9) Signed-off-by: Andras Timar andras.ti...@collabora.com diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 035a827..df08d2c 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -985,7 +985,7 @@ sax_fastparser::FSHelperPtr XclExpXmlStream::WriteAttributesInternal( sal_Int32 rStream-write( ) -writeId( nAttribute ) -write( =\ ) --writeEscaped( OUString(pValue, std::strlen(pValue), RTL_TEXTENCODING_UTF8) ) +-writeEscaped( OUString(pValue, strlen(pValue), RTL_TEXTENCODING_UTF8) ) -write( \ ); } diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index c370492..793412a 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.cxx @@ -229,7 +229,7 @@ void ScQProReader::readString( OUString rString, sal_uInt16 nLength ) sal_Char* pText = new sal_Char[ nLength + 1 ]; mpStream-Read( pText, nLength ); pText[ nLength ] = 0; -rString = OUString( pText, std::strlen(pText), mpStream-GetStreamCharSet() ); +rString = OUString( pText, strlen(pText), mpStream-GetStreamCharSet() ); delete [] pText; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - toolkit/source
toolkit/source/awt/vclxwindows.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 213aafbf006a5099e951f65a472e4f8fa66256a4
Author: Tsutomu Uchino ha...@apache.org
Date: Fri May 16 08:25:28 2014 +
#i98216# extract boolean value for AutoFill value of ComboBox model
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 26a132b..05311f3 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4074,6 +4074,12 @@ void VCLXComboBox::setProperty( const ::rtl::OUString
PropertyName, const ::com
sal_Int16 n = sal_Int16();
if ( Value = n )
pComboBox-EnableAutocomplete( n != 0 );
+ else
+ {
+sal_Bool b = sal_Bool();
+if ( Value = b )
+pComboBox-EnableAutocomplete( b );
+}
}
break;
case BASEPROPERTY_STRINGITEMLIST:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus
https://bugs.freedesktop.org/show_bug.cgi?id=32664 --- Comment #44 from bulwersa...@gmail.com --- Still happens with Calc 4.2.4.2 on Lenovo laptop (g550 model 20023). -- 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/generic
vcl/generic/glyphs/gcach_ftyp.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6709d982a5558cab4d0b7e13d5c72a3b074704d6 Author: Caolán McNamara caol...@redhat.com Date: Fri May 16 10:50:39 2014 +0100 lsan: mpFontCharMap double-add-ref, never released Change-Id: Id511d6d0d975434b4754786204cc0fc91568168e diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 7a05833..47adb09 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1292,8 +1292,8 @@ const ImplFontCharMap* FtFontInfo::GetImplFontCharMap( void ) if( bOK ) mpFontCharMap = new ImplFontCharMap( aCmapResult ); else - mpFontCharMap = ImplFontCharMap::GetDefaultMap(); -mpFontCharMap-AddReference(); +mpFontCharMap = ImplFontCharMap::GetDefaultMap(); +// mpFontCharMap on either branch now has a refcount of 1 return mpFontCharMap; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: example of the output of Lsan
On Thu, 2014-05-15 at 16:40 +0200, Markus Mohrhard wrote: Hey, as promised during the ESC call here is an example from one of my runs. http://cgit.freedesktop.org/libreoffice/core/commit/?id=6709d982a5558cab4d0b7e13d5c72a3b074704d6 should fix a lot of the vcl ones. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus
https://bugs.freedesktop.org/show_bug.cgi?id=32664 --- Comment #45 from bulwersa...@gmail.com --- I discovered something interesting - in my situation foobar2000 is affected by this problem but Winamp is not. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/model/template/GL3DBarChartType.cxx |9 +
chart2/source/model/template/GL3DBarChartType.hxx |3 +++
chart2/source/view/charttypes/GL3DBarChart.cxx|9 -
chart2/source/view/main/GL3DRenderer.cxx | 18 --
4 files changed, 32 insertions(+), 7 deletions(-)
New commits:
commit ca52e5ff2c98268ad1965d43746d3c0f9a53fa79
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri May 16 12:43:09 2014 +0200
support property mapping in new 3D charts
Change-Id: I3da71e354ed2595c1f5b2eaeb5fb565205d24de0
diff --git a/chart2/source/model/template/GL3DBarChartType.cxx
b/chart2/source/model/template/GL3DBarChartType.cxx
index 4e8868c..e99fe39 100644
--- a/chart2/source/model/template/GL3DBarChartType.cxx
+++ b/chart2/source/model/template/GL3DBarChartType.cxx
@@ -118,6 +118,15 @@ OUString SAL_CALL GL3DBarChartType::getChartType()
return CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR;
}
+uno::SequenceOUString GL3DBarChartType::getSupportedPropertyRoles()
+throw (::com::sun::star::uno::RuntimeException, std::exception)
+{
+uno::Sequence OUString aPropRoles(1);
+aPropRoles[0] = FillColor;
+
+return aPropRoles;
+}
+
com::sun::star::uno::Referencecom::sun::star::util::XCloneable
GL3DBarChartType::createClone()
throw (com::sun::star::uno::RuntimeException, std::exception)
diff --git a/chart2/source/model/template/GL3DBarChartType.hxx
b/chart2/source/model/template/GL3DBarChartType.hxx
index f60ba4a..c758d46 100644
--- a/chart2/source/model/template/GL3DBarChartType.hxx
+++ b/chart2/source/model/template/GL3DBarChartType.hxx
@@ -25,6 +25,9 @@ public:
GL3DBarChartType( const css::uno::Referencecss::uno::XComponentContext
xContext );
virtual ~GL3DBarChartType();
+virtual com::sun::star::uno::Sequence OUString SAL_CALL
+getSupportedPropertyRoles()
+throw (::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
virtual OUString SAL_CALL
getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception )
SAL_OVERRIDE;
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 3697903..9921d96 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -77,6 +77,8 @@ void GL3DBarChart::create3DShapes(const
boost::ptr_vectorVDataSeries rDataSer
const VDataSeries rDataSeries = *itr;
sal_Int32 nPointCount = rDataSeries.getTotalPointCount();
+bool bMappedFillProperty = rDataSeries.hasPropertyMapping(FillColor);
+
// Create series name text object.
OUString aSeriesName =
DataSeriesHelper::getDataSeriesLabel(
@@ -96,12 +98,17 @@ void GL3DBarChart::create3DShapes(const
boost::ptr_vectorVDataSeries rDataSer
sal_Int32 nColor = aSeriesColor[nSeriesIndex %
SAL_N_ELEMENTS(aSeriesColor)].GetColor();
for(sal_Int32 nIndex = 0; nIndex nPointCount; ++nIndex)
{
+if(bMappedFillProperty)
+{
+nColor =
static_castsal_uInt32(rDataSeries.getValueByProperty(nIndex, FillColor));
+}
+
float nVal = rDataSeries.getYValue(nIndex);
float nXPos = nIndex * (nBarSizeX + nBarDistanceX);
glm::mat4 aScaleMatrix = glm::scale(nBarSizeX, nBarSizeY, nVal);
-glm::mat4 aTranslationMatrix = glm::translate(nXPos, nYPos,
static_castfloat(0));
+glm::mat4 aTranslationMatrix = glm::translate(nXPos, nYPos, 0.0f);
glm::mat4 aBarPosition = aTranslationMatrix * aScaleMatrix;
maShapes.push_back(new opengl3D::Bar(mpRenderer.get(),
aBarPosition, nColor, nId++));
commit 2c7a4e8aff00f88dcc333f607a1c4334b197a4a1
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri May 16 09:31:38 2014 +0200
set the MVP matrix in picking mode
Change-Id: I11d4838a320ada1d454870436e540b2c56fa18fd
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index c661e33..bcb87b2 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -782,7 +782,8 @@ void OpenGL3DRenderer::RenderPolygon3D(Polygon3DInfo
polygon)
}
else
{
-// TODO: moggi: model matrix
+glm::mat4 aMVP = m_3DProjection * m_3DView * m_Model;
+glUniformMatrix4fv(maPickingResources.m_MatrixID, 1, GL_FALSE,
aMVP[0][0]);
}
GLint maVertexID = mbPickingMode ? maPickingResources.m_2DVertexID :
maResources.m_3DVertexID;
@@ -1085,7 +1086,8 @@ void OpenGL3DRenderer::RenderExtrudeFlatSurface(const
Extrude3DInfo extrude3D,
}
else
{
-// TODO: moggi: model matrix
+glm::mat4 aMVP = m_3DProjection * m_3DView * m_Model;
+
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/awt/vclxwindows.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 5350520ec8da250f57dde664e95229c0e4d5a2ab
Author: Tsutomu Uchino ha...@apache.org
Date: Fri May 16 08:25:28 2014 +
Resolves: #i98216# extract boolean value for AutoFill value of ComboBox
model
(cherry picked from commit 213aafbf006a5099e951f65a472e4f8fa66256a4)
Change-Id: I862abc31b69b98f0ec766ca260fdc063d14a2ee4
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 78637d4..62ec589 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4366,6 +4366,12 @@ void VCLXComboBox::setProperty( const OUString
PropertyName, const ::com::sun::
sal_Int16 n = sal_Int16();
if ( Value = n )
pComboBox-EnableAutocomplete( n != 0 );
+else
+{
+sal_Bool b = sal_Bool();
+if ( Value = b )
+pComboBox-EnableAutocomplete( b );
+}
}
break;
case BASEPROPERTY_STRINGITEMLIST:
___
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' - 21/3aafbf006a5099e951f65a472e4f8fa66256a4
21/3aafbf006a5099e951f65a472e4f8fa66256a4 |1 + 1 file changed, 1 insertion(+) New commits: commit 31da426c446ddc937f51183fee3ec4a5e0aa1f58 Author: Caolán McNamara caol...@redhat.com Date: Fri May 16 11:54:24 2014 +0100 Notes added by 'git notes add' diff --git a/21/3aafbf006a5099e951f65a472e4f8fa66256a4 b/21/3aafbf006a5099e951f65a472e4f8fa66256a4 new file mode 100644 index 000..a637899 --- /dev/null +++ b/21/3aafbf006a5099e951f65a472e4f8fa66256a4 @@ -0,0 +1 @@ +merged as: 5350520ec8da250f57dde664e95229c0e4d5a2ab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/langbox.hxx | 90 ++---
svx/source/dialog/langbox.cxx | 280 ++
2 files changed, 277 insertions(+), 93 deletions(-)
New commits:
commit 5ad020235a8d4dd60752e781622c22f0187b4e45
Author: Eike Rathke er...@redhat.com
Date: Fri May 16 12:50:36 2014 +0200
introduce SvxLanguageBoxBase, SvxLanguageBox, SvxLanguageComboBox
In preparation of having a language box available as ComboBox to be able
to add language tags.
Change-Id: I5af5ea5bb06e558db1fcf9c0668be274d5cec04e
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index d5ca097..7bc28f7 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -23,6 +23,8 @@
#include svx/svxdllapi.h
#include vcl/image.hxx
#include vcl/lstbox.hxx
+#include vcl/combobox.hxx
+#include boost/noncopyable.hpp
#define LANG_LIST_EMPTY 0x
@@ -47,11 +49,27 @@
// load language strings from resource
SVX_DLLPUBLIC OUStringGetDicInfoStr( const OUString rName, const
sal_uInt16 nLang, bool bNeg );
-class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
+class SVX_DLLPUBLIC SvxLanguageBoxBase : boost::noncopyable
{
public:
+explicit SvxLanguageBoxBase( bool bCheck );
+virtual ~SvxLanguageBoxBase();
-private:
+voidSetLanguageList( sal_Int16 nLangList,
+bool bHasLangNone, bool bLangNoneIsLangAll = false,
+bool bCheckSpellAvail = false );
+
+sal_Int32 InsertLanguage( const LanguageType eLangType, sal_Int32
nPos = LISTBOX_APPEND );
+sal_Int32 InsertDefaultLanguage( sal_Int16 nType, sal_Int32 nPos =
LISTBOX_APPEND );
+sal_Int32 InsertSystemLanguage( sal_Int32 nPos = LISTBOX_APPEND );
+sal_Int32 InsertLanguage( const LanguageType eLangType,
+bool bCheckEntry, sal_Int32 nPos =
LISTBOX_APPEND );
+voidRemoveLanguage( const LanguageType eLangType );
+voidSelectLanguage( const LanguageType eLangType, bool bSelect
= true );
+LanguageTypeGetSelectLanguage() const;
+boolIsLanguageSelected( const LanguageType eLangType ) const;
+
+protected:
Image m_aNotCheckedImage;
Image m_aCheckedImage;
OUStringm_aAllString;
@@ -61,27 +79,63 @@ private:
boolm_bLangNoneIsLangAll;
boolm_bWithCheckmark;
-SVX_DLLPRIVATE voidInit();
-SVX_DLLPRIVATE sal_Int32 ImplInsertImgEntry( const
OUString rEntry, sal_Int32 nPos, bool bChecked );
-SVX_DLLPRIVATE sal_Int32
ImplInsertLanguage(LanguageType, sal_Int32 nPos, sal_Int16 nType);
+SVX_DLLPRIVATE void ImplLanguageBoxBaseInit();
+SVX_DLLPRIVATE sal_Int32ImplInsertLanguage(LanguageType,
sal_Int32 nPos, sal_Int16 nType);
+SVX_DLLPRIVATE sal_Int32ImplTypeToPos( LanguageType eType )
const;
+
+SVX_DLLPRIVATE virtual sal_Int32ImplInsertImgEntry( const OUString
rEntry, sal_Int32 nPos, bool bChecked ) = 0;
+SVX_DLLPRIVATE virtual void ImplRemoveEntryAt( sal_Int32 nPos ) =
0;
+
+SVX_DLLPRIVATE virtual void ImplClear() = 0;
+SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString
rEntry, sal_Int32 nPos ) = 0;
+SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos,
void* pData ) = 0;
+SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos() const = 0;
+SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos )
const = 0;
+SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos,
bool bSelect ) = 0;
+SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos
) const = 0;
+SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const = 0;
+};
+
+class SVX_DLLPUBLIC SvxLanguageBox : public ListBox, public SvxLanguageBoxBase
+{
public:
-SvxLanguageBox(Window* pParent, WinBits nBits, bool bCheck = false);
+SvxLanguageBox( Window* pParent, WinBits nBits, bool bCheck = false );
virtual ~SvxLanguageBox();
-voidSetLanguageList( sal_Int16 nLangList,
-bool bHasLangNone, bool bLangNoneIsLangAll = false,
-bool bCheckSpellAvail = false );
+private:
+SVX_DLLPRIVATE virtual sal_Int32ImplInsertImgEntry( const OUString
rEntry, sal_Int32 nPos, bool bChecked );
+SVX_DLLPRIVATE virtual void ImplRemoveEntryAt( sal_Int32 nPos );
-sal_Int32 InsertLanguage( const LanguageType eLangType,
sal_Int32 nPos = LISTBOX_APPEND );
-sal_Int32 InsertDefaultLanguage( sal_Int16 nType, sal_Int32
nPos = LISTBOX_APPEND );
-sal_Int32 InsertSystemLanguage( sal_Int32 nPos = LISTBOX_APPEND
);
-sal_Int32 InsertLanguage(
[Libreoffice-commits] core.git: 3 commits - include/oox oox/source sw/qa writerfilter/source
include/oox/drawingml/effectproperties.hxx | 19 +
include/oox/drawingml/effectpropertiescontext.hxx |3
include/oox/export/drawingml.hxx|1
oox/source/drawingml/effectproperties.cxx | 71 +++---
oox/source/drawingml/effectpropertiescontext.cxx| 77 +++
oox/source/drawingml/shape.cxx | 55 +++--
oox/source/export/drawingml.cxx | 102
+-
oox/source/export/shapes.cxx|4
sw/qa/extras/ooxmlexport/data/picture-effects-preservation.docx |binary
sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|6
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 82
sw/qa/extras/ooxmlimport/ooxmlimport.cxx|8
writerfilter/source/dmapper/GraphicImport.cxx | 13 +
14 files changed, 284 insertions(+), 157 deletions(-)
New commits:
commit 73ad72e820ed3de346efa1914432a7f2c6264dde
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Fri May 16 11:38:18 2014 +0200
ooxml: Preserve effects on pictures
If a picture contains some 2D (glow, shadow...) or 3D effect
(rotation, extrusion...), we prevent the importer from transforming
it into a XTextContent so the XShape grab bag is not removed and
the effects are preserved using the existing mechanisms. Added a unit
test for this issue, and modified some existing unit tests to match
the new behaviour.
Change-Id: I3b87069ea208604383a592d34d0a4ceb6b0f9fc7
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index c9eaa6f..82d2b5e 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -530,6 +530,10 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference
XShape xShape, const
WritePresetShape( rect );
// graphic object can come with the frame (bnc#654525)
WriteOutline( xShapeProps );
+
+WriteShapeEffects( xShapeProps );
+WriteShape3DEffects( xShapeProps );
+
pFS-endElementNS( mnXmlNamespace, XML_spPr );
pFS-endElementNS( mnXmlNamespace, XML_pic );
diff --git a/sw/qa/extras/ooxmlexport/data/picture-effects-preservation.docx
b/sw/qa/extras/ooxmlexport/data/picture-effects-preservation.docx
new file mode 100644
index 000..d26def4
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/picture-effects-preservation.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 014c3b9..67ee861 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1079,8 +1079,10 @@ DECLARE_OOXMLEXPORT_TEST(testFdo67737, fdo67737.docx)
DECLARE_OOXMLEXPORT_TEST(testTransparentShadow, transparent-shadow.docx)
{
uno::Referencedrawing::XShape xPicture = getShape(1);
-table::ShadowFormat aShadow = getPropertytable::ShadowFormat(xPicture,
ShadowFormat);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0x7f808080), aShadow.Color);
+sal_Int32 nShadowColor = getPropertysal_Int32(xPicture, ShadowColor);
+sal_Int16 nShadowTransparence = getPropertysal_Int16(xPicture,
ShadowTransparence);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x808080), nShadowColor);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(50), nShadowTransparence);
}
DECLARE_OOXMLEXPORT_TEST(testBnc834035, bnc834035.odt)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 736546a..21eff8e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1285,6 +1285,59 @@ DECLARE_OOXMLEXPORT_TEST(testShape3DEffectPreservation,
shape-3d-effect-preserv
prstMaterial, legacyWireframe);
}
+DECLARE_OOXMLEXPORT_TEST(testPictureEffectPreservation,
picture-effects-preservation.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+ return;
+
+// first picture: glow effect with theme color and transformations, 3d
rotation and extrusion
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r/mc:AlternateContent/mc:Choice/w:drawing/
+
wp:anchor/a:graphic/a:graphicData/pic:pic/pic:spPr/a:effectLst/a:glow,
+rad, 228600);
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r/mc:AlternateContent/mc:Choice/w:drawing/
+
wp:anchor/a:graphic/a:graphicData/pic:pic/pic:spPr/a:effectLst/a:glow/a:schemeClr,
+val, accent1);
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r/mc:AlternateContent/mc:Choice/w:drawing/
+
wp:anchor/a:graphic/a:graphicData/pic:pic/pic:spPr/a:effectLst/a:glow/a:schemeClr/*,
+2);
+
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r/mc:AlternateContent/mc:Choice/w:drawing/
+
Re: [GSoC] Hello!
Hello Mihai, Welcome aboard! I'm also eager to start that great project with you ;) -- Cedric On Mon, 2014-05-12 at 23:06 +0300, Mihai Varga wrote: Hello everyone ! My name is Mihai and I have been selected to participate in this year's GSoC program. I will be working on the SharePoint and Sky Drive connection project. I am a CS student from Romania and I am in my 2nd year of study. I am looking forward to this summer, as I am eager to start hacking on this project :D. Best regards, Mihai. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Hello from a Newb Here to Help
Original Message From: Lindsey warchan...@yahoo.com To: libreoffice@lists.freedesktop.org Date: Wed, 07 May 2014 18:38:19 -0500 Hi, I know y'all are busy so I'll try to keep this short. I just started using Libre Office and I LOVE it. I want to learn all I can about it but I also hit some snags. I'm not really a dev - so I can't help with coding stuff but I can help with writing documentation, wikis, and anything in that regard. In the past I've found writing about things can go a long way to speed up the learning process. I really want to learn this and I also want to help out as I go. If someone would be so kind as to point me in the right direction, I'd be much obliged. Thank you! Cheers, L. Welcome Lindsey There are many areas of the project you can help with, that don't require developer skills. You have expressed an interest in documentation, so https://www.libreoffice.org/community/docs-team/ might be a good starting point. From the Community side panel on that page there are links to other areas of the project that may be of interest. Subscribing to the documentation mailing list will put you in touch with the Docs team. It is also the place to request an account for the ODF Authors website and access to the wiki. Regards Dave ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/nodedump.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 942156b1ed7d0cd27c18960bf4cf874689e9aa0a Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri May 16 13:45:56 2014 +0200 sw doc model dump: show SdrObject::nOrdNum Change-Id: I4ac2c3d883dd9bb111a2d600f5a17ea96a1e219e diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 31d9821..ab888ad 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -146,6 +146,7 @@ void lcl_dumpSdrModel(WriterHelper writer, const SdrModel* pModel) writer.writeFormatAttribute(name, %s, BAD_CAST(OUStringToOString(pObject-GetName(), RTL_TEXTENCODING_UTF8).getStr())); writer.writeFormatAttribute(title, %s, BAD_CAST(OUStringToOString(pObject-GetTitle(), RTL_TEXTENCODING_UTF8).getStr())); writer.writeFormatAttribute(description, %s, BAD_CAST(OUStringToOString(pObject-GetDescription(), RTL_TEXTENCODING_UTF8).getStr())); +writer.writeFormatAttribute(nOrdNum, TMP_FORMAT, pObject-GetOrdNumDirect()); const OutlinerParaObject* pOutliner = pObject-GetOutlinerParaObject(); writer.startElement(outliner); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Michael Stahl mst...@redhat.com changed: What|Removed |Added Depends on||78782 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit f6f208dd9a4bd62b3b732dc06d35ad082592706f Author: Tor Lillqvist t...@collabora.com Date: Fri May 16 16:14:42 2014 +0300 Add more info about XCODE_DEBUG_INFORMATION_FORMAT Change-Id: I90b1140d9c3f70f01eb673e6d9113593bbe57a09 diff --git a/configure.ac b/configure.ac index 053fc51..b4052c6 100644 --- a/configure.ac +++ b/configure.ac @@ -3979,7 +3979,9 @@ else fi AC_SUBST(ENABLE_SYMBOLS) -# Running dsymutil takes too long +# Debug information format for iOS. Running dsymutil takes a long time... you really need a separate +# .dSYM only if running Instruments, I think. (Not for normal debugging in Xcode.) To enable a +# separate .dSYM, either use --enable-release-build or change manually to DWARF with DSYM in Xcode. XCODE_DEBUG_INFORMATION_FORMAT=dwarf-with-dsym if test $enable_release_build != yes -a \( -n $ENABLE_SYMBOLS -o -n $ENABLE_DEBUG -o -n $ENABLE_DBGUTIL \); then XCODE_DEBUG_INFORMATION_FORMAT=dwarf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
build failure, clock_gettime undefined, linking libavmedialo.so
Zolnai, My build of commit 48eccfb, fetched around 2014-05-16 00:57 UTC, is failing with messages: [build LNK] Library/libavmedialo.so /home/terry/lo_hacking/git/libo2/workdir/LinkTarget/StaticLibrary/libcollada2gltf.a(GLTF-Open3DGC.o): In function `o3dgc::Timer::Tic()': /home/terry/lo_hacking/git/libo2/workdir/UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/inc/o3dgcTimer.h:115: undefined reference to `clock_gettime' /home/terry/lo_hacking/git/libo2/workdir/LinkTarget/StaticLibrary/libcollada2gltf.a(GLTF-Open3DGC.o): In function `o3dgc::Timer::Toc()': /home/terry/lo_hacking/git/libo2/workdir/UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/inc/o3dgcTimer.h:119: undefined reference to `clock_gettime' I notice that the files downloaded by `make fetch` were: collada2gltf-master-6258611a6a.tar.bz2 libpng-1.5.18.tar.gz OpenCOLLADA-master-6509aa13af.tar.bz2 If I am reading things correctly, the first of these was introduced by: commit d575917016f65a7322817a8e13ec25c52d18a600 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Thu Apr 10 13:37:38 2014 +0200 Introduce Collada2gltf external library Change-Id: I157f175ee6ea719e98ba45133f53cb4d2c3045bb Suggestions welcome. Thanks, Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - framework/inc framework/source officecfg/registry sfx2/source
framework/inc/framework/addonmenu.hxx | 15 ++--
framework/source/classes/menumanager.cxx|2
framework/source/dispatch/menudispatcher.cxx|4 -
framework/source/fwe/classes/addonmenu.cxx | 78
framework/source/uielement/menubarmanager.cxx | 10 ---
officecfg/registry/data/org/openoffice/Inet.xcu | 44 -
sfx2/source/menu/virtmenu.cxx | 11 +--
7 files changed, 58 insertions(+), 106 deletions(-)
New commits:
commit 70c4adf42a0d7789abc900a0698a2ff4b5314944
Author: Herbert Dürr h...@apache.org
Date: Fri May 16 12:57:29 2014 +
#i124881# drop ill-reputed euroseek search engine
Found-by: Rainer Bielefeld rainerbielefeld_ooo...@bielefeldundbuss.de
diff --git a/officecfg/registry/data/org/openoffice/Inet.xcu
b/officecfg/registry/data/org/openoffice/Inet.xcu
index 1489697..f779044 100644
--- a/officecfg/registry/data/org/openoffice/Inet.xcu
+++ b/officecfg/registry/data/org/openoffice/Inet.xcu
@@ -91,50 +91,6 @@
/prop
/node
node oor:name=SearchEngines
-node oor:name=Euroseek oor:op=replace
- node oor:name=And
-prop oor:name=ooInetPrefix oor:type=xs:string
-
valuehttp://www.euroseek.com/system/search.cgi?mode=internetamp;string=/value
-/prop
-prop oor:name=ooInetSuffix oor:type=xs:string
- valueamp;language=en/value
-/prop
-prop oor:name=ooInetCaseMatch oor:type=xs:int
- value0/value
-/prop
-prop oor:name=ooInetSeparator oor:type=xs:string
- value+/value
-/prop
- /node
- node oor:name=Exact
-prop oor:name=ooInetPrefix oor:type=xs:string
-
valuehttp://www.euroseek.com/system/search.cgi?mode=internetamp;string=/value
-/prop
-prop oor:name=ooInetSuffix oor:type=xs:string
- valueamp;language=en/value
-/prop
-prop oor:name=ooInetCaseMatch oor:type=xs:int
- value0/value
-/prop
-prop oor:name=ooInetSeparator oor:type=xs:string
- value%20/value
-/prop
- /node
- node oor:name=Or
-prop oor:name=ooInetPrefix oor:type=xs:string
-
valuehttp://www.euroseek.com/system/search.cgi?mode=internetamp;string=/value
-/prop
-prop oor:name=ooInetSuffix oor:type=xs:string
- valueamp;language=en/value
-/prop
-prop oor:name=ooInetCaseMatch oor:type=xs:int
- value0/value
-/prop
-prop oor:name=ooInetSeparator oor:type=xs:string
- value+/value
-/prop
- /node
-/node
node oor:name=Lycos oor:op=replace
node oor:name=And
prop oor:name=ooInetPrefix oor:type=xs:string
commit 2aac0070dbef6c1ad7eeccf7d4015cdcbffe067e
Author: Tsutomu Uchino ha...@apache.org
Date: Fri May 16 12:48:54 2014 +
#i86528# use the module manager to identify the context for addons menu
merging
diff --git a/framework/inc/framework/addonmenu.hxx
b/framework/inc/framework/addonmenu.hxx
index 83b7f2b..6768dc7 100644
--- a/framework/inc/framework/addonmenu.hxx
+++ b/framework/inc/framework/addonmenu.hxx
@@ -30,6 +30,7 @@
#include com/sun/star/frame/XFrame.hpp
#include com/sun/star/beans/PropertyValue.hpp
#include com/sun/star/uno/Sequence.hxx
+#include com/sun/star/lang/XMultiServiceFactory.hpp
//_
// includes of other projects
@@ -92,23 +93,25 @@ class FWE_DLLPUBLIC AddonMenuManager
static sal_Bool IsAddonMenuId( sal_uInt16 nId ) { return (( nId =
ADDONMENU_ITEMID_START ) ( nId ADDONMENU_ITEMID_END )); }
// Check if the context string matches the provided xModel context
-static sal_Bool IsCorrectContext( const
::com::sun::star::uno::Reference ::com::sun::star::frame::XModel rModel,
const rtl::OUString aContext );
+static sal_Bool IsCorrectContext( const ::rtl::OUString
rModuleIdentifier, const rtl::OUString aContext );
// Factory method to create different Add-On menu types
static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const
com::sun::star::uno::Reference com::sun::star::frame::XFrame rFrame );
// Create the Add-Ons menu
-static AddonMenu* CreateAddonMenu( const
::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame rFrame );
+static AddonMenu* CreateAddonMenu( const
::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame rFrame,
+ const
::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory
rServiceManager );
// Merge the Add-Ons help menu items into the given menu bar at a
defined pos
static void MergeAddonHelpMenu( const
com::sun::star::uno::Reference com::sun::star::frame::XFrame rFrame,
-
Re: build failure, clock_gettime undefined, linking libavmedialo.so
On Friday, May 16, 2014 15:00 BST, Terrence Enger ten...@iseries-guru.com wrote: Zolnai, My build of commit 48eccfb, fetched around 2014-05-16 00:57 UTC, is failing with messages: [build LNK] Library/libavmedialo.so /home/terry/lo_hacking/git/libo2/workdir/LinkTarget/StaticLibrary/libcollada2gltf.a(GLTF-Open3DGC.o): In function `o3dgc::Timer::Tic()': /home/terry/lo_hacking/git/libo2/workdir/UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/inc/o3dgcTimer.h:115: undefined reference to `clock_gettime' /home/terry/lo_hacking/git/libo2/workdir/LinkTarget/StaticLibrary/libcollada2gltf.a(GLTF-Open3DGC.o): In function `o3dgc::Timer::Toc()': /home/terry/lo_hacking/git/libo2/workdir/UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/inc/o3dgcTimer.h:119: undefined reference to `clock_gettime' I notice that the files downloaded by `make fetch` were: collada2gltf-master-6258611a6a.tar.bz2 libpng-1.5.18.tar.gz OpenCOLLADA-master-6509aa13af.tar.bz2 If I am reading things correctly, the first of these was introduced by: commit d575917016f65a7322817a8e13ec25c52d18a600 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Thu Apr 10 13:37:38 2014 +0200 Introduce Collada2gltf external library Change-Id: I157f175ee6ea719e98ba45133f53cb4d2c3045bb Suggestions welcome. Hi Terry, I didn't get the same error while building. I google it and find that: http://stackoverflow.com/questions/2418157/ubuntu-linux-c-error-undefined-reference-to-clock-gettime-and-clock-settim It suggests to link -lrt library. So you can try to add these lines: ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,collada2gltf,\ -lrt \ )) endif to the external/collada2gltf/StaticLibrary_collada2gltf.mk file. I hope it helps. Best regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx
include/svx/langbox.hxx | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) New commits: commit 06a45a1a1766f61cd583725c61d685ad4a3f868e Author: Stephan Bergmann sberg...@redhat.com Date: Fri May 16 16:20:56 2014 +0200 loplugin:saloverride Change-Id: I2b6e6a6654e888bec3ba4961f9130ca10b791f87 diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 7bc28f7..a278fac 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -104,17 +104,17 @@ public: virtual ~SvxLanguageBox(); private: -SVX_DLLPRIVATE virtual sal_Int32ImplInsertImgEntry( const OUString rEntry, sal_Int32 nPos, bool bChecked ); -SVX_DLLPRIVATE virtual void ImplRemoveEntryAt( sal_Int32 nPos ); - -SVX_DLLPRIVATE virtual void ImplClear(); -SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString rEntry, sal_Int32 nPos ); -SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ); -SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos() const; -SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) const; -SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ); -SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const; -SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const; +SVX_DLLPRIVATE virtual sal_Int32ImplInsertImgEntry( const OUString rEntry, sal_Int32 nPos, bool bChecked ) SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplRemoveEntryAt( sal_Int32 nPos ) SAL_OVERRIDE; + +SVX_DLLPRIVATE virtual void ImplClear() SAL_OVERRIDE; +SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString rEntry, sal_Int32 nPos ) SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) SAL_OVERRIDE; +SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos() const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) SAL_OVERRIDE; +SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const SAL_OVERRIDE; }; @@ -125,17 +125,17 @@ public: virtual ~SvxLanguageComboBox(); private: -SVX_DLLPRIVATE virtual sal_Int32ImplInsertImgEntry( const OUString rEntry, sal_Int32 nPos, bool bChecked ); -SVX_DLLPRIVATE virtual void ImplRemoveEntryAt( sal_Int32 nPos ); - -SVX_DLLPRIVATE virtual void ImplClear(); -SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString rEntry, sal_Int32 nPos ); -SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ); -SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos() const; -SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) const; -SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ); -SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const; -SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const; +SVX_DLLPRIVATE virtual sal_Int32ImplInsertImgEntry( const OUString rEntry, sal_Int32 nPos, bool bChecked ) SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplRemoveEntryAt( sal_Int32 nPos ) SAL_OVERRIDE; + +SVX_DLLPRIVATE virtual void ImplClear() SAL_OVERRIDE; +SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString rEntry, sal_Int32 nPos ) SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) SAL_OVERRIDE; +SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos() const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) SAL_OVERRIDE; +SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const SAL_OVERRIDE; }; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/svl include/svx sd/source svx/source xmloff/source
include/svl/solar.hrc |2 -
include/svx/unoshprp.hxx |3 +-
sd/source/ui/func/fuinsert.cxx |5 ++-
svx/source/unodraw/unoprov.cxx |1
svx/source/unodraw/unoshap4.cxx|7
xmloff/source/draw/shapeexport.cxx | 55 +++--
xmloff/source/draw/shapeimport.cxx |2 -
xmloff/source/draw/ximpshap.cxx| 13
8 files changed, 74 insertions(+), 14 deletions(-)
New commits:
commit e0d94ef4447734b27d15c50fdcea09d8200b2efe
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri May 16 15:52:35 2014 +0200
3D model insertion UI: add *.dae and *.kmz filters
Change-Id: I20f6bea3b1f5ba03cc461f461458f5460da716c3
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index a8c5eac..cb6c62b 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -777,8 +777,10 @@ void FuInsert3DModel::DoExecute( SfxRequest )
sfx2::FileDialogHelper aDlg(
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
aDlg.SetTitle( Insert 3D Model );
+aDlg.AddFilter( All supported formats, *.json; *.dae; *.kmz );
aDlg.AddFilter( GL Transmission Format, *.json );
-aDlg.AddFilter( All files, *.* );
+aDlg.AddFilter( COLLADA, *.dae );
+aDlg.AddFilter( Keyhole Markup language Zipped, *.kmz );
OUString sURL;
if( aDlg.Execute() == ERRCODE_NONE )
@@ -810,7 +812,6 @@ void FuInsert3DModel::DoExecute( SfxRequest )
aPos.Y() -= aSize.Height() 1;
}
-
mpView-Insert3DModelURL( sURL, nAction, aPos, aSize, false ) ;
if( mpWindow )
commit b862a216f769d10e726ad759762b5e6a412acdaf
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri May 16 15:31:38 2014 +0200
ODF filters: fallback glTF model to bitmap for older versions
Change-Id: I33161401a29f511e61429355dd2905d4643fe8ff
diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc
index 0e7185f..b70cb6e 100644
--- a/include/svl/solar.hrc
+++ b/include/svl/solar.hrc
@@ -23,7 +23,7 @@
// defines --
#define OWN_ATTR_VALUE_START3900
-#define OWN_ATTR_VALUE_END 3992
+#define OWN_ATTR_VALUE_END 3993
#define RID_SFX_START 260
// RID_SFX_END
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 3b263fd..94d358c 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -180,7 +180,8 @@
#define OWN_ATTR_MEDIA_TEMPFILEURL (OWN_ATTR_VALUE_START+90)
#define OWN_ATTR_INTEROPGRABBAG (OWN_ATTR_VALUE_START+91)
#define OWN_ATTR_MEDIA_MIMETYPE (OWN_ATTR_VALUE_START+92)
-// ATTENTION: maximum is OWN_ATTR_VALUE_START+92, see include/svl/solar.hrc
+#define OWN_ATTR_FALLBACK_GRAPHIC (OWN_ATTR_VALUE_START+93)
+// ATTENTION: maximum is OWN_ATTR_VALUE_START+93 svx, see include/svl/solar.hrc
// #FontWork#
#define FONTWORK_PROPERTIES \
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 92bdcfb..ca70ab7 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -733,6 +733,7 @@ SfxItemPropertyMapEntry const *
ImplGetSvxMediaShapePropertyMap()
{OUString(PrivateStream), OWN_ATTR_MEDIA_STREAM,
cppu::UnoTypecss::io::XInputStream::get(),
::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{OUString(PrivateTempFileURL), OWN_ATTR_MEDIA_TEMPFILEURL,
::cppu::UnoTypeOUString::get(),
::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(MediaMimeType), OWN_ATTR_MEDIA_MIMETYPE,
::cppu::UnoTypeOUString::get(), 0, 0},
+{ OUString(FallbackGraphic), OWN_ATTR_FALLBACK_GRAPHIC,
cppu::UnoTypecss::graphic::XGraphic::get(),
::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 35e88a5..16c0329 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -911,7 +911,8 @@ bool SvxMediaShape::getPropertyValueImpl( const OUString
rName, const SfxItemPr
(pProperty-nWID = OWN_ATTR_MEDIA_ZOOM))
|| (pProperty-nWID == OWN_ATTR_MEDIA_STREAM)
|| (pProperty-nWID == OWN_ATTR_MEDIA_TEMPFILEURL)
-|| (pProperty-nWID == OWN_ATTR_MEDIA_MIMETYPE))
+|| (pProperty-nWID == OWN_ATTR_MEDIA_MIMETYPE)
+|| (pProperty-nWID == OWN_ATTR_FALLBACK_GRAPHIC))
{
SdrMediaObj* pMedia = static_cast SdrMediaObj* ( mpObj.get() );
const ::avmedia::MediaItem aItem( pMedia-getMediaProperties() );
@@ -950,6 +951,10 @@ bool SvxMediaShape::getPropertyValueImpl( const OUString
rName, const SfxItemPr
rValue = aItem.getMimeType();
break;
+case
[Libreoffice-commits] core.git: unotools/source
unotools/source/ucbhelper/tempfile.cxx | 82 -
1 file changed, 80 insertions(+), 2 deletions(-)
New commits:
commit 45e8fd5fcc71219d7564b475a3fec3d4536f70aa
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri May 16 16:31:26 2014 +0200
For now, reintroduce the horrible static counter into utl::TempFile
...i.e., bug fdo#41295 and its fix rediscovered.
Change-Id: If958fad74c853f51660a9e0bfffd99969052ea80
diff --git a/unotools/source/ucbhelper/tempfile.cxx
b/unotools/source/ucbhelper/tempfile.cxx
index 3d5814f..9fb5d25 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -237,6 +237,84 @@ OUString lcl_createName(
}
}
+OUString lcl_createName_BROKEN(
+const OUString rLeadingChars, sal_Int16 nRadix,
+bool bFirst, const OUString* pExtension, const OUString* pParent,
+bool bDirectory, bool bKeep, bool bLock)
+{
+// 36 ** 6 == 2176782336
+unsigned long const nMaxRadix = 36;
+unsigned long const nMax =
(nMaxRadix*nMaxRadix*nMaxRadix*nMaxRadix*nMaxRadix*nMaxRadix);
+static unsigned long nSeed = Time::GetSystemTicks() % nMax;
+
+// get correct directory
+OUString aName = ConstructTempDir_Impl( pParent );
+
+bool bUseNumber = bFirst;
+// now use special naming scheme ( name takes leading chars and an index
counting up from zero
+aName += rLeadingChars;
+for ( unsigned long i=nSeed;; )
+{
+OUString aTmp( aName );
+if ( bUseNumber )
+aTmp += OUString::number(nSeed, nRadix);
+bUseNumber = true;
+if ( pExtension )
+aTmp += *pExtension;
+else
+aTmp += .tmp;
+if ( bDirectory )
+{
+FileBase::RC err = Directory::create( aTmp );
+if ( err == FileBase::E_None )
+{
+// !bKeep: only for creating a name, not a file or directory
+if ( bKeep || Directory::remove( aTmp ) == FileBase::E_None )
+return aTmp;
+else
+return OUString();
+}
+else if ( err != FileBase::E_EXIST )
+// if f.e. name contains invalid chars stop trying to create
dirs
+return OUString();
+}
+else
+{
+DBG_ASSERT( bKeep, Too expensive, use directory for creating
name! );
+File aFile( aTmp );
+#ifdef UNX
+/* RW permission for the user only! */
+mode_t old_mode = umask(077);
+#endif
+FileBase::RC err = aFile.open(osl_File_OpenFlag_Create | (bLock ?
0 : osl_File_OpenFlag_NoLock));
+#ifdef UNX
+umask(old_mode);
+#endif
+if ( err == FileBase::E_None || (bLock err ==
FileBase::E_NOLCK) )
+{
+aFile.close();
+return aTmp;
+}
+else if ( err != FileBase::E_EXIST )
+{
+// if f.e. name contains invalid chars stop trying to create
dirs
+// but if there is a folder with such name proceed further
+
+DirectoryItem aTmpItem;
+FileStatus aTmpStatus( osl_FileStatus_Mask_Type );
+if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None
+ || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None
+ || aTmpStatus.getFileType() != FileStatus::Directory )
+return OUString();
+}
+}
+nSeed = (nSeed + 1) % nMax;
+if (i == nSeed) {
+return OUString();
+}
+}
+}
+
OUString CreateTempName_Impl( const OUString* pParent, bool bKeep, bool bDir =
true )
{
OUString aEyeCatcher = lu;
@@ -249,8 +327,8 @@ OUString CreateTempName_Impl( const OUString* pParent, bool
bKeep, bool bDir = t
}
#endif
#endif
-return lcl_createName(
-aEyeCatcher, Time::GetSystemTicks(), 36, true, 0, pParent, bDir, bKeep,
+return lcl_createName_BROKEN(
+aEyeCatcher, 36, true, 0, pParent, bDir, bKeep,
false);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/subsequent_export-test.cxx | 131 +-
sc/source/filter/xml/xmlexprt.cxx | 39 +-
2 files changed, 149 insertions(+), 21 deletions(-)
New commits:
commit fcf5b5c081ded93b12dd888236d0a860b7693ed1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri May 16 10:45:40 2014 -0400
fdo#75056: Overline attribute needs special treatment as well.
Also fix the export of underline types as well. It was always saved
as a single line.
Change-Id: I88cb0f3702a6afc14544ecbce8f200b5422fd78f
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 737a881..d61496e 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1171,6 +1171,10 @@ const SvxFieldData* toXMLPropertyStates(
if (nIndexWidth == -1 || nIndexWidth nEntryCount)
break;
+sal_Int32 nIndexType =
xMapper-GetEntryIndex(XML_NAMESPACE_STYLE, text-underline-type, 0);
+if (nIndexType == -1 || nIndexType nEntryCount)
+break;
+
sal_Int32 nIndexColor =
xMapper-FindEntryIndex(CharUnderlineColor, XML_NAMESPACE_STYLE,
text-underline-color);
if (nIndexColor == -1 || nIndexColor nEntryCount)
break;
@@ -1182,6 +1186,7 @@ const SvxFieldData* toXMLPropertyStates(
const SvxUnderlineItem* pUL = static_castconst
SvxUnderlineItem*(p);
pUL-QueryValue(aAny, MID_TL_STYLE);
rPropStates.push_back(XMLPropertyState(nIndexStyle, aAny));
+rPropStates.push_back(XMLPropertyState(nIndexType, aAny));
rPropStates.push_back(XMLPropertyState(nIndexWidth, aAny));
pUL-QueryValue(aAny, MID_TL_COLOR);
@@ -1193,10 +1198,38 @@ const SvxFieldData* toXMLPropertyStates(
break;
case EE_CHAR_OVERLINE:
{
-if (!static_castconst SvxOverlineItem*(p)-QueryValue(aAny,
pEntry-mnFlag))
-continue;
+// Same with overline. Do just as we do with underline
attributes.
+sal_Int32 nIndexStyle =
xMapper-GetEntryIndex(XML_NAMESPACE_STYLE, text-overline-style, 0);
+if (nIndexStyle == -1 || nIndexStyle nEntryCount)
+break;
-rPropStates.push_back(XMLPropertyState(nIndex, aAny));
+sal_Int32 nIndexWidth =
xMapper-GetEntryIndex(XML_NAMESPACE_STYLE, text-overline-width, 0);
+if (nIndexWidth == -1 || nIndexWidth nEntryCount)
+break;
+
+sal_Int32 nIndexType =
xMapper-GetEntryIndex(XML_NAMESPACE_STYLE, text-overline-type, 0);
+if (nIndexType == -1 || nIndexType nEntryCount)
+break;
+
+sal_Int32 nIndexColor =
xMapper-FindEntryIndex(CharOverlineColor, XML_NAMESPACE_STYLE,
text-overline-color);
+if (nIndexColor == -1 || nIndexColor nEntryCount)
+break;
+
+sal_Int32 nIndexHasColor =
xMapper-FindEntryIndex(CharOverlineHasColor, XML_NAMESPACE_STYLE,
text-overline-color);
+if (nIndexHasColor == -1 || nIndexHasColor nEntryCount)
+break;
+
+const SvxOverlineItem* pOL = static_castconst
SvxOverlineItem*(p);
+pOL-QueryValue(aAny, MID_TL_STYLE);
+rPropStates.push_back(XMLPropertyState(nIndexStyle, aAny));
+rPropStates.push_back(XMLPropertyState(nIndexType, aAny));
+rPropStates.push_back(XMLPropertyState(nIndexWidth, aAny));
+
+pOL-QueryValue(aAny, MID_TL_COLOR);
+rPropStates.push_back(XMLPropertyState(nIndexColor, aAny));
+
+pOL-QueryValue(aAny, MID_TL_HASCOLOR);
+rPropStates.push_back(XMLPropertyState(nIndexHasColor, aAny));
}
break;
case EE_CHAR_COLOR:
commit 5c0b8937f4f41ed1e4a01151bc96113f65c2770c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri May 16 10:45:09 2014 -0400
fdo#75056: Write test for this.
Change-Id: I716467ffe81a1f71f03e0dc7a17c33b2ed39d334
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index ab25140..2e36357 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -45,6 +45,7 @@
#include editeng/crossedoutitem.hxx
#include editeng/borderline.hxx
#include editeng/fontitem.hxx
+#include editeng/udlnitem.hxx
#include formula/grammar.hxx
#include com/sun/star/table/BorderLineStyle.hpp
@@ -437,6 +438,20 @@ void setAttribute( ScFieldEditEngine rEE, sal_Int32
nPara, sal_Int32 nStart, sa
rEE.QuickSetAttribs(aItemSet, aSel);
}
break;
+case EE_CHAR_OVERLINE:
+{
+SvxOverlineItem
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/inline-groupshape.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |6 ++
writerfilter/source/dmapper/GraphicImport.cxx|4
3 files changed, 10 insertions(+)
New commits:
commit e25bdf7f602ce7d3d941c07b8c1cf5740e2b0a85
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri May 16 15:57:09 2014 +0200
DOCX import: make sure inline shapes are not in the background
Change-Id: I80d684662ac3f94bff4448fcdae94f9e69fd1590
diff --git a/sw/qa/extras/ooxmlimport/data/inline-groupshape.docx
b/sw/qa/extras/ooxmlimport/data/inline-groupshape.docx
new file mode 100644
index 000..def5a05
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/inline-groupshape.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 5c08d7a..3e2f2ac 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2120,6 +2120,12 @@ DECLARE_OOXMLIMPORT_TEST(testChartSize,
chart-size.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(6008),
getPropertysal_Int32(xEmbeddedObjects-getByIndex(0), Width));
}
+DECLARE_OOXMLIMPORT_TEST(testInlineGroupshape, inline-groupshape.docx)
+{
+// Inline groupshape was in the background, so it was hidden sometimes by
other shapes.
+CPPUNIT_ASSERT_EQUAL(true, getPropertybool(getShape(1), Opaque));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 59f27fc..1d19df0 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -723,6 +723,10 @@ void GraphicImport::lcl_attribute(Id nName, Value rValue)
uno::makeAny
(text::TextContentAnchorType_AS_CHARACTER));
+// In Word, if a shape is anchored inline, that
+// excludes being in the background.
+xShapeProps-setPropertyValue(Opaque,
uno::makeAny(true));
+
uno::Referencelang::XServiceInfo
xServiceInfo(m_xShape, uno::UNO_QUERY_THROW);
// TextFrames can't be rotated. But for anything else,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/tbsdy/svdemo'
New branch 'private/tbsdy/svdemo' available with the following commits: commit eeeccdb3ede35c66dde41952196c2a9f3a285c9a Author: Chris Sherlock chris.sherloc...@gmail.com Date: Sat May 17 00:39:58 2014 +1000 vcl: fixup svdemo Change-Id: Ifb7cc12da349fcbcd1d3dc25b64cd2bf3fd7e819 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .git-hooks/pre-commit
.git-hooks/pre-commit | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit 66fce1f61e7e088bd92e19ecb0dd94553de6f824
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri May 16 16:47:29 2014 +0200
git pre-commit hook: block large files
Change-Id: Id27cfa805fc7cd0f4f6cc3d8bb770aa7abd536e1
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
index fdd07ad..6933198 100755
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@@ -131,6 +131,20 @@ EOM
exit( 1 );
}
+# Block large files.
+open( FILES, git diff --cached --name-only --diff-filter=A -z $against | )
|| die Cannot run git diff-index.;
+while (FILES)
+{
+my $size = `git cat-file -s :$_`;
+# For now let's say large is 500KB
+my $limit = 500;
+if ($size $limit * 1024)
+{
+print Error: Attempt to add a large file: $_, pleasy try to fit into
$limit KB.\n;
+exit( 1 );
+}
+}
+
# fix whitespace in code
check_whitespaces( $against);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of the ESC call ...
On Thu, May 15, 2014 at 06:21:19PM +0200, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: * unit test documents bloating up git repo: (Michael) + might be mine (Miklos) + automated task? + test fail on too big file? + these docs are not commited with evil intend, they are sneaking in (Bjoern) + test failure on big docs might hurt local testing (Bjoern) + git-hook would prevent pushing unsuited docs though (Bjoern) + even easier (Miklos) + gerrit doesnt show how big a binary is (mst) + git hook would handle that too (Norbert) + people would evade that (Norbert) + external repo? (Norbert) + raising awareness should be enough for now (Bjoern) AI: + update git hook (Miklos) Done as http://cgit.freedesktop.org/libreoffice/core/commit/?id=66fce1f61e7e088bd92e19ecb0dd94553de6f824. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/tbsdy/svdemo' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/shape.cxx | 26 ++ 1 file changed, 10 insertions(+), 16 deletions(-) New commits: commit 633003965a4be0c535b43cc3072c5c4a95109d34 Author: Tor Lillqvist t...@collabora.com Date: Fri May 16 16:43:25 2014 +0300 Use SVM (metafile) instead of PNG for diagrams (SmartArt) It seemed a bit pointless to waste CPU cycles on PNG-compressing a bitmap image only to later then uncompress it anyway. vcl's PNG writing code showed up as 13% on the time profile of TiledLibreOffice when displaying a document full of SmartArts. Miklos suggested I try using SVM (which I guess means StarView Metafile) instead. When using SVM, no rendering of diagrams to bitmaps during loading is done, but the diagram stays stored in a resolution-independent (vector-ish) form. Which means it will be rendered nicely and crisply regardless of the zoom level. At least, that is my understanding, and experimentation (on OS X and Linux) seems to confirm. ce8c0ff07559ddcc729bffd7a68f4c6f281882e3 Change-Id: Ice8c0ff07559ddcc729bffd7a68f4c6f281882e3 diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index b319c38..33c846c 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1088,7 +1088,7 @@ Reference XShape Shape::renderDiagramToGraphic( XmlFilterBase rFilterBase ) Reference io::XOutputStream xOutputStream( xStream-getOutputStream() ); // Rendering format -OUString sFormat( PNG ); +OUString sFormat( SVM ); // Size of the rendering awt::Size aActualSize = mxShape-getSize(); @@ -1097,21 +1097,15 @@ Reference XShape Shape::renderDiagramToGraphic( XmlFilterBase rFilterBase ) awt::Size aSize = awt::Size( static_cast sal_Int32 ( ( fPixelsPer100thmm * aActualSize.Width ) + 0.5 ), static_cast sal_Int32 ( ( fPixelsPer100thmm * aActualSize.Height ) + 0.5 ) ); -Sequence PropertyValue aFilterData( 7 ); -aFilterData[ 0 ].Name = Compression; -aFilterData[ 0 ].Value = static_cast sal_Int32 ( 9 ); -aFilterData[ 1 ].Name = Interlaced; -aFilterData[ 1 ].Value = static_cast sal_Int32 ( 1 ); -aFilterData[ 2 ].Name = Translucent; -aFilterData[ 2 ].Value = static_cast sal_Int32 ( 1 ); -aFilterData[ 3 ].Name = PixelWidth; -aFilterData[ 3 ].Value = aSize.Width; -aFilterData[ 4 ].Name = PixelHeight; -aFilterData[ 4 ].Value = aSize.Height; -aFilterData[ 5 ].Name = LogicalWidth; -aFilterData[ 5 ].Value = aActualSize.Width; -aFilterData[ 6 ].Name = LogicalHeight; -aFilterData[ 6 ].Value = aActualSize.Height; +Sequence PropertyValue aFilterData( 4 ); +aFilterData[ 0 ].Name = PixelWidth; +aFilterData[ 0 ].Value = aSize.Width; +aFilterData[ 1 ].Name = PixelHeight; +aFilterData[ 1 ].Value = aSize.Height; +aFilterData[ 2 ].Name = LogicalWidth; +aFilterData[ 2 ].Value = aActualSize.Width; +aFilterData[ 3 ].Name = LogicalHeight; +aFilterData[ 3 ].Value = aActualSize.Height; Sequence PropertyValue aDescriptor( 3 ); aDescriptor[ 0 ].Name = OutputStream; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/tbsdy/svdemo'
New branch 'private/tbsdy/svdemo' available with the following commits: commit e5c92b9b411a06e101e9d6261c7da938c329d90f Author: Chris Sherlock chris.sherloc...@gmail.com Date: Sat May 17 01:08:41 2014 +1000 Add executable script Change-Id: Id681478de0e2b116d9d1ac3e936f4b48b348c240 commit f47573bf1bb8ce619f569dd577b6c178333cf485 Author: Chris Sherlock chris.sherloc...@gmail.com Date: Sat May 17 00:39:58 2014 +1000 vcl: fixup svdemo Change-Id: Ifb7cc12da349fcbcd1d3dc25b64cd2bf3fd7e819 ___ 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' - sc/source
sc/source/core/data/conditio.cxx | 37 +
1 file changed, 37 insertions(+)
New commits:
commit 5b76a0057a25966f48caed78bcff21b72fdbdda2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 13 22:46:17 2014 -0400
fdo#76710: Adjust sheet position of conditional format entries.
When inserting or deleting sheets.
Change-Id: Ibf898350e22f092ec38b75ad98957832a5580e6a
(cherry picked from commit 146f6e7e68ea56f79b72047b97bd9fba66db499d)
Reviewed-on: https://gerrit.libreoffice.org/9350
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 5e8e549..602446c 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -2004,12 +2004,49 @@ void ScConditionalFormat::InsertCol(SCTAB nTab, SCROW
nRowStart, SCROW nRowEnd,
void ScConditionalFormat::UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt
)
{
+for (size_t i = 0, n = maRanges.size(); i n; ++i)
+{
+// We assume that the start and end sheet indices are equal.
+ScRange* pRange = maRanges[i];
+SCTAB nTab = pRange-aStart.Tab();
+
+if (nTab rCxt.mnInsertPos)
+// Unaffected.
+continue;
+
+pRange-aStart.IncTab(rCxt.mnSheets);
+pRange-aEnd.IncTab(rCxt.mnSheets);
+}
+
for (CondFormatContainer::iterator it = maEntries.begin(); it !=
maEntries.end(); ++it)
it-UpdateInsertTab(rCxt);
}
void ScConditionalFormat::UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt
)
{
+for (size_t i = 0, n = maRanges.size(); i n; ++i)
+{
+// We assume that the start and end sheet indices are equal.
+ScRange* pRange = maRanges[i];
+SCTAB nTab = pRange-aStart.Tab();
+
+if (nTab rCxt.mnDeletePos)
+// Left of the deleted sheet(s). Unaffected.
+continue;
+
+if (nTab = rCxt.mnDeletePos+rCxt.mnSheets-1)
+{
+// On the deleted sheet(s).
+pRange-aStart.SetTab(-1);
+pRange-aEnd.SetTab(-1);
+continue;
+}
+
+// Right of the deleted sheet(s). Adjust the sheet indices.
+pRange-aStart.IncTab(-1*rCxt.mnSheets);
+pRange-aEnd.IncTab(-1*rCxt.mnSheets);
+}
+
for (CondFormatContainer::iterator it = maEntries.begin(); it !=
maEntries.end(); ++it)
it-UpdateDeleteTab(rCxt);
}
___
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' - sc/source
sc/source/filter/xml/xmlexprt.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 181084cb110fefb13200d8a645bca9857964f378
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 15 20:32:05 2014 -0400
fdo#77537: Exporting font names in edit text needs special handling.
Change-Id: Ia9c29d37eaf962e0245920e50f534dd779af72dc
(cherry picked from commit 48eccfb812284f43ba24c3be3903537ce954944d)
Reviewed-on: https://gerrit.libreoffice.org/9366
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 0f157a1..f7c6787 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1109,10 +1109,18 @@ const SvxFieldData* toXMLPropertyStates(
case EE_CHAR_FONTINFO_CJK:
case EE_CHAR_FONTINFO_CTL:
{
-if (!static_castconst SvxFontItem*(p)-QueryValue(aAny,
pEntry-mnFlag))
-continue;
+// Apparently font info needs special handling.
+const SvxFontItem* pItem = static_castconst SvxFontItem*(p);
-rPropStates.push_back(XMLPropertyState(nIndex, aAny));
+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));
}
break;
case EE_CHAR_WEIGHT:
___
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 76710, which changed state. Bug 76710 Summary: FILESAVE: CONDITIONAL FORMATTING is lost after deleting sheet and saving to ODS. https://bugs.freedesktop.org/show_bug.cgi?id=76710 What|Removed |Added Status|ASSIGNED|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: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/xml/xmlexprt.cxx | 39 +++---
1 file changed, 36 insertions(+), 3 deletions(-)
New commits:
commit e373ca05c6d332d139d5a7553faf15d1d0c8cdeb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri May 16 10:45:40 2014 -0400
fdo#75056: Overline attribute needs special treatment as well.
Also fix the export of underline types as well. It was always saved
as a single line.
(cherry picked from commit fcf5b5c081ded93b12dd888236d0a860b7693ed1)
Change-Id: I88cb0f3702a6afc14544ecbce8f200b5422fd78f
Signed-off-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index f7c6787..885b5bc 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1164,6 +1164,10 @@ const SvxFieldData* toXMLPropertyStates(
if (nIndexWidth == -1 || nIndexWidth nEntryCount)
break;
+sal_Int32 nIndexType =
xMapper-GetEntryIndex(XML_NAMESPACE_STYLE, text-underline-type, 0);
+if (nIndexType == -1 || nIndexType nEntryCount)
+break;
+
sal_Int32 nIndexColor =
xMapper-FindEntryIndex(CharUnderlineColor, XML_NAMESPACE_STYLE,
text-underline-color);
if (nIndexColor == -1 || nIndexColor nEntryCount)
break;
@@ -1175,6 +1179,7 @@ const SvxFieldData* toXMLPropertyStates(
const SvxUnderlineItem* pUL = static_castconst
SvxUnderlineItem*(p);
pUL-QueryValue(aAny, MID_TL_STYLE);
rPropStates.push_back(XMLPropertyState(nIndexStyle, aAny));
+rPropStates.push_back(XMLPropertyState(nIndexType, aAny));
rPropStates.push_back(XMLPropertyState(nIndexWidth, aAny));
pUL-QueryValue(aAny, MID_TL_COLOR);
@@ -1186,10 +1191,38 @@ const SvxFieldData* toXMLPropertyStates(
break;
case EE_CHAR_OVERLINE:
{
-if (!static_castconst SvxOverlineItem*(p)-QueryValue(aAny,
pEntry-mnFlag))
-continue;
+// Same with overline. Do just as we do with underline
attributes.
+sal_Int32 nIndexStyle =
xMapper-GetEntryIndex(XML_NAMESPACE_STYLE, text-overline-style, 0);
+if (nIndexStyle == -1 || nIndexStyle nEntryCount)
+break;
-rPropStates.push_back(XMLPropertyState(nIndex, aAny));
+sal_Int32 nIndexWidth =
xMapper-GetEntryIndex(XML_NAMESPACE_STYLE, text-overline-width, 0);
+if (nIndexWidth == -1 || nIndexWidth nEntryCount)
+break;
+
+sal_Int32 nIndexType =
xMapper-GetEntryIndex(XML_NAMESPACE_STYLE, text-overline-type, 0);
+if (nIndexType == -1 || nIndexType nEntryCount)
+break;
+
+sal_Int32 nIndexColor =
xMapper-FindEntryIndex(CharOverlineColor, XML_NAMESPACE_STYLE,
text-overline-color);
+if (nIndexColor == -1 || nIndexColor nEntryCount)
+break;
+
+sal_Int32 nIndexHasColor =
xMapper-FindEntryIndex(CharOverlineHasColor, XML_NAMESPACE_STYLE,
text-overline-color);
+if (nIndexHasColor == -1 || nIndexHasColor nEntryCount)
+break;
+
+const SvxOverlineItem* pOL = static_castconst
SvxOverlineItem*(p);
+pOL-QueryValue(aAny, MID_TL_STYLE);
+rPropStates.push_back(XMLPropertyState(nIndexStyle, aAny));
+rPropStates.push_back(XMLPropertyState(nIndexType, aAny));
+rPropStates.push_back(XMLPropertyState(nIndexWidth, aAny));
+
+pOL-QueryValue(aAny, MID_TL_COLOR);
+rPropStates.push_back(XMLPropertyState(nIndexColor, aAny));
+
+pOL-QueryValue(aAny, MID_TL_HASCOLOR);
+rPropStates.push_back(XMLPropertyState(nIndexHasColor, aAny));
}
break;
case EE_CHAR_COLOR:
___
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 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||78784 -- 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 #139 from Joel Madero jmadero@gmail.com --- Added bug 78784 - Editing a simple draw object within writer and going to format-layer results in total crash. The bug has been around since the branch point (confirmed on 3.3.0.4) but none the less, nasty enough that I thought it belonged on the list. Thanks! -- 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: 8 commits - sdext/source sd/source svtools/source sw/source vcl/source
sd/source/ui/func/fuexpand.cxx |4 +---
sd/source/ui/view/outlnvsh.cxx |1 -
sdext/source/pdfimport/pdfparse/pdfentries.cxx |2 +-
svtools/source/filter/SvFilterOptionsDialog.cxx |4 +---
sw/source/core/docnode/nodes.cxx|2 --
sw/source/filter/writer/writer.cxx |2 +-
vcl/source/fontsubset/cff.cxx | 13 ++---
vcl/source/gdi/bitmap4.cxx |2 +-
8 files changed, 7 insertions(+), 23 deletions(-)
New commits:
commit 4a9a10d169653e42028d32ee8e260692ead8cc36
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 13:30:38 2014 +0100
coverity#708868 Unused pointer value
Change-Id: I5d25f7de37df6fe79bb195e1cb68876fb3b4fcca
diff --git a/sw/source/filter/writer/writer.cxx
b/sw/source/filter/writer/writer.cxx
index e1c9ced..4d8255b 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -198,7 +198,7 @@ Writer::NewSwPaM(SwDoc rDoc, sal_uLong const nStartIdx,
sal_uLong const nEndId
SwNodeIndex aStt( *pNds, nStartIdx );
SwCntntNode* pCNode = aStt.GetNode().GetCntntNode();
-if( !pCNode 0 == ( pCNode = pNds-GoNext( aStt )) )
+if( !pCNode 0 == pNds-GoNext( aStt ) )
{
OSL_FAIL( No more ContentNode at StartPos );
}
commit 87ad02d5ad4e192fb9723830169f6ce0736ac2c3
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 13:28:33 2014 +0100
coverity#708847 Unused pointer value
Change-Id: Id16ebc576834e418a3bf2d3d6eb3e2545e0aac2b
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index c8cc236..8282706 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1586,8 +1586,6 @@ void SwNodes::MoveRange( SwPaM rPam, SwPosition rPos,
SwNodes rNodes )
pDestNd-SplitCntntNode( rPos );
}
-pDestNd = rPos.nNode.GetNode().GetTxtNode();
-
if ( bCorrEnd )
{
aEndIdx--;
commit e772a97e1b21ac67fa226578a52855b9d60fde94
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 13:25:23 2014 +0100
coverity#708815 Unused pointer value
Change-Id: Ie58034f0475dc9a876eeb54f3bc6a3c415c3e0a1
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 515e013..fcfb881 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1814,7 +1814,6 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage*
pPage, Paragraph* pPara )
if( nParasInLayout )
{
// create an OutlinerParaObject
-pPara = pOutliner-GetParagraph( nTitlePara + 1 );
pOPO = pOutliner-CreateParaObject( nTitlePara + 1, nParasInLayout );
}
commit 65219ed0566e987651d3fc16d16f5b40dec418cd
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 13:23:39 2014 +0100
coverity#708811 Unused pointer value
Change-Id: I18ed52cc6c00c5c462629c4fff7804ea22035e3a
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 95299d9..4ab706d 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -212,9 +212,7 @@ void FuExpandPage::DoExecute( SfxRequest )
if (pOutlineObj)
{
// create structuring text objects
-pPara = pOutl-GetParagraph( ++nParaPos );
-
-OutlinerParaObject* pOPO = pOutl-CreateParaObject(
nParaPos, nChildCount);
+OutlinerParaObject* pOPO =
pOutl-CreateParaObject(++nParaPos, nChildCount);
SdrOutliner* pTempOutl = SdrMakeOutliner(
OUTLINERMODE_OUTLINEOBJECT, mpDoc );
pTempOutl-SetText( *pOPO );
commit 0ff4909a55158cb9607986c88c44722ac2291632
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 12:20:59 2014 +0100
coverity#984442 Use after free
Change-Id: I28822f6b74cbf8ace8f7a194248840cb401679be
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 540885e..8d54a9e 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -879,9 +879,9 @@ bool PDFObject::emit( EmitContext rWriteContext ) const
bRet = rWriteContext.write( pOutBytes, nOutBytes );
if( bRet )
bRet = rWriteContext.write( \nendstream\nendobj\n, 18 );
-rtl_freeMemory( pStream );
if( pOutBytes != (sal_uInt8*)pStream )
rtl_freeMemory( pOutBytes );
+rtl_freeMemory( pStream );
if( pEData )
pEData-setDecryptObject( 0, 0 );
return bRet;
commit cb6464fd73bc74af4952cf4dc39ffe6cb55a117f
Author: Caolán McNamara
Re: Access2Base - New release
On Fri, May 16, 2014 at 11:30:15AM +0200, Jean-Pierre Ledure wrote:
On 15/05/2014 12:30, Lionel Elie Mamane wrote:
one might hope that when loading the library, one source is
always preferred over the other.
After a test the behaviour of LibreOffice is found sane: when installing an
extension with the same name as a pre-installed one, the extension gets
INSTALLED but cannot be ENABLED.
So the pre-existing one keeps the precedence.
I took a deeper look at it; actually, the problem is different. A
user-installed extension *is* allowed to override a Basic script (or
dialog) library from a *bundled* *extension*, or from a *system*
(installed as for all users) extension. *But* not to override a
script (or dialog) library that forms an integral part of
LibreOffice. And access2base is (in LibreOffice 4.2) not a bundled
extension, but a standard part of LibreOffice.
The code that enforces that is:
desktop/source/deployment/registry/script/dp_script.cxx around line 350:
if
(sOriginalUrl.match(vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE)
||
sOriginalUrl.match(vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE)
||
sOriginalUrl.match(vnd.sun.star.expand:$BUNDLED_EXTENSIONS))
{
xScriptLibs-removeLibrary(rName);
bCanAdd = true;
}
else
{
bCanAdd = false;
}
However, if I direct the code flow into the if branch anyway with gdb,
then everything goes well, the built-in access2base is disabled and
the one from the user-installed extension takes over.
So, the question is why does this code enforce this condition, and
can we change it? Can we just remove the condition altogether, or
should we add this case:
|| sOriginalUrl.match($(INST))
Noel? Uray? You are our Basic FindTheExperts. What's your opinion on
this?
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/Application.xba | 43 + wizards/source/access2base/Collect.xba | 11 --- wizards/source/access2base/Form.xba| 14 - 3 files changed, 38 insertions(+), 30 deletions(-) New commits: commit 6e60f1a69c87f5c443014f14027cca77a719586a Author: Jean-Pierre Ledure j...@ledure.be Date: Fri May 16 14:55:36 2014 +0200 Access2Base - solve compatibility issues 1) AOO LO Append is a reserved word in AOO Basic, not in LO = Append method replaced with Add 2) Windows Linux ActiveConnection not ready under Windows for standalone forms when database is (user/password) protected = Connection may be postponed to first use of form Change-Id: I8ba409191ba2a2a4c057480ec3287d7d48262073 Reviewed-on: https://gerrit.libreoffice.org/9372 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba index 9de68cd..1350464 100644 --- a/wizards/source/access2base/Application.xba +++ b/wizards/source/access2base/Application.xba @@ -750,7 +750,7 @@ Dim vCurrentDoc() As Variant Dim oBaseContext As Object, sDbNames() As String, oBaseSource As Object Dim sDatabaseURL As String, oHandler As Object Dim vDbContainer As Variant, vDbContainers() As Variant, vDocContainer As Variant -Dim sFormName As String, oConnection As Object +Dim sFormName As String If IsEmpty(_A2B_) Then Call Application._RootInit() apos; First use of Access2Base in current AOO/LibO session Set OpenConnection = Nothing @@ -844,29 +844,26 @@ Const cstThisSub = quot;OpenConnectionquot; For i = 0 To oForms.Count - 1 vDbContainer = New DbContainer apos; To make distinct entries !! sFormName = oForms.ElementNames(i) - Set oConnection = oForms.getByName(sFormName).ActiveConnection - If IsNull(oConnection) Then - Set vDbContainer.Database = Nothing apos; Form is not data-aware - Else - Set vDbContainer.Database = New Database - Set vDbContainer.Database._This = vDbContainer.Database - With vDbContainer.Database - .FormName = sFormName - vDbContainer.FormName = sFormName - Set .Form = oForms.getByName(sFormName) - Set .Connection = oConnection - Set .MetaData = oConnection.MetaData - ._ReadOnly = oConnection.isReadOnly() - Set .Document = oComponent - .Title = oComponent.Title - .URL = .Form.DataSourceName - ._DbConnect = DBCONNECTFORM - Set vDbContainers(i) = vDbContainer - vDbContainers(i).FormName = sFormName + Set vDbContainer.Database = New Database + Set vDbContainer.Database._This = vDbContainer.Database + With vDbContainer.Database + .FormName = sFormName + vDbContainer.FormName = sFormName + Set .Form = oForms.getByName(sFormName) + Set .Connection = .Form.ActiveConnectionapos; Might be Nothing in Windows at AOO/LO startup (not met in Linux) + If Not IsNull(.Connection) Then + Set .MetaData = .Connection.MetaData + ._ReadOnly = .Connection.isReadOnly() TraceLog(TRACEANY, .MetaData.getDatabaseProductName() amp; quot; quot; amp; .MetaData.getDatabaseProductVersion, False) - TraceLog(TRACEANY, UCase(cstThisSub) amp; quot; quot; amp; .URL amp; quot; Form=quot; amp; vDbContainer.FormName, False) - End With - End If + End If + Set .Document = oComponent + .Title = oComponent.Title +
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/DoCmd.xba |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 980f6b505844ffa29d3b78e0abeeb781ed12d57d Author: Jean-Pierre Ledure j...@ledure.be Date: Fri May 16 15:05:49 2014 +0200 Access2Base typo Change-Id: Id5161f2b8e8132c2a8b68073b233137db3fe74b1 Reviewed-on: https://gerrit.libreoffice.org/9373 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba index b3098a1..22e3ef7 100644 --- a/wizards/source/access2base/DoCmd.xba +++ b/wizards/source/access2base/DoCmd.xba @@ -989,7 +989,7 @@ Dim sFilter As String, oForm As Object, oFormsCollection As Object With ofForm Select Case pvDataMode Case acFormAdd - .setAllowAdditions = True + .AllowAdditions = True .AllowDeletions = False .AllowEdits = False Case acFormEdit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/DoCmd.xba |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b9f6c3f9ed96a13c6c25d4002bd593bdbde6fd70 Author: Jean-Pierre Ledure j...@ledure.be Date: Fri May 16 17:34:52 2014 +0200 Access2Base - Correct error message for some actions Change-Id: I8b49886c3b9a884ffc8e68c7483be8f940c3449e Reviewed-on: https://gerrit.libreoffice.org/9376 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba index 22e3ef7..2ece700 100644 --- a/wizards/source/access2base/DoCmd.xba +++ b/wizards/source/access2base/DoCmd.xba @@ -1020,7 +1020,7 @@ Error_Function: Set OpenForm = Nothing GoTo Exit_Function Error_NotApplicable: - TraceError(TRACEFATAL, ERRMETHOD, Utils._CalledSub(), 0, 1, cstThisSub) + TraceError(TRACEFATAL, ERRACTION, Utils._CalledSub(), 0, 1) Goto Exit_Function Trace_Error: TraceError(TRACEFATAL, ERROPENFORM, Utils._CalledSub(), 0, , pvFormName) @@ -1925,7 +1925,7 @@ Trace_Error: TraceError(TRACEFATAL, ERROPENOBJECT, Utils._CalledSub(), 0, , Array(_GetLabel(psObjectType), pvObjectName)) Goto Exit_Function Error_NotApplicable: - TraceError(TRACEFATAL, ERRMETHOD, Utils._CalledSub(), 0, 1, cstThisSub) + TraceError(TRACEFATAL, ERRACTION, Utils._CalledSub(), 0, 1) Goto Exit_Function Trace_NotFound: TraceError(TRACEFATAL, ERROBJECTNOTFOUND, Utils._CalledSub(), 0, , Array(_GetLabel(psObjectType), pvObjectName)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/tbsdy/svdemo' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/odbc/ODatabaseMetaData.cxx | 23 +++--
1 file changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 224002ee63b043404ecb3b594e6d902e5cd7
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 5 10:30:54 2014 +0200
Use SQL_DEFAULT_TXN_ISOLATION to get getDefaultTransactionIsolation
Change-Id: I7f4785088151490ae1d55d2bb78bce28357d5c45
Reviewed-on: https://gerrit.libreoffice.org/8863
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
index ab62346..6a98544 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
@@ -24,6 +24,7 @@
#include com/sun/star/sdbc/DataType.hpp
#include com/sun/star/sdbc/ResultSetType.hpp
#include com/sun/star/sdbc/ResultSetConcurrency.hpp
+#include com/sun/star/sdbc/TransactionIsolation.hpp
#include odbc/OFunctiondefs.hxx
#include stdio.h
#include TPrivilegesResultSet.hxx
@@ -1252,8 +1253,26 @@ sal_Int32 SAL_CALL
ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeExc
sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( )
throw(SQLException, RuntimeException, std::exception)
{
SQLUINTEGER nValue;
-
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
-return nValue;
+sal_Int32 nValueTranslated;
+
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DEFAULT_TXN_ISOLATION,nValue,*this);
+switch(nValue)
+{
+case SQL_TXN_READ_UNCOMMITTED:
+nValueTranslated =
com::sun::star::sdbc::TransactionIsolation::READ_UNCOMMITTED;
+break;
+case SQL_TXN_READ_COMMITTED:
+nValueTranslated =
com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED;
+break;
+case SQL_TXN_REPEATABLE_READ:
+nValueTranslated =
com::sun::star::sdbc::TransactionIsolation::REPEATABLE_READ;
+break;
+case SQL_TXN_SERIALIZABLE:
+nValueTranslated =
com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE;
+break;
+default:
+nValueTranslated = 0;
+}
+return nValueTranslated;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( )
throw(RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Question unoType for getXmlToken (dbaccess/reportdesign module)
Hello, I noticed this: s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::cppu::UnoTypedouble::get(); present at 2 locations: See http://opengrok.libreoffice.org/search?q=%22GetXMLToken%28+XML_FLOAT%29%22project=coredefs=refs=path=hist= Why shouldn't be this: s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::cppu::UnoTypefloat::get(); ? (If double is ok, I'll comment the code accordingly). Julien -- View this message in context: http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-tp4109071.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
list.cxx in VCL
Would it be possible to remove vcl/source/fontsubset/list.cxx and replace its usage with std::list? The only place I see it being used is in ttcr.cxx (same folder). It is hard to tell because most of the files in that directory appear to be C code hiding in .cxx files. Chris -- View this message in context: http://nabble.documentfoundation.org/list-cxx-in-VCL-tp4109073.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 'feature/gtkbmptiledviewer' - vcl/headless
vcl/headless/svpbmp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4df66b4f7f70f69d43c371be1cebf1d1935d0352 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri May 16 18:41:32 2014 +0100 Default to RGB for Bitmap Buffers in svp. By default we seem to use FORMAT_TWENTYFOUR_BIT_TC_MASK for most of our buffers, and presumably we should be using RGB as that's the default format expected by anyone else -- previously red and blue channels were switched when e.g. using tiled rendering on iOS (the vcl implementation is built on svp and appears to therefore reuse svpbmp without change), on Android (which uses svp directly) and in experimental tiled rendering on Linux with svp. Change-Id: I66a7f83bce286b7b2fddf0010587b019e8e1d01f diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 3e08e90..1aa815b 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -194,7 +194,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( bool ) break; case FORMAT_TWENTYFOUR_BIT_TC_MASK: nBitCount = 24; -pBuf-mnFormat = BMP_FORMAT_24BIT_TC_BGR; +pBuf-mnFormat = BMP_FORMAT_24BIT_TC_RGB; break; case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA: nBitCount = 32; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - avmedia/source slideshow/source
avmedia/source/opengl/oglwindow.cxx |4
slideshow/source/engine/shapes/viewmediashape.cxx |1 +
2 files changed, 5 insertions(+)
New commits:
commit 821c42b10a7095124a9afbbba3f9bc687ace40e6
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri May 16 19:53:17 2014 +0200
OGLWindow: fix key capturing issue
Sometimes the event handler parent captures the mouse
moce which should grab the focus for key event handling.
Change-Id: Ida1022968543059154de824fc3d026c5cecba7b3
diff --git a/avmedia/source/opengl/oglwindow.cxx
b/avmedia/source/opengl/oglwindow.cxx
index 90e32ed..ec21651 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -292,6 +292,10 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*,
pEvent)
}
else if( pEvent-GetId() == VCLEVENT_WINDOW_MOUSEMOVE )
{
+if ( !m_pEventHandler-HasFocus() )
+{
+m_pEventHandler-GrabFocus();
+}
MouseEvent* pMouseEvt = (MouseEvent*)pEvent-GetData();
if(pMouseEvt pMouseEvt-IsLeft())
{
commit 9199616e9d6bd04e60a5135df3b2ba7113a5f436
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri May 16 19:50:52 2014 +0200
slideshow/glTF: make sure parent window does not cover the OpenGL window
Change-Id: I0da3978cefeb3d145f7411cc1c83a87d981cac62
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx
b/slideshow/source/engine/shapes/viewmediashape.cxx
index ab97235..f91be0b 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -476,6 +476,7 @@ namespace slideshow
mpEventHandlerParent.reset(new Window(pWindow,
WB_NOBORDER|WB_NODIALOGCONTROL));
mpEventHandlerParent-SetPosSizePixel( Point(
aAWTRect.X, aAWTRect.Y ),
Size(
aAWTRect.Width, aAWTRect.Height ) );
+mpEventHandlerParent-EnablePaint(false);
mpEventHandlerParent-Show();
SystemWindowData aWinData =
OpenGLContext::generateWinData(mpEventHandlerParent.get());
mpMediaWindow.reset(new
SystemChildWindow(mpEventHandlerParent.get(), 0, aWinData));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [solved] build failure, clock_gettime undefined, linking libavmedialo.so
On Fri, 2014-05-16 at 15:19 +0100, Tamas Zolnai wrote: On Friday, May 16, 2014 15:00 BST, Terrence Enger ten...@iseries-guru.com wrote: [snip] /home/terry/lo_hacking/git/libo2/workdir/UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/inc/o3dgcTimer.h:115: undefined reference to `clock_gettime' [snip] Hi Terry, I didn't get the same error while building. Hmm. My system is debian-wheezy, which perhaps is more conservative than most Linux distros. I google it and find that: http://stackoverflow.com/questions/2418157/ubuntu-linux-c-error-undefined-reference-to-clock-gettime-and-clock-settim It suggests to link -lrt library. So you can try to add these lines: ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,collada2gltf,\ -lrt \ )) endif to the external/collada2gltf/StaticLibrary_collada2gltf.mk file. I hope it helps. That did the job. My build is continuing. Thank you for your help. Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sfx2/source svtools/source svx/source
sfx2/source/doc/sfxbasemodel.cxx | 12 +++-
svtools/source/graphic/grfcache.cxx|2 +-
svx/source/sdr/properties/itemsettools.cxx |1 +
3 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit 5b2f1b46b129c41890c54513c6d386407db6718a
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 20:50:24 2014 +0100
strangely obvious leaky code
Change-Id: I968cbb784d53e0cff0649061c58f752939226a09
diff --git a/svx/source/sdr/properties/itemsettools.cxx
b/svx/source/sdr/properties/itemsettools.cxx
index ce937b3..2879b48 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -120,6 +120,7 @@ namespace sdr
SfxPoolItem* pNewItem = pItem-Clone();
pNewItem-ScaleMetrics(nMul, nDiv);
rSet.Put(*pNewItem);
+delete pNewItem;
}
}
nWhich = aIter.NextWhich();
commit fdca15fb864aca975533257d5ee83440992d8a7e
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 16:36:13 2014 +0100
valgrind: SfxBaseModel's pImpl of fallback TargetDocument for paste leaks
e.g. repeatedly pasting a metafile into writer and deleting it.
==13369== 342 (232 direct, 110 indirect) bytes in 1 blocks are definitely
lost in loss record 19,396 of 22,170
==13369==at 0x4A06965: operator new(unsigned long) (in
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==13369==by 0x686D72E: SfxBaseModel::SfxBaseModel(SfxObjectShell*)
(sfxbasemodel.cxx:518)
==13369==by 0x288CA9C1:
SvxUnoDrawingModel::SvxUnoDrawingModel(SdrModel*) (unomod.cxx:255)
==13369==by 0x28961055: SvxDrawingLayerImport(SdrModel*,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
com::sun::star::uno::Referencecom::sun::star::lang::XComponent const, char
const*) (xmlexport.cxx:164)
==13369==by 0x28960FA2: SvxDrawingLayerImport(SdrModel*,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
com::sun::star::uno::Referencecom::sun::star::lang::XComponent const)
(xmlexport.cxx:148)
==13369==by 0x2896175E: SvxDrawingLayerImport(SdrModel*,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const)
(xmlexport.cxx:254)
==13369==by 0x240B1002: SwFEShell::Paste(SvStream, unsigned short,
Point const*) (fecopy.cxx:1333)
==13369==by 0x247B981A:
SwTransferable::_PasteSdrFormat(TransferableDataHelper, SwWrtShell, unsigned
short, Point const*, unsigned char, bool) (swdtflvr.cxx:2207)
==13369==by 0x247B678E:
SwTransferable::PasteData(TransferableDataHelper, SwWrtShell, unsigned short,
unsigned long, unsigned short, bool, bool, Point const*, signed char, bool)
(swdtflvr.cxx:1481)
==13369==by 0x247B5AE4: SwTransferable::Paste(SwWrtShell,
TransferableDataHelper) (swdtflvr.cxx:1150)
==13369==by 0x2488FCCE: SwBaseShell::ExecClpbrd(SfxRequest)
(basesh.cxx:277)
Reference lang::XComponent xTargetDocument( xComponent );
if( !xTargetDocument.is() )
{
xTargetDocument = new SvxUnoDrawingModel( pModel );
pModel-setUnoModel( Reference XInterface ::query(
xTargetDocument ) );
}
Change-Id: I3bd0fc983d9b6bdcdc91071a4ec3d2c584397ebf
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 3ad6fc9..b50afe1 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -523,18 +523,15 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell )
}
}
-
// destructor
-
-
SfxBaseModel::~SfxBaseModel()
{
+//In SvxDrawingLayerImport when !xTargetDocument the fallback
SvxUnoDrawingModel created there
+//never gets disposed called on it, so m_pData leaks.
+delete m_pData, m_pData = 0;
}
-
// XInterface
-
-
Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type rType ) throw(
RuntimeException, std::exception )
{
if ( ( !m_bSupportEmbeddedScripts rType.equals(
cppu::UnoTypedocument::XEmbeddedScripts::get() ) )
@@ -545,10 +542,7 @@ Any SAL_CALL SfxBaseModel::queryInterface( const
uno::Type rType ) throw( Runti
return SfxBaseModel_Base::queryInterface( rType );
}
-
// XInterface
-
-
void SAL_CALL SfxBaseModel::acquire() throw( )
{
// Attention:
commit 7d6e159df4c28afde2fff5bd734ec3a8f63cb15a
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 16:06:10 2014 +0100
fix memory leak on pasting metafiles into writer
copying from mspaint to writer and then deleting the image in a loop will
eventually exhaust all memory.
regression since 004a29b9ac66f68af5ea12a2303a4b2be77d8145
Change-Id: I381285cda3823de7df0c1725a339943caf9536fe
diff --git a/svtools/source/graphic/grfcache.cxx
b/svtools/source/graphic/grfcache.cxx
index 26d766a..72fdc3a 100644
---
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 70/c4adf42a0d7789abc900a0698a2ff4b5314944
70/c4adf42a0d7789abc900a0698a2ff4b5314944 |1 + 1 file changed, 1 insertion(+) New commits: commit be406654dc65ae926a5199b1fa4b4582ec9d6e00 Author: Caolán McNamara caol...@redhat.com Date: Fri May 16 21:07:09 2014 +0100 Notes added by 'git notes add' diff --git a/70/c4adf42a0d7789abc900a0698a2ff4b5314944 b/70/c4adf42a0d7789abc900a0698a2ff4b5314944 new file mode 100644 index 000..12807d0 --- /dev/null +++ b/70/c4adf42a0d7789abc900a0698a2ff4b5314944 @@ -0,0 +1 @@ +prefer: 9e98f12db714b8a1a8cc64234bb4eea26e936166 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/langbox.hxx | 31 +++- svx/source/dialog/langbox.cxx | 101 -- 2 files changed, 125 insertions(+), 7 deletions(-) New commits: commit 0ab5802eb0e530e930bed6d5dbed1a0317ae323b Author: Eike Rathke er...@redhat.com Date: Fri May 16 22:00:15 2014 +0200 more SvxLanguageBoxBase interfacing Change-Id: Ife9317d40756099ae4d8ecb84cccea91bd75a14c diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index a278fac..dc872d8 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -69,6 +69,14 @@ public: LanguageTypeGetSelectLanguage() const; boolIsLanguageSelected( const LanguageType eLangType ) const; +voidSetNoSelectionLBB(); +voidHideLBB(); +voidDisableLBB(); +voidSaveValueLBB(); +sal_Int32 GetSelectEntryPosLBB( sal_Int32 nSelIndex = 0 ) const; +void* GetEntryDataLBB( sal_Int32 nPos ) const; +sal_Int32 GetSavedValueLBB() const; + protected: Image m_aNotCheckedImage; Image m_aCheckedImage; @@ -89,11 +97,16 @@ protected: SVX_DLLPRIVATE virtual void ImplClear() = 0; SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString rEntry, sal_Int32 nPos ) = 0; SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) = 0; -SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos() const = 0; +SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const = 0; SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) const = 0; SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) = 0; SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const = 0; SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const = 0; +SVX_DLLPRIVATE virtual void ImplSetNoSelection() = 0; +SVX_DLLPRIVATE virtual void ImplHide() = 0; +SVX_DLLPRIVATE virtual void ImplDisable() = 0; +SVX_DLLPRIVATE virtual void ImplSaveValue() = 0; +SVX_DLLPRIVATE virtual sal_Int32ImplGetSavedValue() const = 0; }; @@ -110,11 +123,16 @@ private: SVX_DLLPRIVATE virtual void ImplClear() SAL_OVERRIDE; SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString rEntry, sal_Int32 nPos ) SAL_OVERRIDE; SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) SAL_OVERRIDE; -SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos() const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) SAL_OVERRIDE; SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplSetNoSelection() SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplHide() SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplDisable() SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplSaveValue() SAL_OVERRIDE; +SVX_DLLPRIVATE virtual sal_Int32ImplGetSavedValue() const SAL_OVERRIDE; }; @@ -125,17 +143,24 @@ public: virtual ~SvxLanguageComboBox(); private: +sal_Int32 mnSavedValuePos; + SVX_DLLPRIVATE virtual sal_Int32ImplInsertImgEntry( const OUString rEntry, sal_Int32 nPos, bool bChecked ) SAL_OVERRIDE; SVX_DLLPRIVATE virtual void ImplRemoveEntryAt( sal_Int32 nPos ) SAL_OVERRIDE; SVX_DLLPRIVATE virtual void ImplClear() SAL_OVERRIDE; SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString rEntry, sal_Int32 nPos ) SAL_OVERRIDE; SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) SAL_OVERRIDE; -SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos() const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) SAL_OVERRIDE; SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryCount() const SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplSetNoSelection() SAL_OVERRIDE; +SVX_DLLPRIVATE virtual void ImplHide() SAL_OVERRIDE; +SVX_DLLPRIVATE virtual
Re: [solved] build failure, clock_gettime undefined, linking libavmedialo.so
On Friday, May 16, 2014 20:38 BST, Terrence Enger ten...@iseries-guru.com wrote: On Fri, 2014-05-16 at 15:19 +0100, Tamas Zolnai wrote: On Friday, May 16, 2014 15:00 BST, Terrence Enger ten...@iseries-guru.com wrote: [snip] /home/terry/lo_hacking/git/libo2/workdir/UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/inc/o3dgcTimer.h:115: undefined reference to `clock_gettime' [snip] Hi Terry, I didn't get the same error while building. Hmm. My system is debian-wheezy, which perhaps is more conservative than most Linux distros. I google it and find that: http://stackoverflow.com/questions/2418157/ubuntu-linux-c-error-undefined-reference-to-clock-gettime-and-clock-settim It suggests to link -lrt library. So you can try to add these lines: ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,collada2gltf,\ -lrt \ )) endif to the external/collada2gltf/StaticLibrary_collada2gltf.mk file. I hope it helps. That did the job. My build is continuing. Great, then I push it to master to avoid this problem. Regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - avmedia/source external/collada2gltf
avmedia/source/opengl/oglplayer.cxx | 24 +---
avmedia/source/opengl/oglplayer.hxx |7 +
external/collada2gltf/StaticLibrary_collada2gltf.mk |6 +
3 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 73212108571d2ef4a7073193ea37b2f6cba4537b
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri May 16 22:08:23 2014 +0200
OGLPlayer: fix playing of animation in edit mode
gltf_animation_set_time doesn't work but stops the animation.
Change-Id: Ia17724c36e2007451e24f97e04a09240359ad969
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index 5c3ede6..ff056e3 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -138,8 +138,9 @@ double SAL_CALL OGLPlayer::getDuration() throw (
uno::RuntimeException, std::exc
void SAL_CALL OGLPlayer::setMediaTime( double fTime ) throw (
uno::RuntimeException, std::exception )
{
+// TODO: doesn't work, but cause problem in playing
osl::MutexGuard aGuard(m_aMutex);
-gltf_animation_set_time(m_pHandle, fTime);
+//gltf_animation_set_time(m_pHandle, fTime);
}
double SAL_CALL OGLPlayer::getMediaTime() throw (
::com::sun::star::uno::RuntimeException, std::exception )
commit 4c19fd176d964c4ff0b3998b52e268e899350254
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri May 16 21:45:39 2014 +0200
Collada2gltf: add -lrt to fix compilation problems
Change-Id: I1c0c9459cb716512dc726ee96fb811d03084aa62
diff --git a/external/collada2gltf/StaticLibrary_collada2gltf.mk
b/external/collada2gltf/StaticLibrary_collada2gltf.mk
index 0097f3f..dac8caf 100644
--- a/external/collada2gltf/StaticLibrary_collada2gltf.mk
+++ b/external/collada2gltf/StaticLibrary_collada2gltf.mk
@@ -30,6 +30,12 @@ $(eval $(call gb_StaticLibrary_add_defs,collada2gltf,\
endif
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,collada2gltf,\
+ -lrt \
+))
+endif
+
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,collada2gltf,cpp))
$(eval $(call gb_StaticLibrary_set_include,collada2gltf,\
commit ba9357b82ec5551d562f572074b064ccd6c808f0
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri May 16 22:07:16 2014 +0200
OGLPlayer: set a timer which call redrawing to show animation
Change-Id: I7c98ba61be0510e9f86cb80fda73d18f7f7957cf
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index 217fd88..5c3ede6 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -103,6 +103,10 @@ bool OGLPlayer::create( const OUString rURL )
}
}
}
+
+// Set timer
+m_aTimer.SetTimeout(10);
+m_aTimer.SetTimeoutHdl(LINK(this,OGLPlayer,TimerHandler));
return true;
}
@@ -110,12 +114,14 @@ void SAL_CALL OGLPlayer::start() throw (
uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
gltf_animation_start(m_pHandle);
+m_aTimer.Start();
}
void SAL_CALL OGLPlayer::stop() throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
gltf_animation_stop(m_pHandle);
+m_aTimer.Stop();
}
sal_Bool SAL_CALL OGLPlayer::isPlaying() throw ( uno::RuntimeException,
std::exception )
@@ -212,8 +218,8 @@ uno::Reference media::XPlayerWindow SAL_CALL
OGLPlayer::createPlayerWindow( c
m_pHandle-viewport.width = aSize.Width();
m_pHandle-viewport.height = aSize.Height();
gltf_renderer_set_content(m_pHandle);
-OGLWindow* pWindow = new OGLWindow(m_pHandle, m_aContext, pChildWindow);
-return uno::Reference media::XPlayerWindow ( pWindow );
+m_pOGLWindow = new OGLWindow(m_pHandle, m_aContext, pChildWindow);
+return uno::Reference media::XPlayerWindow ( m_pOGLWindow );
}
uno::Reference media::XFrameGrabber SAL_CALL OGLPlayer::createFrameGrabber()
@@ -256,6 +262,17 @@ uno::Sequence OUString SAL_CALL
OGLPlayer::getSupportedServiceNames()
return aRet;
}
+IMPL_LINK(OGLPlayer,TimerHandler,Timer*,pTimer)
+{
+if (pTimer == m_aTimer)
+{
+m_pOGLWindow-update();
+m_aTimer.Start();
+}
+
+return 0;
+}
+
} // namespace ogl
} // namespace avmedia
diff --git a/avmedia/source/opengl/oglplayer.hxx
b/avmedia/source/opengl/oglplayer.hxx
index 86e8a6e..69f010b 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++ b/avmedia/source/opengl/oglplayer.hxx
@@ -16,9 +16,12 @@
#include com/sun/star/media/XPlayer.hpp
#include libgltf.h
#include vcl/opengl/OpenGLContext.hxx
+#include vcl/timer.hxx
namespace avmedia { namespace ogl {
+class OGLWindow;
+
typedef ::cppu::WeakComponentImplHelper2 com::sun::star::media::XPlayer,
com::sun::star::lang::XServiceInfo
Player_BASE;
@@ -55,9 +58,13 @@ public:
virtual com::sun::star::uno::Sequence OUString SAL_CALL
getSupportedServiceNames() throw
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/chardlg.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 48a48e4ea4bdd7afb322e6d0b81c29eb7e7a66a0
Author: Eike Rathke er...@redhat.com
Date: Fri May 16 22:12:58 2014 +0200
use SvxLanguageBoxBase* in the general routines
... so we can switch later to an SvxLanguageComboBox for some.
Change-Id: I1a48ee7207a14b2666be09f091c47f09fcbce192
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index f813c9a..10ff5977 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -440,7 +440,7 @@ namespace
const FontNameBox* _pFontNameLB,
const FontStyleBox* _pFontStyleLB,
const FontSizeBox* _pFontSizeLB,
-const SvxLanguageBox* _pLanguageLB,
+const SvxLanguageBoxBase* _pLanguageLB,
const FontList* _pFontList,
sal_uInt16 _nFontWhich,
sal_uInt16 _nFontHeightWhich)
@@ -623,7 +623,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet rSet,
LanguageGroup eLangGrp
FixedText* pSizeLabel = NULL;
FontSizeBox* pSizeBox = NULL;
FixedText* pLangFT = NULL;
-SvxLanguageBox* pLangBox = NULL;
+SvxLanguageBoxBase* pLangBox = NULL;
sal_uInt16 nWhich = 0;
switch ( eLangGrp )
@@ -786,20 +786,20 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet rSet,
LanguageGroup eLangGrp
case Asian : nWhich = GetWhich( SID_ATTR_CHAR_CJK_LANGUAGE ); break;
case Ctl : nWhich = GetWhich( SID_ATTR_CHAR_CTL_LANGUAGE ); break;
}
-pLangBox-SetNoSelection();
+pLangBox-SetNoSelectionLBB();
eState = rSet.GetItemState( nWhich );
switch ( eState )
{
case SFX_ITEM_UNKNOWN:
pLangFT-Hide();
-pLangBox-Hide();
+pLangBox-HideLBB();
break;
case SFX_ITEM_DISABLED:
case SFX_ITEM_READONLY:
pLangFT-Disable();
-pLangBox-Disable();
+pLangBox-DisableLBB();
break;
case SFX_ITEM_DEFAULT:
@@ -834,7 +834,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet rSet,
LanguageGroup eLangGrp
pNameBox-SaveValue();
pStyleBox-SaveValue();
pSizeBox-SaveValue();
-pLangBox-SaveValue();
+pLangBox-SaveValueLBB();
}
@@ -846,7 +846,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet rSet,
LanguageGroup eLangGrp
FontNameBox* pNameBox = NULL;
FontStyleBox* pStyleBox = NULL;
FontSizeBox* pSizeBox = NULL;
-SvxLanguageBox* pLangBox = NULL;
+SvxLanguageBoxBase* pLangBox = NULL;
sal_uInt16 nWhich = 0;
sal_uInt16 nSlot = 0;
@@ -1086,8 +1086,8 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet rSet,
LanguageGroup eLangGrp
}
nWhich = GetWhich( nSlot );
pOld = GetOldItem( rSet, nSlot );
-sal_Int32 nLangPos = pLangBox-GetSelectEntryPos();
-LanguageType eLangType = (LanguageType)(sal_uLong)pLangBox-GetEntryData(
nLangPos );
+sal_Int32 nLangPos = pLangBox-GetSelectEntryPosLBB();
+LanguageType eLangType =
(LanguageType)(sal_uLong)pLangBox-GetEntryDataLBB( nLangPos );
if ( pOld )
{
@@ -1098,7 +1098,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet rSet,
LanguageGroup eLangGrp
}
if ( !bChanged )
-bChanged = ( pLangBox-GetSavedValue() == LISTBOX_ENTRY_NOTFOUND );
+bChanged = ( pLangBox-GetSavedValueLBB() == LISTBOX_ENTRY_NOTFOUND );
if ( bChanged nLangPos != LISTBOX_ENTRY_NOTFOUND )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin.cxx | 55 +-
1 file changed, 34 insertions(+), 21 deletions(-)
New commits:
commit df51f7d486cafb2795a38ae9fedd8fde8827d8a4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri May 16 15:03:31 2014 -0400
fdo#77315: When in cell edit mode, use the EditView instance already there.
This prevents creation of a temporary EditView instance which would mess up
the cursor state while the mouse pointer is hovering.
Change-Id: I7759667b105b4389dd4de2673cd2fbe32082c95d
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 2226ab1..ff7693d 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -64,6 +64,7 @@
#include com/sun/star/awt/MouseButton.hpp
#include com/sun/star/script/vba/VBAEventId.hpp
#include com/sun/star/script/vba/XVBAEventProcessor.hpp
+#include com/sun/star/text/textfield/Type.hpp
#include gridwin.hxx
#include tabvwsh.hxx
@@ -5205,11 +5206,43 @@ boost::shared_ptrScFieldEditEngine createEditEngine(
ScDocShell* pDocSh, const
return pEngine;
}
+bool extractURLInfo( const SvxFieldItem* pFieldItem, OUString* pName,
OUString* pUrl, OUString* pTarget )
+{
+if (!pFieldItem)
+return false;
+
+const SvxFieldData* pField = pFieldItem-GetField();
+if (pField-GetClassId() != text::textfield::Type::URL)
+return false;
+
+const SvxURLField* pURLField = static_castconst SvxURLField*(pField);
+
+if (pName)
+*pName = pURLField-GetRepresentation();
+if (pUrl)
+*pUrl = pURLField-GetURL();
+if (pTarget)
+*pTarget = pURLField-GetTargetFrame();
+
+return true;
+}
+
}
bool ScGridWindow::GetEditUrl( const Point rPos,
OUString* pName, OUString* pUrl, OUString*
pTarget )
{
+ScTabViewShell* pViewSh = pViewData-GetViewShell();
+ScInputHandler* pInputHdl = NULL;
+if (pViewSh)
+pInputHdl = pViewSh-GetInputHandler();
+
+if (pInputHdl-IsInputMode())
+{
+EditView* pView = pInputHdl-GetTableView();
+return extractURLInfo(pView-GetFieldUnderMousePointer(), pName, pUrl,
pTarget);
+}
+
//! nPosX/Y mit uebergeben?
SCsCOL nPosX;
SCsROW nPosY;
@@ -5318,27 +5351,7 @@ bool ScGridWindow::GetEditUrl( const Point rPos,
bool bRet = false;
MapMode aOld = GetMapMode();
SetMapMode(aEditMode); // kein return mehr
-
-const SvxFieldItem* pFieldItem = aTempView.GetFieldUnderMousePointer();
-if (pFieldItem)
-{
-const SvxFieldData* pField = pFieldItem-GetField();
-if ( pField pField-ISA(SvxURLField) )
-{
-if ( pName || pUrl || pTarget )
-{
-const SvxURLField* pURLField = (const SvxURLField*)pField;
-if (pName)
-*pName = pURLField-GetRepresentation();
-if (pUrl)
-*pUrl = pURLField-GetURL();
-if (pTarget)
-*pTarget = pURLField-GetTargetFrame();
-}
-bRet = true;
-}
-}
-
+bRet = extractURLInfo(aTempView.GetFieldUnderMousePointer(), pName,
pUrl, pTarget);
SetMapMode(aOld);
return bRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build failure, clock_gettime undefined, linking libavmedialo.so
On Fri, 2014-05-16 at 21:12 +0100, Tamas Zolnai wrote: On Friday, May 16, 2014 20:38 BST, Terrence Enger ten...@iseries-guru.com wrote: On Fri, 2014-05-16 at 15:19 +0100, Tamas Zolnai wrote: On Friday, May 16, 2014 15:00 BST, Terrence Enger ten...@iseries-guru.com wrote: [snip] /home/terry/lo_hacking/git/libo2/workdir/UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/inc/o3dgcTimer.h:115: undefined reference to `clock_gettime' [snip] Hi Terry, I didn't get the same error while building. Hmm. My system is debian-wheezy, which perhaps is more conservative than most Linux distros. I google it and find that: http://stackoverflow.com/questions/2418157/ubuntu-linux-c-error-undefined-reference-to-clock-gettime-and-clock-settim It suggests to link -lrt library. So you can try to add these lines: ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,collada2gltf,\ -lrt \ )) endif to the external/collada2gltf/StaticLibrary_collada2gltf.mk file. I hope it helps. That did the job. My build is continuing. Uh-oh. I do not know what I was looking at when I wrote that. The link just failed the same way. And that was after `make clean`. OTOH, I see that you added those lines earlier in the file than I did Meanwhile I accomplished the link by typing the command at the command line, including -lrt. I am sorry for having given you false encouragement. Terry. Great, then I push it to master to avoid this problem. Regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/collada2gltf
external/collada2gltf/StaticLibrary_collada2gltf.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 29316ee0350654515463043f8fb818a0e84e4386 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri May 16 22:25:27 2014 +0200 Fix typo: this is a static library Change-Id: I663e8da9ee3f4b860d727abb3783e322eedd7d9f diff --git a/external/collada2gltf/StaticLibrary_collada2gltf.mk b/external/collada2gltf/StaticLibrary_collada2gltf.mk index dac8caf..a2f7d2b 100644 --- a/external/collada2gltf/StaticLibrary_collada2gltf.mk +++ b/external/collada2gltf/StaticLibrary_collada2gltf.mk @@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_add_defs,collada2gltf,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_libs,collada2gltf,\ +$(eval $(call gb_StaticLibrary_add_libs,collada2gltf,\ -lrt \ )) endif ___ 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' - oox/source
oox/source/drawingml/shape.cxx | 26 ++ 1 file changed, 10 insertions(+), 16 deletions(-) New commits: commit 456d5d928ebfd333b3169d69806d50303cebb6bf Author: Tor Lillqvist t...@collabora.com Date: Fri May 16 16:43:25 2014 +0300 Use SVM (metafile) instead of PNG for diagrams (SmartArt) It seemed a bit pointless to waste CPU cycles on PNG-compressing a bitmap image only to later then uncompress it anyway. vcl's PNG writing code showed up as 13% on the time profile of TiledLibreOffice when displaying a document full of SmartArts. Miklos suggested I try using SVM (which I guess means StarView Metafile) instead. When using SVM, no rendering of diagrams to bitmaps during loading is done, but the diagram stays stored in a resolution-independent (vector-ish) form. Which means it will be rendered nicely and crisply regardless of the zoom level. At least, that is my understanding, and experimentation (on OS X and Linux) seems to confirm. ce8c0ff07559ddcc729bffd7a68f4c6f281882e3 Change-Id: Ice8c0ff07559ddcc729bffd7a68f4c6f281882e3 (cherry picked from commit 633003965a4be0c535b43cc3072c5c4a95109d34) Reviewed-on: https://gerrit.libreoffice.org/9382 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 54db7bb..35bdf6c 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -717,7 +717,7 @@ Reference XShape Shape::renderDiagramToGraphic( XmlFilterBase rFilterBase ) Reference io::XOutputStream xOutputStream( xStream-getOutputStream() ); // Rendering format -OUString sFormat( PNG ); +OUString sFormat( SVM ); // Size of the rendering awt::Size aActualSize = mxShape-getSize(); @@ -726,21 +726,15 @@ Reference XShape Shape::renderDiagramToGraphic( XmlFilterBase rFilterBase ) awt::Size aSize = awt::Size( static_cast sal_Int32 ( ( fPixelsPer100thmm * aActualSize.Width ) + 0.5 ), static_cast sal_Int32 ( ( fPixelsPer100thmm * aActualSize.Height ) + 0.5 ) ); -Sequence PropertyValue aFilterData( 7 ); -aFilterData[ 0 ].Name = Compression; -aFilterData[ 0 ].Value = static_cast sal_Int32 ( 9 ); -aFilterData[ 1 ].Name = Interlaced; -aFilterData[ 1 ].Value = static_cast sal_Int32 ( 1 ); -aFilterData[ 2 ].Name = Translucent; -aFilterData[ 2 ].Value = static_cast sal_Int32 ( 1 ); -aFilterData[ 3 ].Name = PixelWidth; -aFilterData[ 3 ].Value = aSize.Width; -aFilterData[ 4 ].Name = PixelHeight; -aFilterData[ 4 ].Value = aSize.Height; -aFilterData[ 5 ].Name = LogicalWidth; -aFilterData[ 5 ].Value = aActualSize.Width; -aFilterData[ 6 ].Name = LogicalHeight; -aFilterData[ 6 ].Value = aActualSize.Height; +Sequence PropertyValue aFilterData( 4 ); +aFilterData[ 0 ].Name = PixelWidth; +aFilterData[ 0 ].Value = aSize.Width; +aFilterData[ 1 ].Name = PixelHeight; +aFilterData[ 1 ].Value = aSize.Height; +aFilterData[ 2 ].Name = LogicalWidth; +aFilterData[ 2 ].Value = aActualSize.Width; +aFilterData[ 3 ].Name = LogicalHeight; +aFilterData[ 3 ].Value = aActualSize.Height; Sequence PropertyValue aDescriptor( 3 ); aDescriptor[ 0 ].Name = OutputStream; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/opengl/oglplayer.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit baf78fb898b0b7ec24a1f15f46e1a884b34867c6
Author: Tor Lillqvist t...@collabora.com
Date: Fri May 16 23:41:59 2014 +0300
WaE: unused parameter 'fTime'
Change-Id: I1f44de228fe09584699a1e158c32882cd9e7eac7
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index ff056e3..f789acd 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -140,6 +140,7 @@ void SAL_CALL OGLPlayer::setMediaTime( double fTime ) throw
( uno::RuntimeExcept
{
// TODO: doesn't work, but cause problem in playing
osl::MutexGuard aGuard(m_aMutex);
+(void) fTime;
//gltf_animation_set_time(m_pHandle, fTime);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/app/gtksys.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 5eeea7c91d87ee8f0b8bc8c0144c04fb84310bbf
Author: Michael Meeks michael.me...@collabora.com
Date: Fri May 16 21:49:23 2014 +0100
fdo#78799 - ignore overlayed monitors with co-incident origin.
This happens with certain fglrx drivers etc. where 'cloned' is not
set but instead both monitors are placed over the top of each other
(by XFCE) - work around that.
Change-Id: I9d1846bfae2692681606717f7f5e8408df532d95
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 058b5f5..4bd61c7 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -55,15 +55,14 @@ GtkSalSystem::GetDisplayXScreenCount()
namespace
{
-struct GdkRectangleEqual
+struct GdkRectangleCoincident
{
+// fdo#78799 - detect and elide overlaying monitors of different sizes
bool operator()(GdkRectangle const rLeft, GdkRectangle const rRight)
{
return
rLeft.x == rRight.x
rLeft.y == rRight.y
- rLeft.width == rRight.width
- rLeft.height == rRight.height
;
}
};
@@ -95,7 +94,7 @@ GtkSalSystem::countScreenMonitors()
gdk_screen_get_monitor_geometry(pScreen, j, aGeometry);
aGeometries.push_back(aGeometry);
}
-GdkRectangleEqual aCmp;
+GdkRectangleCoincident aCmp;
std::sort(aGeometries.begin(), aGeometries.end(), aCmp);
const std::vectorGdkRectangle::iterator aUniqueEnd(
std::unique(aGeometries.begin(), aGeometries.end(), aCmp));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/opengl/oglplayer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 17ed8c53290eee47fcf085c1592b7e635055f1b3
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri May 16 22:57:33 2014 +0200
OGLPlayer: comment out gltf_animation_get_time
It leads confusing behavior. Time is not set by now
because set method does not work.
Change-Id: I447d07d4193e25e6916ee05ee335d4cf150380a2
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index f789acd..83f5221 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -147,7 +147,7 @@ void SAL_CALL OGLPlayer::setMediaTime( double fTime ) throw
( uno::RuntimeExcept
double SAL_CALL OGLPlayer::getMediaTime() throw (
::com::sun::star::uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
-return gltf_animation_get_time(m_pHandle);
+return 0.0; //gltf_animation_get_time(m_pHandle);
}
double SAL_CALL OGLPlayer::getRate() throw ( uno::RuntimeException,
std::exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/svx svx/source sw/qa sw/source unusedcode.easy
include/svx/xgrad.hxx|1
svx/source/xoutdev/xattr.cxx | 16 -
sw/qa/extras/rtfexport/rtfexport.cxx | 10 ++-
sw/qa/extras/rtfimport/rtfimport.cxx | 101 ---
sw/source/core/doc/docbm.cxx |3 -
unusedcode.easy |1
6 files changed, 55 insertions(+), 77 deletions(-)
New commits:
commit 8ae06100856964d849e8c6ecbc85cbb44bcf0414
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri May 16 22:19:37 2014 +0200
coverity#704866 Unchecked dynamic_cast
Change-Id: Ib1108a66416350d88968754d7bb19a8c9e73
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index b28239f..72764a6 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -486,7 +486,8 @@ namespace sw { namespace mark
sw::mark::IMark* pMark = makeMark( rPaM, rName,
IDocumentMarkAccess::CHECKBOX_FIELDMARK );
sw::mark::IFieldmark* pFieldMark =
dynamic_castsw::mark::IFieldmark*( pMark );
-pFieldMark-SetFieldname( rType );
+if (pFieldMark)
+pFieldMark-SetFieldname( rType );
return pFieldMark;
}
commit 5bbc90be755aae4b87125f9d748828d74efe645d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri May 16 22:17:11 2014 +0200
unused XGradient::VclGradient
Change-Id: Ia0c416ce7c1323f9c0c20b969bd57e9a2174a3dc
diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index 30c1741..b97d0c0 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -75,7 +75,6 @@ public:
sal_uInt16 GetStartIntens() const { return nIntensStart;
}
sal_uInt16 GetEndIntens() const { return nIntensEnd; }
sal_uInt16 GetSteps() const { return nStepCount; }
-Gradient VclGradient() const;
};
#endif
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 84b1f0a..b9dfb6a 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2511,22 +2511,6 @@ bool XGradient::operator==(const XGradient rGradient)
const
nStepCount == rGradient.nStepCount );
}
-Gradient XGradient::VclGradient() const
-{
-Gradient aGradient;
-aGradient.SetStyle((GradientStyle)eStyle);
-aGradient.SetStartColor(aStartColor);
-aGradient.SetEndColor(aEndColor);
-aGradient.SetAngle(nAngle);
-aGradient.SetBorder(nBorder);
-aGradient.SetOfsX(nOfsX);
-aGradient.SetOfsY(nOfsY);
-aGradient.SetStartIntensity(nIntensStart);
-aGradient.SetEndIntensity(nIntensEnd);
-aGradient.SetSteps(nStepCount);
-return aGradient;
-}
-
// class XFillGradientItem
TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
diff --git a/unusedcode.easy b/unusedcode.easy
index 5e769ec..e75d512 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -59,7 +59,6 @@ VCLXGraphics::getLineColor()
VCLXGraphics::getRasterOp()
VCLXGraphics::getTextColor()
VCLXGraphics::getTextFillColor()
-XGradient::VclGradient() const
apitest::CellProperties::testRotateReference()
apitest::CellProperties::testVertJustify()
apitest::DataPilotField::testAutoShowInfo()
commit 04ab7b8e16af993c3269e3780e5234903cdc0cf1
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri May 16 22:11:51 2014 +0200
sw: fix indentation in rtf{export,import} test
Change-Id: Ie777de47dc70da136b145028a08ea17a0de7a87d
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index c395ec9..9a38b49 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -30,9 +30,11 @@ class Test : public SwModelTestBase
public:
Test() : SwModelTestBase(/sw/qa/extras/rtfexport/data/, Rich Text
Format) {}
-bool mustTestImportOf(const char* filename) const SAL_OVERRIDE {
+bool mustTestImportOf(const char* filename) const SAL_OVERRIDE
+{
// Don't test the first import of these, for some reason those tests
fail
-const char* aBlacklist[] = {
+const char* aBlacklist[] =
+{
math-eqarray.rtf,
math-escaping.rtf,
math-lim.rtf,
@@ -230,7 +232,7 @@ DECLARE_RTFEXPORT_TEST(testMathMso2007, math-mso2007.rtf)
aActual = getFormula(getRun(getParagraph(4), 1));
aExpected = OUString(f left (x right ) = {a} rsub {0} + sum from {n = 1}
to {\xe2\x88\x9e} {left ({a} rsub {n} cos {n\xcf\x80x} over {L} + {b} rsub {n}
sin {n\xcf\x80x} over {L} right )}, 144,
-RTL_TEXTENCODING_UTF8);
+ RTL_TEXTENCODING_UTF8);
CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
aActual = getFormula(getRun(getParagraph(5), 1));
@@ -355,7 +357,7 @@ DECLARE_RTFEXPORT_TEST(testFdo55939, fdo55939.odt)
getRun(xParagraph, 1, Main text before footnote.);
// Why the tab has to be removed here?
CPPUNIT_ASSERT_EQUAL(OUString(Footnote text.),
-getProperty
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 65074, which changed state. Bug 65074 Summary: FORMATTING: cells with with conditional formatting sometimes show the numbers not centered and without points; cell borders are not shown https://bugs.freedesktop.org/show_bug.cgi?id=65074 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/w32/module.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 48acb3ebd9403a95b3bbd906d45bb67b4410f3e4
Author: Herbert Dürr h...@apache.org
Date: Fri May 16 20:11:36 2014 +
#i124896# use default allocator for w32 ShortPathName buffer
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index afbb8b6..2d1c0f3 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -74,7 +74,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName,
sal_Int32 nRtldMod
//on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit)
if (hInstance == NULL Module-length 260)
{
-std::vectorWCHAR, rtl::AllocatorWCHAR vec(Module-length + 1);
+std::vectorWCHAR vec(Module-length + 1);
DWORD len =
GetShortPathNameW(reinterpret_castLPCWSTR(Module-buffer),
vec[0], Module-length + 1);
if (len )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/linkuno.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f9ed1ec1bac799f79fcdf28ce817990e4f307bf1
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat May 17 00:28:44 2014 +0200
Fix previous commit
Change-Id: I22ded05f328aeb4479c90e79b12729eb3835b3ec
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 3fbeb9d..27cc395 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1026,7 +1026,7 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScAreaLinksObj::getElementType()
throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
-return cppu::UnoTypeutil::DateTime::get();
+return cppu::UnoTypesheet::XAreaLink::get();
}
sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException,
std::exception)
@@ -1333,7 +1333,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32
nIndex )
uno::Type SAL_CALL ScDDELinksObj::getElementType()
throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
-return cppu::UnoTypeutil::DateTime::get();
+return cppu::UnoTypesheet::XDDELink::get();
}
sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException,
std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/docuno.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 280eed820fdd7fccb4fe6f4095b80f7ec50c
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat May 17 00:33:08 2014 +0200
More fix
Change-Id: Iadb275a3799195a8c2eb57a975315f21d8215b31
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9837217..9aeceb7 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -111,10 +111,10 @@ static const SfxItemPropertyMapEntry*
lcl_GetDocOptPropertyMap()
static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
{
{OUString(SC_UNO_APPLYFMDES), 0, getBooleanCppuType(),
0, 0},
-{OUString(SC_UNO_AREALINKS), 0,
cppu::UnoTypeutil::DateTime::get(), 0, 0},
+{OUString(SC_UNO_AREALINKS), 0,
cppu::UnoTypesheet::XAreaLinks::get(), 0, 0},
{OUString(SC_UNO_AUTOCONTFOC), 0, getBooleanCppuType(),
0, 0},
-{OUString(SC_UNO_BASICLIBRARIES), 0,
cppu::UnoTypeutil::DateTime::get(), beans::PropertyAttribute::READONLY,
0},
-{OUString(SC_UNO_DIALOGLIBRARIES), 0,
cppu::UnoTypeutil::DateTime::get(), beans::PropertyAttribute::READONLY,
0},
+{OUString(SC_UNO_BASICLIBRARIES), 0,
cppu::UnoTypescript::XLibraryContainer::get(),
beans::PropertyAttribute::READONLY, 0},
+{OUString(SC_UNO_DIALOGLIBRARIES), 0,
cppu::UnoTypescript::XLibraryContainer::get(),
beans::PropertyAttribute::READONLY, 0},
{OUString(SC_UNO_VBAGLOBNAME), 0,
cppu::UnoTypeOUString::get(),
beans::PropertyAttribute::READONLY, 0},
{OUString(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN,
getBooleanCppuType(), 0, 0},
{OUString(SC_UNONAME_CLOCAL), 0,
cppu::UnoTypelang::Locale::get(),0, 0},
@@ -123,8 +123,8 @@ static const SfxItemPropertyMapEntry*
lcl_GetDocOptPropertyMap()
{OUString(SC_UNO_COLLABELRNG), 0,
cppu::UnoTypesheet::XLabelRanges::get(), 0, 0},
{OUString(SC_UNO_DDELINKS),0,
cppu::UnoTypecontainer::XNameAccess::get(), 0, 0},
{OUString(SC_UNO_DEFTABSTOP), PROP_UNO_DEFTABSTOP,
cppu::UnoTypesal_Int16::get(), 0, 0},
-{OUString(SC_UNO_EXTERNALDOCLINKS),0,
cppu::UnoTypeutil::DateTime::get(),0, 0},
-{OUString(SC_UNO_FORBIDDEN), 0,
cppu::UnoTypeutil::DateTime::get(), beans::PropertyAttribute::READONLY,
0},
+{OUString(SC_UNO_EXTERNALDOCLINKS),0,
cppu::UnoTypesheet::XExternalDocLinks::get(),0, 0},
+{OUString(SC_UNO_FORBIDDEN), 0,
cppu::UnoTypei18n::XForbiddenCharacters::get(),
beans::PropertyAttribute::READONLY, 0},
{OUString(SC_UNO_HASDRAWPAGES),0, getBooleanCppuType(),
beans::PropertyAttribute::READONLY, 0},
{OUString(SC_UNO_IGNORECASE), PROP_UNO_IGNORECASE,
getBooleanCppuType(), 0, 0},
{OUString(SC_UNO_ITERENABLED), PROP_UNO_ITERENABLED,
getBooleanCppuType(), 0, 0},
@@ -133,7 +133,7 @@ static const SfxItemPropertyMapEntry*
lcl_GetDocOptPropertyMap()
{OUString(SC_UNO_LOOKUPLABELS),PROP_UNO_LOOKUPLABELS,
getBooleanCppuType(), 0, 0},
{OUString(SC_UNO_MATCHWHOLE), PROP_UNO_MATCHWHOLE,
getBooleanCppuType(), 0, 0},
{OUString(SC_UNO_NAMEDRANGES), 0,
cppu::UnoTypesheet::XNamedRanges::get(), 0, 0},
-{OUString(SC_UNO_DATABASERNG), 0,
cppu::UnoTypeutil::DateTime::get(), 0, 0},
+{OUString(SC_UNO_DATABASERNG), 0,
cppu::UnoTypesheet::XDatabaseRanges::get(), 0, 0},
{OUString(SC_UNO_NULLDATE),PROP_UNO_NULLDATE,
cppu::UnoTypeutil::Date::get(), 0, 0},
{OUString(SC_UNO_ROWLABELRNG), 0,
cppu::UnoTypesheet::XLabelRanges::get(), 0, 0},
{OUString(SC_UNO_SHEETLINKS), 0,
cppu::UnoTypecontainer::XNameAccess::get(), 0, 0},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/chartuno.cxx |2 +-
sc/source/ui/unoobj/confuno.cxx |2 +-
sc/source/ui/unoobj/datauno.cxx |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 42af6f983164dcaf87d4a05e36ab8bbfbdd49eea
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat May 17 00:35:25 2014 +0200
Fixes
Change-Id: Iaecba29cb5958787ec2581198943d373e37a3934
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 23e31cd..c94e4d9 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -365,7 +365,7 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex
)
uno::Type SAL_CALL ScChartsObj::getElementType() throw(uno::RuntimeException,
std::exception)
{
SolarMutexGuard aGuard;
-return cppu::UnoTypeutil::DateTime::get();
+return cppu::UnoTypetable::XTableChart::get();
}
sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException,
std::exception)
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 9099f91..58f8b89 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -65,7 +65,7 @@ static const SfxItemPropertyMapEntry*
lcl_GetConfigPropertyMap()
{OUString(SC_UNO_PRINTERNAME), 0, cppu::UnoTypeOUString::get(),
0, 0},
{OUString(SC_UNO_PRINTERSETUP), 0,
getCppuType((uno::Sequencesal_Int8*)0), 0, 0},
{OUString(SC_UNO_APPLYDOCINF), 0, getBooleanCppuType(),
0, 0},
-{OUString(SC_UNO_FORBIDDEN),0,
cppu::UnoTypeutil::DateTime::get(), beans::PropertyAttribute::READONLY, 0},
+{OUString(SC_UNO_FORBIDDEN),0,
cppu::UnoTypei18n::XForbiddenCharacters::get(),
beans::PropertyAttribute::READONLY, 0},
{OUString(SC_UNO_CHARCOMP), 0, cppu::UnoTypesal_Int16::get(),
0, 0},
{OUString(SC_UNO_ASIANKERN),0, getBooleanCppuType(),
0, 0},
{OUString(SCSAVEVERSION), 0, getBooleanCppuType(),
0, 0},
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index b8d6bb2..fd160cf 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -669,7 +669,7 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex(
sal_Int32 nIndex )
uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType()
throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
-return cppu::UnoTypeutil::DateTime::get();
+return cppu::UnoTypesheet::XSubTotalField::get();
}
sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements()
throw(uno::RuntimeException, std::exception)
@@ -2332,7 +2332,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex(
sal_Int32 nIndex )
uno::Type SAL_CALL ScDatabaseRangesObj::getElementType()
throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
-return cppu::UnoTypeutil::DateTime::get();
+return cppu::UnoTypesheet::XDatabaseRange::get();
}
sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements()
throw(uno::RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/addincol.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 53130f7afb3fcf39f95f69e3752cec1fa00d6d93
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat May 17 00:41:03 2014 +0200
Fixes
Change-Id: I5e2c57f4c53147ab4ae58f48059c8020de144f3c
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 77567d4..bbc709e 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -684,7 +684,7 @@ static bool lcl_ValidReturnType( const
uno::Referencereflection::XIdlClass xC
OUString sName = xClass-getName();
return (
-IsTypeName( sName, cppu::UnoTypeutil::DateTime::get()) ||
+IsTypeName( sName,
cppu::UnoTypesheet::XVolatileResult::get()) ||
IsTypeName( sName, cppu::UnoTypeuno::XInterface::get())
);
}
@@ -734,7 +734,7 @@ static ScAddInArgumentType lcl_GetArgType( const
uno::Referencereflection::XIdl
if (IsTypeName( sName, getCppuType((uno::Sequence uno::Sequenceuno::Any
*)0) ))
return SC_ADDINARG_MIXED_ARRAY;
-if (IsTypeName( sName, cppu::UnoTypeutil::DateTime::get()))
+if (IsTypeName( sName, cppu::UnoTypeuno::Any::get()))
return SC_ADDINARG_VALUE_OR_ARRAY;
if (IsTypeName( sName, cppu::UnoTypetable::XCellRange::get()))
@@ -821,11 +821,11 @@ void ScUnoAddInCollection::ReadFromAddIn( const
uno::Referenceuno::XInterface
IsTypeName( sName,
cppu::UnoTypeuno::XInterface::get()) ||
IsTypeName( sName,
-cppu::UnoTypeutil::DateTime::get()) ||
+cppu::UnoTypelang::XServiceName::get())
||
IsTypeName( sName,
cppu::UnoTypelang::XServiceInfo::get())
||
IsTypeName( sName,
-cppu::UnoTypeutil::DateTime::get()) );
+cppu::UnoTypesheet::XAddIn::get()) );
}
if (!bSkip)
{
@@ -1491,10 +1491,10 @@ void
ScUnoAddInCall::ExecuteCallWithArgs(uno::Sequenceuno::Any rCallArgs)
catch(const reflection::InvocationTargetException rWrapped)
{
if ( rWrapped.TargetException.getValueType().equals(
-cppu::UnoTypeutil::DateTime::get()) )
+cppu::UnoTypelang::IllegalArgumentException::get()) )
nErrCode = errIllegalArgument;
else if ( rWrapped.TargetException.getValueType().equals(
-cppu::UnoTypeutil::DateTime::get()) )
+cppu::UnoTypesheet::NoConvergenceException::get()) )
nErrCode = errNoConvergence;
else
nErrCode = errNoValue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - svx/source sw/source
svx/source/sdr/contact/objectcontactofpageview.cxx |4 +++-
sw/source/core/text/txtfrm.cxx |2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit aa68e1309450f79d1b40545ad6c340a49eff51c6
Author: Michael Stahl mst...@redhat.com
Date: Sat May 17 00:08:34 2014 +0200
fdo#78149: set the ViewPort even when painting to a MetaFile
ObjectContactOfPageView::DoProcessDisplay() has a special case for
painting to MetaFiles, and does not set the ViewPort from the passed-in
RedrawArea unless it's a printing or PDF export, with the result
that for a plain MetaFile all fly-frames in a Writer document
are painted, whether visible or not.
Since e2eda70f2746f08376d8cdf5e5360df217335aef now calls
GetPreviewMetaFile() after every document load, this issue is more
visible.
Since there is no obvious reason to ever ignore a passed RedrawArea,
simply always use it for the ViewPort, not just when printing.
Change-Id: I256710f1476181f567069b45a2a494b0d2064d6b
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx
b/svx/source/sdr/contact/objectcontactofpageview.cxx
index cefbd96..864e730 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -175,12 +175,14 @@ namespace sdr
// create ViewRange
if(isOutputToRecordingMetaFile())
{
-if(isOutputToPDFFile() || isOutputToPrinter())
+if (!rDisplayInfo.GetRedrawArea().IsEmpty())
{
// #i98402# if it's a PDF export, set the ClipRegion as
ViewRange. This is
// mainly because SW does not use DrawingLayer
Page-Oriented and if not doing this,
// all existing objects will be collected as primitives
and processed.
// OD 2009-03-05 #i99876# perform the same also for SW on
printing.
+// fdo#78149 same thing also needed for plain MetaFile
+// export, so why not do it always
const Rectangle
aLogicClipRectangle(rDisplayInfo.GetRedrawArea().GetBoundRect());
aViewRange = basegfx::B2DRange(
commit 44c81ce21825554aad8dcebd58388cb5c0f81df8
Author: Michael Stahl mst...@redhat.com
Date: Fri May 16 17:58:12 2014 +0200
sw: try to fix a valgrind warning
Invalid read of size 1
at SwParaPortion::SetPrep(bool) (porlay.hxx:299)
by SwTxtFrm::Prepare(PrepareHint, void const*, bool) (txtfrm.cxx:1756)
by SwTxtFrm::Prepare(PrepareHint, void const*, bool) (txtfrm.cxx:1663)
by SwCntntFrm::MakeAll() (calcmove.cxx:1310)
by SwFrm::OptPrepareMake() (calcmove.cxx:356)
by SwFrm::OptCalc() const (frame.hxx:1037)
by SwLayAction::_FormatCntnt(SwCntntFrm const*, SwPageFrm const*)
(layact.cxx:1829)
by SwLayAction::FormatCntnt(SwPageFrm const*) (layact.cxx:1660)
by SwLayAction::InternalAction() (layact.cxx:597)
by SwLayAction::Action() (layact.cxx:376)
by SwLayIdle::SwLayIdle(SwRootFrm*, SwViewImp*) (layact.cxx:2179)
Address 0x1f9507e0 is 832 bytes inside a block of size 840 free'd
by FixedMemPool::Free(void*) (mempool.cxx:48)
by SwParaPortion::operator delete(void*, unsigned long) (in
/work/lo/master/instdir/program/libswlo.so)
by SwParaPortion::~SwParaPortion() (porlay.cxx:1972)
by SwTxtFrm::ClearPara() (txtcache.cxx:102)
by SwTxtFrm::Init() (txtfrm.cxx:329)
by SwTxtFrm::CalcLineSpace() (txtfrm.cxx:746)
by SwTxtFrm::Prepare(PrepareHint, void const*, bool) (txtfrm.cxx:1680)
by SwTxtFrm::Prepare(PrepareHint, void const*, bool) (txtfrm.cxx:1663)
by SwCntntFrm::MakeAll() (calcmove.cxx:1310)
by SwFrm::OptPrepareMake() (calcmove.cxx:356)
by SwFrm::OptCalc() const (frame.hxx:1037)
by SwLayAction::_FormatCntnt(SwCntntFrm const*, SwPageFrm const*)
(layact.cxx:1829)
by SwLayAction::FormatCntnt(SwPageFrm const*) (layact.cxx:1660)
by SwLayAction::InternalAction() (layact.cxx:597)
by SwLayAction::Action() (layact.cxx:376)
by SwLayIdle::SwLayIdle(SwRootFrm*, SwViewImp*) (layact.cxx:2179)
Change-Id: I64a1cc6ea301b653af951ba0e00e28d4655d2d97
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index bd4fc8c..ab0d613 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1678,6 +1678,8 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const
void* pVoid,
{
pPara-SetPrepAdjust();
CalcLineSpace();
+// possible that pPara was deleted above; retrieve it again
+pPara = aAccess.GetPara();
InvalidateSize();
_InvalidatePrt();
SwFrm* pNxt;
___
Wrong copy paste in ucbcmds.cxx? (ucb module)
Hello,
I noticed this part:
236 CommandProcessorInfo::CommandProcessorInfo()
237 {
238 m_pInfo = new uno::Sequence ucb::CommandInfo ( 2 );
239
240 (*m_pInfo)[ 0 ]
241 = ucb::CommandInfo(
242 OUString( GETCOMMANDINFO_NAME ), // Name
243 GETCOMMANDINFO_HANDLE, // Handle
244 getCppuVoidType() ); // ArgType
245 (*m_pInfo)[ 1 ]
246 = ucb::CommandInfo(
247 OUString( GLOBALTRANSFER_NAME ), // Name
248 GLOBALTRANSFER_HANDLE, // Handle
249 cppu::UnoTypeucb::GlobalTransferCommandArgument::get()
); // ArgType
250 (*m_pInfo)[ 2 ]
251 = ucb::CommandInfo(
252 OUString( CHECKIN_NAME ), // Name
253 CHECKIN_HANDLE, // Handle
254 cppu::UnoTypeucb::GlobalTransferCommandArgument::get()
); // ArgType
255 }
See
http://opengrok.libreoffice.org/xref/core/ucb/source/core/ucbcmds.cxx#257
I wonder if line 254 could be a wrong copy paste and should be:
cppu::UnoTypeucb::CheckinArgument::get() );
Any idea?
Julien
--
View this message in context:
http://nabble.documentfoundation.org/Wrong-copy-paste-in-ucbcmds-cxx-ucb-module-tp4109103.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
Re: Questions about getCppuType
I noticed that if I did this:
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index bbea200..f0d2b03 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -271,8 +271,8 @@ void Test::testUnoType() {
void Test::testGetTypeFavourUnsigned() {
CPPUNIT_ASSERT(typeid(::sal_Unicode) == typeid(::sal_uInt16));
CPPUNIT_ASSERT(
-::getCppuType(static_cast ::sal_Unicode * (0)) ==
-::getCppuType(static_cast ::sal_uInt16 * (0)));
+cppu::UnoTypecppu::UnoCharType::get() ==
+cppu::UnoTypecppu::UnoUnsignedShortType::get() );
make cppu gives this:
/home/julien/compile-libreoffice/libreoffice/cppu/qa/test_unotype.cxx:275:(anonymous
namespace)::Test::testGetTypeFavourUnsigned
assertion failed
- Expression: cppu::UnoTypecppu::UnoCharType::get() ==
cppu::UnoTypecppu::UnoUnsignedShortType::get()
test_unotype.cxx:275:Assertion
Test name: (anonymous namespace)::Test::testGetTypeFavourUnsigned
assertion failed
- Expression: cppu::UnoTypecppu::UnoCharType::get() ==
cppu::UnoTypecppu::UnoUnsignedShortType::get()
Failures !!!
Run: 3 Failure total: 1 Failures: 1 Errors: 0
I don't understand why it's failing in this case.
Any idea?
Also, I noticed this:
273 CPPUNIT_ASSERT(
274 ::getCppuType(static_cast ::sal_Unicode * (0)) ==
275 ::getCppuType(static_cast ::sal_uInt16 * (0)));
551 CPPUNIT_ASSERT(
552 ::getCppuType ::sal_Unicode () == ::getCppuType
::sal_uInt16 ());
How could the line 552 be converted to remove getCppuType? (compared with
first case)
Julien
--
View this message in context:
http://nabble.documentfoundation.org/Questions-about-getCppuType-tp4106361p4109104.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: sc/source
sc/source/ui/view/gridwin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8c8de51cc954aaae07f76732e6202398e33afeb7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri May 16 20:56:16 2014 -0400
I should check for NULL here.
Change-Id: I245f4a26c8fdee8230bb0af2963cae2739413253
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ff7693d..4c408bd 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5237,7 +5237,7 @@ bool ScGridWindow::GetEditUrl( const Point rPos,
if (pViewSh)
pInputHdl = pViewSh-GetInputHandler();
-if (pInputHdl-IsInputMode())
+if (pInputHdl pInputHdl-IsInputMode())
{
EditView* pView = pInputHdl-GetTableView();
return extractURLInfo(pView-GetFieldUnderMousePointer(), pName, pUrl,
pTarget);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforfind.cxx | 59 +---
svl/source/numbers/zforfind.hxx |7
2 files changed, 57 insertions(+), 9 deletions(-)
New commits:
commit 8e71f81f47c20320c4de7a7aadb7d524f0d8ea76
Author: Eike Rathke er...@redhat.com
Date: Sat May 17 02:33:42 2014 +0200
resolved fdo#41166 match month and day name word instead of substring
Change-Id: I897dbcee47de574d91ba3e3b40a39a35b779fef8
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index c77bb0a..0cf62fd 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -439,6 +439,47 @@ bool ImpSvNumberInputScan::StringPtrContainsImpl( const
OUString rWhat,
/**
+ * Whether rString contains word rWhat at nPos
+ */
+bool ImpSvNumberInputScan::StringContainsWord( const OUString rWhat,
+ const OUString rString,
sal_Int32 nPos )
+{
+if (rWhat.isEmpty() || rString.getLength() nPos + rWhat.getLength())
+return false;
+
+if (StringPtrContainsImpl( rWhat, rString.getStr(), nPos))
+{
+nPos += rWhat.getLength();
+if (nPos == rString.getLength())
+return true;// word at end of string
+
+/* TODO: we COULD invoke bells and whistles word break iterator to find
+ * the next boundary, but really ... this is called for date input, so
+ * how many languages do not separate the day and month names in some
+ * form? */
+
+sal_Int32 nIndex = nPos;
+sal_uInt32 c = rString.iterateCodePoints( nIndex);
+if (nPos+1 nIndex)
+return true;// Surrogate, assume these to be new words.
+(void)c;
+
+const sal_Int32 nType = pFormatter-GetCharClass()-getCharacterType(
rString, nPos);
+
+if (CharClass::isAlphaNumericType( nType))
+return false; // Alpha or numeric is not word gap.
+
+if (CharClass::isLetterType( nType))
+return true;// Letter other than alpha is new word. (Is it?)
+
+return true;// Catch all remaining as gap until we know better.
+}
+
+return false;
+}
+
+
+/**
* Skips the supplied char
*/
inline bool ImpSvNumberInputScan::SkipChar( sal_Unicode c, const OUString
rString,
@@ -577,7 +618,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString
rString, sal_Int32 nPos )
// if we stopped at the first match.
for ( sal_Int16 i = 0; i nMonths; i++ )
{
-if ( bScanGenitiveMonths StringContains(
pUpperGenitiveMonthText[i], rString, nPos ) )
+if ( bScanGenitiveMonths StringContainsWord(
pUpperGenitiveMonthText[i], rString, nPos ) )
{ // genitive full names first
const int nMonthLen = pUpperGenitiveMonthText[i].getLength();
if (nMonthLen nMatchLen)
@@ -586,7 +627,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString
rString, sal_Int32 nPos )
res = i + 1;
}
}
-else if ( bScanGenitiveMonths StringContains(
pUpperGenitiveAbbrevMonthText[i], rString, nPos ) )
+else if ( bScanGenitiveMonths StringContainsWord(
pUpperGenitiveAbbrevMonthText[i], rString, nPos ) )
{ // genitive abbreviated
const int nMonthLen =
pUpperGenitiveAbbrevMonthText[i].getLength();
if (nMonthLen nMatchLen)
@@ -595,7 +636,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString
rString, sal_Int32 nPos )
res = sal::static_int_cast short (-(i+1)); // negative
}
}
-else if ( bScanPartitiveMonths StringContains(
pUpperPartitiveMonthText[i], rString, nPos ) )
+else if ( bScanPartitiveMonths StringContainsWord(
pUpperPartitiveMonthText[i], rString, nPos ) )
{ // partitive full names
const int nMonthLen = pUpperPartitiveMonthText[i].getLength();
if (nMonthLen nMatchLen)
@@ -604,7 +645,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString
rString, sal_Int32 nPos )
res = i+1;
}
}
-else if ( bScanPartitiveMonths StringContains(
pUpperPartitiveAbbrevMonthText[i], rString, nPos ) )
+else if ( bScanPartitiveMonths StringContainsWord(
pUpperPartitiveAbbrevMonthText[i], rString, nPos ) )
{ // partitive abbreviated
const int nMonthLen =
pUpperPartitiveAbbrevMonthText[i].getLength();
if (nMonthLen nMatchLen)
@@ -613,7 +654,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString
rString, sal_Int32 nPos )
res = sal::static_int_cast short (-(i+1)); // negative
}
}
-else if ( StringContains( pUpperMonthText[i], rString, nPos ) )
+else if ( StringContainsWord( pUpperMonthText[i],
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforfind.cxx | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) New commits: commit 3885b5d4b00ebb31adabc36c507abd642c03d0d4 Author: Eike Rathke er...@redhat.com Date: Sat May 17 04:05:20 2014 +0200 resolved fdo#41166 match month and day name word instead of substring Follow-up, check for ASCII first to avoid calls to i18n, and check the type flags instead of calls to CharClass methods that give unexpected results with their masks. Change-Id: I10e685998299dceb2dbcf1d87ae1de09680b8a99 diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 0cf62fd..0e10138 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -458,18 +458,23 @@ bool ImpSvNumberInputScan::StringContainsWord( const OUString rWhat, * how many languages do not separate the day and month names in some * form? */ +// Check simple ASCII first before invoking i18n or anything else. +if (rtl::isAsciiAlphanumeric( rString[nPos] )) +return false; // Alpha or numeric is not word gap. + sal_Int32 nIndex = nPos; -sal_uInt32 c = rString.iterateCodePoints( nIndex); +const sal_uInt32 c = rString.iterateCodePoints( nIndex); if (nPos+1 nIndex) return true;// Surrogate, assume these to be new words. (void)c; const sal_Int32 nType = pFormatter-GetCharClass()-getCharacterType( rString, nPos); +using namespace ::com::sun::star::i18n; -if (CharClass::isAlphaNumericType( nType)) +if ((nType (KCharacterType::UPPER | KCharacterType::LOWER | KCharacterType::DIGIT)) != 0) return false; // Alpha or numeric is not word gap. -if (CharClass::isLetterType( nType)) +if ((nType (KCharacterType::LETTER)) != 0) return true;// Letter other than alpha is new word. (Is it?) return true;// Catch all remaining as gap until we know better. ___ 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 QA Administrators qa-ad...@libreoffice.org changed: What|Removed |Added Depends on||78801 -- 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 #140 from Joel Madero jmadero@gmail.com --- Added 78801 - very recent regression, affects 4.2.4.2 release and 4.3 master Copy + paste from website to writer results in no image being pasted. 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: svl/source
svl/source/numbers/zforfind.cxx | 69
1 file changed, 21 insertions(+), 48 deletions(-)
New commits:
commit e8b2e9163c953048e9e5f7f6cb9392b66be26e01
Author: Eike Rathke er...@redhat.com
Date: Sat May 17 04:26:28 2014 +0200
Back out change for fdo#78119 now that we have StringContainsWord()
This reverts commit 3b3b690c1f0479cfbebcfa68595f75a4994e7a5f.
With the use of StringContainsWord() it is unnecessary to loop all
available names.
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 0e10138..6d6b9d5 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -609,7 +609,6 @@ short ImpSvNumberInputScan::GetMonth( const OUString
rString, sal_Int32 nPos )
static const OUString aSepShortened(SEP);
short res = 0; // no month found
-int nMatchLen = 0;
if (rString.getLength() nPos) // only if needed
{
@@ -618,78 +617,52 @@ short ImpSvNumberInputScan::GetMonth( const OUString
rString, sal_Int32 nPos )
InitText();
}
sal_Int16 nMonths =
pFormatter-GetCalendar()-getNumberOfMonthsInYear();
-// Find the longest match. This is needed for, e.g., Czech, as
Ccaron;erven (June)
-// is fully contained in Ccaron;ervenec (July), so the latter could
never be found
-// if we stopped at the first match.
for ( sal_Int16 i = 0; i nMonths; i++ )
{
if ( bScanGenitiveMonths StringContainsWord(
pUpperGenitiveMonthText[i], rString, nPos ) )
{ // genitive full names first
-const int nMonthLen = pUpperGenitiveMonthText[i].getLength();
-if (nMonthLen nMatchLen)
-{
-nMatchLen = nMonthLen;
-res = i + 1;
-}
+nPos = nPos + pUpperGenitiveMonthText[i].getLength();
+res = i + 1;
+break; // for
}
else if ( bScanGenitiveMonths StringContainsWord(
pUpperGenitiveAbbrevMonthText[i], rString, nPos ) )
{ // genitive abbreviated
-const int nMonthLen =
pUpperGenitiveAbbrevMonthText[i].getLength();
-if (nMonthLen nMatchLen)
-{
-nMatchLen = nMonthLen;
-res = sal::static_int_cast short (-(i+1)); // negative
-}
+nPos = nPos + pUpperGenitiveAbbrevMonthText[i].getLength();
+res = sal::static_int_cast short (-(i+1)); // negative
+break; // for
}
else if ( bScanPartitiveMonths StringContainsWord(
pUpperPartitiveMonthText[i], rString, nPos ) )
{ // partitive full names
-const int nMonthLen = pUpperPartitiveMonthText[i].getLength();
-if (nMonthLen nMatchLen)
-{
-nMatchLen = nMonthLen;
-res = i+1;
-}
+nPos = nPos + pUpperPartitiveMonthText[i].getLength();
+res = i+1;
+break; // for
}
else if ( bScanPartitiveMonths StringContainsWord(
pUpperPartitiveAbbrevMonthText[i], rString, nPos ) )
{ // partitive abbreviated
-const int nMonthLen =
pUpperPartitiveAbbrevMonthText[i].getLength();
-if (nMonthLen nMatchLen)
-{
-nMatchLen = nMonthLen;
-res = sal::static_int_cast short (-(i+1)); // negative
-}
+nPos = nPos + pUpperPartitiveAbbrevMonthText[i].getLength();
+res = sal::static_int_cast short (-(i+1)); // negative
+break; // for
}
else if ( StringContainsWord( pUpperMonthText[i], rString, nPos ) )
{ // noun full names
-const int nMonthLen = pUpperMonthText[i].getLength();
-if (nMonthLen nMatchLen)
-{
-nMatchLen = nMonthLen;
-res = i+1;
-}
+nPos = nPos + pUpperMonthText[i].getLength();
+res = i+1;
+break; // for
}
else if ( StringContainsWord( pUpperAbbrevMonthText[i], rString,
nPos ) )
{ // noun abbreviated
-const int nMonthLen = pUpperAbbrevMonthText[i].getLength();
-if (nMonthLen nMatchLen)
-{
-nMatchLen = nMonthLen;
-res = sal::static_int_cast short (-(i+1)); // negative
-}
+nPos = nPos + pUpperAbbrevMonthText[i].getLength();
+res = sal::static_int_cast short (-(i+1)); // negative
+break; // for
}
else if ( i == 8 pUpperAbbrevMonthText[i] == aSeptCorrect
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx| 25 +
sc/qa/unit/ucalc.hxx|2 ++
sc/source/core/data/column4.cxx |4
3 files changed, 31 insertions(+)
New commits:
commit bc7e0967be52f5eb7948fbb1c30edc7dd5acc18d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri May 16 23:06:33 2014 -0400
fdo#77735: Don't proceed when all cells in the range are empty.
That means there is nothing to delete, and proceeding would cause Calc
to freeze.
Change-Id: I2a8fb5736870ba459082873c8f864283d8b9c664
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index c5465c6..4acb374 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -59,6 +59,10 @@ void ScColumn::DeleteBeforeCopyFromClip(
sc::CopyFromClipContext rCxt, const Sc
sc::SingleColumnSpanSet::SpansType aSpans;
aSpanSet.getSpans(aSpans);
+if (aSpans.empty())
+// All cells in the range in the clip are empty. Nothing to delete.
+return;
+
// Translate the clip column spans into the destination column, and repeat
as needed.
std::vectorsc::RowSpan aDestSpans;
SCROW nDestOffset = aRange.mnRow1 - nClipRow1;
commit 30cc43a56d63ba9ffd588ebc589e3576483d7141
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri May 16 23:05:40 2014 -0400
fdo#77735: Write test for this. This test will freeze with the bug present.
Change-Id: I7b7e67fe2ee59b57ce74f8303d30bebc84f6b0d0
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 14a323b..b086711 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3706,6 +3706,31 @@ void Test::testCopyPasteSkipEmpty()
m_pDoc-DeleteTab(0);
}
+void Test::testCopyPasteSkipEmpty2()
+{
+m_pDoc-InsertTab(0, Test);
+
+m_pDoc-SetString(ScAddress(0,0,0), A);
+m_pDoc-SetString(ScAddress(2,0,0), C);
+
+// Copy A1:C1 to clipboard.
+ScDocument aClipDoc(SCDOCMODE_CLIP);
+aClipDoc.ResetClip(m_pDoc, static_castSCTAB(0));
+copyToClip(m_pDoc, ScRange(0,0,0,2,0,0), aClipDoc);
+
+// Paste to A3 with the skip empty option set. This used to freeze.
(fdo#77735)
+ScRange aDestRange(0,2,0,2,2,0);
+ScMarkData aMark;
+aMark.SetMarkArea(aDestRange);
+m_pDoc-CopyFromClip(aDestRange, aMark, IDF_ALL, NULL, aClipDoc, false,
false, true, true);
+
+CPPUNIT_ASSERT_EQUAL(OUString(A), m_pDoc-GetString(ScAddress(0,2,0)));
+CPPUNIT_ASSERT_MESSAGE(B3 should be empty.,
m_pDoc-GetCellType(ScAddress(1,2,0)) == CELLTYPE_NONE);
+CPPUNIT_ASSERT_EQUAL(OUString(C), m_pDoc-GetString(ScAddress(2,2,0)));
+
+m_pDoc-DeleteTab(0);
+}
+
void Test::testCopyPasteSkipEmptyConditionalFormatting()
{
m_pDoc-InsertTab(0, Test);
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 35d57ce..66fbfd5 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -273,6 +273,7 @@ public:
void testCopyPasteTranspose();
void testCopyPasteMultiRange();
void testCopyPasteSkipEmpty();
+void testCopyPasteSkipEmpty2();
void testCopyPasteSkipEmptyConditionalFormatting();
void testCutPasteRefUndo();
void testUndoCut();
@@ -469,6 +470,7 @@ public:
CPPUNIT_TEST(testCopyPasteTranspose);
CPPUNIT_TEST(testCopyPasteMultiRange);
CPPUNIT_TEST(testCopyPasteSkipEmpty);
+CPPUNIT_TEST(testCopyPasteSkipEmpty2);
//CPPUNIT_TEST(testCopyPasteSkipEmptyConditionalFormatting);
CPPUNIT_TEST(testCutPasteRefUndo);
CPPUNIT_TEST(testUndoCut);
___
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' - svx/source
svx/source/sdr/properties/itemsettools.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 68ee7e9c423ba8ca01862435753105c7c28aa62e Author: Caolán McNamara caol...@redhat.com Date: Fri May 16 20:50:24 2014 +0100 strangely obvious leaky code Change-Id: I968cbb784d53e0cff0649061c58f752939226a09 (cherry picked from commit 5b2f1b46b129c41890c54513c6d386407db6718a) Reviewed-on: https://gerrit.libreoffice.org/9385 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index cea89d0..10472bc 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -120,6 +120,7 @@ namespace sdr SfxPoolItem* pNewItem = pItem-Clone(); pNewItem-ScaleMetrics(nMul, nDiv); rSet.Put(*pNewItem); +delete pNewItem; } } nWhich = aIter.NextWhich(); ___ 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' - sc/source
sc/source/core/data/column4.cxx |4 1 file changed, 4 insertions(+) New commits: commit 8549d1dbe648ce01e4a351eb301dcf146c62676d Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri May 16 23:06:33 2014 -0400 fdo#77735: Don't proceed when all cells in the range are empty. That means there is nothing to delete, and proceeding would cause Calc to freeze. Change-Id: I2a8fb5736870ba459082873c8f864283d8b9c664 (cherry picked from commit bc7e0967be52f5eb7948fbb1c30edc7dd5acc18d) Reviewed-on: https://gerrit.libreoffice.org/9388 Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index 7996cd8..9a3ef12 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -53,6 +53,10 @@ void ScColumn::DeleteBeforeCopyFromClip( sc::CopyFromClipContext rCxt, const Sc sc::SingleColumnSpanSet::SpansType aSpans; aSpanSet.getSpans(aSpans); +if (aSpans.empty()) +// All cells in the range in the clip are empty. Nothing to delete. +return; + // Translate the clip column spans into the destination column, and repeat as needed. std::vectorsc::RowSpan aDestSpans; SCROW nDestOffset = aRange.mnRow1 - nClipRow1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
