[Libreoffice-commits] core.git: 2 commits - extensions/source include/connectivity
extensions/source/propctrlr/composeduiupdate.cxx |4 --
include/connectivity/CommonTools.hxx | 32 ---
2 files changed, 7 insertions(+), 29 deletions(-)
New commits:
commit 43a37822dc82abd16e0d99b5bbe21ac469c04ddd
Author: Noel Grandin n...@peralex.com
Date: Fri Jul 18 16:21:04 2014 +0200
convert ORefVector to use salhelp::SimpleReferenceObject
instead of hand-rolled code
Change-Id: I56e991c70334cb201a460ea8679be70808451a86
diff --git a/include/connectivity/CommonTools.hxx
b/include/connectivity/CommonTools.hxx
index d099905..1ef5908 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -37,6 +37,7 @@
#include com/sun/star/uno/XComponentContext.hpp
#include connectivity/dbtoolsdllapi.hxx
#include cppuhelper/supportsservice.hxx
+#include salhelper/simplereferenceobject.hxx
namespace com { namespace sun { namespace star { namespace util {
struct Date;
@@ -63,21 +64,19 @@ namespace connectivity
typedef std::mapOUString,OSQLTable,comphelper::UStringMixLess OSQLTables;
// class ORefVector allows reference counting on a std::vector
-template class VectorVal class ORefVector
+template class VectorVal class ORefVector : public
salhelper::SimpleReferenceObject
{
std::vector VectorVal m_vector;
-oslInterlockedCount m_refCount;
protected:
virtual ~ORefVector(){}
public:
typedef std::vector VectorVal Vector;
-ORefVector() : m_refCount(0) {}
-ORefVector(size_t _st) : m_vector(_st) , m_refCount(0) {}
-ORefVector(const ORefVector _rRH) :
m_vector(_rRH.m_vector),m_refCount(0)
-{
-}
+ORefVector() {}
+ORefVector(size_t _st) : m_vector(_st) {}
+ORefVector(const ORefVector _rRH) : m_vector(_rRH.m_vector) {}
+
ORefVector operator=(const ORefVector _rRH)
{
if ( _rRH != this )
@@ -90,25 +89,6 @@ namespace connectivity
std::vector VectorVal get() { return m_vector; }
std::vector VectorVal const get() const { return m_vector; }
-inline static void * SAL_CALL operator new( size_t nSize )
-{ return ::rtl_allocateMemory( nSize ); }
-inline static void SAL_CALL operator delete( void * pMem )
-{ ::rtl_freeMemory( pMem ); }
-inline static void * SAL_CALL operator new( size_t, void * pMem )
-{ return pMem; }
-inline static void SAL_CALL operator delete( void *, void * )
-{}
-
-void acquire()
-{
-osl_atomic_increment( m_refCount );
-}
-void release()
-{
-if (! osl_atomic_decrement( m_refCount ))
-delete this;
-}
-
};
// class ORowVector incudes refcounting and initialze himself
commit d694339bc87b1e8966bc536b042723a96b93e408
Author: Noel Grandin n...@peralex.com
Date: Fri Jul 18 15:01:33 2014 +0200
remove unused field
Change-Id: I4d58650f96191c0c58c0cd1233d7a7f670de3324
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx
b/extensions/source/propctrlr/composeduiupdate.cxx
index c4cf96a..bcff8de 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -82,7 +82,6 @@ namespace pcr
{
private:
::osl::Mutexm_aMutex;
-oslInterlockedCount m_refCount;
boolm_bDisposed;
ComposedPropertyUIUpdate
m_rMaster;
@@ -187,8 +186,7 @@ namespace pcr
CachedInspectorUI::CachedInspectorUI( ComposedPropertyUIUpdate _rMaster,
FNotifySingleUIChange _pUIChangeNotification )
-:m_refCount( 0 )
-,m_bDisposed( false )
+:m_bDisposed( false )
,m_rMaster( _rMaster )
,m_pUIChangeNotification( _pUIChangeNotification )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for submodules on 2014-07-21
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: + Fix fdo#80433 help pages for new T functions in https://gerrit.libreoffice.org/10426 from Olivier Hallot + Fix for fdo#80450: MS excel F functions help pages in https://gerrit.libreoffice.org/10424 from Olivier Hallot + Fix fdo#80451: New DIST functions from Excel in https://gerrit.libreoffice.org/10423 from Olivier Hallot * Merged changes on master for project help changed in the last 25 hours: None * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-07-21
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#76754 Speed up registration of new listeners to SfxBroadcaster in https://gerrit.libreoffice.org/10344 from Tobias Lippert about module include, sd, svl, svx, sw End of freshness + fdo#58194 - export DOCX Automatic indent as firstLine indent in https://gerrit.libreoffice.org/10425 from Joren De Cuyper about module sw + fdo#79172: dev builds were misleadingly labeled 'beta' in https://gerrit.libreoffice.org/10313 from Adolfo Jayme Barrientos about module icon-themes + fdo#81489: Tweak the color in 'Insert Row/Column' to increase its visibil in https://gerrit.libreoffice.org/10412 from Adolfo Jayme Barrientos about module icon-themes * Merged changes on master for project core changed in the last 25 hours: + vcl: add floating equivalent for MapRes in https://gerrit.libreoffice.org/10415 from Norbert Thiebaud + Use DeviceCorrdinate for DXArray in FillDXArray and ImplLayoutArgs in https://gerrit.libreoffice.org/10414 from Norbert Thiebaud + add config_vcl to control DevicePixel coordinate base type in https://gerrit.libreoffice.org/10413 from Norbert Thiebaud + vcl quartz: Add support back for DXArray tweaking in https://gerrit.libreoffice.org/10420 from Norbert Thiebaud + vcl quartz use the font size to approximate the position of the bullet in https://gerrit.libreoffice.org/10419 from Norbert Thiebaud + vcl quartz: draw 'bullet' manually for better control in https://gerrit.libreoffice.org/10418 from Norbert Thiebaud + vcl use DeviceCoordinate got GetNextGlyphs in https://gerrit.libreoffice.org/10417 from Norbert Thiebaud + vcl consitent use of long for corrdinate in https://gerrit.libreoffice.org/10416 from Norbert Thiebaud + fdo#63756 build libxml2 with ICU support in https://gerrit.libreoffice.org/10369 from David Tardon * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#57950 Replace chained append( with operator+) in https://gerrit.libreoffice.org/10149 from Petr Vorel + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + Use assert instead of OSL_ASSERT in sal/ in https://gerrit.libreoffice.org/10113 from Arnaud Versini + fdo#45286: Fix for saving a file as.xlsx destroys link to linked contents in https://gerrit.libreoffice.org/10104 from Robin Kumar + __arm and __arm64 don't exist when building for the simulator. in https://gerrit.libreoffice.org/10103 from Andrzej Hunt + attempt in https://gerrit.libreoffice.org/9939 from Michael Stahl + fdo#78947 : The File gets corrupted when saved in LO in https://gerrit.libreoffice.org/9775 from BisalNayal + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source
oox/source/drawingml/textrun.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 6786bb6571c2d84cdfb2c09ff739c512459e4367 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Jul 18 09:23:17 2014 +0200 bnc#887230: always use theme color for hyperlinks in Impress Change-Id: I888f107c61037162439ad2d1ba99ad8185532f71 (cherry picked from commit 92f74f6ccb5a55807724db85815f7ea0c49370e0) Reviewed-on: https://gerrit.libreoffice.org/10383 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index c4648c2..6c5259e 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -140,8 +140,7 @@ sal_Int32 TextRun::insertAt( xTextFieldCursor-gotoEnd( sal_True ); -if ( !maTextCharacterProperties.maCharColor.isUsed() ) -aTextCharacterProps.maCharColor.setSchemeClr( XML_hlink ); +aTextCharacterProps.maCharColor.setSchemeClr( XML_hlink ); if ( !maTextCharacterProperties.moUnderline.has() ) aTextCharacterProps.moUnderline.set( XML_sng ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source
oox/source/drawingml/textrun.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 2762bb1b1b57d0eec2d8cd2c092e52ef082c50b6 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Jul 18 09:23:17 2014 +0200 bnc#887230: always use theme color for hyperlinks in Impress Change-Id: I888f107c61037162439ad2d1ba99ad8185532f71 (cherry picked from commit 92f74f6ccb5a55807724db85815f7ea0c49370e0) Reviewed-on: https://gerrit.libreoffice.org/10384 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 9537948..8e10553 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -144,8 +144,7 @@ sal_Int32 TextRun::insertAt( xTextFieldCursor-gotoEnd( sal_True ); -if ( !maTextCharacterProperties.maCharColor.isUsed() ) -aTextCharacterProps.maCharColor.setSchemeClr( XML_hlink ); +aTextCharacterProps.maCharColor.setSchemeClr( XML_hlink ); if ( !maTextCharacterProperties.moUnderline.has() ) aTextCharacterProps.moUnderline.set( XML_sng ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/hunspell external/hyphen external/mythes
external/hunspell/hunspell-fdo48017-wfopen.patch |6 +++---
external/hyphen/hyphen-fdo48017-wfopen.patch | 12
external/mythes/mythes-fdo48017-wfopen.patch |9 +++--
3 files changed, 18 insertions(+), 9 deletions(-)
New commits:
commit 0ad283adb51b3a1bb777e6341e61541d4bffaa44
Author: László Németh nem...@numbertext.org
Date: Sun Jul 20 13:46:57 2014 +0200
fdo#80363 _wfullpath in MyThes and Hyphen
(cherry-picked from commit d7374d4812316a79916956f03c8bd4a281fdbdec)
Conflicts:
external/hyphen/hyphen-fdo48017-wfopen.patch
Change-Id: I4232040d4c62220389ca356797d18b1c87673e64
Reviewed-on: https://gerrit.libreoffice.org/10422
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/external/hunspell/hunspell-fdo48017-wfopen.patch
b/external/hunspell/hunspell-fdo48017-wfopen.patch
index e358106..37203be 100644
--- a/external/hunspell/hunspell-fdo48017-wfopen.patch
+++ b/external/hunspell/hunspell-fdo48017-wfopen.patch
@@ -13,7 +13,7 @@ diff -ru hunspell/src/hunspell/csutil.cxx
build/hunspell/src/hunspell/csutil.cxx
#ifdef OPENOFFICEORG
# include unicode/uchar.h
#else
-@@ -46,6 +50,26 @@
+@@ -51,6 +51,26 @@
static struct unicode_info2 * utf_tbl = NULL;
static int utf_tbl_count = 0; // utf_tbl can be used by multiple Hunspell
instances
@@ -24,11 +24,11 @@ diff -ru hunspell/src/hunspell/csutil.cxx
build/hunspell/src/hunspell/csutil.cxx
+int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
+wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
+wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t));
-+MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
+FILE * f = NULL;
++MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
+if (_wfullpath( buff2, buff, len ) != NULL) {
+ f = _wfopen(buff2, (strcmp(mode, r) == 0) ? Lr : Lrb);
-+}
++}
+free(buff);
+free(buff2);
+return f;
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch
b/external/hyphen/hyphen-fdo48017-wfopen.patch
index 27cffa0..e99a891 100644
--- a/external/hyphen/hyphen-fdo48017-wfopen.patch
+++ b/external/hyphen/hyphen-fdo48017-wfopen.patch
@@ -13,7 +13,7 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
#define noVERBOSE
/* calculate hyphenmin values with long ligature length (2 or 3 characters
-@@ -371,6 +376,22 @@
+@@ -371,6 +376,26 @@
}
}
@@ -23,10 +23,14 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
+if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
+int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
+wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
-+FILE * f;
++wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t));
++FILE * f = NULL;
+MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
-+f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++if (_wfullpath( buff2, buff, len ) != NULL) {
++ f = _wfopen(buff2, (strcmp(mode, r) == 0) ? Lr : Lrb);
++}
+free(buff);
++free(buff2);
+return f;
+}
+#endif
@@ -36,7 +40,7 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
HyphenDict *
hnj_hyphen_load (const char *fn)
{
-@@ -383,7 +404,7 @@
+@@ -383,7 +408,7 @@
HashEntry *e;
int state_num = 0;
diff --git a/external/mythes/mythes-fdo48017-wfopen.patch
b/external/mythes/mythes-fdo48017-wfopen.patch
index 1621b1d..82d69ad 100644
--- a/external/mythes/mythes-fdo48017-wfopen.patch
+++ b/external/mythes/mythes-fdo48017-wfopen.patch
@@ -31,7 +31,7 @@ diff -u mythes/mythes.cxx build/mythes/mythes.cxx
if (!pdfile) {
return 0;
}
-@@ -370,3 +375,17 @@
+@@ -373,3 +378,22 @@
return -1;
}
@@ -41,9 +41,14 @@ diff -u mythes/mythes.cxx build/mythes/mythes.cxx
+if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
+int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
+wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t));
++FILE * f = NULL;
+MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
-+FILE * f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++if (_wfullpath( buff2, buff, len ) != NULL) {
++ f = _wfopen(buff2, (strcmp(mode, r) == 0) ? Lr : Lrb);
++}
+free(buff);
++free(buff2);
+return f;
+}
+#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
distro-pack-install do not install libsaxlo.so
Hello guys,
I found this out when packaging 4.3 for openSUSE and used following hack to
fix the problem:
make DESTDIR=%{buildroot} distro-pack-install
# FIXME: Hack add missing file
install -m755 instdir/program/libsaxlo.so
%{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so
echo %{_libdir}/%{name}/program/libsaxlo.so file-lists/common_list.txt
But I am not exactly sure how to fix this, so someone knowledgable on how
the file-lists are generated needs to fix it :)
Cheers
Tom
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Internal Updater
Khargaroth you coudl actually do one better. have it when download is clicked have it automatically poll the nearest mirror to you and download the installer from within LO and have it auto run and update ones system. not sure though how much work that would be though. We would eliminate the need to load a browser and alot of extra steps currently involved. On Sun, Jul 20, 2014 at 7:50 PM, khagaroth khagar...@gmail.com wrote: I don't find this that useful. Unless the internal updater starts using differential updates (which would be great), I think it's better to just open the download site in a browser. On Sun, Jul 20, 2014 at 7:35 PM, Joel Madero jmadero@gmail.com wrote: Hi All, I know we've discussed this already a few times - both within ESC and within the QA call but I wanted to get a better sense of what is needed to move forward with getting it fixed. FWIW I've closed 3 bugs this at least tangentially related to the subject. So - from what I understand the entire updater is just broken, when you get a notification that there is a new version you click it and it just takes you to the website where additional clicks are needed to download, and then more to install. QA has discussed this a few times and generally I think we've come up with a roadmap of what would be ideal but I know that it will require others to implement so I'm not trying to push this onto any developer just curious how (if at all) we can get it fixed. Phase I: Fix what is already there - currently you can go to Help - Check for Updates and there is a Install button that is always inactive. How much work would it take to at least fix that? If this will never get fixed (or be a long time) I think we should remove the button as it just reminds users about a broken feature that has been broken for a long time already. FWIW here I think we need to be clearer about what it means to check for update because it's based on what branch you are on Phase II: Add new options to allow a user to select the branch they want (fresh/stable/pre-release) and then another option to either download only or download and install which would automatically either download to a folder or download and install upon release. I think Phase II would be an amazing addition that would be kind of one of those big things we could run some PR about during a major release. Like I said - not pushing this on anyone, just curious where we stand as I see updater related bug reports and enhancement requests and QA has discussed it quite a few times as something that we feel need some love/attention. Best Regards, Joel ___ 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 -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
additional dictionaries
Some areas of work and study require special spelling dictionaries. For example: botany, zoology, legal, medical, computer, etc. the list goes on and on. Many of these words should not be in a standard spelling dictionary because doing so would make their use in the wrong place much more probable. I have a word list of botanical names that I have compiled over the years mainly from free online plant lists and databases. Some major sources are: http://plants.usda.gov/ http://www.pfaf.org/ An India plant list An Australia plant list What are the requirements to get a word list like this into a specialized spelling dictionary? Is there software to do it or a special format? Thank you John Goude DiningOnTheWilds.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060181.xhp | 30 ++ 1 file changed, 30 insertions(+) New commits: commit 0e6d0e8907c46f3d3dcaf3f06add2496beaf16a8 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sat Jul 19 12:11:45 2014 -0300 Fix fdo#80447: Help pages for MS BINOM functions Covers BIMOM.DIST and BINOM.INV Change-Id: If1f3ef61dfa5e23c6b88818439be2932eb98aabe Reviewed-on: https://gerrit.libreoffice.org/10409 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/scalc/01/04060181.xhp b/source/text/scalc/01/04060181.xhp index 24d7963..4768af7 100644 --- a/source/text/scalc/01/04060181.xhp +++ b/source/text/scalc/01/04060181.xhp @@ -258,6 +258,36 @@ paragraph xml-lang=en-US id=par_id3150120 role=paragraph l10n=U oldref=86 item type=input=BINOMDIST(A1;12;0.5;1)/item shows the cumulative probabilities for the same series. For example, if A1 = item type=input4/item, the cumulative probability of the series is 0, 1, 2, 3 or 4 times emphHeads/emph (non-exclusive OR)./paragraph /section +section id=binomdotdist +bookmark xml-lang=en-US branch=index id=bm_id2943228bookmark_valueBINOM.DIST function/bookmark_value/bookmark +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_BINOM_DIST_MS id=bm_id2950146 localize=false/ +paragraph xml-lang=en-US id=hd_id2943228 role=heading level=2 l10n=U oldref=76BINOM.DIST/paragraph +paragraph xml-lang=en-US id=par_id2946897 role=paragraph l10n=U oldref=77ahelp hid=HID_FUNC_BINOM_DIST_MSReturns the individual term binomial distribution probability./ahelp/paragraph +paragraph xml-lang=en-US id=hd_id2949289 role=heading level=3 l10n=U oldref=78Syntax/paragraph +paragraph xml-lang=en-US id=par_id2956009 role=code l10n=U oldref=79BINOM.DIST(X; Trials; SP; C)/paragraph +paragraph xml-lang=en-US id=par_id2954304 role=paragraph l10n=U oldref=80emphX/emph is the number of successes in a set of trials./paragraph +paragraph xml-lang=en-US id=par_id2947492 role=paragraph l10n=U oldref=81emphTrials/emph is the number of independent trials./paragraph +paragraph xml-lang=en-US id=par_id2946085 role=paragraph l10n=U oldref=82emphSP/emph is the probability of success on each trial./paragraph +paragraph xml-lang=en-US id=par_id299760 role=paragraph l10n=U oldref=83emphC/emph = 0 calculates the probability of a single event and emphC/emph = 1 calculates the cumulative probability./paragraph +paragraph xml-lang=en-US id=hd_id291171 role=heading level=3 l10n=U oldref=84Example/paragraph +paragraph xml-lang=en-US id=par_id295666 role=paragraph l10n=U oldref=85 +item type=input=BINOM.DIST(A1;12;0.5;0)/item shows (if the values item type=input0/item to item type=input12/item are entered in A1) the probabilities for 12 flips of a coin that emphHeads/emph will come up exactly the number of times entered in A1./paragraph +paragraph xml-lang=en-US id=par_id290120 role=paragraph l10n=U oldref=86 +item type=input=BINOM.DIST(A1;12;0.5;1)/item shows the cumulative probabilities for the same series. For example, if A1 = item type=input4/item, the cumulative probability of the series is 0, 1, 2, 3 or 4 times emphHeads/emph (non-exclusive OR)./paragraph +/section +section id=binomdotinv +bookmark xml-lang=en-US branch=index id=bm_id2843228bookmark_valueBINOM.INV function/bookmark_value/bookmark +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_BINOM_INV_MS id=bm_id2850146 localize=false/ +paragraph xml-lang=en-US id=hd_id2843228 role=heading level=2 l10n=U oldref=76BINOM.INV/paragraph +paragraph xml-lang=en-US id=par_id2846897 role=paragraph l10n=U oldref=77ahelp hid=HID_FUNC_BINOM_INV_MSReturns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value./ahelp/paragraph +paragraph xml-lang=en-US id=hd_id2849289 role=heading level=3 l10n=U oldref=78Syntax/paragraph +paragraph xml-lang=en-US id=par_id2856009 role=code l10n=U oldref=79BINOM.INV(Trials; SP; Alpha)/paragraph +paragraph xml-lang=en-US id=par_id2847492 role=paragraph l10n=U oldref=81emphTrials/emph The total number of trials./paragraph +paragraph xml-lang=en-US id=par_id2846085 role=paragraph l10n=U oldref=82emphSP/emph is the probability of success on each trial./paragraph +paragraph xml-lang=en-US id=par_id289760 role=paragraph l10n=U oldref=83emphAlpha/emphThe border probability that is attained or exceeded./paragraph +paragraph xml-lang=en-US id=hd_id281171 role=heading level=3 l10n=U oldref=84Example/paragraph +paragraph xml-lang=en-US id=par_id285666 role=paragraph l10n=U oldref=85item type=input=BINOM.INV(8;0.6;0.9)/item returns 7, the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value./paragraph +/section section id=chisqinv bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_CHISQINV id=bm_id0119200902430717 localize=false/
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4d2ceee29baafc5d1d92d4bc55ebe3a66145e1d5 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sat Jul 19 11:18:55 2014 -0300 Updated core Project: help 3da3b8063d11ea0d584753e17d13f6ad6b9b0aa4 Fix fdo#80449: help text for CONFIDENCE functions CONFIDENCE.T and CONFIDENCE.NORM Change-Id: Ie63eddc86dfd1de116acc980d5d672678279e779 Reviewed-on: https://gerrit.libreoffice.org/10408 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 4afc42f..3da3b80 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4afc42f9eb3f50b542f22414045856bfc588855e +Subproject commit 3da3b8063d11ea0d584753e17d13f6ad6b9b0aa4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060183.xhp | 38 ++ 1 file changed, 38 insertions(+) New commits: commit 3da3b8063d11ea0d584753e17d13f6ad6b9b0aa4 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sat Jul 19 11:18:55 2014 -0300 Fix fdo#80449: help text for CONFIDENCE functions CONFIDENCE.T and CONFIDENCE.NORM Change-Id: Ie63eddc86dfd1de116acc980d5d672678279e779 Reviewed-on: https://gerrit.libreoffice.org/10408 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/scalc/01/04060183.xhp b/source/text/scalc/01/04060183.xhp index 0e617b9..d96f6b1 100644 --- a/source/text/scalc/01/04060183.xhp +++ b/source/text/scalc/01/04060183.xhp @@ -80,6 +80,44 @@ paragraph role=paragraph id=par_id3153335 xml-lang=en-US l10n=U oldref=28 item type=input=CONFIDENCE(0.05;1.5;100)/item gives 0.29./paragraph /section +section id=confidencedott +bookmark xml-lang=en-US branch=index id=bm_id2953559bookmark_valueCONFIDENCE.T function/bookmark_value +/bookmark +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_CONFIDENCE_T id=bm_id2953803 localize=false/ +paragraph role=heading id=hd_id2953559 xml-lang=en-US level=2 l10n=U oldref=20CONFIDENCE.T/paragraph +paragraph role=paragraph id=par_id2953814 xml-lang=en-US l10n=U oldref=21 +ahelp hid=HID_FUNC_CONFIDENCE_TReturns the (1-alpha) confidence interval for a Student's t distribution./ahelp/paragraph +paragraph role=heading id=hd_id2949315 xml-lang=en-US level=3 l10n=U oldref=22Syntax/paragraph +paragraph role=code id=par_id2947501 xml-lang=en-US l10n=U oldref=23CONFIDENCE.T(Alpha; StDev; Size)/paragraph +paragraph role=paragraph id=par_id2949872 xml-lang=en-US l10n=U oldref=24 +emphAlpha/emph is the level of the confidence interval./paragraph +paragraph role=paragraph id=par_id2945324 xml-lang=en-US l10n=U oldref=25 +emphStDev/emph is the standard deviation for the total population./paragraph +paragraph role=paragraph id=par_id2953075 xml-lang=en-US l10n=U oldref=26 +emphSize/emph is the size of the total population./paragraph +paragraph role=heading id=hd_id2950435 xml-lang=en-US level=3 l10n=U oldref=27Example/paragraph +paragraph role=paragraph id=par_id2953335 xml-lang=en-US l10n=U oldref=28 +item type=input=CONFIDENCE.T(0.05;1.5;100)/item gives 0.2976325427./paragraph +/section +section id=confidencedotnorm +bookmark xml-lang=en-US branch=index id=bm_id2853559bookmark_valueCONFIDENCE.NORM function/bookmark_value +/bookmark +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_CONFIDENCE_N id=bm_id2853803 localize=false/ +paragraph role=heading id=hd_id2853559 xml-lang=en-US level=2 l10n=U oldref=20CONFIDENCE.NORM/paragraph +paragraph role=paragraph id=par_id2853814 xml-lang=en-US l10n=U oldref=21 +ahelp hid=HID_FUNC_CONFIDENCE_NReturns the (1-alpha) confidence interval for a normal distribution./ahelp/paragraph +paragraph role=heading id=hd_id2849315 xml-lang=en-US level=3 l10n=U oldref=22Syntax/paragraph +paragraph role=code id=par_id2847501 xml-lang=en-US l10n=U oldref=23CONFIDENCE.NORM(Alpha; StDev; Size)/paragraph +paragraph role=paragraph id=par_id2849872 xml-lang=en-US l10n=U oldref=24 +emphAlpha/emph is the level of the confidence interval./paragraph +paragraph role=paragraph id=par_id2845324 xml-lang=en-US l10n=U oldref=25 +emphStDev/emph is the standard deviation for the total population./paragraph +paragraph role=paragraph id=par_id2853075 xml-lang=en-US l10n=U oldref=26 +emphSize/emph is the size of the total population./paragraph +paragraph role=heading id=hd_id2850435 xml-lang=en-US level=3 l10n=U oldref=27Example/paragraph +paragraph role=paragraph id=par_id2853335 xml-lang=en-US l10n=U oldref=28 +item type=input=CONFIDENCE.NORM(0.05;1.5;100)/item gives 0.2939945977./paragraph +/section section id=correl bookmark xml-lang=en-US branch=index id=bm_id3148746bookmark_valueCORREL function/bookmark_value bookmark_valuecoefficient of correlation/bookmark_value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 785216943193cc7b4fc53947bbf696697b01d77b Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sat Jul 19 12:11:45 2014 -0300 Updated core Project: help 0e6d0e8907c46f3d3dcaf3f06add2496beaf16a8 Fix fdo#80447: Help pages for MS BINOM functions Covers BIMOM.DIST and BINOM.INV Change-Id: If1f3ef61dfa5e23c6b88818439be2932eb98aabe Reviewed-on: https://gerrit.libreoffice.org/10409 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 3da3b80..0e6d0e8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3da3b8063d11ea0d584753e17d13f6ad6b9b0aa4 +Subproject commit 0e6d0e8907c46f3d3dcaf3f06add2496beaf16a8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060182.xhp | 14 +++ source/text/scalc/01/04060184.xhp | 47 ++ 2 files changed, 61 insertions(+) New commits: commit 76e8934ce147560cd18db1f62885e05d4d9e530e Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sat Jul 19 23:12:26 2014 -0300 Fix fdo#80436 Help pages for MODE functions MODE.SNGL, MODE.MULT, Z.TEST, NEGBINOM.DIST Change-Id: I0e6ad33f76a09c9d4af7b8146d07eb4f1df86313 Reviewed-on: https://gerrit.libreoffice.org/10411 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/scalc/01/04060182.xhp b/source/text/scalc/01/04060182.xhp index 3d595d0..c3b2767 100644 --- a/source/text/scalc/01/04060182.xhp +++ b/source/text/scalc/01/04060182.xhp @@ -333,6 +333,20 @@ emphSigma/emph (optional) is the known standard deviation of the population. If omitted, the standard deviation of the given sample is used./paragraph paragraph xml-lang=en-US id=par_id0305200911372999 role=paragraph l10n=NEWSee also the link href=http://wiki.documentfoundation.org/Documentation/How_Tos/Calc:_ZTEST_function;Wiki page/link./paragraph /section +section id=zdottest +bookmark xml-lang=en-US branch=index id=bm_id2953216bookmark_valueZ.TEST function/bookmark_value +/bookmark +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_Z_TEST_MS id=bm_id2947569 localize=false/ +paragraph xml-lang=en-US id=hd_id2953216 role=heading level=2 l10n=U oldref=103Z.TEST/paragraph +paragraph xml-lang=en-US id=par_id2950758 role=paragraph l10n=CHG oldref=104ahelp hid=HID_FUNC_Z_TEST_MSCalculates the probability of observing a z-statistic greater than the one computed based on a sample./ahelp/paragraph +paragraph xml-lang=en-US id=hd_id2950872 role=heading level=3 l10n=U oldref=105Syntax/paragraph +paragraph xml-lang=en-US id=par_id2953274 role=code l10n=CHG oldref=106Z.TEST(Data; mu; Sigma)/paragraph +paragraph xml-lang=en-US id=par_id2956109 role=paragraph l10n=CHG oldref=107emphData/emph is the given sample, drawn from a normally distributed population./paragraph +paragraph xml-lang=en-US id=par_id2949977 role=paragraph l10n=CHG oldref=108emphmu/emph is the known mean of the population./paragraph +paragraph xml-lang=en-US id=par_id2954740 role=paragraph l10n=CHG oldref=109emphSigma/emph (optional) is the known standard deviation of the population. If omitted, the standard deviation of the given sample is used./paragraph +paragraph xml-lang=en-US id=hd_id2949539 role=heading level=3 l10n=U oldref=58Example/paragraph +paragraph xml-lang=en-US id=par_id2948770 role=paragraph l10n=U oldref=59item type=input=Z.TEST(A2:A20; 9; 2)/item returns the result of a z-test on a sample A2:A20 drawn from a population with known mean 9 and known standard deviation 2./paragraph +/section section id=harmean bookmark xml-lang=en-US branch=index id=bm_id3153623bookmark_valueHARMEAN function/bookmark_value bookmark_valuemeans;harmonic/bookmark_value diff --git a/source/text/scalc/01/04060184.xhp b/source/text/scalc/01/04060184.xhp index 12d3201..1cd71a2 100644 --- a/source/text/scalc/01/04060184.xhp +++ b/source/text/scalc/01/04060184.xhp @@ -184,6 +184,35 @@ oldref=48Example/paragraph item type=input=MODE(A1:A50)/item /paragraph /section + +section id=modedotsngl +bookmark xml-lang=en-US branch=index id=bm_id2953933bookmark_valueMODE.SNGL function/bookmark_value +bookmark_valuemost common value/bookmark_value +/bookmarkcommentmw added one entry/comment +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_MODAL_VALUE_MS id=bm_id2949253 localize=false/ +paragraph xml-lang=en-US id=hd_id2953933 role=heading level=2 l10n=U oldref=43MODE.SNGL/paragraph +paragraph xml-lang=en-US id=par_id2953085 role=paragraph l10n=U oldref=44ahelp hid=HID_FUNC_MODAL_VALUE_MSReturns the most frequently occurring, or repetitive, value in an array or range of data./ahelp If there are several values with the same frequency, it returns the smallest value. An error occurs when a value doesn't appear twice./paragraph +paragraph xml-lang=en-US id=hd_id2953003 role=heading level=3 l10n=U oldref=45Syntax/paragraph +paragraph xml-lang=en-US id=par_id2955950 role=code l10n=U oldref=46MODE.SNGL(Number1; Number2; ...Number30)/paragraph +paragraph xml-lang=en-US id=par_id2950337 role=paragraph l10n=CHG oldref=47emphNumber1; Number2;...Number30/emph are numerical values or ranges./paragraph +paragraph xml-lang=en-US id=par_id2963792 role=warning l10n=CHG oldref=629If the data set contains no duplicate data points, MODE.SNGL returns the #VALUE! error value./paragraph +paragraph xml-lang=en-US id=hd_id2953571 role=heading level=3 l10n=U oldref=48Example/paragraph +paragraph xml-lang=en-US id=par_id2953733 role=paragraph l10n=U oldref=49item type=input=MODE.SNGL(A1:A50)/item/paragraph +/section +section id=modedotmult +bookmark xml-lang=en-US
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3cd037818c5e227607c8b4315d911ed3cd081fc7 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sun Jul 20 11:09:11 2014 -0300 Updated core Project: help 19da9bb07bd4cdedc266e614d0aecb6569a81df1 Fix fdo#80451: New DIST functions from Excel EXPON.DIST, HYPGEOM.DIST, POISSON.DIST and WEIBULL.DIST Change-Id: I10ca3013e430c53a03d4795d0c47cbaaeb7b9adb Reviewed-on: https://gerrit.libreoffice.org/10423 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 76e8934..19da9bb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 76e8934ce147560cd18db1f62885e05d4d9e530e +Subproject commit 19da9bb07bd4cdedc266e614d0aecb6569a81df1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060181.xhp | 16 source/text/scalc/01/04060182.xhp | 21 - source/text/scalc/01/04060184.xhp | 15 +++ source/text/scalc/01/04060185.xhp | 20 4 files changed, 71 insertions(+), 1 deletion(-) New commits: commit 19da9bb07bd4cdedc266e614d0aecb6569a81df1 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sun Jul 20 11:09:11 2014 -0300 Fix fdo#80451: New DIST functions from Excel EXPON.DIST, HYPGEOM.DIST, POISSON.DIST and WEIBULL.DIST Change-Id: I10ca3013e430c53a03d4795d0c47cbaaeb7b9adb Reviewed-on: https://gerrit.libreoffice.org/10423 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/scalc/01/04060181.xhp b/source/text/scalc/01/04060181.xhp index 4768af7..04994d1 100644 --- a/source/text/scalc/01/04060181.xhp +++ b/source/text/scalc/01/04060181.xhp @@ -507,6 +507,22 @@ paragraph xml-lang=en-US id=par_id3150357 role=paragraph l10n=U oldref=123 item type=input=EXPONDIST(3;0.5;1)/item returns 0.78./paragraph /section +section id=expondotdist +bookmark xml-lang=en-US branch=index id=bm_id2950603 +bookmark_valueEXPON.DIST function/bookmark_value +bookmark_valueexponential distributions/bookmark_value +/bookmark +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_EXP_DIST_MS id=bm_id2952962 localize=false/ +paragraph xml-lang=en-US id=hd_id2950603 role=heading level=2 l10n=U oldref=115EXPON.DIST/paragraph +paragraph xml-lang=en-US id=par_id2949563 role=paragraph l10n=U oldref=116ahelp hid=HID_FUNC_EXP_DIST_MSReturns the exponential distribution./ahelp/paragraph +paragraph xml-lang=en-US id=hd_id2953789 role=heading level=3 l10n=U oldref=117Syntax/paragraph +paragraph xml-lang=en-US id=par_id2950987 role=code l10n=U oldref=118EXPON.DIST(Number; Lambda; C)/paragraph +paragraph xml-lang=en-US id=par_id2954663 role=paragraph l10n=U oldref=119emphNumber/emph is the value of the function./paragraph +paragraph xml-lang=en-US id=par_id2954569 role=paragraph l10n=U oldref=120emphLambda/emph is the parameter value./paragraphcommentUFI removed a double bookmark/comment +paragraph xml-lang=en-US id=par_id2947332 role=paragraph l10n=U oldref=121emphC/emph is a logical value that determines the form of the function. emphC = 0/emph calculates the density function, and emphC = 1/emph calculates the distribution./paragraph +paragraph xml-lang=en-US id=hd_id2946133 role=heading level=3 l10n=U oldref=122Example/paragraph +paragraph xml-lang=en-US id=par_id2950357 role=paragraph l10n=U oldref=123item type=input=EXPON.DIST(3;0.5;1)/item returns 0.7768698399./paragraph +/section /sort section id=relatedtopics embed href=text/scalc/01/04060100.xhp#drking/ diff --git a/source/text/scalc/01/04060182.xhp b/source/text/scalc/01/04060182.xhp index c3b2767..26219db 100644 --- a/source/text/scalc/01/04060182.xhp +++ b/source/text/scalc/01/04060182.xhp @@ -155,7 +155,6 @@ paragraph xml-lang=en-US id=par_id3153331 role=paragraph l10n=U oldref=55 item type=input=GAMMAINV(0.8;1;1)/item yields 1.61./paragraph /section - section id=gammadotinv bookmark xml-lang=en-US branch=index id=bm_id2914841bookmark_valueGAMMA.INV function/bookmark_value /bookmark @@ -389,6 +388,26 @@ paragraph xml-lang=en-US id=par_id3154904 role=paragraph l10n=U oldref=131 item type=input=HYPGEOMDIST(2;2;90;100)/item yields 0.81. If 90 out of 100 pieces of buttered toast fall from the table and hit the floor with the buttered side first, then if 2 pieces of buttered toast are dropped from the table, the probability is 81%, that both will strike buttered side first./paragraph /section +section id=hypgeomdotdist +bookmark xml-lang=en-US branch=index id=bm_id2952801 +bookmark_valueHYPGEOM.DIST function/bookmark_value +bookmark_valuesampling without replacement/bookmark_value +/bookmark +commentmw added one entry/comment +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_HYP_GEOM_DIST_MS id=bm_id2953910 localize=false/ +paragraph xml-lang=en-US id=hd_id2952801 role=heading level=2 l10n=U oldref=122HYPGEOM.DIST/paragraph +paragraph xml-lang=en-US id=par_id2959341 role=paragraph l10n=U oldref=123ahelp hid=HID_FUNC_HYP_GEOM_DIST_MSReturns the hypergeometric distribution./ahelp/paragraph +paragraph xml-lang=en-US id=hd_id2954697 role=heading level=3 l10n=U oldref=124Syntax/paragraph +paragraph xml-lang=en-US id=par_id2955388 role=code l10n=U oldref=125HYPGEOM.DIST(X; NSample; Successes; NPopulation; Cumulative)/paragraph +paragraph xml-lang=en-US id=par_id2954933 role=paragraph l10n=U oldref=126emphX/emph is the number of results achieved in the random sample./paragraph +paragraph xml-lang=en-US id=par_id2953106 role=paragraph l10n=U oldref=127emphNSample/emph is
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a646e6ff6bbbc30c331615eb70a725fb5814703f Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sat Jul 19 23:12:26 2014 -0300 Updated core Project: help 76e8934ce147560cd18db1f62885e05d4d9e530e Fix fdo#80436 Help pages for MODE functions MODE.SNGL, MODE.MULT, Z.TEST, NEGBINOM.DIST Change-Id: I0e6ad33f76a09c9d4af7b8146d07eb4f1df86313 Reviewed-on: https://gerrit.libreoffice.org/10411 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 0e6d0e8..76e8934 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0e6d0e8907c46f3d3dcaf3f06add2496beaf16a8 +Subproject commit 76e8934ce147560cd18db1f62885e05d4d9e530e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060185.xhp | 92 ++ 1 file changed, 92 insertions(+) New commits: commit 7a0a3f1e2063343be1325f6fc5136e597606a107 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sun Jul 20 20:18:56 2014 -0300 Fix fdo#80433 help pages for new T functions T.DIST, T.DIST.2T, T.DIST.RT, T.INV, T.INV.2T and T.TEST Change-Id: I65fc995e0131cfcc528d64984ceafed25cd74fbc Reviewed-on: https://gerrit.libreoffice.org/10426 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/scalc/01/04060185.xhp b/source/text/scalc/01/04060185.xhp index 7baa691..1c0db0c 100644 --- a/source/text/scalc/01/04060185.xhp +++ b/source/text/scalc/01/04060185.xhp @@ -334,6 +334,36 @@ paragraph xml-lang=en-US id=par_id3156010 role=paragraph l10n=CHG oldref=105 item type=input=TINV(0.1;6)/item returns 1.94/paragraph /section +section id=tdotinv +bookmark xml-lang=en-US branch=index id=bm_id2949579 +bookmark_valueT.INV function/bookmark_value +bookmark_valuetwo tailed inverse of t-distribution/bookmark_value +/bookmark +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_TINV_MS id=bm_id2953155 localize=false/ +paragraph xml-lang=en-US id=hd_id2949579 role=heading level=2 l10n=U oldref=98T.INV/paragraph +paragraph xml-lang=en-US id=par_id2943232 role=paragraph l10n=U oldref=99ahelp hid=HID_FUNC_TINV_MSReturns the two tailed inverse of the t-distribution./ahelp/paragraph +paragraph xml-lang=en-US id=hd_id2955101 role=heading level=3 l10n=U oldref=100Syntax/paragraph +paragraph xml-lang=en-US id=par_id2949289 role=code l10n=U oldref=101T.INV(Number; DegreesFreedom)/paragraph +paragraph xml-lang=en-US id=par_id2954070 role=paragraph l10n=U oldref=102emphNumber/emph is the probability associated with the two-tailed t-distribution./paragraph +paragraph xml-lang=en-US id=par_id2955315 role=paragraph l10n=U oldref=103emphDegreesFreedom/emph is the number of degrees of freedom for the t-distribution./paragraph +paragraph xml-lang=en-US id=hd_id2953885 role=heading level=3 l10n=U oldref=104Example/paragraph +paragraph xml-lang=en-US id=par_id2956010 role=paragraph l10n=CHG oldref=105item type=input=T.INV(0.1;6)/item returns -1.4397557473./paragraph +/section +section id=tdotinvdot2t +bookmark xml-lang=en-US branch=index id=bm_id2849579 +bookmark_valueT.INV.2T function/bookmark_value +bookmark_valueinverse of two tailed t-distribution/bookmark_value +/bookmark +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_TINV_2T id=bm_id2853155 localize=false/ +paragraph xml-lang=en-US id=hd_id2849579 role=heading level=2 l10n=U oldref=98T.INV.2T/paragraph +paragraph xml-lang=en-US id=par_id2843232 role=paragraph l10n=U oldref=99ahelp hid=HID_FUNC_TINV_2TCalculates the inverse of the two-tailed Student's T Distribution /ahelp, which is a continuous probability distribution that is frequently used for testing hypotheses on small sample data sets./paragraph +paragraph xml-lang=en-US id=hd_id2855101 role=heading level=3 l10n=U oldref=100Syntax/paragraph +paragraph xml-lang=en-US id=par_id2849289 role=code l10n=U oldref=101T.INV.2T(Number; DegreesFreedom)/paragraph +paragraph xml-lang=en-US id=par_id2854070 role=paragraph l10n=U oldref=102emphNumber/emph is the probability associated with the two-tailed t-distribution./paragraph +paragraph xml-lang=en-US id=par_id2855315 role=paragraph l10n=U oldref=103emphDegreesFreedom/emph is the number of degrees of freedom for the t-distribution./paragraph +paragraph xml-lang=en-US id=hd_id2853885 role=heading level=3 l10n=U oldref=104Example/paragraph +paragraph xml-lang=en-US id=par_id2856010 role=paragraph l10n=CHG oldref=105item type=input=T.INV.2T(0.25; 10)/item returns 1.221255395./paragraph +/section section id=ttest bookmark xml-lang=en-US branch=index id=bm_id3154129bookmark_valueTTEST function/bookmark_value /bookmark @@ -358,6 +388,22 @@ item type=input=TTEST(A1:A50;B1:B50;2;2)/item /paragraph /section +section id=tdottest +bookmark xml-lang=en-US branch=index id=bm_id2954129 +bookmark_valueT.TEST function/bookmark_value +/bookmark +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_TTEST_MS id=bm_id2953981 localize=false/ +paragraph xml-lang=en-US id=hd_id2954129 role=heading level=2 l10n=U oldref=107T.TEST/paragraph +paragraph xml-lang=en-US id=par_id2959184 role=paragraph l10n=U oldref=108ahelp hid=HID_FUNC_TTEST_MSReturns the probability associated with a Student's t-Test./ahelp/paragraph +paragraph xml-lang=en-US id=hd_id2947257 role=heading level=3 l10n=U oldref=109Syntax/paragraph +paragraph xml-lang=en-US id=par_id2951175 role=code l10n=U oldref=110T.TEST(Data1; Data2; Mode; Type)/paragraph +paragraph
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 78e867cd37d6c9eb2cbde9c1e27ff5821b2da444 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sun Jul 20 13:01:19 2014 -0300 Updated core Project: help 678f0e0d9c99e25a66c17450a58a888e2b0213e0 Fix for fdo#80450: MS excel F functions help pages F.DIST, F.DIST.RT, F.INV, F.INV.RT and F.TEST Change-Id: Ia5cc2984c118f2d85872c80cd2ec6c533c94ff95 Reviewed-on: https://gerrit.libreoffice.org/10424 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 19da9bb..678f0e0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 19da9bb07bd4cdedc266e614d0aecb6569a81df1 +Subproject commit 678f0e0d9c99e25a66c17450a58a888e2b0213e0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 235f84b26bd746b6f99268af5aa783add8685e90 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sun Jul 20 20:18:56 2014 -0300 Updated core Project: help 7a0a3f1e2063343be1325f6fc5136e597606a107 Fix fdo#80433 help pages for new T functions T.DIST, T.DIST.2T, T.DIST.RT, T.INV, T.INV.2T and T.TEST Change-Id: I65fc995e0131cfcc528d64984ceafed25cd74fbc Reviewed-on: https://gerrit.libreoffice.org/10426 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 678f0e0..7a0a3f1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 678f0e0d9c99e25a66c17450a58a888e2b0213e0 +Subproject commit 7a0a3f1e2063343be1325f6fc5136e597606a107 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060182.xhp | 80 ++ 1 file changed, 80 insertions(+) New commits: commit 678f0e0d9c99e25a66c17450a58a888e2b0213e0 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sun Jul 20 13:01:19 2014 -0300 Fix for fdo#80450: MS excel F functions help pages F.DIST, F.DIST.RT, F.INV, F.INV.RT and F.TEST Change-Id: Ia5cc2984c118f2d85872c80cd2ec6c533c94ff95 Reviewed-on: https://gerrit.libreoffice.org/10424 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/scalc/01/04060182.xhp b/source/text/scalc/01/04060182.xhp index 26219db..b444ba3 100644 --- a/source/text/scalc/01/04060182.xhp +++ b/source/text/scalc/01/04060182.xhp @@ -49,6 +49,40 @@ paragraph xml-lang=en-US id=par_id3145073 role=paragraph l10n=U oldref=10 item type=input=FINV(0.5;5;10)/item yields 0.93./paragraph /section +section id=fdotinv +bookmark xml-lang=en-US branch=index id=bm_id2945388 +bookmark_valueF.INV function/bookmark_value +bookmark_valueValues of the inverse left tail of the F distribution/bookmark_value +/bookmark +commentmw added one entry/comment +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_F_INV_LT id=bm_id2946113 localize=false/ +paragraph xml-lang=en-US id=hd_id2945388 role=heading level=2 l10n=U oldref=2F.INV/paragraph +paragraph xml-lang=en-US id=par_id2955089 role=paragraph l10n=U oldref=3ahelp hid=HID_FUNC_F_INV_LTReturns the inverse of the cumulative F distribution./ahelp The F distribution is used for F tests in order to set the relation between two differing data sets./paragraph +paragraph xml-lang=en-US id=hd_id2953816 role=heading level=3 l10n=U oldref=4Syntax/paragraph +paragraph xml-lang=en-US id=par_id2953068 role=code l10n=U oldref=5F.INV(Number; DegreesFreedom1; DegreesFreedom2)/paragraph +paragraph xml-lang=en-US id=par_id2946866 role=paragraph l10n=U oldref=6emphNumber/emph is probability value for which the inverse F distribution is to be calculated./paragraph +paragraph xml-lang=en-US id=par_id2953914 role=paragraph l10n=U oldref=7emphDegreesFreedom1/emph is the number of degrees of freedom in the numerator of the F distribution./paragraph +paragraph xml-lang=en-US id=par_id2948607 role=paragraph l10n=U oldref=8emphDegreesFreedom2/emph is the number of degrees of freedom in the denominator of the F distribution./paragraph +paragraph xml-lang=en-US id=hd_id2956021 role=heading level=3 l10n=U oldref=9Example/paragraph +paragraph xml-lang=en-US id=par_id2945073 role=paragraph l10n=U oldref=10item type=input=F.INV(0.5;5;10)/item yields 0.9319331609./paragraph +/section +section id=fdotinvdotrt +bookmark xml-lang=en-US branch=index id=bm_id2845388 +bookmark_valueF.INV.RT function/bookmark_value +bookmark_valueValues of the inverse right tail of the F distribution/bookmark_value +/bookmark +commentmw added one entry/comment +bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_F_INV_RT id=bm_id2846113 localize=false/ +paragraph xml-lang=en-US id=hd_id2845388 role=heading level=2 l10n=U oldref=2F.INV.RT/paragraph +paragraph xml-lang=en-US id=par_id2855089 role=paragraph l10n=U oldref=3ahelp hid=HID_FUNC_F_INV_RTReturns the inverse right tail of the F distribution./ahelp/paragraph +paragraph xml-lang=en-US id=hd_id2853816 role=heading level=3 l10n=U oldref=4Syntax/paragraph +paragraph xml-lang=en-US id=par_id2853068 role=code l10n=U oldref=5F.INV.RT(Number; DegreesFreedom1; DegreesFreedom2)/paragraph +paragraph xml-lang=en-US id=par_id2846866 role=paragraph l10n=U oldref=6emphNumber/emph is probability value for which the inverse F distribution is to be calculated./paragraph +paragraph xml-lang=en-US id=par_id2853914 role=paragraph l10n=U oldref=7emphDegreesFreedom1/emph is the number of degrees of freedom in the numerator of the F distribution./paragraph +paragraph xml-lang=en-US id=par_id2848607 role=paragraph l10n=U oldref=8emphDegreesFreedom2/emph is the number of degrees of freedom in the denominator of the F distribution./paragraph +paragraph xml-lang=en-US id=hd_id2856021 role=heading level=3 l10n=U oldref=9Example/paragraph +paragraph xml-lang=en-US id=par_id2845073 role=paragraph l10n=U oldref=10item type=input=F.INV.RT(0.5;5;10)/item yields 0.9319331609./paragraph +/section section id=fisher bookmark xml-lang=en-US branch=index id=bm_id3150888bookmark_valueFISHER function/bookmark_value /bookmark @@ -103,6 +137,20 @@ paragraph xml-lang=en-US id=par_id3159126 role=paragraph l10n=U oldref=35 item type=input=FTEST(A1:A30;B1:B12)/item calculates whether the two data sets are different in their variance and returns the probability that both sets could have come from the same total population./paragraph /section
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/IconThemeScanner.cxx | 68 ++--
1 file changed, 43 insertions(+), 25 deletions(-)
New commits:
commit 60954a8a96a66ff11e06b850838f3d16e8e1625f
Author: Tobias Lippert d...@fastmail.fm
Date: Sat Jul 19 13:39:21 2014 +0200
fdo#81532 Handle symlinks to icon themes correctly
- added logging for icon theme scanning.
Change-Id: I799c5fc09879411020142f7808da0d9f2f63dc17
Reviewed-on: https://gerrit.libreoffice.org/10406
Tested-by: Rene Engelhard r...@debian.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/app/IconThemeScanner.cxx
b/vcl/source/app/IconThemeScanner.cxx
index 9684bb6..29d3cd7 100644
--- a/vcl/source/app/IconThemeScanner.cxx
+++ b/vcl/source/app/IconThemeScanner.cxx
@@ -12,6 +12,7 @@
#include config_folders.h
#include osl/file.hxx
#include rtl/bootstrap.hxx
+#include salhelper/linkhelper.hxx
#include vcl/svapp.hxx
#include vcl/IconThemeInfo.hxx
@@ -20,24 +21,34 @@ namespace vcl {
namespace {
-bool
-search_path_is_valid(const OUString dir)
+const char *LOG_AREA = vcl.app;
+
+// set the status of a file. Returns false if the status could not be
determined.
+bool set_file_status(osl::FileStatus status, const OUString file)
{
osl::DirectoryItem dirItem;
-osl::FileBase::RC retvalGet = osl::DirectoryItem::get(dir, dirItem);
+osl::FileBase::RC retvalGet = osl::DirectoryItem::get(file, dirItem);
if (retvalGet != osl::FileBase::E_None) {
+SAL_WARN(LOG_AREA, Could not determine status for file ' file
'.);
return false;
}
-osl::FileStatus fileStatus(osl_FileStatus_Mask_Type);
-osl::FileBase::RC retvalStatus = dirItem.getFileStatus(fileStatus);
+osl::FileBase::RC retvalStatus = dirItem.getFileStatus(status);
if (retvalStatus != osl::FileBase::E_None) {
+SAL_WARN(LOG_AREA, Could not determine status for file ' file
'.);
return false;
}
+return true;
+}
-if (!fileStatus.isDirectory()) {
-return false;
+OUString convert_to_absolute_path(const OUString path)
+{
+salhelper::LinkResolver resolver(0);
+osl::FileBase::RC rc = resolver.fetchFileStatus(path);
+if (rc != osl::FileBase::E_None) {
+SAL_WARN(LOG_AREA, Could not resolve path ' path ' to search
for icon themes.);
+throw std::runtime_error(Provided a recursive symlink to a icon theme
directory that could not be resolved.);
}
-return true;
+return resolver.m_aStatus.getFileURL();
}
}
@@ -48,12 +59,20 @@ IconThemeScanner::IconThemeScanner()
bool
IconThemeScanner::ScanDirectoryForIconThemes(const OUString path)
{
-bool pathIsValid = search_path_is_valid(path);
-if (!pathIsValid) {
+osl::FileStatus fileStatus(osl_FileStatus_Mask_Type);
+bool couldSetFileStatus = set_file_status(fileStatus, path);
+if (!couldSetFileStatus) {
+return false;
+}
+
+if (!fileStatus.isDirectory()) {
+SAL_INFO(LOG_AREA, Cannot search for icon themes in ' path '.
It is not a directory.);
return false;
}
+
std::vectorOUString iconThemePaths = ReadIconThemesFromPath(path);
if (iconThemePaths.empty()) {
+SAL_WARN(LOG_AREA, Could not find any icon themes in the provided
directory (' path'.);
return false;
}
mFoundIconThemes.clear();
@@ -70,8 +89,11 @@ IconThemeScanner::AddIconThemeByPath(const OUString url)
if (!IconThemeInfo::UrlCanBeParsed(url)) {
return false;
}
+SAL_INFO(LOG_AREA, Found a file that seems to be an icon theme: ' url
' );
IconThemeInfo newTheme(url);
mFoundIconThemes.push_back(newTheme);
+SAL_INFO(LOG_AREA, Adding the file as ' newTheme.GetDisplayName()
+' with id ' newTheme.GetThemeId() '.);
return true;
}
@@ -79,6 +101,7 @@ IconThemeScanner::AddIconThemeByPath(const OUString url)
IconThemeScanner::ReadIconThemesFromPath(const OUString dir)
{
std::vectorOUString found;
+SAL_INFO(LOG_AREA, Scanning directory ' dir for icon themes.);
osl::Directory dirToScan(dir);
osl::FileBase::RC retvalOpen = dirToScan.open();
@@ -93,15 +116,12 @@ IconThemeScanner::ReadIconThemesFromPath(const OUString
dir)
if (retvalStatus != osl::FileBase::E_None) {
continue;
}
-if (!status.isRegular()) {
-continue;
-}
-if (!FileIsValidIconTheme(status.getFileURL())) {
+
+OUString filename = convert_to_absolute_path(status.getFileURL());
+if (!FileIsValidIconTheme(filename)) {
continue;
}
-OUString entry;
-entry = status.getFileURL();
-found.push_back(entry);
+found.push_back(filename);
}
return found;
}
@@ -111,20 +131,16 @@ IconThemeScanner::FileIsValidIconTheme(const OUString
filename)
{
// check whether we can construct a IconThemeInfo
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - connectivity/source
connectivity/source/parse/sqlbison.y |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit ebe64ee44175452e9d6646e220ca7030e1019be4 Author: Lionel Elie Mamane lio...@mamane.lu Date: Sat Jul 19 07:45:20 2014 +0200 fdo#81336 bison priority increase with bigger number Change-Id: Ib99f08c52379fd9df90c30b61cc246ee53022506 Reviewed-on: https://gerrit.libreoffice.org/10402 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index dda9dd3..35819a3 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -1153,12 +1153,12 @@ search_condition: } ; predicate: - comparison_predicate %dprec 2 + comparison_predicate %dprec 1 | between_predicate | all_or_any_predicate | existence_test | unique_test - | test_for_null%dprec 1 + | test_for_null%dprec 2 | in_predicate | like_predicate ; @@ -3948,11 +3948,11 @@ when_operand_list: ; when_operand: row_value_constructor_elem - | comparison_predicate_part_2%dprec 2 + | comparison_predicate_part_2%dprec 1 | between_predicate_part_2 | in_predicate_part_2 | character_like_predicate_part_2 - | null_predicate_part_2 %dprec 1 + | null_predicate_part_2 %dprec 2 ; searched_when_clause_list: searched_when_clause ___ 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-6' - sc/source
sc/source/core/data/table1.cxx | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 7477e87a1baaddf50f332c152568620e3ce32184
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 18 00:45:44 2014 +0200
resolved fdo#81294 store correct sheet number during range names update
Change-Id: Ic4c858efa6e7c1a65357ac79f01e6c08f464ae3f
(cherry picked from commit 4011b74eb7650a0eeb99d3acebb9ef60b0fcaab9)
Reviewed-on: https://gerrit.libreoffice.org/10377
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index e0eb3eb..834dfe1 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1603,6 +1603,12 @@ void ScTable::UpdateGrow( const ScRange rArea, SCCOL
nGrowX, SCROW nGrowY )
void ScTable::UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt )
{
+// Store the old tab number in sc::UpdatedRangeNames for
+// ScTokenArray::AdjustReferenceOnInsertedTab() to check with
+// isNameModified()
+if (mpRangeName)
+mpRangeName-UpdateInsertTab(rCxt, nTab);
+
if (nTab = rCxt.mnInsertPos)
{
nTab += rCxt.mnSheets;
@@ -1610,9 +1616,6 @@ void ScTable::UpdateInsertTab(
sc::RefUpdateInsertTabContext rCxt )
pDBDataNoName-UpdateMoveTab(nTab - 1 ,nTab);
}
-if (mpRangeName)
-mpRangeName-UpdateInsertTab(rCxt, nTab);
-
if (mpCondFormatList)
mpCondFormatList-UpdateInsertTab(rCxt);
@@ -1624,6 +1627,12 @@ void ScTable::UpdateInsertTab(
sc::RefUpdateInsertTabContext rCxt )
void ScTable::UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt )
{
+// Store the old tab number in sc::UpdatedRangeNames for
+// ScTokenArray::AdjustReferenceOnDeletedTab() to check with
+// isNameModified()
+if (mpRangeName)
+mpRangeName-UpdateDeleteTab(rCxt, nTab);
+
if (nTab rCxt.mnDeletePos)
{
nTab -= rCxt.mnSheets;
@@ -1631,9 +1640,6 @@ void ScTable::UpdateDeleteTab(
sc::RefUpdateDeleteTabContext rCxt )
pDBDataNoName-UpdateMoveTab(nTab + 1,nTab);
}
-if (mpRangeName)
-mpRangeName-UpdateDeleteTab(rCxt, nTab);
-
if (mpCondFormatList)
mpCondFormatList-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' - connectivity/source
connectivity/source/parse/sqlbison.y |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 665e7479205647bb0c8feceef585c29c2ac46a5b Author: Lionel Elie Mamane lio...@mamane.lu Date: Sat Jul 19 07:45:20 2014 +0200 fdo#81336 bison priority increase with bigger number Change-Id: Ib99f08c52379fd9df90c30b61cc246ee53022506 Reviewed-on: https://gerrit.libreoffice.org/10403 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 3484b0d..0a3772f 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -1155,12 +1155,12 @@ search_condition: } ; predicate: - comparison_predicate %dprec 2 + comparison_predicate %dprec 1 | between_predicate | all_or_any_predicate | existence_test | unique_test - | test_for_null%dprec 1 + | test_for_null%dprec 2 | in_predicate | like_predicate ; @@ -3950,11 +3950,11 @@ when_operand_list: ; when_operand: row_value_constructor_elem - | comparison_predicate_part_2%dprec 2 + | comparison_predicate_part_2%dprec 1 | between_predicate_part_2 | in_predicate_part_2 | character_like_predicate_part_2 - | null_predicate_part_2 %dprec 1 + | null_predicate_part_2 %dprec 2 ; searched_when_clause_list: searched_when_clause ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - cppcanvas/source vcl/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 134 +-
cppcanvas/source/mtfrenderer/implrenderer.cxx | 13 ++
vcl/source/filter/wmf/winmtf.cxx | 18 ++-
vcl/source/filter/wmf/winmtf.hxx |2
4 files changed, 158 insertions(+), 9 deletions(-)
New commits:
commit dfa0fc194fc2600569374f7282208f77548c27c5
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Sat Jul 19 21:52:09 2014 +0200
emf+: emulate hatch with color blend
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: I2ac8f790c79c269d4c1fa650e703c3645c567ca4
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 0c53c59..e6b1ea8 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -123,6 +123,63 @@ enum EmfPlusCombineMode
EmfPlusCombineModeComplement = 0x0005
};
+enum EmfPlusHatchStyle
+{
+HatchStyleHorizontal = 0x,
+HatchStyleVertical = 0x0001,
+HatchStyleForwardDiagonal = 0x0002,
+HatchStyleBackwardDiagonal = 0x0003,
+HatchStyleLargeGrid = 0x0004,
+HatchStyleDiagonalCross = 0x0005,
+HatchStyle05Percent = 0x0006,
+HatchStyle10Percent = 0x0007,
+HatchStyle20Percent = 0x0008,
+HatchStyle25Percent = 0x0009,
+HatchStyle30Percent = 0x000A,
+HatchStyle40Percent = 0x000B,
+HatchStyle50Percent = 0x000C,
+HatchStyle60Percent = 0x000D,
+HatchStyle70Percent = 0x000E,
+HatchStyle75Percent = 0x000F,
+HatchStyle80Percent = 0x0010,
+HatchStyle90Percent = 0x0011,
+HatchStyleLightDownwardDiagonal = 0x0012,
+HatchStyleLightUpwardDiagonal = 0x0013,
+HatchStyleDarkDownwardDiagonal = 0x0014,
+HatchStyleDarkUpwardDiagonal = 0x0015,
+HatchStyleWideDownwardDiagonal = 0x0016,
+HatchStyleWideUpwardDiagonal = 0x0017,
+HatchStyleLightVertical = 0x0018,
+HatchStyleLightHorizontal = 0x0019,
+HatchStyleNarrowVertical = 0x001A,
+HatchStyleNarrowHorizontal = 0x001B,
+HatchStyleDarkVertical = 0x001C,
+HatchStyleDarkHorizontal = 0x001D,
+HatchStyleDashedDownwardDiagonal = 0x001E,
+HatchStyleDashedUpwardDiagonal = 0x001F,
+HatchStyleDashedHorizontal = 0x0020,
+HatchStyleDashedVertical = 0x0021,
+HatchStyleSmallConfetti = 0x0022,
+HatchStyleLargeConfetti = 0x0023,
+HatchStyleZigZag = 0x0024,
+HatchStyleWave = 0x0025,
+HatchStyleDiagonalBrick = 0x0026,
+HatchStyleHorizontalBrick = 0x0027,
+HatchStyleWeave = 0x0028,
+HatchStylePlaid = 0x0029,
+HatchStyleDivot = 0x002A,
+HatchStyleDottedGrid = 0x002B,
+HatchStyleDottedDiamond = 0x002C,
+HatchStyleShingle = 0x002D,
+HatchStyleTrellis = 0x002E,
+HatchStyleSphere = 0x002F,
+HatchStyleSmallGrid = 0x0030,
+HatchStyleSmallCheckerBoard = 0x0031,
+HatchStyleLargeCheckerBoard = 0x0032,
+HatchStyleOutlinedDiamond = 0x0033,
+HatchStyleSolidDiamond = 0x0034
+};
+
using namespace ::com::sun::star;
using namespace ::basegfx;
@@ -362,9 +419,28 @@ namespace cppcanvas
sal_Int32 surroundColorsNumber;
::Color* surroundColors;
EMFPPath *path;
+EmfPlusHatchStyle hatchStyle;
public:
EMFPBrush ()
+: type(0)
+, additionalFlags(0)
+, wrapMode(0)
+, areaX(0.0)
+, areaY(0.0)
+, areaWidth(0.0)
+, areaHeight(0.0)
+, hasTransformation(false)
+, blendPoints(0)
+, blendPositions(NULL)
+, blendFactors(NULL)
+, colorblendPoints(0)
+, colorblendPositions(NULL)
+, colorblendColors(NULL)
+, surroundColorsNumber(0)
+, surroundColors(NULL)
+, path(NULL)
+, hatchStyle(HatchStyleHorizontal)
{
blendPositions = NULL;
colorblendPositions = NULL;
@@ -418,7 +494,20 @@ namespace cppcanvas
s color;
solidColor = ::Color (0xff - (color 24), (color
16) 0xff, (color 8) 0xff, color 0xff);
SAL_INFO (cppcanvas.emf, EMF+\tsolid color: 0x
std::hex color std::dec);
-
+break;
+}
+case 1:
+{
+sal_uInt32 style;
+sal_uInt32 foregroundColor;
+sal_uInt32 backgroundColor;
+s style;
+s foregroundColor;
+s backgroundColor;
+
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - avmedia/source
avmedia/source/opengl/oglwindow.cxx | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
New commits:
commit 99c6a8eb358003b9a5663988e475509cf77cc583
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Jul 17 16:21:02 2014 +0200
glTF: allow to move camera also by keyboard in orbit mode.
Change-Id: Ibf16b9651988358c30d649dd937813329d0f64ec
(cherry picked from commit 9e8dbd37c4dda5d07c22c66a5a2b08cce4d175f5)
Reviewed-on: https://gerrit.libreoffice.org/10368
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/avmedia/source/opengl/oglwindow.cxx
b/avmedia/source/opengl/oglwindow.cxx
index c748ca1..2650faf 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -268,15 +268,18 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*,
pEvent)
vMup = glm::normalize(vMup);
vMup *= 25.0f;
-if(nCode == KEY_W)vMoveBy += vMove*(0.0005f*fModelSize);
-if(nCode == KEY_S)vMoveBy -= vMove*(0.0005f*fModelSize);
if( !m_bIsOrbitMode )
{
+if(nCode == KEY_W)vMoveBy +=
vMove*(0.0005f*fModelSize);
+if(nCode == KEY_S)vMoveBy -=
vMove*(0.0005f*fModelSize);
if(nCode == KEY_A)vMoveBy -=
vStrafe*(0.0005f*fModelSize);
if(nCode == KEY_D)vMoveBy +=
vStrafe*(0.0005f*fModelSize);
}
else
{
+if(nCode == KEY_E)vMoveBy +=
vMove*(0.0005f*fModelSize);
+if(nCode == KEY_Q)vMoveBy -=
vMove*(0.0005f*fModelSize);
+
// Limit zooming in orbit mode
m_fCameraDistance += vMoveBy.z;
if ((m_fCameraDistance 0.5 * fModelSize vMoveBy.z
0.0 ) ||
@@ -288,6 +291,30 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*,
pEvent)
}
}
gltf_renderer_move_camera(m_rHandle, vMoveBy.x, vMoveBy.y,
vMoveBy.z, 0.0);
+
+if( m_bIsOrbitMode )
+{
+long nDeltaX = 0;
+long nDeltaY = 0;
+if (nCode == KEY_W)
+{
+nDeltaY -= 1;
+}
+if (nCode == KEY_S)
+{
+nDeltaY += 1;
+}
+if (nCode == KEY_A)
+{
+nDeltaX -= 1;
+}
+if (nCode == KEY_D)
+{
+nDeltaX += 1;
+}
+float fSensitivity = 50.0;
+gltf_renderer_rotate_model(m_rHandle,
nDeltaX*fSensitivity, nDeltaY*fSensitivity, 0.0);
+}
}
else if(nCode == KEY_M)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - bin/findunusedcode vcl/generic
bin/findunusedcode |2 +-
vcl/generic/fontmanager/helper.cxx | 13 +
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit f5d33e5e70d74d18893a67672eac95b84483226b
Author: Caolán McNamara caol...@redhat.com
Date: Sun Jul 20 20:37:40 2014 +0100
Resolves: coverity#706171 Untrusted value as argument
limit nBytesToRead to remaining size of file
also zero last byte of alloced block, seeing as the
block is size+1 and we only read size into it
Change-Id: I2729ec7bb9de20731531f32da864c572fa83ce58
diff --git a/vcl/generic/fontmanager/helper.cxx
b/vcl/generic/fontmanager/helper.cxx
index 0e4bc89..3a31319 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -248,12 +248,12 @@ bool psp::convertPfbToPfa( ::osl::File rInFile,
::osl::File rOutFile )
bool bSuccess = true;
bool bEof = false;
unsigned char buffer[256];
-sal_uInt64 nRead;
-sal_uInt64 nOrgPos = 0;
-rInFile.getPos( nOrgPos );
+sal_uInt64 nSize(0);
+rInFile.getSize(nSize);
while( bSuccess ! bEof )
{
+sal_uInt64 nRead;
// read leading bytes
bEof = ((0 != rInFile.read( buffer, 6, nRead)) || (nRead != 6));
if( bEof )
@@ -285,7 +285,12 @@ bool psp::convertPfbToPfa( ::osl::File rInFile,
::osl::File rOutFile )
}
else if( nType == 1 || nType == 2 )
{
-boost::scoped_arrayunsigned char pBuffer(new unsigned char[
nBytesToRead+1 ]);
+sal_uInt64 nOrgPos(0);
+rInFile.getPos(nOrgPos);
+nBytesToRead = std::minsal_uInt64(nBytesToRead, nSize - nOrgPos);
+
+boost::scoped_arrayunsigned char pBuffer(new unsigned
char[nBytesToRead+1]);
+pBuffer[nBytesToRead] = 0;
if( ! rInFile.read( pBuffer.get(), nBytesToRead, nRead ) nRead
== nBytesToRead )
{
commit 8306c25ef416a22fde6f31311b530b4caea1bba6
Author: Caolán McNamara caol...@redhat.com
Date: Sun Jul 20 17:22:01 2014 +0100
force a make clean first
Change-Id: Icef93accc6953a4484707fb9da01a85963002a21
diff --git a/bin/findunusedcode b/bin/findunusedcode
index 8485f44..df865bc 100755
--- a/bin/findunusedcode
+++ b/bin/findunusedcode
@@ -37,7 +37,7 @@ export AR=callarchive ${AR:-ar}
export dbglevel=2
-make
+make clean make
callanalyse \
instdir/program/* \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libgltf
external/libgltf/UnpackedTarball_libgltf.mk |1
external/libgltf/pathces/fix_rendering_of_resized_model.patch | 71 ++
2 files changed, 72 insertions(+)
New commits:
commit 830aa8da71f798b83befd392c7773d81c142510e
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Jul 15 23:15:08 2014 +0200
fdo#81182: glTF window size does not match with the scene size after
resizing
When viewport changed it is necessary to resize the whole scene.
Calling releasFbo removes size dependent objects and triggers
creating the new ones with the new size.
Change-Id: Ibd8be1e92be92da31add4a30aa799f0995b1cc88
(cherry picked from commit 3cd7c0f6b6cdb8ebc6c72d2ffe1e0bc18968e27b)
Reviewed-on: https://gerrit.libreoffice.org/10352
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk
b/external/libgltf/UnpackedTarball_libgltf.mk
index 176c1d1..a7565ea 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_UnpackedTarball_set_patchflags,libgltf,--binary))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
$(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
+ external/libgltf/pathces/fix_rendering_of_resized_model.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/pathces/fix_rendering_of_resized_model.patch
b/external/libgltf/pathces/fix_rendering_of_resized_model.patch
new file mode 100644
index 000..57af9f9
--- /dev/null
+++ b/external/libgltf/pathces/fix_rendering_of_resized_model.patch
@@ -0,0 +1,71 @@
+diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
+--- libgltf.org/src/RenderScene.cpp2014-07-15 17:33:12.615059856 +0200
libgltf/src/RenderScene.cpp2014-07-15 22:24:20.862307666 +0200
+@@ -639,7 +639,7 @@
+ , pScene(0)
+ , mLoadJson()
+ , mBindBufferMap()
+-, viewport()
++, mCurrentViewport()
+ , fbo()
+ , mEnableTransparency(false)
+ , mEnableRotation(false)
+@@ -1555,10 +1555,9 @@
+ pFPSCounter-timeStamp();
+ }
+ #endif
+-viewport = *((glTFViewport*)lpParam);
+ {
+ TRACE_TIME;
+-status = initSSAAFrameBuf(viewport);
++status = initSSAAFrameBuf(((glTFViewport*)lpParam));
+ if (LIBGLTF_SUCCESS != status)
+ return status;
+ }
+@@ -1569,6 +1568,15 @@
+ {
+ if (0 == pViewport-width)
+ return LIBGLTF_INVALID_SIZE;
++
++// When viewport changes we need to release fbo and create a new one
++if( mCurrentViewport.x != pViewport-x || mCurrentViewport.y !=
pViewport-y ||
++mCurrentViewport.width != pViewport-width || mCurrentViewport.height
!= pViewport-height )
++{
++fbo.releaseFbo();
++mCurrentViewport = *pViewport;
++}
++
+ #if DEFAULT_VIEW
+ unsigned int width = SSAA * DEFAULT_VIEW;
+ unsigned int height = (SSAA * DEFAULT_VIEW *
+@@ -1730,14 +1738,14 @@
+ #if ENABLE_FPS
+ if (0 != pFPSCounter)
+ {
+-pFPSCounter-printFPS(viewport);
++pFPSCounter-printFPS(mCurrentViewport);
+ }
+ #endif
+
+ {
+ TRACE_TIME;
+-glViewport(viewport.x, viewport.y,
+- viewport.width, viewport.height);
++glViewport(mCurrentViewport.x, mCurrentViewport.y,
++ mCurrentViewport.width, mCurrentViewport.height);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ fbo.renderFboTexture();
+ }
+Only in libgltf/src: RenderScene.cpp~
+diff -ur libgltf.org/src/RenderScene.h libgltf/src/RenderScene.h
+--- libgltf.org/src/RenderScene.h 2014-07-15 17:33:12.615059856 +0200
libgltf/src/RenderScene.h 2014-07-15 22:18:01.306324010 +0200
+@@ -349,7 +349,7 @@
+ std::mapstd::string, BindBufferInfo mBindBufferMap;
+
+ static ShaderProgram mShaderProgram;
+-glTFViewport viewport;
++glTFViewport mCurrentViewport;
+ RenderWithFBO fbo;
+
+ bool mEnableTransparency;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - avmedia/source
avmedia/source/opengl/oglwindow.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 4641e8f3e2675386df4418506861945e35cd69a0
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Wed Jul 16 14:55:43 2014 +0200
fdo#81182: Resizing glTF window affects camera position
Camera moves by click and drag, with checking the last mouse
position we can make sure click was done inside the window
before drag.
Resizing can trigger drag event, but not click event.
(cherry picked from commit 51ba2df1cb29d4343f92174da6dc8f36ba9152eb)
Conflicts:
avmedia/source/opengl/oglwindow.cxx
Change-Id: I9e8b70fcb4a0abf26e76e03cafd026f940eceb10
Reviewed-on: https://gerrit.libreoffice.org/10353
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/avmedia/source/opengl/oglwindow.cxx
b/avmedia/source/opengl/oglwindow.cxx
index 2650faf..09a6333 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -20,7 +20,7 @@ OGLWindow::OGLWindow( glTFHandle rHandle, OpenGLContext
rContext, Window rEve
, m_rEventHandler( rEventHandlerParent )
, m_bVisible ( false )
, meZoomLevel( media::ZoomLevel_ORIGINAL )
-, m_aLastMousePos(Point())
+, m_aLastMousePos(Point(0,0))
, m_bIsOrbitMode( false )
, m_fCameraDistance(0.0)
{
@@ -356,7 +356,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
m_rEventHandler.GrabFocus();
}
MouseEvent* pMouseEvt = (MouseEvent*)pEvent-GetData();
-if(pMouseEvt pMouseEvt-IsLeft())
+if(pMouseEvt pMouseEvt-IsLeft() m_aLastMousePos != Point(0,0))
{
const Point aCurPos = pMouseEvt-GetPosPixel();
float fSensitivity = std::min(m_rHandle.viewport.width,
m_rHandle.viewport.height);
@@ -388,6 +388,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
MouseEvent* pMouseEvt = (MouseEvent*)pEvent-GetData();
if(pMouseEvt pMouseEvt-IsLeft() pMouseEvt-GetClicks() == 1)
{
+m_aLastMousePos = Point(0,0);
gltf_renderer_stop_rotate_model(m_rHandle);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 3 commits - cppcanvas/source vcl/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 118 +-
cppcanvas/source/mtfrenderer/implrenderer.cxx | 13 ++
vcl/source/filter/wmf/winmtf.cxx | 17 ++-
vcl/source/filter/wmf/winmtf.hxx |2
4 files changed, 142 insertions(+), 8 deletions(-)
New commits:
commit ca51926a2a0eacc5d8fc01bbbeff6293bf3f25c6
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Sat Jul 19 21:52:09 2014 +0200
emf+: emulate hatch with color blend
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: I2ac8f790c79c269d4c1fa650e703c3645c567ca4
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4ff1ea2..aa3cb27 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -123,6 +123,63 @@ enum EmfPlusCombineMode
EmfPlusCombineModeComplement = 0x0005
};
+enum EmfPlusHatchStyle
+{
+HatchStyleHorizontal = 0x,
+HatchStyleVertical = 0x0001,
+HatchStyleForwardDiagonal = 0x0002,
+HatchStyleBackwardDiagonal = 0x0003,
+HatchStyleLargeGrid = 0x0004,
+HatchStyleDiagonalCross = 0x0005,
+HatchStyle05Percent = 0x0006,
+HatchStyle10Percent = 0x0007,
+HatchStyle20Percent = 0x0008,
+HatchStyle25Percent = 0x0009,
+HatchStyle30Percent = 0x000A,
+HatchStyle40Percent = 0x000B,
+HatchStyle50Percent = 0x000C,
+HatchStyle60Percent = 0x000D,
+HatchStyle70Percent = 0x000E,
+HatchStyle75Percent = 0x000F,
+HatchStyle80Percent = 0x0010,
+HatchStyle90Percent = 0x0011,
+HatchStyleLightDownwardDiagonal = 0x0012,
+HatchStyleLightUpwardDiagonal = 0x0013,
+HatchStyleDarkDownwardDiagonal = 0x0014,
+HatchStyleDarkUpwardDiagonal = 0x0015,
+HatchStyleWideDownwardDiagonal = 0x0016,
+HatchStyleWideUpwardDiagonal = 0x0017,
+HatchStyleLightVertical = 0x0018,
+HatchStyleLightHorizontal = 0x0019,
+HatchStyleNarrowVertical = 0x001A,
+HatchStyleNarrowHorizontal = 0x001B,
+HatchStyleDarkVertical = 0x001C,
+HatchStyleDarkHorizontal = 0x001D,
+HatchStyleDashedDownwardDiagonal = 0x001E,
+HatchStyleDashedUpwardDiagonal = 0x001F,
+HatchStyleDashedHorizontal = 0x0020,
+HatchStyleDashedVertical = 0x0021,
+HatchStyleSmallConfetti = 0x0022,
+HatchStyleLargeConfetti = 0x0023,
+HatchStyleZigZag = 0x0024,
+HatchStyleWave = 0x0025,
+HatchStyleDiagonalBrick = 0x0026,
+HatchStyleHorizontalBrick = 0x0027,
+HatchStyleWeave = 0x0028,
+HatchStylePlaid = 0x0029,
+HatchStyleDivot = 0x002A,
+HatchStyleDottedGrid = 0x002B,
+HatchStyleDottedDiamond = 0x002C,
+HatchStyleShingle = 0x002D,
+HatchStyleTrellis = 0x002E,
+HatchStyleSphere = 0x002F,
+HatchStyleSmallGrid = 0x0030,
+HatchStyleSmallCheckerBoard = 0x0031,
+HatchStyleLargeCheckerBoard = 0x0032,
+HatchStyleOutlinedDiamond = 0x0033,
+HatchStyleSolidDiamond = 0x0034
+};
+
using namespace ::com::sun::star;
using namespace ::basegfx;
@@ -357,6 +414,7 @@ namespace cppcanvas
sal_Int32 surroundColorsNumber;
::Color* surroundColors;
EMFPPath *path;
+EmfPlusHatchStyle hatchStyle;
public:
EMFPBrush ()
@@ -377,6 +435,7 @@ namespace cppcanvas
, surroundColorsNumber(0)
, surroundColors(NULL)
, path(NULL)
+, hatchStyle(HatchStyleHorizontal)
{
}
@@ -424,7 +483,21 @@ namespace cppcanvas
s.ReadUInt32( color );
solidColor = ::Color (0xff - (color 24), (color
16) 0xff, (color 8) 0xff, color 0xff);
SAL_INFO (cppcanvas.emf, EMF+\tsolid color: 0x
std::hex color std::dec);
-
+break;
+}
+case 1:
+{
+sal_uInt32 style;
+sal_uInt32 foregroundColor;
+sal_uInt32 backgroundColor;
+s.ReadUInt32( style );
+s.ReadUInt32( foregroundColor );
+s.ReadUInt32( backgroundColor );
+
+hatchStyle = static_castEmfPlusHatchStyle(style);
+solidColor = ::Color(0xff - (foregroundColor 24),
(foregroundColor 16) 0xff, (foregroundColor 8) 0xff, foregroundColor
0xff);
+secondColor = ::Color(0xff - (backgroundColor 24),
(backgroundColor 16) 0xff, (backgroundColor 8) 0xff, backgroundColor
0xff);
+SAL_INFO (cppcanvas.emf, EMF+\thatch style
style foregroundcolor: 0x
[Libreoffice-commits] core.git: configmgr/qa officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig
configmgr/qa/unit/data.xcd |2 +- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- sc/uiconfig/scalc/menubar/menubar.xml|2 ++ sd/uiconfig/sdraw/menubar/menubar.xml|2 ++ sd/uiconfig/simpress/menubar/menubar.xml |2 ++ sw/uiconfig/sglobal/menubar/menubar.xml |2 ++ sw/uiconfig/sweb/menubar/menubar.xml |2 ++ sw/uiconfig/swform/menubar/menubar.xml |2 ++ sw/uiconfig/swreport/menubar/menubar.xml |2 ++ sw/uiconfig/swriter/menubar/menubar.xml |2 ++ sw/uiconfig/swxform/menubar/menubar.xml |2 ++ 11 files changed, 20 insertions(+), 2 deletions(-) New commits: commit 2420e776f728aee6171a8afe199ff84907152c39 Author: Joren De Cuyper jore...@libreoffice.org Date: Fri Jul 11 01:15:04 2014 +0200 fdo#80536 UI: Menu entry for 'Edit File' - 'Edit Mode' In this commit not only a menu entry is created, also the name is changed from 'Edit File' to 'Edit Mode'. Change-Id: Icd7998307cb0337dd2ee95b298452557ab37375b Reviewed-on: https://gerrit.libreoffice.org/10211 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd index d82baec..da8707e 100644 --- a/configmgr/qa/unit/data.xcd +++ b/configmgr/qa/unit/data.xcd @@ -2391,7 +2391,7 @@ /node node oor:name=.uno:EditDoc oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=x-no-translate/valuevalue xml:lang=en-USEdit File/value + value xml:lang=x-no-translate/valuevalue xml:lang=en-USEd~it Mode/value /prop prop oor:name=Properties oor:type=xs:int value1/value diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 4a3b542..74597a3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2423,7 +2423,7 @@ /node node oor:name=.uno:EditDoc oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USEdit File/value + value xml:lang=en-USEd~it Mode/value /prop prop oor:name=Properties oor:type=xs:int value9/value diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index d2234bf..efbd03c 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -129,6 +129,8 @@ menu:menuitem menu:id=.uno:PlugInsActive/ menu:menuitem menu:id=.uno:ImageMapDialog/ menu:menuitem menu:id=.uno:ObjectMenue/ +menu:menuseparator/ +menu:menuitem menu:id=.uno:EditDoc/ /menu:menupopup /menu:menu menu:menu menu:id=.uno:ViewMenu diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index c34e8bb..2d6948f 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -91,6 +91,8 @@ menu:menuitem menu:id=.uno:ImageMapDialog/ menu:menuitem menu:id=.uno:ObjectMenue/ menu:menuitem menu:id=.uno:EditHyperlink/ + menu:menuseparator/ + menu:menuitem menu:id=.uno:EditDoc/ /menu:menupopup /menu:menu menu:menu menu:id=.uno:ViewMenu diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index be36853..5fc1caa 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -92,6 +92,8 @@ menu:menuitem menu:id=.uno:ImageMapDialog/ menu:menuitem menu:id=.uno:ObjectMenue/ menu:menuitem menu:id=.uno:EditHyperlink/ +menu:menuseparator/ +menu:menuitem menu:id=.uno:EditDoc/ /menu:menupopup /menu:menu menu:menu menu:id=.uno:ViewMenu diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index d5736a5..fabc234 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -122,6 +122,8 @@ menu:menuitem menu:id=.uno:PlugInsActive/ menu:menuitem menu:id=.uno:ImageMapDialog/ menu:menuitem menu:id=.uno:ObjectMenue/ + menu:menuseparator/ + menu:menuitem menu:id=.uno:EditDoc/ /menu:menupopup /menu:menu menu:menu menu:id=.uno:ViewMenu diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index ee78c24..7a6a9b4 100644 ---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - avmedia/source
avmedia/source/opengl/oglframegrabber.cxx |7 ++-
avmedia/source/opengl/oglwindow.cxx |7 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit f3785c8532e627e4d9d0e7372213cffe67fdd96f
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Jul 14 00:21:55 2014 +0200
glTF: More rendering related error handling
If any error occurs related to glTF rendering, a question
mark is displayed at the place of the OpenGL window
(Question mark is a general concept of media objects).
Change-Id: Id7df5a47a4dd6832e640b3a7cb3c7712ebfb4408
(cherry picked from commit 58fd5a6dd6d5d599df88c9fd4ed5257577562bd9)
Reviewed-on: https://gerrit.libreoffice.org/10275
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/avmedia/source/opengl/oglframegrabber.cxx
b/avmedia/source/opengl/oglframegrabber.cxx
index cca8cc0..2f76436 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -38,7 +38,12 @@ uno::Reference css::graphic::XGraphic SAL_CALL
OGLFrameGrabber::grabFrame( do
{
boost::scoped_arraysal_uInt8 pBuffer(new
sal_uInt8[m_rHandle.viewport.width * m_rHandle.viewport.height * 4]);
glTFHandle* pHandle = m_rHandle;
-gltf_renderer_get_bitmap(pHandle, 1, (char*)pBuffer.get(), GL_BGRA);
+int nRet = gltf_renderer_get_bitmap(pHandle, 1, (char*)pBuffer.get(),
GL_BGRA);
+if( nRet != 0 )
+{
+SAL_WARN(avmedia.opengl, Error occured while rendering to bitmap!
Error code: nRet);
+return uno::Reference css::graphic::XGraphic ();
+}
BitmapEx aBitmap =
OpenGLHelper::ConvertBGRABufferToBitmapEx(pBuffer.get(),
m_rHandle.viewport.width, m_rHandle.viewport.height);
return Graphic( aBitmap ).GetXGraphic();
}
diff --git a/avmedia/source/opengl/oglwindow.cxx
b/avmedia/source/opengl/oglwindow.cxx
index 09a6333..72ccbfb 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -34,7 +34,12 @@ OGLWindow::~OGLWindow()
void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException,
std::exception)
{
m_rContext.makeCurrent();
-gltf_prepare_renderer(m_rHandle);
+int nRet = gltf_prepare_renderer(m_rHandle);
+if( nRet != 0 )
+{
+SAL_WARN(avmedia.opengl, Error occured while preparing for
rendering! Error code: nRet);
+return;
+}
gltf_renderer(m_rHandle);
gltf_complete_renderer(m_rHandle);
m_rContext.swapBuffers();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango icon-themes/tango_testing officecfg/registry sw/inc sw/sdi sw/source sw/uiconfig
icon-themes/galaxy/links.txt|2 icon-themes/tango/links.txt |2 icon-themes/tango_testing/links.txt |2 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 12 - sw/inc/cmdid.h |1 sw/sdi/swriter.sdi | 24 ++ sw/sdi/viewsh.sdi |6 ++ sw/source/uibase/uiview/pview.cxx |4 + sw/uiconfig/sglobal/toolbar/previewobjectbar.xml|1 sw/uiconfig/sweb/toolbar/previewobjectbar.xml |1 sw/uiconfig/swform/toolbar/previewobjectbar.xml |1 sw/uiconfig/swreport/toolbar/previewobjectbar.xml |1 sw/uiconfig/swriter/toolbar/previewobjectbar.xml|1 sw/uiconfig/swxform/toolbar/previewobjectbar.xml|1 14 files changed, 57 insertions(+), 2 deletions(-) New commits: commit c38b40c0101e2607deb53690205fa889f06f3440 Author: Joren De Cuyper jore...@libreoffice.org Date: Thu Jul 3 14:01:10 2014 +0200 fdo#80651 - Add 'Single Page' button to Page Preview Toolbar Only Oxygen and Crystal theme need another icon then the 'adddirect' one. Both themes have a 'sum' sign in that icon. Other themes shows a nice single page icon. Change-Id: I7db13014f6fa97b2a9474a66a27a70352ea69b29 Reviewed-on: https://gerrit.libreoffice.org/10053 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index 96ccd9b..94b4da2 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -2,3 +2,5 @@ cmd/lc_datastreamsplay.png avmedia/res/avl02049.png cmd/sc_datastreamsplay.png avmedia/res/av02049.png cmd/lc_datastreamsstop.png avmedia/res/avl02051.png cmd/sc_datastreamsstop.png avmedia/res/av02051.png +cmd/lc_showsinglepage.png cmd/lc_adddirect.png +cmd/sc_showsinglepage.png cmd/sc_adddirect.png diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 6ea6ddc..eb2fd6c 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -285,6 +285,8 @@ cmd/lc_pie.png cmd/lc_basicshapes.circle-pie.png cmd/lc_circlepie.png cmd/lc_basicshapes.circle-pie.png cmd/sc_pie.png cmd/sc_basicshapes.circle-pie.png cmd/sc_circlepie.png cmd/sc_basicshapes.circle-pie.png +cmd/lc_showsinglepage.png cmd/lc_adddirect.png +cmd/sc_showsinglepage.png cmd/sc_adddirect.png sfx2/res/sortascending.png cmd/lc_sortascending.png svx/res/symphony/Line_color.png cmd/sc_xlinecolor.png svx/res/symphony/rotate_left.png cmd/sc_rotateleft.png diff --git a/icon-themes/tango_testing/links.txt b/icon-themes/tango_testing/links.txt index 409b8b3..8638065 100644 --- a/icon-themes/tango_testing/links.txt +++ b/icon-themes/tango_testing/links.txt @@ -15,6 +15,8 @@ cmd/lc_rightpara.png cmd/lc_alignright.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_justifypara.png cmd/lc_alignblock.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png +cmd/lc_showsinglepage.png cmd/lc_adddirect.png +cmd/sc_showsinglepage.png cmd/sc_adddirect.png # Split button categories cmd/lc_arrowshapes.png cmd/lc_arrowshapes.left-right-arrow.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 877f30d..b5e25a8 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -927,7 +927,15 @@ /node node oor:name=.uno:ShowTwoPages oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USPage Preview: Two Pages/value + value xml:lang=en-USTwo Pages Preview/value +/prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop + /node + node oor:name=.uno:ShowSinglePage oor:op=replace +prop oor:name=Label oor:type=xs:string + value xml:lang=en-USSingle Page Preview/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -943,7 +951,7 @@ /node node oor:name=.uno:ShowMultiplePages oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USPage Preview: Multiple Pages/value + value xml:lang=en-USMultiple Pages Preview/value /prop prop oor:name=Properties oor:type=xs:int value1/value diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 3c036ba..9a656a6 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -812,6 +812,7 @@ #define FN_PRINT_PAGEPREVIEW
[Libreoffice-commits] core.git: icon-themes/tango
icon-themes/tango/cmd/sc_insertcolumns.png |binary icon-themes/tango/cmd/sc_insertcolumns.xcf.bz2 |binary icon-themes/tango/cmd/sc_insertrows.png|binary icon-themes/tango/cmd/sc_insertrows.xcf.bz2|binary 4 files changed New commits: commit 95874c02b6be22192dca2a203b4d20c84f34bf4d Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sun Jul 20 00:28:57 2014 -0500 fdo#81489: Tweak the color in 'Insert Row/Column' to increase its visibility ... and convey its meaning better. Change-Id: I95e33c975762e3a909dc110e60c502e7872b Reviewed-on: https://gerrit.libreoffice.org/10412 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/tango/cmd/sc_insertcolumns.png b/icon-themes/tango/cmd/sc_insertcolumns.png index 40ebcce..b5fb0bb 100644 Binary files a/icon-themes/tango/cmd/sc_insertcolumns.png and b/icon-themes/tango/cmd/sc_insertcolumns.png differ diff --git a/icon-themes/tango/cmd/sc_insertcolumns.xcf.bz2 b/icon-themes/tango/cmd/sc_insertcolumns.xcf.bz2 index 8cbe193..1cd975b 100644 Binary files a/icon-themes/tango/cmd/sc_insertcolumns.xcf.bz2 and b/icon-themes/tango/cmd/sc_insertcolumns.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/sc_insertrows.png b/icon-themes/tango/cmd/sc_insertrows.png index 5f1777b..07f630d 100644 Binary files a/icon-themes/tango/cmd/sc_insertrows.png and b/icon-themes/tango/cmd/sc_insertrows.png differ diff --git a/icon-themes/tango/cmd/sc_insertrows.xcf.bz2 b/icon-themes/tango/cmd/sc_insertrows.xcf.bz2 index ccfa75a..8ae8cbe 100644 Binary files a/icon-themes/tango/cmd/sc_insertrows.xcf.bz2 and b/icon-themes/tango/cmd/sc_insertrows.xcf.bz2 differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a68dbdd334f9e653eb7e4db934055d32be506537 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 18 22:07:02 2014 +0200 (related: fdo#78502) writerfilter: RTF import: fix invalid string copy ... in leveltext destination. Change-Id: I74de6d14170130bf33923854a0c9851dc7cc390f (cherry picked from commit b94bd40b915ab32d18d43fc60dfda932e4e00ca8) Reviewed-on: https://gerrit.libreoffice.org/10395 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c53174e..bee142c 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4863,7 +4863,7 @@ int RTFDocumentImpl::popState() // The first character is the length of the string (the rest should be ignored). sal_Int32 nLength(aStr.toChar()); OUString aValue; -if (nLength = aStr.getLength()) +if (nLength aStr.getLength()) aValue = aStr.copy(1, nLength); else aValue = aStr; ___ 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' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e7bd0484228beb4529e84742faf56f813dca495a Author: Michael Stahl mst...@redhat.com Date: Fri Jul 18 22:07:02 2014 +0200 (related: fdo#78502) writerfilter: RTF import: fix invalid string copy ... in leveltext destination. Change-Id: I74de6d14170130bf33923854a0c9851dc7cc390f (cherry picked from commit b94bd40b915ab32d18d43fc60dfda932e4e00ca8) Reviewed-on: https://gerrit.libreoffice.org/10397 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 66abe80..73eb3f2 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4278,7 +4278,7 @@ int RTFDocumentImpl::popState() // The first character is the length of the string (the rest should be ignored). sal_Int32 nLength(aStr.toChar()); OUString aValue; -if (nLength = aStr.getLength()) +if (nLength aStr.getLength()) aValue = aStr.copy(1, nLength); else aValue = aStr; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - embeddedobj/source include/svx offapi/com offapi/UnoApi_offapi.mk svx/source
embeddedobj/source/commonembedding/miscobj.cxx |8 -
embeddedobj/source/commonembedding/persistence.cxx |9 ++
embeddedobj/source/inc/commonembobj.hxx|8 -
include/svx/svdoole2.hxx |7
offapi/UnoApi_offapi.mk|1
offapi/com/sun/star/embed/XEmbedPersist2.idl | 30 +
svx/source/svdraw/svdetc.cxx |4 --
svx/source/svdraw/svdoole2.cxx | 16 ++-
8 files changed, 62 insertions(+), 21 deletions(-)
New commits:
commit 65a41146af0c3c86de5c530446719e75f2c5512e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Jul 11 10:50:29 2014 -0400
bnc#883684: Better fix for this.
Instead of making all chart objects exempt from unloading, check each OLE
object on whether or not it already has its persistent storage created.
If not, don't unload it else it would have nothing to load back from once
unloaded.
(cherry picked from commit a0bd5587a5ac62974bdb10731d3fd21584521a72)
Conflicts:
svx/source/svdraw/svdetc.cxx
Change-Id: I2312e86c9376d3699ef4aa1e0cf2f4c04f706c1e
Reviewed-on: https://gerrit.libreoffice.org/10237
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx
b/embeddedobj/source/commonembedding/miscobj.cxx
index 8df625d..fd5ab0d 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -363,6 +363,11 @@ uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface(
const uno::Type rType
void * p = static_cast embed::XEmbeddedObject * ( this );
return uno::Any( p, rType );
}
+else if (rType == cppu::UnoTypeembed::XEmbedPersist2::get())
+{
+void* p = static_castembed::XEmbedPersist2*(this);
+return uno::Any(p, rType);
+}
else
aReturn = ::cppu::queryInterface(
rType,
@@ -431,7 +436,8 @@ uno::Sequence uno::Type SAL_CALL
OCommonEmbeddedObject::getTypes()
cppu::UnoTypeembed::XInplaceObject::get(),
cppu::UnoTypeembed::XCommonEmbedPersist::get(),
cppu::UnoTypecontainer::XChild::get(),
-
cppu::UnoTypeembed::XEmbedPersist::get());
+
cppu::UnoTypeembed::XEmbedPersist::get(),
+
cppu::UnoTypeembed::XEmbedPersist2::get());
pTypeCollection = aTypeCollection ;
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx
b/embeddedobj/source/commonembedding/persistence.cxx
index 51210a7..c85e786 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1789,6 +1789,15 @@ void SAL_CALL OCommonEmbeddedObject::reload(
}
}
+sal_Bool SAL_CALL OCommonEmbeddedObject::isStored() throw
(css::uno::RuntimeException, std::exception)
+{
+uno::Referencecontainer::XNameAccess xNA(m_xObjectStorage,
uno::UNO_QUERY);
+if (!xNA.is())
+return false;
+
+return xNA-getElementNames().getLength() 0;
+}
+
void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference
embed::XStorage xStorage,
const OUString sEntName )
diff --git a/embeddedobj/source/inc/commonembobj.hxx
b/embeddedobj/source/inc/commonembobj.hxx
index ceba61e..0808363 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -27,7 +27,7 @@
#include com/sun/star/document/XStorageBasedDocument.hpp
#include com/sun/star/embed/XEmbeddedObject.hpp
#include com/sun/star/embed/XVisualObject.hpp
-#include com/sun/star/embed/XEmbedPersist.hpp
+#include com/sun/star/embed/XEmbedPersist2.hpp
#include com/sun/star/embed/XLinkageSupport.hpp
#include com/sun/star/embed/XClassifiedObject.hpp
#include com/sun/star/embed/XComponentSupplier.hpp
@@ -72,7 +72,7 @@ namespace comphelper {
class Interceptor;
class OCommonEmbeddedObject : public ::com::sun::star::embed::XEmbeddedObject
-, public ::com::sun::star::embed::XEmbedPersist
+, public ::com::sun::star::embed::XEmbedPersist2
, public ::com::sun::star::embed::XLinkageSupport
, public ::com::sun::star::embed::XInplaceObject
, public ::com::sun::star::container::XChild
@@ -429,6 +429,10 @@ public:
::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception )
SAL_OVERRIDE;
+// XEmbedPersist2
+
+virtual sal_Bool SAL_CALL isStored()
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - configure.ac external/libabw external/libebook external/libetonyek external/liblangtag external/libvisio external/libxml2 external/libxmlsec
RepositoryExternal.mk | 16 +++-
configure.ac |9 +++
external/libabw/ExternalProject_libabw.mk |3 --
external/libebook/ExternalProject_libebook.mk |2 -
external/libetonyek/ExternalProject_libetonyek.mk |2 -
external/liblangtag/ExternalProject_langtag.mk|6 +---
external/libvisio/ExternalProject_libvisio.mk |3 --
external/libxml2/ExternalProject_xml2.mk |4 ++-
external/libxml2/UnpackedTarball_xml2.mk |1
external/libxml2/libxml2-icu.patch.0 | 28 ++
external/libxmlsec/ExternalProject_xmlsec.mk |1
external/libxmlsec/xmlsec1-vc.patch |2 -
external/libxslt/libxslt-vc10.patch |2 -
external/redland/ExternalProject_redland.mk |6 +---
sc/source/core/tool/cellkeytranslator.cxx | 15 +--
sc/source/core/tool/cellkeywords.inl |6 ++--
sc/source/core/tool/formulaopt.cxx|4 +--
sc/source/ui/unoobj/cellvaluebinding.cxx |3 +-
sfx2/source/appl/newhelp.cxx |2 -
sfx2/source/doc/doctemplates.cxx | 14 +--
20 files changed, 82 insertions(+), 47 deletions(-)
New commits:
commit 23b4b764ade82cf3a5835a7b7f35fb5e45cd6cc9
Author: David Tardon dtar...@redhat.com
Date: Thu Jul 17 17:27:05 2014 +0200
fdo#63756 build libxml2 with ICU support
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab
(cherry picked from commit 7515b1a90fac9e31733c0fdcc1156adadf0e6f99)
Reviewed-on: https://gerrit.libreoffice.org/10428
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 919df96..c149869 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -915,23 +915,25 @@ define gb_LinkTarget__use_libxml2
$(call gb_LinkTarget_use_package,$(1),xml2)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
- -I$(call gb_UnpackedTarball_get_dir,xml2)/include \
+ $(LIBXML_CFLAGS) \
)
-ifeq ($(COM),MSC)
-$(call gb_LinkTarget_add_libs,$(1),\
- $(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc/libxml2.lib \
-)
-else
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2 \
+ $(LIBXML_LIBS) \
)
+
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_use_external,$(1),icu_headers)
endif
endef
define gb_ExternalProject__use_libxml2
$(call gb_ExternalProject_use_package,$(1),xml2)
+ifeq ($(COM),MSC)
+$(call gb_ExternalProject_use_external_project,$(1),icu)
+endif
+
endef
endif # SYSTEM_LIBXML
diff --git a/configure.ac b/configure.ac
index 35e1534..5ead2a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7972,6 +7972,15 @@ if test $with_system_libxml = yes; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXML=
+LIBXML_CFLAGS=-I${WORKDIR}/UnpackedTarball/xml2/include
+if test $COM = MSC; then
+LIBXML_CFLAGS=${LIBXML_CFLAGS}
-I${WORKDIR}/UnpackedTarball/icu/source/i18n
-I${WORKDIR}/UnpackedTarball/icu/source/common
+fi
+if test $COM = MSC; then
+
LIBXML_LIBS=${WORKDIR}/UnpackedTarball/xml2/win32/bin.msvc/libxml2.lib
+else
+LIBXML_LIBS=-L${WORKDIR}/UnpackedTarball/xml2/.libs -lxml2
+fi
BUILD_TYPE=$BUILD_TYPE LIBXML2
fi
AC_SUBST(SYSTEM_LIBXML)
diff --git a/external/libabw/ExternalProject_libabw.mk
b/external/libabw/ExternalProject_libabw.mk
index 63d4e52..49a2645 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -35,8 +35,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-werror \
$(if
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS=$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
- -I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)) \
- $(if $(SYSTEM_LIBXML),,-I$(call
gb_UnpackedTarball_get_dir,xml2)/include) \
+ -I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(MAKE) \
)
diff --git a/external/libebook/ExternalProject_libebook.mk
b/external/libebook/ExternalProject_libebook.mk
index 785aeb7..293028f 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
--disable-werror \
--disable-weffc \
CXXFLAGS=$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/Outliner.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 59f84b4a2c082382767f12e0c7a06a3f0b52e721 Author: Alex Henrie alexhenri...@gmail.com Date: Wed Jul 16 20:01:35 2014 -0600 fdo#79343 When searching in Draw or Impress, leave focus in search bar Setting bGrabFocus to false resolved the problem. Change-Id: I7678be76e1cca2a3d58635b4fc44aa3b1cdddb9a Reviewed-on: https://gerrit.libreoffice.org/10362 Reviewed-by: Joren De Cuyper jore...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index ebbc0f5..87c777a 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1188,7 +1188,7 @@ void Outliner::PrepareSearchAndReplace (void) mbStringFound = true; mbMatchMayExist = true; -EnterEditMode (); +EnterEditMode(false); mpDrawDocument-GetDocSh()-SetWaitCursor( false ); // Start seach at the right end of the current object's text ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlimport/data/floating-table-section-columns.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |7 +++
sw/qa/extras/ww8import/data/floating-table-section-columns.doc|binary
sw/qa/extras/ww8import/data/floating-table-section-margins.doc|binary
sw/qa/extras/ww8import/ww8import.cxx | 19
++
sw/source/filter/ww8/ww8par.cxx |4 ++
sw/source/filter/ww8/ww8par6.cxx |4 +-
writerfilter/source/dmapper/PropertyMap.cxx |4 +-
writerfilter/source/dmapper/PropertyMap.hxx |1
9 files changed, 37 insertions(+), 2 deletions(-)
New commits:
commit c5ed52b1cd6f22787c94bec035ceecf9e1da3271
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Mon Jul 21 10:56:52 2014 +0200
ww8import create a pagedesc if continuous section changes margins
(bnc#875383)
This is similar to what writerfilter does. MSWord can have one page with
several
different margins, which are saved using continuous sections, which causes
all
kinds of trouble, because either we treat them as Writer sections, which
means
we lose some of the data, or we treat them as Writer page styles, which
causes
spurious page breaks if in the wrong place. Either option has its problems,
but
here it seems slightly better to go for keeping the data and hoping the page
break will be in a place where a break will be anyway.
Change-Id: I8f52aa820750da6788ea04180a15ac334f6bf87b
diff --git a/sw/qa/extras/ww8import/data/floating-table-section-margins.doc
b/sw/qa/extras/ww8import/data/floating-table-section-margins.doc
new file mode 100644
index 000..f414be7
Binary files /dev/null and
b/sw/qa/extras/ww8import/data/floating-table-section-margins.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index a5f3a8c..fe4a8fc 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -34,6 +34,18 @@ public:
#define DECLARE_WW8IMPORT_TEST(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
+DECLARE_WW8IMPORT_TEST(testFloatingTableSectionMargins,
floating-table-section-margins.doc)
+{
+sal_Int32 pageLeft = parseDump(/root/page[2]/infos/bounds,
left).toInt32();
+sal_Int32 pageWidth = parseDump(/root/page[2]/infos/bounds,
width).toInt32();
+sal_Int32 tableLeft =
parseDump(/root/page[2]/body/column/body/section/column/body/txt[2]/anchored/fly/tab/infos/bounds,
left).toInt32();
+sal_Int32 tableWidth =
parseDump(/root/page[2]/body/column/body/section/column/body/txt[2]/anchored/fly/tab/infos/bounds,
width).toInt32();
+CPPUNIT_ASSERT( pageWidth 0 );
+CPPUNIT_ASSERT( tableWidth 0 );
+// The table's resulting position should be roughly centered.
+CPPUNIT_ASSERT( abs(( pageLeft + pageWidth / 2 ) - ( tableLeft +
tableWidth / 2 )) 20 );
+}
+
DECLARE_WW8IMPORT_TEST(testN757910, n757910.doc)
{
// The internal margin was larger than 0.28cm
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 56c184d..0906232 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4440,6 +4440,10 @@ void wwSectionManager::InsertSegments()
bool bInsertSection = (aIter != aStart) aIter-IsContinuous()
bThisAndPreviousAreCompatible;
bool bInsertPageDesc = !bInsertSection;
+// HACK Force new pagedesc if margins change, otherwise e.g. floating
tables may be anchored improperly.
+if( aIter-maSep.dyaTop != aPrev-maSep.dyaTop ||
aIter-maSep.dyaBottom != aPrev-maSep.dyaBottom
+|| aIter-maSep.dxaLeft != aPrev-maSep.dxaLeft ||
aIter-maSep.dxaRight != aPrev-maSep.dxaRight )
+bInsertPageDesc = true;
bool bProtected = SectionIsProtected(*aIter); // do we really need
this ?? I guess I have a different logic in editshell which disables this...
if (bUseEnhFields mrReader.pWDop-fProtEnabled
aIter-IsNotProtected())
{
commit 2aa6589aa5bbcd7cd74b33b81e431fb6837a2458
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Mon Jul 7 13:56:02 2014 +0200
fix floating table over section with several columns (part of bnc#875383)
Change-Id: Ic6e75cc2cedb61754b45bc4678a1185f580d5ed6
diff --git a/sw/qa/extras/ooxmlimport/data/floating-table-section-columns.docx
b/sw/qa/extras/ooxmlimport/data/floating-table-section-columns.docx
new file mode 100644
index 000..50bb7ac
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/floating-table-section-columns.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 061c393..a8c0936 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2290,6 +2290,13 @@
[Libreoffice-commits] dev-tools.git: scripts/gerrit-filter-domain
scripts/gerrit-filter-domain |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7abaa4ca7573efc1a4f8e4b4732f2d75bae854ea Author: Jan Holesovsky ke...@collabora.com Date: Mon Jul 21 11:11:34 2014 +0200 gerrit-filter-domain: Prefer re.search over re.match. This actually does what the Usage: advertises, as the match() wants to match the entire string, while search() only checks that anywhere in the string, the RE appears. diff --git a/scripts/gerrit-filter-domain b/scripts/gerrit-filter-domain index 9586bc7..0cb9677 100755 --- a/scripts/gerrit-filter-domain +++ b/scripts/gerrit-filter-domain @@ -24,7 +24,7 @@ def dumpChange(change): def filterDomain(changes, domain): ret = [] for i in changes: -if re.match(domain, i['owner']['email']): +if re.search(domain, i['owner']['email']): ret.append(i) return ret ___ 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 64161, which changed state. Bug 64161 Summary: PDF: EPS images don't get exported when writing a PDF file https://bugs.freedesktop.org/show_bug.cgi?id=64161 What|Removed |Added Status|VERIFIED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/connectivity
include/connectivity/CommonTools.hxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 7f15d2612d450dd430a1288052bc408f3bb1fcd9
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 21 11:28:54 2014 +0200
fix -Werror=extra: base class âclass salhelper::SimpleReferenceObjectâ
should be explicitly initialized in the copy constructor
Change-Id: If375412e43bad6bced7bd5c69578f998b9e6618c
diff --git a/include/connectivity/CommonTools.hxx
b/include/connectivity/CommonTools.hxx
index 1ef5908..cda2f65 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -75,7 +75,10 @@ namespace connectivity
ORefVector() {}
ORefVector(size_t _st) : m_vector(_st) {}
-ORefVector(const ORefVector _rRH) : m_vector(_rRH.m_vector) {}
+ORefVector(const ORefVector rOther)
+: salhelper::SimpleReferenceObject()
+, m_vector(rOther.m_vector)
+{}
ORefVector operator=(const ORefVector _rRH)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 59 +++ 1 file changed, 51 insertions(+), 8 deletions(-) New commits: commit b8f4db5bad245c2e340b3217b10df994785eecd3 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jul 21 11:36:27 2014 +0200 Resolves fdo#81581: Mediawiki doesn't recognize underlining Change-Id: I27ec27bd733e5161bbd18ba7cf813daa3ac6c089 diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 64474b3..1205536 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -118,23 +118,26 @@ !-- Italic character style. -- variable name=ITALIC_BIT select=2/ + !-- Underline character style. -- + variable name=UNDERLINE_BIT select=4/ + !-- Subscript character style. -- - variable name=SUBSCRIPT_BIT select=4/ + variable name=SUBSCRIPT_BIT select=8/ !-- Superscript character style. -- - variable name=SUPERSCRIPT_BIT select=8/ + variable name=SUPERSCRIPT_BIT select=16/ !-- Typewriter character style. -- - variable name=TYPEWRITER_BIT select=16/ + variable name=TYPEWRITER_BIT select=32/ !-- Preformatted text paragraph style. -- - variable name=CODE_BIT select=32/ + variable name=CODE_BIT select=64/ !-- Centered paragraph style. -- - variable name=CENTER_BIT select=64/ + variable name=CENTER_BIT select=128/ !-- Right aligned paragraph style. -- - variable name=RIGHT_BIT select=128/ + variable name=RIGHT_BIT select=256/ !-- Constant defining the empty style. -- variable name=NO_STYLE select=0/ @@ -976,6 +979,8 @@ select=($style mod (2 * $BOLD_BIT)) != 0/ variable name=italic select=($style mod (2 * $ITALIC_BIT)) - ($style mod ($ITALIC_BIT)) != 0/ + variable name=underline + select=($style mod (2 * $UNDERLINE_BIT)) - ($style mod ($UNDERLINE_BIT)) != 0/ variable name=superscript select=($style mod (2 * $SUPERSCRIPT_BIT)) - ($style mod ($SUPERSCRIPT_BIT)) != 0/ variable name=subscript @@ -989,6 +994,8 @@ select=($style-left mod (2 * $BOLD_BIT)) != 0/ variable name=italic-left select=($style-left mod (2 * $ITALIC_BIT)) - ($style-left mod ($ITALIC_BIT)) != 0/ + variable name=underline-left + select=($style-left mod (2 * $UNDERLINE_BIT)) - ($style-left mod ($UNDERLINE_BIT)) != 0/ variable name=superscript-left select=($style-left mod (2 * $SUPERSCRIPT_BIT)) - ($style-left mod ($SUPERSCRIPT_BIT)) != 0/ variable name=subscript-left @@ -1000,6 +1007,8 @@ select=($style-right mod (2 * $BOLD_BIT)) != 0/ variable name=italic-right select=($style-right mod (2 * $ITALIC_BIT)) - ($style-right mod ($ITALIC_BIT)) != 0/ + variable name=underline-right + select=($style-right mod (2 * $UNDERLINE_BIT)) - ($style-right mod ($UNDERLINE_BIT)) != 0/ variable name=superscript-right select=($style-right mod (2 * $SUPERSCRIPT_BIT)) - ($style-right mod ($SUPERSCRIPT_BIT)) != 0/ variable name=subscript-right @@ -1027,6 +1036,9 @@ if test=not($code) and $typewriter and not($typewriter-left) textlt;ttgt;/text /if + if test=$underline and not($underline-left) + textlt;ugt;/text + /if if test=$bold and not($bold-left) text'''/text /if @@ -1044,6 +1056,9 @@ if test=$bold and not($bold-right) text'''/text /if + if test=$underline and not($underline-right) + textlt;/ugt;/text + /if if test=not($code) and $typewriter and not($typewriter-right) textlt;/ttgt;/text
RE: export of Calc functions to OOXML
Hi Eike, The Calc function GAMMADIST has an optional 4th argument (cumulative), whereas this argument is mandatory for Excel. When saving a document with function GAMMADIST as xls, this argument is added if necessary (in /sc/source/filter/excel/xeformula.cxx). When saving this document as xlsx, this argument is not added. That's odd, XclExpFmlaCompImpl::AppendTrailingParam() is called in XclExpFmlaCompImpl::FinishFunction() that should be called also for OOXML export (or was it?). Best to place a breakpoint there and see if/when it gets hit. Neither XclExpFmlaCompImpl::AppendTrailingParam(), nor XclExpFmlaCompImpl::FinishFunction() gets hit when set as a breakpoint in gdb. BUT, I think I might know why it doesn't get called anymore ... the OOXML formula string is now directly generated from the token array, which bypasses all mechanisms we had in place for the Excel binary export and the earlier OOXML export benefitted from. It may be we have to re-implement that entirely :-( and end up with an almost duplicated functionality.. It seems to me that re-implementing the OOXML export functionality is rather a complex business, i.e. not something suitable for me. Shall I create a bug report for this? As I want to use the same principle for F.DIST (see fdo#40835), which also has a 4th argument that is optional in ODFF1.2 and mandatory in Excel, and maybe more functions. Would make sense to add those similar to the existing ones. That will have to wait till after the re-implementation then ;-) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - cui/uiconfig
cui/uiconfig/ui/aboutconfigdialog.ui | 163 +++ 1 file changed, 72 insertions(+), 91 deletions(-) New commits: commit 68dc545f9d269c75c3ab2df73b8adf1d2276c240 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Mon Jul 7 15:31:55 2014 -0500 Related fdo#67642: remove redundant 'Preferences' label to save some space This label is redundant now that the dialog has a title. Change-Id: I628cc99594f7c42e9484f31d64779881e17c8f02 Reviewed-on: https://gerrit.libreoffice.org/10119 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit c1b562139a2e87cce2f189c50a242cf057970551) Reviewed-on: https://gerrit.libreoffice.org/10433 diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui b/cui/uiconfig/ui/aboutconfigdialog.ui index 495b0eab..2bbaf43 100644 --- a/cui/uiconfig/ui/aboutconfigdialog.ui +++ b/cui/uiconfig/ui/aboutconfigdialog.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ !-- interface-requires LibreOffice 1.0 -- object class=GtkDialog id=AboutConfig property name=can_focusFalse/property @@ -95,95 +96,87 @@ /packing /child child - object class=GtkFrame id=frame1 + object class=GtkAlignment id=alignment1 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property property name=vexpandTrue/property -property name=label_xalign0/property -property name=shadow_typenone/property child - object class=GtkAlignment id=alignment1 + object class=GtkBox id=box1 property name=visibleTrue/property property name=can_focusFalse/property -property name=top_padding6/property -property name=left_padding12/property +property name=orientationvertical/property child - object class=GtkBox id=box1 -property name=visibleTrue/property + object class=GtkGrid id=grid1 property name=can_focusFalse/property -property name=orientationvertical/property +property name=no_show_allTrue/property +property name=row_spacing6/property +property name=column_spacing6/property +property name=column_homogeneousTrue/property child - object class=GtkGrid id=grid1 + object class=GtkLabel id=preference +property name=visibleTrue/property property name=can_focusFalse/property -property name=no_show_allTrue/property -property name=row_spacing6/property -property name=column_spacing6/property -property name=column_homogeneousTrue/property -child - object class=GtkLabel id=preference -property name=visibleTrue/property -property name=can_focusFalse/property -property name=yalign0.4900953674316/property -property name=label translatable=yesPreference Name/property - /object - packing -property name=left_attach0/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkLabel id=property -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0.5198092651367/property -property name=yalign0.5099046325684/property -property name=label translatable=yesProperty/property - /object - packing -property name=left_attach1/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkLabel id=type -property name=visibleTrue/property -
Re: export of Calc functions to OOXML
Hi Winfried, On Monday, 2014-07-21 11:39:30 +0200, Winfried Donkers wrote: Neither XclExpFmlaCompImpl::AppendTrailingParam(), nor XclExpFmlaCompImpl::FinishFunction() gets hit when set as a breakpoint in gdb. That confirms my assumption that it is due to the change that formula expressions are now written using the compiler internals. It seems to me that re-implementing the OOXML export functionality is rather a complex business, i.e. not something suitable for me. Shall I create a bug report for this? There are already entry points that do something similar for the old non-ODFF (aka PODF) OOo-XML format, i.e. in formula/source/core/api/FormulaCompiler.cxx FormulaCompiler::CreateStringFromTokenArray() and in formula/source/core/api/token.cxx all functions with *Rewrite*() The MissingConvention and FormulaMissingContext need to handle also the OOXML cases, or probably better create a derived MissingConvention for the OOXML case so there are less explicit comparisons and/or switch cases to differentiate. _Maybe_ that and the code in XclExpFmlaCompImpl::AppendTrailingParam() could even be united in some way to diminish code duplication. If you want to take a stab at this just tell me, otherwise I'll do. A bug report might be good so things don't get lost. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpR8yaOEZHhx.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSoC] Varga Mihai - progress report week 9
Hello, Last week Cedric (my mentor) managed to solve the bug we were having with the NSSInitializer so now I'm working to integrate the OneDrive connection in LO. So far I was able to browse the contents in my onedrive account but I'm having problems opening files. I'm working on this issue and it should be solved soon. Best regards, Mihai ___ 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 Kevin Suo suokunl...@gmail.com changed: What|Removed |Added Depends on||81396 -- 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: export of Calc functions to OOXML
Hi Eike, It seems to me that re-implementing the OOXML export functionality is rather a complex business, i.e. not something suitable for me. Shall I create a bug report for this? [ ... ] If you want to take a stab at this just tell me, otherwise I'll do. A bug report might be good so things don't get lost. I might give it a try, but it will take some time before I can really have a go at it. If you have time to spare, assign yourself to fdo#81596 ;-) Winfried ___ 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 #189 from Kevin Suo suokunl...@gmail.com --- Added bug 81396, charts do not show correctly in XLSX when open with libreoffice. Affects all chart types. -- 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 - avmedia/source include/vcl slideshow/source vcl/source
avmedia/source/opengl/oglplayer.cxx| 31
++
include/vcl/opengl/OpenGLHelper.hxx|3
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 11
---
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 12
+--
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 12
+--
vcl/source/opengl/OpenGLHelper.cxx | 15
6 files changed, 60 insertions(+), 24 deletions(-)
New commits:
commit 378b1d24a958114eb4484cb10f609f6e482772ec
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sun Jul 20 17:20:01 2014 +0200
fdo#81055: Crash due to inadequate checks for GL version / capabilities
Base line is OpenGL 2.1 + extensions:
GL_ARB_framebuffer_object (part of OpenGL 3.0) for
glGenFramebuffers, glGenRenderbuffers...
GL_ARB_vertex_array_object (part of OpenGL 3.0) for
glGenVertexArrays, glBindVertexArray...
GL_ARB_sampler_objects (part of OpenGL 3.3) for
glGenSamplers, glBindSampler...
Change-Id: Ib8acf41ab85cd1677d0341719b3a5b4f743ed756
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index a602d3c..89ac3b1 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -239,6 +239,25 @@ awt::Size SAL_CALL
OGLPlayer::getPreferredPlayerWindowSize() throw ( uno::Runtim
return awt::Size( 480, 360 );
}
+static bool lcl_CheckOpenGLRequirements()
+{
+float fVersion = OpenGLHelper::getGLVersion();
+if( fVersion = 3.3 )
+{
+return true;
+}
+else if( fVersion = 3.0 )
+{
+return glewIsSupported(GL_ARB_sampler_objects);
+}
+else if( fVersion = 2.1 )
+{
+return glewIsSupported(GL_ARB_sampler_objects
GL_ARB_framebuffer_object GL_ARB_vertex_array_object);
+}
+
+return false;
+}
+
uno::Reference media::XPlayerWindow SAL_CALL OGLPlayer::createPlayerWindow(
const uno::Sequence uno::Any rArguments )
throw ( uno::RuntimeException, std::exception )
{
@@ -264,6 +283,12 @@ uno::Reference media::XPlayerWindow SAL_CALL
OGLPlayer::createPlayerWindow( c
return uno::Reference media::XPlayerWindow ();
}
+if( !lcl_CheckOpenGLRequirements() )
+{
+SAL_WARN(avmedia.opengl, Your platform does not have the minimal
OpenGL requiremenets!);
+return uno::Reference media::XPlayerWindow ();
+}
+
Size aSize = pChildWindow-GetSizePixel();
m_aContext.setWinSize(aSize);
m_pHandle-viewport.x = 0;
@@ -298,6 +323,12 @@ uno::Reference media::XFrameGrabber SAL_CALL
OGLPlayer::createFrameGrabber()
return uno::Reference media::XFrameGrabber ();
}
+if( !lcl_CheckOpenGLRequirements() )
+{
+SAL_WARN(avmedia.opengl, Your platform does not have the minimal
OpenGL requiremenets!);
+return uno::Reference media::XFrameGrabber ();
+}
+
m_pHandle-viewport.x = 0;
m_pHandle-viewport.y = 0;
m_pHandle-viewport.width = getPreferredPlayerWindowSize().Width;
commit 23c876deeb357b6306712ff0586a819176151c15
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sun Jul 20 14:20:35 2014 +0200
Extract getGLVersion() method to OpenGLHelper
Change-Id: If3b7a6c71164f2b55defe8c28cdce69de9283175
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 9cc485b..87a71fa 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -36,6 +36,9 @@ public:
*/
static void createFramebuffer(long nWidth, long nHeight,
GLuint nFramebufferId, GLuint nRenderbufferTextId, GLuint
nRenderbufferColorId);
+
+// Get OpenGL version (needs a context)
+static float getGLVersion();
};
VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const
glm::mat4 rMatrix);
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 36c1dd0..378de36 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -61,6 +61,7 @@
#include vcl/canvastools.hxx
#include vcl/opengl/OpenGLContext.hxx
+#include vcl/opengl/OpenGLHelper.hxx
#include vcl/window.hxx
#include boost/noncopyable.hpp
@@ -337,14 +338,8 @@ void OGLTransitionerImpl::impl_initializeFlags( bool const
bGLXPresent )
{
mbGLXPresent = bGLXPresent;
if ( bGLXPresent ) {
-const GLubyte* version = glGetString( GL_VERSION );
-if( version version[0] ) {
-mnGLVersion = version[0] - '0';
-if( version[1] == '.' version[2] )
-mnGLVersion += (version[2] - '0')/10.0;
-} else
-mnGLVersion = 1.0;
-
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 12
++
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 70df3e3e507d978561565199d553314e2b24cd91
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Jul 21 14:08:30 2014 +0200
Partly revert Extract getGLVersion() method to OpenGLHelper to fix mac
build
This partly reverts commit 23c876deeb357b6306712ff0586a819176151c15.
Change-Id: I1008c06ec7562e090627ad3860dd198d8fa89362
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 62b135a..47cdb2d 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -56,8 +56,6 @@
#include vcl/syschild.hxx
#include vcl/sysdata.hxx
-#include vcl/opengl/OpenGLHelper.hxx
-
#include boost/noncopyable.hpp
#include premac.h
@@ -313,8 +311,14 @@ bool OGLTransitionerImpl::initialize( const Reference
presentation::XSlideShowV
if( instance-initWindowFromSlideShowView( xView ) )
{
-cnGLVersion = OpenGLHelper::getGLVersion();
-OSL_TRACE(GL version: %f, cnGLVersion );
+const GLubyte* version = glGetString( GL_VERSION );
+if( version version[0] ) {
+cnGLVersion = version[0] - '0';
+if( version[1] == '.' version[2] )
+cnGLVersion += (version[2] - '0')/10.0;
+} else
+cnGLVersion = 1.0;
+OSL_TRACE(GL version: %s parsed: %f, version, cnGLVersion );
const GLubyte* vendor = glGetString( GL_VENDOR );
cbMesa = ( vendor strstr( (const char *) vendor, Mesa ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC] Tiled Rendering, ahunt, Weekly Report 09 / WK29
Hi All, * Dug into LoadEnv exceptions happening on some machines (took 2 or so days to get to the bottom of, as I was getting different errors depending on whether this was a first or later run in gdb -- I think that was just the config generation being problematic too, and confusing me). ** Turns out this is due to leftover lockfiles: *** Loading a locked file via LOK fails: LO would usually try to ask for confirmation of whether you want to ignore the lock-file, or open it read-only, but the default in headless mode is to cancel any dialogs -- hence loading fails (but sfx2 seems to catch/pass/hide exceptions over multiple layers -- there is some additional logging I could add here to help -- we'll want this anyway for LOK in general I think). *** And we're reusing the file from another unit test -- which seems to commonly result in leftover lockfiles (at least on some dev machines and TBs). *** Hence for now: we just force removal of the lockfile until a better solution is found within LOK. * Disabled the LOK tiledrendering test since it still seems to fail on some TBs and we sometimes get only very useless debug output -- even with the delete-the-lockfile hack above, can probably reenable (even if only temporarily) once more debugging output available. (The failures all seem to happen in documentLoad.) * Reintegrated soffice_main (still on a branch, could probably use some review at some point): ** This causes images in impress and calc to be rendered (no-rerendering etc. necessary -- it just happens). ** Added some detection of when Desktop::Main has actually initialised by using the OfficeIPCThread's conditions (rather than using an ugly sleep) ** Also some shutdown/restart detection: on the first run, Desktop::Main will shut down (config preparation/generation/not-quite-sure-what?). I haven't figured out if there's any way we could just restart it, but at least LOK fails cleanly now. (Simply restarting soffice_main in this case doesn't work as there appears to be leftover state etc. in the config manager) * For the LOK unit test: ** Unit tests start with completely clean config/user profile. ** Means that the unit test will fail since first run simply fails. ** Hence implemented a lokconf_init binary -- which simply inits LOK once -- currently working on integrating this into gbuild to have something along the lines of gb_Cpppunit_pregenerate_config which will pre-generate the necessary files for such unit tests. ** (Chances are any unit tests using LOK would each need to be completely independent anyway, then again it would be nice if we were still able to re-initialise LOK multiple times within the same process -- will try to investigate this.) Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 12
++
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit aeeddd97eb123132aa542a277e81c5f49a4d8572
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Jul 21 14:14:40 2014 +0200
Revert also an other part of Extract getGLVersion() method to OpenGLHelper
This partly reverts commit 23c876deeb357b6306712ff0586a819176151c15.
Change-Id: I9ba7a2e8286b5fa6064c3b9e2d680fedf402f1a2
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
index 2fcd3b5..19f22fd 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
@@ -56,8 +56,6 @@
#include vcl/syschild.hxx
#include vcl/sysdata.hxx
-#include vcl/opengl/OpenGLHelper.hxx
-
#include boost/noncopyable.hpp
#include GL/gl.h
@@ -316,8 +314,14 @@ bool OGLTransitionerImpl::initialize( const Reference
presentation::XSlideShowV
instance = new OGLTransitionerImpl( NULL );
if( instance-initWindowFromSlideShowView( xView ) ) {
-cnGLVersion = OpenGLHelper::getGLVersion();
-OSL_TRACE(GL version: %f, cnGLVersion );
+const GLubyte* version = glGetString( GL_VERSION );
+if( version version[0] ) {
+cnGLVersion = version[0] - '0';
+if( version[1] == '.' version[2] )
+cnGLVersion += (version[2] - '0')/10.0;
+} else
+cnGLVersion = 1.0;
+OSL_TRACE(GL version: %s parsed: %f, version, cnGLVersion );
const GLubyte* vendor = glGetString( GL_VENDOR );
cbMesa = ( vendor strstr( (const char *) vendor, Mesa ) );
___
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' - qadevOOo/runner sfx2/qa
qadevOOo/runner/util/SOfficeFactory.java |9 +++--
sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java |4
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit d19c216f191ca13b7895b69cd5790d526aec2bb5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jun 10 09:36:54 2014 -0400
fdo#79676: Fix the Java UNO API test with regard to chart tests.
The Java tests rely on the undocumented behavior that, when loading an
empty
chart document, the chart automaticallly created a default chart which is
a
column chart with many of its properties filled. Unfortunately this
behavior
caused ugly side effects when loading documents with charts via flat ODF
filter.
I believe fixing the test this way is the right fix.
Change-Id: If3e6c8979da9d0731346ebeedc23c0d3363e83fd
(cherry picked from commit d44b58beed743871df03909e7d9545e488f3d7c8)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/qadevOOo/runner/util/SOfficeFactory.java
b/qadevOOo/runner/util/SOfficeFactory.java
index 2a0f0ed..f464ea8 100644
--- a/qadevOOo/runner/util/SOfficeFactory.java
+++ b/qadevOOo/runner/util/SOfficeFactory.java
@@ -225,7 +225,12 @@ public class SOfficeFactory {
if (oDoc != null) {
DesktopTools.bringWindowToFront(oDoc);
-return UnoRuntime.queryInterface(XChartDocument.class, oDoc);
+XChartDocument xChartDoc =
UnoRuntime.queryInterface(XChartDocument.class, oDoc);
+// Create a default chart which many chart tests rely on.
+com.sun.star.chart2.XChartDocument xCD2 =
+
UnoRuntime.queryInterface(com.sun.star.chart2.XChartDocument.class, oDoc);
+xCD2.createDefaultChart();
+return xChartDoc;
} else {
return null;
}
@@ -616,4 +621,4 @@ public class SOfficeFactory {
}
return null;
} // finish queryXServiceInfo
-}
\ No newline at end of file
+}
diff --git a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
index 3eb7d4e..75981d7 100644
--- a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
+++ b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
@@ -74,6 +74,10 @@ public class ChartDocumentTest implements DocumentTest
// retrieve the chart model
XChartDocument chartDoc = UnoRuntime.queryInterface(
XChartDocument.class, shapeProps.getPropertyValue( Model ) );
+// insert default chart for the test to use.
+com.sun.star.chart2.XChartDocument xCD2 =
+
UnoRuntime.queryInterface(com.sun.star.chart2.XChartDocument.class, chartDoc);
+xCD2.createDefaultChart();
m_chartDocument = new OfficeDocument( i_orb, chartDoc );
// actually activate the object
___
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 Bug 75025 depends on bug 81055, which changed state. Bug 81055 Summary: Crash due to inadequate checks for GL version / capabilities https://bugs.freedesktop.org/show_bug.cgi?id=81055 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 64161, which changed state. Bug 64161 Summary: PDF: EPS images don't get exported when writing a PDF file https://bugs.freedesktop.org/show_bug.cgi?id=64161 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - external/libcmis
external/libcmis/StaticLibrary_cmis.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 9888b88cd4053e21c03ac0063e1a6f7fec69d8a3 Author: Mihai Varga mihai.m...@gmail.com Date: Mon Jul 21 15:55:29 2014 +0300 OneDrive object type Change-Id: Id3bc8c75dc20b95c89c4f1798bae98863e77d87d diff --git a/external/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk index 4ac504d..8171590 100644 --- a/external/libcmis/StaticLibrary_cmis.mk +++ b/external/libcmis/StaticLibrary_cmis.mk @@ -56,6 +56,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,cmislib,\ UnpackedTarball/cmis/src/libcmis/onedrive-document \ UnpackedTarball/cmis/src/libcmis/onedrive-folder \ UnpackedTarball/cmis/src/libcmis/onedrive-object \ + UnpackedTarball/cmis/src/libcmis/onedrive-object-type \ UnpackedTarball/cmis/src/libcmis/onedrive-property \ UnpackedTarball/cmis/src/libcmis/onedrive-repository \ UnpackedTarball/cmis/src/libcmis/onedrive-session \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: export of Calc functions to OOXML
On Fri, 2014-07-18 at 17:54 +0200, Eike Rathke wrote: BUT, I think I might know why it doesn't get called anymore ... the OOXML formula string is now directly generated from the token array, which bypasses all mechanisms we had in place for the Excel binary export and the earlier OOXML export benefitted from. The xlsx *export* code always exported formulas this way. Perhaps you are thinking of the xlsx *import* code? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libxml2
external/libxml2/libxml2-icu.patch.0 |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit a8a3ad1e5f2c2539aae8067a3506a896b83389de Author: David Tardon dtar...@redhat.com Date: Mon Jul 21 15:32:37 2014 +0200 fix debug build of libxml2 on windows Change-Id: I36672c56742468cda8c0481b76ee6e3fec700983 diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 index 6a9f8e4..f33e261 100644 --- a/external/libxml2/libxml2-icu.patch.0 +++ b/external/libxml2/libxml2-icu.patch.0 @@ -17,12 +17,16 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) LIBS = !if $(WITH_FTP) == 1 || $(WITH_HTTP) == 1 -@@ -78,7 +78,7 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib +@@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib LIBS = $(LIBS) iconv.lib !endif !if $(WITH_ICU) == 1 -LIBS = $(LIBS) icu.lib ++!if $(DEBUG) == 1 ++LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib ++!else +LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib ++!endif !endif !if $(WITH_ZLIB) == 1 # could be named differently zdll or zlib ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source include/vcl vcl/source
chart2/source/view/main/3DChartObjects.cxx |1 +
include/vcl/opengl/GLMHelper.hxx | 24
include/vcl/opengl/OpenGLHelper.hxx|7 ---
vcl/source/opengl/OpenGLHelper.cxx |1 +
4 files changed, 26 insertions(+), 7 deletions(-)
New commits:
commit 9ab9d22f820831e16551f90105edaea5319c528e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 21 14:37:25 2014 +0100
split helper and fix build
Change-Id: Ie479d363152d3c6a109d6e924b09c155c79511c8
diff --git a/chart2/source/view/main/3DChartObjects.cxx
b/chart2/source/view/main/3DChartObjects.cxx
index c5df687..9786c00 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -11,6 +11,7 @@
#include vcl/virdev.hxx
#include vcl/svapp.hxx
+#include vcl/opengl/GLMHelper.hxx
#include vcl/opengl/OpenGLHelper.hxx
#include vcl/bmpacc.hxx
diff --git a/include/vcl/opengl/GLMHelper.hxx b/include/vcl/opengl/GLMHelper.hxx
new file mode 100644
index 000..8287c34
--- /dev/null
+++ b/include/vcl/opengl/GLMHelper.hxx
@@ -0,0 +1,24 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_VCL_GLM_GLMHELPER_HXX
+#define INCLUDED_VCL_GLM_GLMHELPER_HXX
+
+#include glm/glm.hpp
+#include vcl/vclopengl_dllapi.hxx
+
+#include ostream
+
+VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const
glm::mat4 rMatrix);
+VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const
glm::vec4 rPos);
+VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const
glm::vec3 rPos);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 87a71fa..f80d34b 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -11,14 +11,11 @@
#define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
#include GL/glew.h
-#include glm/glm.hpp
#include vcl/vclopengl_dllapi.hxx
#include vcl/bitmapex.hxx
#include rtl/ustring.hxx
-#include ostream
-
class VCLOPENGL_DLLPUBLIC OpenGLHelper
{
public:
@@ -41,10 +38,6 @@ public:
static float getGLVersion();
};
-VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const
glm::mat4 rMatrix);
-VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const
glm::vec4 rPos);
-VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const
glm::vec3 rPos);
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 0629d90..84a1399 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include vcl/opengl/GLMHelper.hxx
#include vcl/opengl/OpenGLHelper.hxx
#include osl/file.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: export of Calc functions to OOXML
Hi Kohei, On Monday, 2014-07-21 09:13:32 -0400, Kohei Yoshida wrote: BUT, I think I might know why it doesn't get called anymore ... the OOXML formula string is now directly generated from the token array, which bypasses all mechanisms we had in place for the Excel binary export and the earlier OOXML export benefitted from. The xlsx *export* code always exported formulas this way. Perhaps you are thinking of the xlsx *import* code? Yeah, likely.. confusing. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpNz_gHAp0mM.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libxml2
external/libxml2/libxml2-icu.patch.0 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 22274468ef27ae8651f8ea8805611bf39758b9d5 Author: Tor Lillqvist t...@collabora.com Date: Mon Jul 21 17:07:56 2014 +0300 Test $(DEBUG) for being non-empty instead of 1 (which it is not) Change-Id: I22e7a142bb874653344a7ffcc55e8a062669fa2a diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 index f33e261..a0ab104 100644 --- a/external/libxml2/libxml2-icu.patch.0 +++ b/external/libxml2/libxml2-icu.patch.0 @@ -22,7 +22,7 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc !endif !if $(WITH_ICU) == 1 -LIBS = $(LIBS) icu.lib -+!if $(DEBUG) == 1 ++!if $(DEBUG) != +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib +!else +LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/core/data/ooxml/pass/fdo81380.docx|binary writerfilter/source/dmapper/PropertyMap.cxx |3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit c73cb50cdd7dffe809d3e66e5acdfab2bd521f62 Author: dinesh_mp dinesh.pa...@synerzip.com Date: Thu Jul 17 18:59:37 2014 +0530 fdo#81380: LO crashes while opening the document LO crashes while opening the document because PropertySet interface is null and check for this condition was missing, so added the check. Change-Id: I04dd873ea0923a662e27f9eb2013cde31edc912b Reviewed-on: https://gerrit.libreoffice.org/10379 Reviewed-by: LuboÅ¡ LuÅák l.lu...@collabora.com Tested-by: LuboÅ¡ LuÅák l.lu...@collabora.com diff --git a/sw/qa/core/data/ooxml/pass/fdo81380.docx b/sw/qa/core/data/ooxml/pass/fdo81380.docx new file mode 100644 index 000..5245844 Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo81380.docx differ diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index f3d93f8..1fe256f 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -549,7 +549,8 @@ void SectionPropertyMap::ApplyBorderToPageStyles( sal_uInt32 nLineWidth = 0; if (m_pBorderLines[nBorder]) nLineWidth = m_pBorderLines[nBorder]-LineWidth; -SetBorderDistance( xFirst, aMarginIds[nBorder], aBorderDistanceIds[nBorder], +if(xFirst.is()) +SetBorderDistance( xFirst, aMarginIds[nBorder], aBorderDistanceIds[nBorder], m_nBorderDistances[nBorder], nOffsetFrom, nLineWidth ); if(xSecond.is()) SetBorderDistance( xSecond, aMarginIds[nBorder], aBorderDistanceIds[nBorder], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sw/qa
include/oox/export/drawingml.hxx |2 -
include/oox/export/shapes.hxx |1
oox/source/drawingml/customshapeproperties.cxx | 27 +
oox/source/export/drawingml.cxx|7 +-
oox/source/export/shapes.cxx | 10 ++---
oox/source/shape/WpsContext.cxx| 11 ++
oox/source/token/properties.txt|1
sw/qa/extras/ooxmlexport/data/fdo80897.docx|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 +
9 files changed, 60 insertions(+), 9 deletions(-)
New commits:
commit acd2c90978052723475a41144dd5d92090fbf6b4
Author: Rohit Deshmukh rohit.deshm...@synerzip.com
Date: Fri Jul 18 12:27:25 2014 +0530
fdo#80897: Preservation of text warp properties.
- Generic fix for all warp properties
Change-Id: I77c37759aa49706fc3cd1a80770a85face53f0a2
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index bf46326..db685b1 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -166,7 +166,7 @@ public:
void WriteTransformation( const Rectangle rRectangle,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV =
false, sal_Int32 nRotation = 0 );
-void WriteText( ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface rXIface, bool bBodyPr = true, bool bText =
true, sal_Int32 nXmlNamespace = 0);
+void WriteText( ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface rXIface, OUString presetWarp, bool bBodyPr
= true, bool bText = true, sal_Int32 nXmlNamespace = 0);
void WriteParagraph( ::com::sun::star::uno::Reference
::com::sun::star::text::XTextContent rParagraph );
void WriteParagraphProperties( ::com::sun::star::uno::Reference
::com::sun::star::text::XTextContent rParagraph );
void WriteParagraphNumbering( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet,
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index c7f8d15..925ba72 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -73,6 +73,7 @@ private:
ShapeHashMap maShapeMap;
ShapeHashMap* mpShapeMap;
+OUString m_presetWarp;
public:
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index 5dcc122..efaddba 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -151,15 +151,34 @@ void CustomShapeProperties::pushToPropSet( const
::oox::core::FilterBase /* rFi
Sequence PropertyValue aSeq =
aPropertyMap.makePropertyValueSequence();
aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );
+const OUString sCustomShapeGeometry(CustomShapeGeometry);
+uno::Any aGeoPropSet = xPropSet-getPropertyValue(
sCustomShapeGeometry );
+uno::Sequence beans::PropertyValue aGeoPropSeq;
+
+sal_Int32 i, nCount = 0;
+if (aGeoPropSet = aGeoPropSeq)
+{
+nCount = aGeoPropSeq.getLength();
+for ( i = 0; i nCount; i++ )
+{
+const OUString sAdjustmentValues(AdjustmentValues);
+if ( aGeoPropSeq[ i ].Name.equals( sAdjustmentValues ) )
+{
+OUString presetTextWarp;
+if ( aGeoPropSeq[ i ].Value = presetTextWarp )
+{
+aPropertyMap.setProperty( PROP_PresetTextWarp, Any(
presetTextWarp ) );
+}
+}
+}
+}
+
if ( maAdjustmentGuideList.size() )
{
const OUString sType = Type;
-const OUString sCustomShapeGeometry(CustomShapeGeometry);
-uno::Any aGeoPropSet = xPropSet-getPropertyValue(
sCustomShapeGeometry );
-uno::Sequence beans::PropertyValue aGeoPropSeq;
if ( aGeoPropSet = aGeoPropSeq )
{
-sal_Int32 i, nCount = aGeoPropSeq.getLength();
+nCount = aGeoPropSeq.getLength();
for ( i = 0; i nCount; i++ )
{
const OUString sAdjustmentValues(AdjustmentValues);
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 75b6cfe..a303365 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1690,7 +1690,7 @@ void DrawingML::WriteParagraph( Reference XTextContent
rParagraph )
mpFS-endElementNS( XML_a, XML_p );
}
-void DrawingML::WriteText( Reference XInterface rXIface, bool bBodyPr, bool
bText, sal_Int32 nXmlNamespace )
+void DrawingML::WriteText( Reference XInterface rXIface, OUString
presetWarp, bool bBodyPr, bool bText, sal_Int32 nXmlNamespace )
{
Reference XText xXText( rXIface, UNO_QUERY );
Reference
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/dbgui/validate.cxx | 27 ++-
sc/source/ui/inc/validate.hxx |2 ++
2 files changed, 24 insertions(+), 5 deletions(-)
New commits:
commit c5b71635e523e3675a72acc4960a1cac6e16e3fd
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 21 13:14:19 2014 +0100
Resolves: rhbz#1121341 crash on closing shrunk validity window
Change-Id: I5fc1d6b909b3281ec3799b60bc3fd7b5f1163a75
Reviewed-on: https://gerrit.libreoffice.org/10439
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index f40981c..49e0bce 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -151,12 +151,14 @@ voidScTPValidationValue::RefInputDonePostHdl()
}
-
sal_Bool ScValidationDlg::Close()
{
-if( m_bOwnRefHdlr )
-if( SfxTabPage* pPage = GetTabPage( TP_VALIDATION_VALUES ) )
-static_castScTPValidationValue*(pPage)-RemoveRefDlg();
+SfxTabPage* pPage = GetTabPage(TP_VALIDATION_VALUES);
+if (pPage)
+static_castScTPValidationValue*(pPage)-ParkRefs();
+
+if (m_bOwnRefHdlr pPage)
+static_castScTPValidationValue*(pPage)-RemoveRefDlg();
return ScValidationDlgBase::Close();
}
@@ -168,7 +170,6 @@ ScValidationDlg::~ScValidationDlg()
delete mpHBox;
}
-
//
namespace {
@@ -338,6 +339,22 @@ ScTPValidationValue::ScTPValidationValue( Window* pParent,
const SfxItemSet rAr
m_btnRef.Hide(); // cell range picker
}
+void ScTPValidationValue::ParkRefs()
+{
+//if there are children of the mpHBox, i.e.
+//in shrunk mode, this will crash
+//after the mpHBox is deleted
+if( m_pRefEdit m_pRefEdit-GetParent()!= this )
+{
+m_pRefEdit-SetParent( this );
+}
+
+if( m_btnRef.GetParent()!=this )
+{
+m_btnRef.SetParent( this );
+}
+}
+
ScTPValidationValue::~ScTPValidationValue()
{
}
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 5cac401..12d1cec 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -182,6 +182,8 @@ public:
virtual sal_BoolFillItemSet( SfxItemSet rArgSet );
virtual voidReset( const SfxItemSet rArgSet );
+voidParkRefs();
+
private:
voidInit();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - include/sfx2 include/vcl sfx2/source svx/source svx/uiconfig svx/UIConfig_svx.mk vcl/source
include/sfx2/tbxctrl.hxx|6 ++
include/vcl/floatwin.hxx| 13
sfx2/source/toolbox/tbxitem.cxx | 20 +++
svx/UIConfig_svx.mk |1
svx/source/tbxctrls/colorwindow.hxx | 19 +++---
svx/source/tbxctrls/tbcontrl.cxx| 98
svx/uiconfig/ui/colorwindow.ui | 68
vcl/source/window/floatwin.cxx | 36 +
8 files changed, 198 insertions(+), 63 deletions(-)
New commits:
commit 01a74e6707ee7b7b2f5494d7a12c45aa3390b0a4
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Mon Jul 21 16:34:30 2014 +0200
Convert SvxColorWindow_Impl to Widget Layout
Change-Id: I8c830de56892fd8eb1c14add25f65c25046d47fd
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index df4eb2b..d752600 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -148,6 +148,12 @@ public:
SfxPopupWindow( sal_uInt16 nId,
const
::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame rFrame,
Window* pParentWindow,
+const OString rID,
+const OUString rUIXMLDescription,
+WinBits nBits );
+SfxPopupWindow( sal_uInt16 nId,
+const
::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame rFrame,
+Window* pParentWindow,
const ResId rId );
virtual ~SfxPopupWindow();
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 62d0086..b65668e 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -21,8 +21,11 @@
#define INCLUDED_VCL_FLOATWIN_HXX
#include tools/solar.h
+#include vcl/builder.hxx
#include vcl/dllapi.h
#include vcl/syswin.hxx
+#include vcl/window.hxx
+#include vcl/layout.hxx
class ToolBox;
@@ -64,7 +67,9 @@ class ToolBox;
// - FloatingWindow -
-class VCL_DLLPUBLIC FloatingWindow : public SystemWindow
+class VCL_DLLPUBLIC FloatingWindow
+: public SystemWindow
+, public VclBuilderContainer
{
class ImplData;
private:
@@ -117,6 +122,7 @@ public:
public:
explicitFloatingWindow( Window* pParent, WinBits nStyle =
WB_STDFLOATWIN );
+explicitFloatingWindow( Window* pParent, const OString rID, const
OUString rUIXMLDescription, WinBits nStyle = WB_STDFLOATWIN );
explicitFloatingWindow( Window* pParent, const ResId );
virtual ~FloatingWindow();
@@ -146,6 +152,11 @@ public:
boolGrabsFocus() const { return mbGrabFocus; }
static PointCalcFloatingPosition( Window* pWindow, const Rectangle
rRect, sal_uLong nFlags, sal_uInt16 rArrangeIndex );
+
+virtual voidSetPosSizePixel(const Point rNewPos, const Size
rNewSize) SAL_OVERRIDE;
+virtual voidSetPosPixel(const Point rNewPos) SAL_OVERRIDE;
+virtual voidSetSizePixel(const Size rNewSize) SAL_OVERRIDE;
+virtual SizeGetOptimalSize() const SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_FLOATWIN_HXX
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 2b4efb0..26c6341 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1200,6 +1200,26 @@ SfxPopupWindow::SfxPopupWindow(
((SystemWindow *)pWindow)-GetTaskPaneList()-AddWindow( this );
}
+
+SfxPopupWindow::SfxPopupWindow(
+sal_uInt16 nId,
+const Reference XFrame rFrame,
+Window* pParentWindow,
+const OString rID,
+const OUString rUIXMLDescription,
+WinBits nBits ) :
+FloatingWindow( pParentWindow, rID, rUIXMLDescription, nBits )
+, m_bFloating( false )
+, m_bCascading( false )
+, m_nId( nId )
+, m_xFrame( rFrame )
+, m_pStatusListener( 0 )
+{
+Window* pWindow = GetTopMostParentSystemWindow( this );
+if ( pWindow )
+((SystemWindow *)pWindow)-GetTaskPaneList()-AddWindow( this );
+}
+
SfxPopupWindow::SfxPopupWindow(
sal_uInt16 nId,
const Reference XFrame rFrame,
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 5388669..71036bf 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/chinesedictionary \
+ svx/uiconfig/ui/colorwindow \
svx/uiconfig/ui/compressgraphicdialog \
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
diff --git a/svx/source/tbxctrls/colorwindow.hxx
b/svx/source/tbxctrls/colorwindow.hxx
index 086cdef..2f2d318 100644
---
[Libreoffice-commits] core.git: external/libxml2
external/libxml2/ExternalProject_xml2.mk |2 +- external/libxml2/libxml2-icu.patch.0 |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 6831ae4d0e0b69e4f06c2987c3be748c8f35c9d8 Author: David Tardon dtar...@redhat.com Date: Mon Jul 21 15:32:37 2014 +0200 fix debug build of libxml2 on windows, version 2 Change-Id: I67f269e316906913b1a9b4d91907d95b869ca71f diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk index cb23686..f19cb52 100644 --- a/external/libxml2/ExternalProject_xml2.mk +++ b/external/libxml2/ExternalProject_xml2.mk @@ -33,7 +33,7 @@ $(call gb_ExternalProject_use_external_project,xml2,icu) $(call gb_ExternalProject_get_state_target,xml2,build): $(call gb_ExternalProject_run,build,\ cscript configure.js \ - iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ + iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \ unset MAKEFLAGS \ LIB=$(ILIB) nmake \ ,win32) diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 index a0ab104..4db9f9b 100644 --- a/external/libxml2/libxml2-icu.patch.0 +++ b/external/libxml2/libxml2-icu.patch.0 @@ -22,7 +22,7 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc !endif !if $(WITH_ICU) == 1 -LIBS = $(LIBS) icu.lib -+!if $(DEBUG) != ++!if $(WITH_RUN_DEBUG) == 1 +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib +!else +LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/inc/swmodeltestbase.hxx |1 +
sw/qa/extras/ooxmlexport/data/fdo81381.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 21 +
writerfilter/source/dmapper/OLEHandler.cxx |8 +++-
5 files changed, 31 insertions(+), 5 deletions(-)
New commits:
commit 8ed122f34275f4b4afd1a84d3b5254e4a814ba43
Author: Ravindra_Vidhate ravindra.vidh...@synerzip.com
Date: Tue Jul 15 17:51:38 2014 +0530
fdo#81381 Objects:Icon is not editable after LO Export
The Object's DrawAspect =Icon is not getting preserved.
Open the exported file in MS-Office and double click on the object Icon.
The object doesn't open the ppt associated with it.
Because DrawAspect=Icon property of the OLEObject is not getting prserved.
The DrawAspect=Content property is getting exported as Content is the
hard code value.
Change-Id: I2f1cbdbb4931657115f6a657b43a1cab3c5369a6
Reviewed-on: https://gerrit.libreoffice.org/10356
Reviewed-by: LuboÅ¡ LuÅák l.lu...@collabora.com
Tested-by: LuboÅ¡ LuÅák l.lu...@collabora.com
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 43e6d7e..887fde8 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -653,6 +653,7 @@ protected:
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(lc),
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas;));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(extended-properties),
BAD_CAST(http://schemas.openxmlformats.org/officeDocument/2006/extended-properties;));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(a14),
BAD_CAST(http://schemas.microsoft.com/office/drawing/2010/main;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(o),
BAD_CAST(urn:schemas-microsoft-com:office:office));
}
};
diff --git a/sw/qa/extras/ooxmlexport/data/fdo81381.docx
b/sw/qa/extras/ooxmlexport/data/fdo81381.docx
new file mode 100644
index 000..bf4a860
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo81381.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 02a4d4e..922301a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3347,6 +3347,12 @@ DECLARE_OOXMLEXPORT_TEST(testSdt2Run, sdt-2-run.docx)
assertXPathContent(pXmlDoc, /w:document/w:body/w:p[1]/w:r/w:t, third);
}
+DECLARE_OOXMLEXPORT_TEST(testfdo81381, fdo81381.docx)
+{
+if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[1]/w:object[1]/o:OLEObject[1], DrawAspect,
Icon);
+}
+
DECLARE_OOXMLEXPORT_TEST(testSdtAlias, sdt-alias.docx)
{
xmlDocPtr pXmlDoc = parseExport();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4f5a1a3..8eb11f8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4396,7 +4396,7 @@ void DocxAttributeOutput::WriteOLE( SwOLENode rNode,
const Size rSize, const S
// get interoperability information about embedded objects
uno::Reference beans::XPropertySet xPropSet(
m_rExport.pDoc-GetDocShell()-GetBaseModel(), uno::UNO_QUERY_THROW );
OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
-uno::Sequence beans::PropertyValue aGrabBag, aObjectsInteropList;
+uno::Sequence beans::PropertyValue aGrabBag,
aObjectsInteropList,aObjectInteropAttributes;
xPropSet-getPropertyValue( pName ) = aGrabBag;
for( sal_Int32 i=0; i aGrabBag.getLength(); ++i )
if ( aGrabBag[i].Name == EmbeddedObjects )
@@ -4411,13 +4411,26 @@ void DocxAttributeOutput::WriteOLE( SwOLENode rNode,
const Size rSize, const S
OUString sObjectName = aContainer-GetEmbeddedObjectName( xObj );
// set some attributes according to the type of the embedded object
-OUString sProgID, sMediaType, sRelationType, sFileExtension;
+OUString sProgID, sMediaType, sRelationType, sFileExtension,
sDrawAspect=Content;
for( sal_Int32 i=0; i aObjectsInteropList.getLength(); ++i )
if ( aObjectsInteropList[i].Name == sObjectName )
{
-aObjectsInteropList[i].Value = sProgID;
+aObjectsInteropList[i].Value = aObjectInteropAttributes;
break;
}
+
+for( sal_Int32 i=0; i aObjectInteropAttributes.getLength(); ++i )
+{
+if ( aObjectInteropAttributes[i].Name == ProgID )
+{
+aObjectInteropAttributes[i].Value = sProgID;
+}
+else if ( aObjectInteropAttributes[i].Name == DrawAspect )
+{
+aObjectInteropAttributes[i].Value = sDrawAspect;
+}
+}
+
if( sProgID == Excel.Sheet.12 )
{
sMediaType =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/xml/xmlexprt.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit f6445efb0e5c3de099f0425825fe1e6e8271dfb9
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri Jul 18 20:31:09 2014 +0200
respect flag for relative paths, fdo#79305
Change-Id: I8f4e5f8f5e489d543f81b0b20255c875b83f7afc
Reviewed-on: https://gerrit.libreoffice.org/10407
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index a76033f..9fb515a 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -105,6 +105,7 @@
#include rtl/ustring.hxx
#include tools/color.hxx
+#include tools/urlobj.hxx
#include rtl/math.hxx
#include svl/zforlist.hxx
#include svx/unoshape.hxx
@@ -117,6 +118,9 @@
#include svx/svdpage.hxx
#include svtools/miscopt.hxx
+#include officecfg/Office/Common.hxx
+
+#include com/sun/star/uno/XComponentContext.hpp
#include comphelper/processfactory.hxx
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/container/XNamed.hpp
@@ -3086,7 +3090,17 @@ void writeContent(
{
// text:a xlink:href=url xlink:type=simplevalue/text:a
+Reference uno::XComponentContext xContext =
comphelper::getProcessComponentContext();
+bool bUseRelative =
officecfg::Office::Common::Save::URL::FileSystem::get( xContext );
OUString aURL = static_castconst
SvxURLField*(pField)-GetURL();
+if(bUseRelative)
+{
+OUString aBase = rExport.GetOrigFileName();
+INetURLObject aURLObject(aBase);
+aURLObject.removeSegment();
+aURLObject.removeSegment();
+aURL =
INetURLObject::GetRelURL(aURLObject.GetMainURL(INetURLObject::DECODE_TO_IURI),
aURL);
+}
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aURL);
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, simple);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/filter oox/source sw/qa sw/source
filter/source/msfilter/util.cxx | 12
include/filter/msfilter/util.hxx|8
oox/source/export/vmlexport.cxx | 15 ++-
sw/qa/extras/ooxmlexport/data/fdo78663.docx |binary
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 28 +---
sw/source/filter/ww8/docxsdrexport.cxx |3 ++-
6 files changed, 49 insertions(+), 17 deletions(-)
New commits:
commit 245df9b4b37e3b1a6863aec5802346999bd71477
Author: Bisal Nayal bisal.na...@synerzip.com
Date: Fri Jul 11 16:27:34 2014 +0530
fdo#78663 : The File gets corrupted when saved in LO
Problem Description:
The docx file contains a word art inside a drawing tool.
After RT, nesting of txbxContent tag is happening which
is causing the corruption.
Solution: Created a service in util.cxx for checking
few shapetypes for which textbox with content is not
allowed. This check also helps to find that if we are
already inside a DML then we should purely read VML
Information.An existing UT testWordArtWithinDraingtool
was failing. The UT is related to same issue
(word art inside drawing tool) hence changed it
accordingly. Following is the commit id of the
UT-Change-Id: I00e94712e912ad1977fcb65a945fefb927795d77
Change-Id: I7e456c9f6a69af80da443e29eb02a64ba7d59468
Reviewed-on: https://gerrit.libreoffice.org/10229
Reviewed-by: LuboÅ¡ LuÅák l.lu...@collabora.com
Tested-by: LuboÅ¡ LuÅák l.lu...@collabora.com
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 5aad6fe..9f3a640 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1333,6 +1333,18 @@ MSO_SPT GETVMLShapeType(const OString aType)
return i == pDMLToVMLMap-end() ? mso_sptNil : i-second;
}
+bool HasTextBoxContent(sal_uInt32 nShapeType)
+{
+switch (nShapeType)
+{
+case ESCHER_ShpInst_TextPlainText:
+case ESCHER_ShpInst_TextSlantUp:
+case ESCHER_ShpInst_TextDeflateInflateDeflate:
+return false;
+default:
+return true;
+}
+}
}
}
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index ddf5a12..c1bb36d 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -17,6 +17,7 @@
#include filter/msfilter/msfilterdllapi.h
#include svx/msdffdef.hxx
#include com/sun/star/awt/Size.hpp
+#include filter/msfilter/escherex.hxx
namespace msfilter {
namespace util {
@@ -138,6 +139,13 @@ MSFILTER_DLLPUBLIC const char* GetOOXMLPresetGeometry(
const char* sShapeType );
/// Similar to EnhancedCustomShapeTypeNames::Get(), but returns an MSO_SPT
(binary / VML type).
MSFILTER_DLLPUBLIC MSO_SPT GETVMLShapeType(const OString aType);
+/**
+ * The following function checks if a MSO shapetype is allowed to have
textboxcontent.
+ *
+ * @param nShapeType shape to check
+ */
+MSFILTER_DLLPUBLIC bool HasTextBoxContent(sal_uInt32 nShapeType);
+
}
}
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 039514d..a0a1ac7 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -31,6 +31,7 @@
#include svx/svdotext.hxx
#include vcl/cvtgrf.hxx
#include filter/msfilter/msdffimp.hxx
+#include filter/msfilter/util.hxx
#include filter/msfilter/escherex.hxx
#include com/sun/star/drawing/XShape.hpp
@@ -970,18 +971,6 @@ bool lcl_isTextBox(const SdrObject* pSdrObject)
return false;
}
-bool lcl_hasTextBoxContent(sal_uInt32 nShapeType)
-{
-switch (nShapeType)
-{
-case ESCHER_ShpInst_TextPlainText:
-case ESCHER_ShpInst_TextSlantUp:
-return false;
-default:
-return true;
-}
-}
-
OUString lcl_getAnchorIdFromGrabBag(const SdrObject* pSdrObject)
{
OUString aResult;
@@ -1137,7 +1126,7 @@ sal_Int32 VMLExport::StartShape()
// now check if we have some editeng text (not associated textbox) and we
have a text exporter registered
const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, m_pSdrObject);
-if (pTxtObj m_pTextExport lcl_hasTextBoxContent(m_nShapeType)
!IsWaterMarkShape(m_pSdrObject-GetName()) !lcl_isTextBox(m_pSdrObject))
+if (pTxtObj m_pTextExport
msfilter::util::HasTextBoxContent(m_nShapeType)
!IsWaterMarkShape(m_pSdrObject-GetName()) !lcl_isTextBox(m_pSdrObject))
{
const OutlinerParaObject* pParaObj = 0;
bool bOwnParaObj = false;
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78663.docx
b/sw/qa/extras/ooxmlexport/data/fdo78663.docx
new file mode 100644
index 000..be35b6c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78663.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 92dc825..20f7fd7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1595,10 +1595,32 @@
[Libreoffice-commits] core.git: vbahelper/source
vbahelper/source/msforms/vbacombobox.cxx|1 - vbahelper/source/msforms/vbaimage.cxx |1 - vbahelper/source/msforms/vbamultipage.cxx |1 - vbahelper/source/msforms/vbaprogressbar.cxx |1 - vbahelper/source/msforms/vbascrollbar.cxx |1 - vbahelper/source/msforms/vbaspinbutton.cxx |1 - 6 files changed, 6 deletions(-) New commits: commit f31a9abfd20a4ce625fcd985aff4978c34ae1a90 Author: Takeshi Abe t...@fixedpoint.jp Date: Tue Jul 22 00:11:49 2014 +0900 Remove unused #includes Change-Id: I96775ac9a8624e12974c78c6abb93ddd80eed567 diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx index 8ac4aff..3f2c0df 100644 --- a/vbahelper/source/msforms/vbacombobox.cxx +++ b/vbahelper/source/msforms/vbacombobox.cxx @@ -18,7 +18,6 @@ */ #include vbacombobox.hxx -#include vector #include filter/msfilter/msvbahelper.hxx #include basic/sbstar.hxx #include basic/sbmod.hxx diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx index 0a27269..0515a11 100644 --- a/vbahelper/source/msforms/vbaimage.cxx +++ b/vbahelper/source/msforms/vbaimage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include vbaimage.hxx -#include vector using namespace com::sun::star; using namespace ooo::vba; diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index 0bacf37..4fa287e 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -19,7 +19,6 @@ #include vbamultipage.hxx #include ooo/vba/XCollection.hpp #include vbapages.hxx -#include vector #include com/sun/star/container/XNameContainer.hpp using namespace com::sun::star; diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx index 23403d2..8d223af 100644 --- a/vbahelper/source/msforms/vbaprogressbar.cxx +++ b/vbahelper/source/msforms/vbaprogressbar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include vbaprogressbar.hxx -#include vector using namespace com::sun::star; using namespace ooo::vba; diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx index 6379cef..c9c846f 100644 --- a/vbahelper/source/msforms/vbascrollbar.cxx +++ b/vbahelper/source/msforms/vbascrollbar.cxx @@ -18,7 +18,6 @@ */ #include vbascrollbar.hxx -#include vector using namespace com::sun::star; using namespace ooo::vba; diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx index 9a61ec1..440b072 100644 --- a/vbahelper/source/msforms/vbaspinbutton.cxx +++ b/vbahelper/source/msforms/vbaspinbutton.cxx @@ -18,7 +18,6 @@ */ #include vbaspinbutton.hxx -#include vector using namespace com::sun::star; using namespace ooo::vba; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo80997.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|7 +++
sw/source/filter/ww8/wrtw8nds.cxx |2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 570775d352c1465763bb9db974c4503245652d79
Author: Rohit Deshmukh rohit.deshm...@synerzip.com
Date: Fri Jul 11 15:18:17 2014 +0530
fd0#80997: Fix for text missing which is behind textbox in RT.
Issue:
-If file contains Textbox having In front of text wrap property,
then text behind the textbox is missing after roundtrip.
Change-Id: I1b4b7c7ea0e9fd2ae4594b9d5e66246974b09c2a
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80997.docx
b/sw/qa/extras/ooxmlexport/data/fdo80997.docx
new file mode 100644
index 000..713e890
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80997.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 922301a..f22b96c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3413,6 +3413,13 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80897 , fdo80897.docx)
+DECLARE_OOXMLEXPORT_TEST(testFdo80997, fdo80997.docx)
+{
+// The problem was that the DOCX exporter not able to export text behind
textbox, if textbox has a wrap property.
+uno::Reference text::XTextRange xParagraph = getParagraph( 1 );
+uno::Reference text::XTextRange xText = getRun( xParagraph, 1, text);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 5da52e8..89d90aa 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2325,7 +2325,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode
rNode )
AttrOutput().RunText( aSavedSnippet, eChrSet );
AttrOutput().EndRun();
}
-else if( bPostponeWritingText FLY_NOT_PROCESSED == nStateOfFlyFrame
)
+else if( bPostponeWritingText !aSavedSnippet.isEmpty() )
{
//write the postponed text run
bPostponeWritingText = false ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 81fb15d33fcdf8adb0776d22dba06a1fde549936 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 21 16:27:59 2014 +0100 Updated core Project: help b8feecec406652bb24799a209aae9530da926f4a diff --git a/helpcontent2 b/helpcontent2 index 7a0a3f1..b8feece 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7a0a3f1e2063343be1325f6fc5136e597606a107 +Subproject commit b8feecec406652bb24799a209aae9530da926f4a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |2 -- 1 file changed, 2 deletions(-) New commits: commit b8feecec406652bb24799a209aae9530da926f4a Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 21 16:27:59 2014 +0100 drop unused helpids Change-Id: I986615001840c8456a044617f2ada7f7c683fd26 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index cb2d646..ab927c8 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5057,7 +5057,6 @@ dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240, dbaccess_TabPage_PAGE_ORACLE_JDBC,851886080, dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936, dbaccess_TabPage_TP_MIGRATE,851476480, -dbaccess_TabPage_TP_PREPARE,851443712, dbaccess_TabPage_TP_SAVE_DBDOC_AS,851460096, dbaccess_TabPage_TP_SUMMARY,851492864, desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859, @@ -5281,7 +5280,6 @@ svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_CELLS,1338786327, svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_SHEETS,1338786326, svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION,1338786338, svtools_TabPage_TP_FINISH,797753344, -svtools_TabPage_TP_PREPARE,797720576, svtools_TabPage_TP_SETUP,797736960, svtools_TabPage_TP_WELCOME,797704192, svtools_WorkWindow_TT_INLINE_TRANSLATION,2886664192, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ext/macromigration/dbmm_global.hrc |1
dbaccess/source/ext/macromigration/macromigration.hrc |1
dbaccess/source/ext/macromigration/macromigration.src | 49
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 25 ++--
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 10 -
dbaccess/uiconfig/ui/preparepage.ui| 72 +
7 files changed, 93 insertions(+), 66 deletions(-)
New commits:
commit aa7d58a1e6e6f809a5372d893b70fc298a240676
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 21 16:26:22 2014 +0100
convert TP_PREPARE to .ui
Change-Id: Iad0c94ffd08117f79cba5d5305f03c836ac6ada9
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 197e4a3..c6060f1 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/indexdesigndialog \
dbaccess/uiconfig/ui/joindialog \
dbaccess/uiconfig/ui/password \
+dbaccess/uiconfig/ui/preparepage \
dbaccess/uiconfig/ui/queryfilterdialog \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/relationdialog \
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc
b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index 2918be1..9354332 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -38,7 +38,6 @@
//= tab pages
-#define TP_PREPARE ( RID_DBMM_TAPPAGE_START + 0 )
#define TP_SAVE_DBDOC_AS( RID_DBMM_TAPPAGE_START + 1 )
#define TP_MIGRATE ( RID_DBMM_TAPPAGE_START + 2 )
#define TP_SUMMARY ( RID_DBMM_TAPPAGE_START + 3 )
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc
b/dbaccess/source/ext/macromigration/macromigration.hrc
index d55a9e1..ada05ff 100644
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ b/dbaccess/source/ext/macromigration/macromigration.hrc
@@ -47,7 +47,6 @@
//... fixed texts ...
#define FT_HEADER 1
-#define FT_INTRODUCTION 2
#define FT_EXPLANATION 3
#define FT_SAVE_AS_LABEL4
#define FT_START_MIGRATION 5
diff --git a/dbaccess/source/ext/macromigration/macromigration.src
b/dbaccess/source/ext/macromigration/macromigration.src
index 52da579..b58891c 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -51,55 +51,6 @@ ModalDialog DLG_MACRO_MIGRATION
};
};
-//= PreparationPage
-
-TabPage TP_PREPARE
-{
-HelpID = dbaccess:TabPage:TP_PREPARE;
-Pos = MAP_APPFONT( 40, 130 );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
-
-Hide = TRUE;
-
-FixedText FT_HEADER
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_CONTENT_MARGIN );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
FIXED_TEXT_HEIGHT );
-
-Text [ en-US ] = Welcome to the Database Macro Migration Wizard;
-};
-
-FixedText FT_INTRODUCTION
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - CONTENT_POS_X -
TAB_PAGE_CONTENT_MARGIN - ( 2 * FIXED_TEXT_HEIGHT - SPACING_UNRELATED ) );
-WordBreak = TRUE;
-
-Text [ en-US ] = This wizard will guide you through the task of
migrating your macros.\n\n
-
-After you finished it, all macros which were formerly embedded
into the forms and reports of
-the current database document will have been moved to the
document itself. In this course,
-libraries will be renamed as needed.\n\n
-
-If your forms and reports contain references to those macros,
they will be adjusted, where
-possible.\n\n
-
-Before the migration can start, all forms, reports, queries and
tables belonging to the document must be closed.
-Press 'Next' to do so.;
-};
-
-FixedText FT_CLOSE_DOC_ERROR
-{
-Pos = MAP_APPFONT ( TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - TAB_PAGE_CONTENT_MARGIN - ( 2 *
FIXED_TEXT_HEIGHT - SPACING_UNRELATED ) );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
-2 * FIXED_TEXT_HEIGHT - SPACING_UNRELATED );
-Text [ en-US ] = Not all objects could be closed. Please close them
manually, and re-start the wizard.;
-hide = TRUE;
-};
-};
-
//= SaveDBDocPage
TabPage TP_SAVE_DBDOC_AS
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
[GSOC] Personas - Weekly Report #9
Hello all. This week, I have been trying to convert the Hangul Hanja Conversion dialog. As this is my first attempt at dialog conversion and the dialog consists of 2 custom widgets, it is taking a bit longer that I anticipated! I'll be trying to finish it this week, and look for more work from my mentors. -- Regards, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo80902.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 ++
writerfilter/source/dmapper/DomainMapper.cxx | 16 +++-
writerfilter/source/dmapper/PropertyMap.cxx |4
4 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 8e71604ebde7092dc026521fc5a414686777cb38
Author: PriyankaGaikwad priyanka.gaik...@synerzip.com
Date: Fri Jul 11 12:00:30 2014 +0530
fdo#80902: Document grid type is not rendered properly
XML difference :
In document.xml
Original :
w:docGrid w:type=lines w:linePitch=360/
Roundtrip :
w:docGrid w:type=default w:linePitch=360 w:charSpace=0/
Document grid type is not set properly while import.
Change-Id: I68ec778c3138b37ad96f69942361a73ed0e85d71
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80902.docx
b/sw/qa/extras/ooxmlexport/data/fdo80902.docx
new file mode 100644
index 000..73a927f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80902.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f22b96c..eac281a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3420,6 +3420,16 @@ DECLARE_OOXMLEXPORT_TEST(testFdo80997, fdo80997.docx)
uno::Reference text::XTextRange xText = getRun( xParagraph, 1, text);
}
+DECLARE_OOXMLEXPORT_TEST(testFdo80902, fdo80902.docx)
+{
+// The problem was that the docGrid type was set as default so fix it for
other grid type
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc, /w:document/w:body/w:sectPr/w:docGrid, type,
lines);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 27bda6e..23ffe2a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -896,7 +896,21 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
{
if (pSectionContext != NULL)
{
-pSectionContext-SetGridType(nIntValue);
+switch( nIntValue )
+{
+case
NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_default:
+case
NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_snapToChars:
+pSectionContext-SetGridType( 0 );
+break;
+case NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_lines:
+pSectionContext-SetGridType( 1 );
+break;
+case
NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_linesAndChars:
+pSectionContext-SetGridType( 2 );
+break;
+default :
+OSL_FAIL(unknown SwTextGrid value);
+}
}
}
break;
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 1fe256f..1743d32 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1049,6 +1049,10 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl rDM_Impl )
operator[](PROP_GRID_LINES) =
uno::makeAny(
static_castsal_Int16(nTextAreaHeight/nGridLinePitch));
+// PROP_GRID_MODE
+operator[]( PROP_GRID_MODE) =
+uno::makeAny( static_castsal_Int16 (m_nGridType) );
+
sal_Int32 nCharWidth = 423; //240 twip/ 12 pt
//todo: is '0' the right index here?
const StyleSheetEntryPtr pEntry =
rDM_Impl.GetStyleSheetTable()-FindStyleSheetByISTD(OUString::number(0, 16));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Improved Color Selection, Week 9
Hi All! Last week I converted the palette popup to use the new widget layout system. Hopefully this will make it easier for UI people to work on the look. This week I'll probably work on improving the color selection in Draw/Impress. If anyone has any insights, please share them! Thank you! All the best, Krisztian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/IconThemeScanner.cxx | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
New commits:
commit cebd0347a02844b1f3b3f496e4722b30a9393d47
Author: Tor Lillqvist t...@collabora.com
Date: Mon Jul 21 19:06:12 2014 +0300
Our log area checking Clang plugin requires it to be a string literal
And even if that wasn't a problem, we don't use a macro for the log area
anywhere else in the codebase, so why suddenly introduce such a convention
here? What's the gain from that? On the contrary, haven't we been *reducing*
the amount of pointless #define FOO foo style stuff?
Change-Id: I1247dc499136cdf3ae1921e6ffe7c7f63d57cfc1
diff --git a/vcl/source/app/IconThemeScanner.cxx
b/vcl/source/app/IconThemeScanner.cxx
index 29d3cd7..4599260 100644
--- a/vcl/source/app/IconThemeScanner.cxx
+++ b/vcl/source/app/IconThemeScanner.cxx
@@ -21,20 +21,18 @@ namespace vcl {
namespace {
-const char *LOG_AREA = vcl.app;
-
// set the status of a file. Returns false if the status could not be
determined.
bool set_file_status(osl::FileStatus status, const OUString file)
{
osl::DirectoryItem dirItem;
osl::FileBase::RC retvalGet = osl::DirectoryItem::get(file, dirItem);
if (retvalGet != osl::FileBase::E_None) {
-SAL_WARN(LOG_AREA, Could not determine status for file ' file
'.);
+SAL_WARN(vcl.app, Could not determine status for file ' file
'.);
return false;
}
osl::FileBase::RC retvalStatus = dirItem.getFileStatus(status);
if (retvalStatus != osl::FileBase::E_None) {
-SAL_WARN(LOG_AREA, Could not determine status for file ' file
'.);
+SAL_WARN(vcl.app, Could not determine status for file ' file
'.);
return false;
}
return true;
@@ -45,7 +43,7 @@ OUString convert_to_absolute_path(const OUString path)
salhelper::LinkResolver resolver(0);
osl::FileBase::RC rc = resolver.fetchFileStatus(path);
if (rc != osl::FileBase::E_None) {
-SAL_WARN(LOG_AREA, Could not resolve path ' path ' to search
for icon themes.);
+SAL_WARN(vcl.app, Could not resolve path ' path ' to search
for icon themes.);
throw std::runtime_error(Provided a recursive symlink to a icon theme
directory that could not be resolved.);
}
return resolver.m_aStatus.getFileURL();
@@ -66,13 +64,13 @@ IconThemeScanner::ScanDirectoryForIconThemes(const
OUString path)
}
if (!fileStatus.isDirectory()) {
-SAL_INFO(LOG_AREA, Cannot search for icon themes in ' path '.
It is not a directory.);
+SAL_INFO(vcl.app, Cannot search for icon themes in ' path '.
It is not a directory.);
return false;
}
std::vectorOUString iconThemePaths = ReadIconThemesFromPath(path);
if (iconThemePaths.empty()) {
-SAL_WARN(LOG_AREA, Could not find any icon themes in the provided
directory (' path'.);
+SAL_WARN(vcl.app, Could not find any icon themes in the provided
directory (' path'.);
return false;
}
mFoundIconThemes.clear();
@@ -89,10 +87,10 @@ IconThemeScanner::AddIconThemeByPath(const OUString url)
if (!IconThemeInfo::UrlCanBeParsed(url)) {
return false;
}
-SAL_INFO(LOG_AREA, Found a file that seems to be an icon theme: ' url
' );
+SAL_INFO(vcl.app, Found a file that seems to be an icon theme: '
url ' );
IconThemeInfo newTheme(url);
mFoundIconThemes.push_back(newTheme);
-SAL_INFO(LOG_AREA, Adding the file as ' newTheme.GetDisplayName()
+SAL_INFO(vcl.app, Adding the file as ' newTheme.GetDisplayName()
' with id ' newTheme.GetThemeId() '.);
return true;
}
@@ -101,7 +99,7 @@ IconThemeScanner::AddIconThemeByPath(const OUString url)
IconThemeScanner::ReadIconThemesFromPath(const OUString dir)
{
std::vectorOUString found;
-SAL_INFO(LOG_AREA, Scanning directory ' dir for icon themes.);
+SAL_INFO(vcl.app, Scanning directory ' dir for icon themes.);
osl::Directory dirToScan(dir);
osl::FileBase::RC retvalOpen = dirToScan.open();
@@ -131,7 +129,7 @@ IconThemeScanner::FileIsValidIconTheme(const OUString
filename)
{
// check whether we can construct a IconThemeInfo from it
if (!IconThemeInfo::UrlCanBeParsed(filename)) {
-SAL_INFO(LOG_AREA, File ' filename ' does not seem to be an
icon theme.);
+SAL_INFO(vcl.app, File ' filename ' does not seem to be an
icon theme.);
return false;
}
@@ -194,7 +192,7 @@ IconThemeScanner::GetIconThemeInfo(const OUString themeId)
std::vectorIconThemeInfo::iterator info =
std::find_if(mFoundIconThemes.begin(), mFoundIconThemes.end(),
SameTheme(themeId));
if (info == mFoundIconThemes.end()) {
-SAL_WARN(LOG_AREA, Requested information for icon theme with id '
themeId
+SAL_WARN(vcl.app, Requested information for icon theme with id '
themeId
' which does not
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|4 source/text/shared/explorer/database/migrate_macros.xhp |5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) New commits: commit 3d0fefd1db11ee86be12b2db37fed812f6561d7c Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 21 17:07:20 2014 +0100 update helpids for backup page .ui conversion Change-Id: I5fb852ee9bc507f1f0dda3cbafe5815e332c65cc diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ab927c8..ccbf62c 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1982,7 +1982,6 @@ HID_LTRWIZ_TXTSENDERPOSTCODE,40804, HID_LTRWIZ_TXTSENDERSTATE_TEXT,40805, HID_LTRWIZ_TXTSENDERSTREET,40803, HID_LTRWIZ_TXTTEMPLATENAME,40812, -HID_MACRO_MIGRATION_BACKUP_LOCATION,39152, HID_MD_COPY_TO_CLIPBOARD,53441, HID_MD_GLOS_DEFINE,53424, HID_MD_GLOS_DEFINE_TEXT,53439, @@ -4994,7 +4993,6 @@ chart2_TabPage_TP_YERRORBAR,551927808, dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657, dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041, dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953, -dbaccess_ComboBox_TP_SAVE_DBDOC_AS_ED_SAVE_AS_LOCATION,851464193, dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589, dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588, dbaccess_Edit_DLG_ADABASSTAT_ET_SYSDEVSPACE,1388611585, @@ -5043,7 +5041,6 @@ dbaccess_PushButton_PAGE_ORACLE_JDBC_PB_TESTDRIVERCLASS,851890693, dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_ALL,851628560, dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_NONE,851628561, dbaccess_PushButton_TAB_WIZ_TYPE_SELECT_PB_AUTO,851612165, -dbaccess_PushButton_TP_SAVE_DBDOC_AS_PB_BROWSE_SAVE_AS_LOCATION,851464705, dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385, dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386, dbaccess_RadioButton_PAGE_DBWIZARD_MYSQL_INTRO_RB_CONNECTVIANATIVE,852197893, @@ -5057,7 +5054,6 @@ dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240, dbaccess_TabPage_PAGE_ORACLE_JDBC,851886080, dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936, dbaccess_TabPage_TP_MIGRATE,851476480, -dbaccess_TabPage_TP_SAVE_DBDOC_AS,851460096, dbaccess_TabPage_TP_SUMMARY,851492864, desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859, desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011, diff --git a/source/text/shared/explorer/database/migrate_macros.xhp b/source/text/shared/explorer/database/migrate_macros.xhp index 1f74a79..6ea336b 100644 --- a/source/text/shared/explorer/database/migrate_macros.xhp +++ b/source/text/shared/explorer/database/migrate_macros.xhp @@ -33,11 +33,12 @@ bookmark_valuemacros;attaching new (Base)/bookmark_value bookmark_valuemigrating macros (Base)/bookmark_value /bookmarkcommentMW added 2 index entries/comment +bookmark xml-lang=en-US branch=hid/dbaccess/ui/backuppage/BackupPage id=bm_id022420091141366 localize=false/ paragraph xml-lang=en-US id=hd_id0112200902353472 role=heading level=1 l10n=NEWlink href=text/shared/explorer/database/migrate_macros.xhpMigrate Macros/link/paragraph bookmark xml-lang=en-US branch=hid/.uno:DBMigrateScripts id=bm_id0224200911384751 localize=false/ paragraph xml-lang=en-US id=par_id0112200902353466 role=paragraph l10n=NEWahelp hid=.The Database Document Macro Migration Wizard moves existing macros from sub-documents of an old Base file into the new Base file's macro storage area./ahelp/paragraph /section -bookmark xml-lang=en-US branch=hid/dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION id=bm_id022420091141368 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/backuppage/browse id=bm_id022420091141368 localize=false/ paragraph xml-lang=en-US id=par_id0224200911454780 role=paragraph l10n=NEWahelp hid=. visibility=hiddenChoose a location and file name to save the new database file. By default, the new file gets the same name as the old file, while the old file gets renamed with the string backup in the name./ahelp/paragraph bookmark xml-lang=en-US branch=hid/dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES id=bm_id0224200911450172 localize=false/ paragraph xml-lang=en-US id=par_id022420091145472 role=paragraph l10n=NEWahelp hid=. visibility=hiddenThe list shows all changes that were applied to the database file./ahelp/paragraph @@ -54,4 +55,4 @@ paragraph xml-lang=en-US id=par_id0112200902353554 role=paragraph l10n=NEWlink href=http://wiki.documentfoundation.org/Macros_in_Database_Documents;An in depth explanation by the developers (Wiki)./link/paragraph /section /body -/helpdocument \ No newline at end of file +/helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/inc/dbaccess_helpid.hrc |2
dbaccess/source/ext/macromigration/dbmm_global.hrc |1
dbaccess/source/ext/macromigration/macromigration.hrc |8
dbaccess/source/ext/macromigration/macromigration.src | 76 --
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 35 +--
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 18 -
dbaccess/uiconfig/ui/backuppage.ui | 144 +
8 files changed, 171 insertions(+), 114 deletions(-)
New commits:
commit 55a639f6b3f0b78eac0f4c16c28baf6a51b1d623
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 21 17:05:31 2014 +0100
convert backup page to .ui
Change-Id: Id9a90001153fdaad51a00b68f38b1298195c5646
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index c6060f1..25675c8 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/admindialog \
dbaccess/uiconfig/ui/advancedsettingsdialog \
dbaccess/uiconfig/ui/applycolpage \
+dbaccess/uiconfig/ui/backuppage \
dbaccess/uiconfig/ui/choosedatasourcedialog \
dbaccess/uiconfig/ui/collectionviewdialog \
dbaccess/uiconfig/ui/colwidthdialog \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index b99138f..a64c290 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -245,8 +245,6 @@
#define HID_DLG_DATABASE_WIZARD
DBACCESS_HID_DLG_DATABASE_WIZARD
-#define HID_MACRO_MIGRATION_BACKUP_LOCATION
DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION
-
#endif // _DBA_DBACCESS_HELPID_HRC_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc
b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index 9354332..fb6fb05 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -38,7 +38,6 @@
//= tab pages
-#define TP_SAVE_DBDOC_AS( RID_DBMM_TAPPAGE_START + 1 )
#define TP_MIGRATE ( RID_DBMM_TAPPAGE_START + 2 )
#define TP_SUMMARY ( RID_DBMM_TAPPAGE_START + 3 )
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc
b/dbaccess/source/ext/macromigration/macromigration.hrc
index ada05ff..fdb85a0 100644
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ b/dbaccess/source/ext/macromigration/macromigration.hrc
@@ -47,9 +47,6 @@
//... fixed texts ...
#define FT_HEADER 1
-#define FT_EXPLANATION 3
-#define FT_SAVE_AS_LABEL4
-#define FT_START_MIGRATION 5
#define FT_CURRENT_OBJECT_LABEL 6
#define FT_CURRENT_OBJECT 7
#define FT_CURRENT_PROGRESS_LABEL 8
@@ -68,13 +65,8 @@
//... edits ..
-#define ED_SAVE_AS_LOCATION 1
#define ED_CHANGES 2
-//... buttons
-
-#define PB_BROWSE_SAVE_AS_LOCATION 1
-
//... strings
#define STR_STATE_CLOSE_SUB_DOCS1
diff --git a/dbaccess/source/ext/macromigration/macromigration.src
b/dbaccess/source/ext/macromigration/macromigration.src
index b58891c..cf0c6c1 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -51,83 +51,7 @@ ModalDialog DLG_MACRO_MIGRATION
};
};
-//= SaveDBDocPage
-
-TabPage TP_SAVE_DBDOC_AS
-{
-HelpID = dbaccess:TabPage:TP_SAVE_DBDOC_AS;
-Pos = MAP_APPFONT( 40, 130 );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
-
-Hide = TRUE;
-
-FixedText FT_HEADER
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_CONTENT_MARGIN );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
FIXED_TEXT_HEIGHT );
-
-Text [ en-US ] = Backup your Document;
-};
-
-FixedText FT_EXPLANATION
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, 5 *
FIXED_TEXT_HEIGHT );
-
-WordBreak = TRUE;
-
-Text [ en-US ] = To allow you to go back to the state before the
migration, the database
-document will be backed up to a location of your choice. Every
change done by the wizard will
-be made to the original document, the backup will stay
untouched.;
-};
-
-FixedText FT_SAVE_AS_LABEL
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X + 5 *
FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
-Size =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - sal/osl sal/qa sal/rtl
sal/osl/all/debugbase.cxx| 30 +++---
sal/qa/osl/file/osl_File.cxx |4 ++--
sal/qa/osl/module/osl_Module.cxx |8
sal/qa/osl/mutex/osl_Mutex.cxx |2 +-
sal/qa/osl/process/osl_Thread.cxx|2 +-
sal/qa/osl/security/osl_Security.cxx |2 +-
sal/rtl/alloc_global.cxx |6 +++---
sal/rtl/hash.cxx |4 ++--
sal/rtl/uri.cxx |2 +-
9 files changed, 22 insertions(+), 38 deletions(-)
New commits:
commit e5285e0186a1e45e3c12f6775f8ef24bccb9a871
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 25 12:18:05 2014 +0100
Adapt to sal/log.hxx
(cherry picked from commit 3c5d30c03b4b2d2c4d38d602afc839e7a922bca3)
Signed-off-by: Michael Stahl mst...@redhat.com
Note: this avoids an abort() in smoketest due to leaking
SvxUnoTextRangeBase
Change-Id: I9c59495977e111d94077470f07591c91fa3c1665
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 57238ce..75cd846 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -23,18 +23,10 @@
#include rtl/ustring.hxx
#include osl/process.h
#include osl/diagnose.hxx
+#include sal/log.hxx
#include boost/bind.hpp
#include vector
-// define own ones, independent of OSL_DEBUG_LEVEL:
-#define DEBUGBASE_ENSURE_(c, f, l, m) \
-do \
-{ \
-if (!(c) _OSL_GLOBAL osl_assertFailedLine(f, l, m)) \
-_OSL_GLOBAL osl_breakDebug(); \
-} while (false)
-#define DEBUGBASE_ENSURE(c, m) DEBUGBASE_ENSURE_(c, OSL_THIS_FILE, __LINE__, m)
-
namespace {
typedef std::vectorrtl::OString, rtl::Allocatorrtl::OString OStringVec;
@@ -118,16 +110,10 @@ bool SAL_CALL osl_detail_ObjectRegistry_checkObjectCount(
nSize = static_caststd::size_t(rData.m_nCount);
bool const bRet = (nSize == nExpected);
-if (! bRet) {
-rtl::OStringBuffer buf;
-buf.append( unexpected number of );
-buf.append( rData.m_pName );
-buf.append( : );
-buf.append( static_castsal_Int64(nSize) );
-buf.append(; Expected: );
-buf.append( static_castsal_Int64(nExpected) );
-DEBUGBASE_ENSURE( false, buf.makeStringAndClear().getStr() );
-}
+SAL_WARN_IF(
+!bRet, sal.osl,
+unexpected number of rData.m_pName : nSize
+ ; Expected: nExpected);
return bRet;
}
@@ -139,8 +125,7 @@ void SAL_CALL osl_detail_ObjectRegistry_registerObject(
osl::MutexGuard const guard( osl_detail_ObjectRegistry_getMutex() );
std::pairosl::detail::VoidPointerSet::iterator, bool const insertion(
rData.m_addresses.insert(pObj) );
-DEBUGBASE_ENSURE( insertion.second, ### insertion failed!? );
-static_castvoid(insertion);
+SAL_WARN_IF(!insertion.second, sal.osl, insertion failed!?);
}
else {
osl_atomic_increment(rData.m_nCount);
@@ -154,8 +139,7 @@ void SAL_CALL osl_detail_ObjectRegistry_revokeObject(
if (rData.m_bStoreAddresses) {
osl::MutexGuard const guard( osl_detail_ObjectRegistry_getMutex() );
std::size_t const n = rData.m_addresses.erase(pObj);
-DEBUGBASE_ENSURE( n == 1, erased more than 1 entry!? );
-static_castvoid(n);
+SAL_WARN_IF(n != 1, sal.osl, erased more than 1 entry!?);
}
else {
osl_atomic_decrement(rData.m_nCount);
commit eb758877fb799111673b909e73065cb6d966881a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 28 20:00:40 2014 +0100
bool improvements
Change-Id: I7ae2b02e435d21390843c6c56877a8ce3a73f9f2
(cherry picked from commit bd4053f895167978978023309925c85c3826b31a)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 8bc0c46..57238ce 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -32,7 +32,7 @@
{ \
if (!(c) _OSL_GLOBAL osl_assertFailedLine(f, l, m)) \
_OSL_GLOBAL osl_breakDebug(); \
-} while (0)
+} while (false)
#define DEBUGBASE_ENSURE(c, m) DEBUGBASE_ENSURE_(c, OSL_THIS_FILE, __LINE__, m)
namespace {
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 43f255c..54055fe 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -2587,7 +2587,7 @@ namespace osl_FileStatus
::osl::FileBase::RC nError1 = testDirectory.open();
::rtl::OUString aFileName (link.file);
sal_Bool bOk = sal_False;
-while (1) {
+while (true) {
nError1 = testDirectory.getNextItem( rItem_link, 4 );
if (::osl::FileBase::E_None == nError1) {
sal_uInt32 mask_link = osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_LinkTargetURL;
@@ -5639,7 +5639,7 @@ namespace osl_Directory
CPPUNIT_ASSERT( ::osl::FileBase::E_None
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/export/drawingml.hxx |2 +-
oox/source/export/drawingml.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 77d6ac27e1815d701e773e1c586b2545fa1f3382
Author: Tor Lillqvist t...@collabora.com
Date: Mon Jul 21 19:20:27 2014 +0300
WaE: passing class rtl::OUString by value, rather pass by reference
Change-Id: Ib332d04fa27501ec35267b5e389c2979c9c55be2
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index db685b1..f68c5e6 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -166,7 +166,7 @@ public:
void WriteTransformation( const Rectangle rRectangle,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV =
false, sal_Int32 nRotation = 0 );
-void WriteText( ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface rXIface, OUString presetWarp, bool bBodyPr
= true, bool bText = true, sal_Int32 nXmlNamespace = 0);
+void WriteText( ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface rXIface, const OUString presetWarp, bool
bBodyPr = true, bool bText = true, sal_Int32 nXmlNamespace = 0);
void WriteParagraph( ::com::sun::star::uno::Reference
::com::sun::star::text::XTextContent rParagraph );
void WriteParagraphProperties( ::com::sun::star::uno::Reference
::com::sun::star::text::XTextContent rParagraph );
void WriteParagraphNumbering( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet,
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a303365..6b25c57 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1690,7 +1690,7 @@ void DrawingML::WriteParagraph( Reference XTextContent
rParagraph )
mpFS-endElementNS( XML_a, XML_p );
}
-void DrawingML::WriteText( Reference XInterface rXIface, OUString
presetWarp, bool bBodyPr, bool bText, sal_Int32 nXmlNamespace )
+void DrawingML::WriteText( Reference XInterface rXIface, const OUString
presetWarp, bool bBodyPr, bool bText, sal_Int32 nXmlNamespace )
{
Reference XText xXText( rXIface, UNO_QUERY );
Reference XPropertySet rXPropSet( rXIface, UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 +++---
writerfilter/source/dmapper/FieldTypes.hxx|2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 31d4ab06b5e5250140293e88e91c56a679cc71fd
Author: Joren De Cuyper jore...@libreoffice.org
Date: Mon Jul 21 18:10:42 2014 +0200
Rename FILED_BIBLIOGRAPHY to FIELD_BIBLIOGRAPHY
Not sure why it was that way. I assume it was just a typo that
never was fixed.
Change-Id: I5767c8ff10abd687b12d209bacb74c3144ce7b25
Reviewed-on: https://gerrit.libreoffice.org/10443
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c25308d..bab9053 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2646,7 +2646,7 @@ if(!bFilled)
{OUString(NUMPAGES), PageCount, , FIELD_NUMPAGES},
{OUString(INDEX), com.sun.star.text.DocumentIndex, ,
FIELD_INDEX},
{OUString(XE), com.sun.star.text.DocumentIndexMark, ,
FIELD_XE},
-{OUString(BIBLIOGRAPHY), com.sun.star.text.Bibliography, ,
FILED_BIBLIOGRAPHY},
+{OUString(BIBLIOGRAPHY), com.sun.star.text.Bibliography, ,
FIELD_BIBLIOGRAPHY},
{OUString(CITATION), com.sun.star.text.TextField.Bibliography,
, FIELD_CITATION},
//{OUString(), , , FIELD_},
@@ -3300,7 +3300,7 @@ void DomainMapper_Impl::CloseFieldCommand()
case FIELD_TOC:
case FIELD_INDEX:
case FIELD_XE:
-case FILED_BIBLIOGRAPHY:
+case FIELD_BIBLIOGRAPHY:
case FIELD_CITATION:
case FIELD_TC:
case FIELD_EQ:
@@ -3787,7 +3787,7 @@ void DomainMapper_Impl::CloseFieldCommand()
handleIndex(pContext, rPropNameSupplier,
xFieldInterface, xFieldProperties,
OUString::createFromAscii(aIt-second.cFieldServiceName));
break;
-case FILED_BIBLIOGRAPHY:
+case FIELD_BIBLIOGRAPHY:
handleBibliography(pContext, rPropNameSupplier,
OUString::createFromAscii(aIt-second.cFieldServiceName));
break;
diff --git a/writerfilter/source/dmapper/FieldTypes.hxx
b/writerfilter/source/dmapper/FieldTypes.hxx
index 37acbef..0ce6e1f 100644
--- a/writerfilter/source/dmapper/FieldTypes.hxx
+++ b/writerfilter/source/dmapper/FieldTypes.hxx
@@ -296,7 +296,7 @@ enum FieldId
/**
* Bibliography
*/
-,FILED_BIBLIOGRAPHY
+,FIELD_BIBLIOGRAPHY
/* Citation
*/
,FIELD_CITATION
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/metaact.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2949d3ccc547d77c7e064a0d34c5d92c565bdcbb
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 21 18:41:03 2014 +0200
vcl: fix MetaTextArrayAction copying only half of mpDXArray
This causes an infinite loop in forms_unoapi test forms.OCheckBoxModel
(regression from cd3d26b7edbce67805259a71e4118223e02ebdd4)
Change-Id: I46715e1f1381fa92419558c34c6d47c3767de3e1
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 25f14fe..728860b 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1199,7 +1199,7 @@ MetaTextArrayAction::MetaTextArrayAction( const Point
rStartPt,
if( nAryLen )
{
mpDXAry = new long[ nAryLen ];
-memcpy( mpDXAry, pDXAry, nAryLen * sizeof( sal_Int32 ) );
+memcpy( mpDXAry, pDXAry, nAryLen * sizeof(long) );
}
else
mpDXAry = NULL;
___
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/filter/xml/xmlexprt.cxx | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit bc3b62e25eb0c3921fa600e80eeb314e45ecaaef
Author: Eike Rathke er...@redhat.com
Date: Mon Jul 21 18:50:31 2014 +0200
use SvXMLExport::GetRelativeReference(), fdo#79305
... instead of a manual approach that missed one extra package level.
Change-Id: I41c76eb84677fcf49eb09830127a419ed23ec643
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 70243eb..6e59a83 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3084,18 +3084,8 @@ void writeContent(
{
// text:a xlink:href=url xlink:type=simplevalue/text:a
-Reference uno::XComponentContext xContext =
comphelper::getProcessComponentContext();
-bool bUseRelative =
officecfg::Office::Common::Save::URL::FileSystem::get( xContext );
OUString aURL = static_castconst
SvxURLField*(pField)-GetURL();
-if(bUseRelative)
-{
-OUString aBase = rExport.GetOrigFileName();
-INetURLObject aURLObject(aBase);
-aURLObject.removeSegment();
-aURLObject.removeSegment();
-aURL =
INetURLObject::GetRelURL(aURLObject.GetMainURL(INetURLObject::DECODE_TO_IURI),
aURL);
-}
-rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aURL);
+rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,
rExport.GetRelativeReference(aURL));
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, simple);
OUString aElemName = rExport.GetNamespaceMap().GetQNameByKey(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdotext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2524d890de8c68125204cef8a2e8a9cda8ea9f11
Author: matteocam matteo.campane...@gmail.com
Date: Mon Jul 21 19:04:22 2014 +0200
ImpChainText is called
Change-Id: I8b5b012df286ab80025c7b50dcafa584703677e0
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 008ebcf..f249bbf 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1927,7 +1927,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
}
else if (/* TODO: IsChained() */ pEditStatus-IsPageOverflow())
{
-
+ImpChainText();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ext/macromigration/macromigrationpages.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 059ce597b544f9eccd7f12a4218ab3631025d95d
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 21 19:32:04 2014 +0200
SaveDBDocPage: [loplugin:saloverride]
Change-Id: I2491ec467df8874bb7eaa89e316b0e89f59c740a
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index bd5535d..50b6a5a 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -77,7 +77,7 @@ namespace dbmm
{
public:
SaveDBDocPage(MacroMigrationDialog _rParentDialog);
-~SaveDBDocPage();
+virtual ~SaveDBDocPage();
static TabPage* Create( ::svt::RoadmapWizard _rParentDialog );
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calctiledrendering4' - 5 commits - desktop/source libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/Executable_lokconf_init.mk
Repository.mk |1
desktop/source/app/app.cxx |2
libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk |3
libreofficekit/Executable_lokconf_init.mk | 42
libreofficekit/Module_libreofficekit.mk |1
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |4 +
libreofficekit/qa/lokconf_init/lokconf_init.cxx | 41 +++
solenv/gbuild/CppunitTest.mk|8 ++
8 files changed, 100 insertions(+), 2 deletions(-)
New commits:
commit dc1c9770671e0475cc758ccc23df5a1eb8a4337d
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 21 19:46:16 2014 +0200
DON'T USE: ignore unknown args instead of failure.
The --protector flag ends up here in unit tests, which causes things
to fail -- either we need to make --protector known, or filter
it out before hand -- whereby I suspect filtering it out would be
difficult to do in a reliable fashion.
Change-Id: Iab47a6e24723604df75def2b963e82ba6479318e
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a2df758..e9098c2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -656,7 +656,7 @@ void Desktop::Init()
// 2nd office startup should terminate after sending cmdlineargs
through pipe
SetBootstrapStatus(BS_TERMINATE);
}
-else if ( !rCmdLineArgs.GetUnknown().isEmpty()
+else if ( (!rCmdLineArgs.GetUnknown().isEmpty() false)
|| rCmdLineArgs.IsHelp() || rCmdLineArgs.IsVersion() )
{
// disable IPC thread in an instance that is just showing a help
message
commit 3a5a4689c102e375c8d30e2498b73fd449d1cb32
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 21 19:39:49 2014 +0200
gtktiledviewer: make sure we clean up the office instance.
Change-Id: I12c3e9df8b8fcf8dcd6fb5fa781c2f7c10ab0a0c
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 74661f1..27227b4 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -226,5 +226,9 @@ int main( int argc, char* argv[] )
gtk_main();
+pOffice-pClass-destroy( pOffice );
+
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d28e19069c065ba74f31834142f7eca88a25c9e2
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 21 19:36:11 2014 +0200
Use gb_CppunitTest_use_confpreinit for LOK tiled rendering.
Now that we use the event loop for LOK we need to make sure that
it is able to run successfully first time, as unit tests start
with a completely clean config.
Change-Id: If9ddcb75fe8286381d71ecdc76ac7eb3697960d0
diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
index 4b77fbf..9159a24 100644
--- a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
+++ b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
@@ -29,7 +29,6 @@ $(eval $(call
gb_CppunitTest_use_libraries,libreofficekit_tiledrendering, \
$(gb_UWINAPI) \
))
-
# unotest \
ifeq ($(OS),LINUX)
@@ -54,4 +53,6 @@ $(eval $(call
gb_CppunitTest_use_rdb,libreofficekit_tiledrendering,services))
$(eval $(call gb_CppunitTest_use_configuration,libreofficekit_tiledrendering))
+$(eval $(call gb_CppunitTest_use_confpreinit,libreofficekit_tiledrendering))
+
# vim: set noet sw=4 ts=4:
commit f8a1d9d6c363140a316a5d2e0f5562127799b93d
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 21 19:35:13 2014 +0200
Add gb_CppunitTest_use_confpreinit:
For unit tests that use the VCL event loop we can use this to
avoid the otherwise required restart.
Change-Id: I48265d7e7188a4efaa6f87432c762320331c0c78
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 622e16d..137a347 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -75,6 +75,8 @@ $(call gb_CppunitTest_get_target,%) :|
$(gb_CppunitTest_CPPTESTDEPS)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) \
rm -fr $@.user mkdir $@.user \
+ $(if $(gb_CppunitTest__use_confpreinit), \
+ $(INSTDIR)/program/lokconf_init $(call
gb_CppunitTest__make_args) ) \
$(if $(gb_CppunitTest__interactive),, \
$(if $(value gb_CppunitTest_postprocess), \
rm -fr $@.core mkdir $@.core cd $@.core
)) \
@@ -165,6 +167,12 @@ endif
endef
+define gb_CppunitTest_use_confpreinit
+$(call gb_CppunitTest_use_executable,$(1),lokconf_init)
+$(call gb_CppunitTest_get_target,$(1)) :
[Libreoffice-commits] core.git: 2 commits - chart2/source oox/inc
chart2/source/model/main/DataSeries.cxx | 49 ++
oox/inc/drawingml/chart/seriescontext.hxx |2 -
2 files changed, 24 insertions(+), 27 deletions(-)
New commits:
commit 8952061d818f485d3343193a3729ef5eb1067d4d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Jul 21 13:38:10 2014 -0400
Most certainly meant to be plural.
Change-Id: I3772091c77307892b13d75cc6a5a191ec07c7bf5
diff --git a/oox/inc/drawingml/chart/seriescontext.hxx
b/oox/inc/drawingml/chart/seriescontext.hxx
index 5f34ecf..98583ae 100644
--- a/oox/inc/drawingml/chart/seriescontext.hxx
+++ b/oox/inc/drawingml/chart/seriescontext.hxx
@@ -46,7 +46,7 @@ public:
struct DataLabelsModel;
-/** Handler for a chart data point label context (c:dLbl element).
+/** Handler for a chart data point label context (c:dLbls element).
*/
class DataLabelsContext : public ContextBase DataLabelsModel
{
commit 38272ba9157c35d882642634c4bf9da7007802cd
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Jul 21 12:12:24 2014 -0400
Scope reduction by throwing early.
Change-Id: Ic0b7b69b8c4e57064b31ef62ddceaf6094ca9991
diff --git a/chart2/source/model/main/DataSeries.cxx
b/chart2/source/model/main/DataSeries.cxx
index f97f310..3189100 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -335,41 +335,38 @@ Reference beans::XPropertySet
::std::vector Reference chart2::data::XLabeledDataSequence
aValuesSeries(
DataSeriesHelper::getAllDataSequencesByRole( aSequences , values,
true ) );
-if( !aValuesSeries.empty() )
+
+if (aValuesSeries.empty())
+throw lang::IndexOutOfBoundsException();
+
+Reference chart2::data::XDataSequence xSeq(
aValuesSeries.front()-getValues() );
+if( 0 = nIndex nIndex xSeq-getData().getLength() )
{
-Reference chart2::data::XDataSequence xSeq(
aValuesSeries.front()-getValues() );
-if( 0 = nIndex nIndex xSeq-getData().getLength() )
{
+MutexGuard aGuard( GetMutex() );
+tDataPointAttributeContainer::iterator aIt(
m_aAttributedDataPoints.find( nIndex ) );
+if( aIt != m_aAttributedDataPoints.end() )
+xResult = (*aIt).second;
+}
+if( !xResult.is() )
+{
+Reference beans::XPropertySet xParentProperties;
+Reference util::XModifyListener xModifyEventForwarder;
{
MutexGuard aGuard( GetMutex() );
-tDataPointAttributeContainer::iterator aIt(
m_aAttributedDataPoints.find( nIndex ) );
-if( aIt != m_aAttributedDataPoints.end() )
-xResult = (*aIt).second;
+xParentProperties = this;
+xModifyEventForwarder = m_xModifyEventForwarder;
}
-if( !xResult.is() )
-{
-Reference beans::XPropertySet xParentProperties;
-Reference util::XModifyListener xModifyEventForwarder;
-{
-MutexGuard aGuard( GetMutex() );
-xParentProperties = this;
-xModifyEventForwarder = m_xModifyEventForwarder;
-}
-// create a new XPropertySet for this data point
-xResult.set( new DataPoint( xParentProperties ) );
-{
-MutexGuard aGuard( GetMutex() );
-m_aAttributedDataPoints[ nIndex ] = xResult;
-}
-ModifyListenerHelper::addListener( xResult,
xModifyEventForwarder );
+// create a new XPropertySet for this data point
+xResult.set( new DataPoint( xParentProperties ) );
+{
+MutexGuard aGuard( GetMutex() );
+m_aAttributedDataPoints[ nIndex ] = xResult;
}
+ModifyListenerHelper::addListener( xResult, xModifyEventForwarder
);
}
}
-else
-{
-throw lang::IndexOutOfBoundsException();
-}
return xResult;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source
editeng/source/editeng/impedit3.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 9d22d0ae7dfa98c261bc13e4c2e8ff564e0858a7
Author: matteocam matteo.campane...@gmail.com
Date: Mon Jul 21 20:05:34 2014 +0200
Set overflow Status in CheckAutoPageSize
Change-Id: I07b149495175b110c931b74394dca1eab338df48
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 8d9e41b..ee23f98 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -544,6 +544,9 @@ void ImpEditEngine::CheckAutoPageSize()
// FIXME(matteocam)
fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
? YES Overflow!\n : NO Overflow!\n );
+// setting overflow status // XXX: Is status reset somewhere?
+if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) )
+aStatus.bIsPageOverflow = true;
if ( aPaperSize != aPrevPaperSize )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Weekly Report #4 - Dialog Widget Conversion
Hi Szymon, On Saturday, 2014-06-21 20:38:20 +0200, Szymon Kłos wrote: Now I'm finishing conversion of RID_SVXDLG_NEWHYPERLINK (4 tabs). That one introduced radio buttons that didn't exist before (E-mail and News) and a superfluous Subject edit field for the Document type / tab page, likely just a copypaste error from the MailNews type to cui/uiconfig/ui/hyperlinkdocpage.ui Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpFQ5pfsESxD.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng
editeng/source/editeng/impedit3.cxx |2 +-
include/editeng/editstat.hxx|1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 01e4be5815252fd3c9d21161bd7a0f4437f4c7cb
Author: matteocam matteo.campane...@gmail.com
Date: Mon Jul 21 20:17:56 2014 +0200
Added public method EditStatus::SetPageOverflow
Change-Id: I8f4f3cc6b2c3ad20db441120f3cd3a4f0ad2e0b9
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index ee23f98..ce30d8e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -546,7 +546,7 @@ void ImpEditEngine::CheckAutoPageSize()
? YES Overflow!\n : NO Overflow!\n );
// setting overflow status // XXX: Is status reset somewhere?
if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) )
-aStatus.bIsPageOverflow = true;
+aStatus.SetPageOverflow(true);
if ( aPaperSize != aPrevPaperSize )
{
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index e62ef82..148c8c4 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -112,6 +112,7 @@ public:
sal_Int32 GetPrevParagraph() { return nPrevPara; }
boolIsPageOverflow() const { return bIsPageOverflow; }
+voidSetPageOverflow(bool isOverflow) { bIsPageOverflow =
isOverflow; }
};
#define SPELLCMD_IGNOREWORD 0x0001
___
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' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 134 ++-
1 file changed, 132 insertions(+), 2 deletions(-)
New commits:
commit 28bd6fe0c4fdca575ef078d6e5ff2a5acb852ac3
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Sat Jul 19 21:52:09 2014 +0200
emf+: emulate hatch with color blend
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: I2ac8f790c79c269d4c1fa650e703c3645c567ca4
Reviewed-on: https://gerrit.libreoffice.org/10436
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 0c53c59..e6b1ea8 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -123,6 +123,63 @@ enum EmfPlusCombineMode
EmfPlusCombineModeComplement = 0x0005
};
+enum EmfPlusHatchStyle
+{
+HatchStyleHorizontal = 0x,
+HatchStyleVertical = 0x0001,
+HatchStyleForwardDiagonal = 0x0002,
+HatchStyleBackwardDiagonal = 0x0003,
+HatchStyleLargeGrid = 0x0004,
+HatchStyleDiagonalCross = 0x0005,
+HatchStyle05Percent = 0x0006,
+HatchStyle10Percent = 0x0007,
+HatchStyle20Percent = 0x0008,
+HatchStyle25Percent = 0x0009,
+HatchStyle30Percent = 0x000A,
+HatchStyle40Percent = 0x000B,
+HatchStyle50Percent = 0x000C,
+HatchStyle60Percent = 0x000D,
+HatchStyle70Percent = 0x000E,
+HatchStyle75Percent = 0x000F,
+HatchStyle80Percent = 0x0010,
+HatchStyle90Percent = 0x0011,
+HatchStyleLightDownwardDiagonal = 0x0012,
+HatchStyleLightUpwardDiagonal = 0x0013,
+HatchStyleDarkDownwardDiagonal = 0x0014,
+HatchStyleDarkUpwardDiagonal = 0x0015,
+HatchStyleWideDownwardDiagonal = 0x0016,
+HatchStyleWideUpwardDiagonal = 0x0017,
+HatchStyleLightVertical = 0x0018,
+HatchStyleLightHorizontal = 0x0019,
+HatchStyleNarrowVertical = 0x001A,
+HatchStyleNarrowHorizontal = 0x001B,
+HatchStyleDarkVertical = 0x001C,
+HatchStyleDarkHorizontal = 0x001D,
+HatchStyleDashedDownwardDiagonal = 0x001E,
+HatchStyleDashedUpwardDiagonal = 0x001F,
+HatchStyleDashedHorizontal = 0x0020,
+HatchStyleDashedVertical = 0x0021,
+HatchStyleSmallConfetti = 0x0022,
+HatchStyleLargeConfetti = 0x0023,
+HatchStyleZigZag = 0x0024,
+HatchStyleWave = 0x0025,
+HatchStyleDiagonalBrick = 0x0026,
+HatchStyleHorizontalBrick = 0x0027,
+HatchStyleWeave = 0x0028,
+HatchStylePlaid = 0x0029,
+HatchStyleDivot = 0x002A,
+HatchStyleDottedGrid = 0x002B,
+HatchStyleDottedDiamond = 0x002C,
+HatchStyleShingle = 0x002D,
+HatchStyleTrellis = 0x002E,
+HatchStyleSphere = 0x002F,
+HatchStyleSmallGrid = 0x0030,
+HatchStyleSmallCheckerBoard = 0x0031,
+HatchStyleLargeCheckerBoard = 0x0032,
+HatchStyleOutlinedDiamond = 0x0033,
+HatchStyleSolidDiamond = 0x0034
+};
+
using namespace ::com::sun::star;
using namespace ::basegfx;
@@ -362,9 +419,28 @@ namespace cppcanvas
sal_Int32 surroundColorsNumber;
::Color* surroundColors;
EMFPPath *path;
+EmfPlusHatchStyle hatchStyle;
public:
EMFPBrush ()
+: type(0)
+, additionalFlags(0)
+, wrapMode(0)
+, areaX(0.0)
+, areaY(0.0)
+, areaWidth(0.0)
+, areaHeight(0.0)
+, hasTransformation(false)
+, blendPoints(0)
+, blendPositions(NULL)
+, blendFactors(NULL)
+, colorblendPoints(0)
+, colorblendPositions(NULL)
+, colorblendColors(NULL)
+, surroundColorsNumber(0)
+, surroundColors(NULL)
+, path(NULL)
+, hatchStyle(HatchStyleHorizontal)
{
blendPositions = NULL;
colorblendPositions = NULL;
@@ -418,7 +494,20 @@ namespace cppcanvas
s color;
solidColor = ::Color (0xff - (color 24), (color
16) 0xff, (color 8) 0xff, color 0xff);
SAL_INFO (cppcanvas.emf, EMF+\tsolid color: 0x
std::hex color std::dec);
-
+break;
+}
+case 1:
+{
+sal_uInt32 style;
+sal_uInt32 foregroundColor;
+sal_uInt32 backgroundColor;
+s style;
+s foregroundColor;
+s backgroundColor;
+
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cppcanvas/source
cppcanvas/source/mtfrenderer/implrenderer.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 48242717e3a7a8d4c936bad0b96d75cca70b5e0b
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Fri Jul 18 13:36:59 2014 +0200
bnc#881024 Handle 0 font height just like outdev drawinglayer
Change-Id: I80055e4101873e0ddd408ac1f0ee9c75cc3bf6b3
Reviewed-on: https://gerrit.libreoffice.org/10435
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index a8145bb..b7cbcab 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -809,7 +809,18 @@ namespace cppcanvas
// TODO(Q3): This code smells of programming by
// coincidence (the next two if statements)
-const ::Size rFontSizeLog( rFont.GetSize() );
+
+::Size rFontSizeLog( rFont.GetSize() );
+
+if (rFontSizeLog.Height() == 0)
+{
+// guess 16 pixel (as in VCL)
+rFontSizeLog = ::Size(0, 16);
+
+// convert to target MapUnit if not pixels
+rFontSizeLog = OutputDevice::LogicToLogic(rFontSizeLog,
MAP_PIXEL, rParms.mrVDev.GetMapMode());
+}
+
const sal_Int32 nFontWidthLog = rFontSizeLog.Width();
if( nFontWidthLog != 0 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/filter/wmf/winmtf.cxx | 18 +-
vcl/source/filter/wmf/winmtf.hxx |2 +-
2 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit f5949d09321e3ac62538df0e70e58284bd1cab32
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Fri Jul 18 13:36:13 2014 +0200
bnc#881024 Don't world transform font size in WMF/EMF import
Conflicts:
vcl/source/filter/wmf/winmtf.cxx
Change-Id: Ia865b84ee2b159ff7251ab5a769a2b635dd2a1ea
Reviewed-on: https://gerrit.libreoffice.org/10434
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 38e79a8..d8c2a67 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -412,14 +412,22 @@ Point WinMtfOutput::ImplMap( const Point rPt )
return Point();
};
-
-Size WinMtfOutput::ImplMap( const Size rSz )
+Size WinMtfOutput::ImplMap(const Size rSz, bool bDoWorldTransform)
{
if ( mnWinExtX mnWinExtY )
{
// #i121382# apply the whole WorldTransform, else a rotation will be
misinterpreted
-double fWidth = rSz.Width() * maXForm.eM11 + rSz.Height() *
maXForm.eM21;
-double fHeight = rSz.Width() * maXForm.eM12 + rSz.Height() *
maXForm.eM22;
+double fWidth, fHeight;
+if (bDoWorldTransform)
+{
+fWidth = rSz.Width() * maXForm.eM11 + rSz.Height() * maXForm.eM21;
+fHeight = rSz.Width() * maXForm.eM12 + rSz.Height() * maXForm.eM22;
+}
+else
+{
+fWidth = rSz.Width();
+fHeight = rSz.Height();
+}
if ( mnGfxMode == GM_COMPATIBLE )
{
@@ -483,7 +491,7 @@ void WinMtfOutput::ImplMap( Font rFont )
{
// !!! HACK: we now always set the width to zero because the OS width is
interpreted differently;
// must later be made portable in SV (KA 1996-02-08)
-Size aFontSize = ImplMap ( rFont.GetSize() );
+Size aFontSize = ImplMap (rFont.GetSize(), false);
if( aFontSize.Height() 0 )
aFontSize.Height() *= -1;
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 9db9245..e2c1f1c 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -632,7 +632,7 @@ class WinMtfOutput
Point ImplMap( const Point rPt );
Point ImplScale( const Point rPt );
-SizeImplMap( const Size rSz );
+SizeImplMap( const Size rSize, bool bDoWorldTransform =
true);
Rectangle ImplMap( const Rectangle rRectangle );
voidImplMap( Font rFont );
PolygonImplMap( Polygon rPolygon );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/editeng
include/editeng/editstat.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2870d1762a1f74cee30480dec626a6205e6e9267
Author: matteocam matteo.campane...@gmail.com
Date: Mon Jul 21 20:25:59 2014 +0200
EditStatus::Clear resets page overflow
Change-Id: If7385814a6136929dc132c4d4cc6a2c70d455456
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 148c8c4..3ab90bc 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -98,7 +98,7 @@ public:
EditStatus(){ nStatusBits = 0; nControlBits = 0;
nPrevPara = -1; bIsPageOverflow =
false; }
-voidClear() { nStatusBits = 0; }
+voidClear() { nStatusBits = 0; bIsPageOverflow =
false; }
voidSetControlBits( sal_uLong nMask, bool bOn )
{ SetFlags( nControlBits, nMask, bOn ); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
