Re: Performance samples for LibreOffice ...
On 09/13/2014 05:43 PM, Jan Hubicka wrote: I updated to current tree and my ODR checker reports no more violations during of libmergedlo. Did you integrated more stuff to it? I at least didn't address any further issues from your list than the ones I'd reported as fixed. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: jurt/com
jurt/com/sun/star/comp/loader/JavaLoader.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5c2d2d087f22b00a8447d1d97de353242e89deab
Author: rbuj
Date: Sun Sep 14 15:27:59 2014 +0200
jurt: encode(String) in URLEncoder has been deprecated
Change-Id: I914985aa73653e0fb08200ddd06ad5b914087e3a
Reviewed-on: https://gerrit.libreoffice.org/11446
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java
b/jurt/com/sun/star/comp/loader/JavaLoader.java
index c82f8e9..4298d0b 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -109,7 +109,7 @@ public class JavaLoader implements XImplementationLoader,
String macro = URLDecoder.decode(
StringHelper.replace(
url.substring( EXPAND_PROTOCOL_PREFIX.length() ),
-'+', "%2B" ) );
+'+', "%2B" ), "UTF-8" );
// expand macro string
String ret = m_xMacroExpander.expandMacros( macro );
if (DEBUG) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bean/test
bean/test/applet/oooapplet/OOoViewer.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7b8934d27ea9b6aa227cc16272823f4bec55860f
Author: rbuj
Date: Sun Sep 14 14:26:10 2014 +0200
bean: use a non-varargs call for a stopOOoConnection method invocation
Change-Id: I589436be7d28b50b0b900a314b300d382eac5eb8
Reviewed-on: https://gerrit.libreoffice.org/11445
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/bean/test/applet/oooapplet/OOoViewer.java
b/bean/test/applet/oooapplet/OOoViewer.java
index c2eaaa5..cd86b4a 100644
--- a/bean/test/applet/oooapplet/OOoViewer.java
+++ b/bean/test/applet/oooapplet/OOoViewer.java
@@ -101,7 +101,7 @@ public class OOoViewer extends Applet {
try {
Method methStop = m_objBean.getClass().getMethod(
"stopOOoConnection", new Class[0]);
-methStop.invoke(m_objBean, null);
+methStop.invoke(m_objBean, (Object[]) null);
} catch (java.lang.NoSuchMethodException e) {
e.printStackTrace();
} catch (java.lang.IllegalAccessException e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 352b580e30476dce135a40a21daac7f974ecc430
Author: rbuj
Date: Sun Sep 14 14:04:50 2014 +0200
javaunohelper: warning: unchecked cast
Change-Id: I7c47e3a8657ec2368543088743879085878d78fb
Reviewed-on: https://gerrit.libreoffice.org/11444
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
index 344ab1f..b00519a 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
@@ -212,22 +212,22 @@ public final class PropertySetMixin {
if ((p.Attributes & PropertyAttribute.CONSTRAINED) != 0) {
ArrayList o =
vetoListeners.get(propertyName);
if (o != null) {
-specificVeto = (ArrayList)
o.clone();
+specificVeto = new ArrayList(o);
}
o = vetoListeners.get("");
if (o != null) {
-unspecificVeto = (ArrayList)
o.clone();
+unspecificVeto = new ArrayList(o);
}
}
if ((p.Attributes & PropertyAttribute.BOUND) != 0) {
// assert bound != null;
ArrayList o =
boundListeners.get(propertyName);
if (o != null) {
-bound.specificListeners =
(ArrayList) o.clone();
+bound.specificListeners = new
ArrayList(o);
}
o = boundListeners.get("");
if (o != null) {
-bound.unspecificListeners =
(ArrayList) o.clone();
+bound.unspecificListeners = new
ArrayList(o);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-09-15
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + jurt: encode(String) in URLEncoder has been deprecated in https://gerrit.libreoffice.org/11446 from Robert Antoni Buj i Gelonch about module jurt + bean: use a non-varargs call for a stopOOoConnection method invocation in https://gerrit.libreoffice.org/11445 from Robert Antoni Buj i Gelonch about module bean + javaunohelper: warning: unchecked cast in https://gerrit.libreoffice.org/11444 from Robert Antoni Buj i Gelonch about module javaunohelper + bean: encode(String) in URLEncoder has been deprecated in https://gerrit.libreoffice.org/11442 from Robert Antoni Buj i Gelonch about module bean + fdo#65209 attempt to enable daylight saving time in https://gerrit.libreoffice.org/11441 from Lim Jing about module tools End of freshness + cppcheck: unpreciseMathCall in https://gerrit.libreoffice.org/11434 from Julien Nabet about module extensions, sc * Merged changes on master for project core changed in the last 25 hours: + scripting: Uncaught Exception in https://gerrit.libreoffice.org/11439 from Robert Antoni Buj i Gelonch + Updated example paths in wizards/com/sun/star/wizards/README in https://gerrit.libreoffice.org/11440 from Ryan McCoskrie + scripting: replace StringBuffer with StringBuilder method in https://gerrit.libreoffice.org/11436 from Robert Antoni Buj i Gelonch * 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: + Perftest for loading autocorrect dictionaries (fdo#79761) in https://gerrit.libreoffice.org/11296 from Matúš Kukan + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde + fdo#63154: Use OSL_* macros to manage endianess... in https://gerrit.libreoffice.org/11082 from Marcos Paulo de Souza + fdo#63154: Rearrange some solar.h includes in https://gerrit.libreoffice.org/10892 from Marcos Paulo de Souza + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + 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
Re: LibreOffice Weekly News #5 waiting for reviews
Hey William, On 14 septembre 2014 22:24:55 CEST, William Gathoye wrote: >-BEGIN PGP SIGNED MESSAGE- >Hash: SHA1 > >On 09/13/2014 03:25 AM, William Gathoye wrote: >> Hi *, >> >> I've just finished to write the fifth edition of LOWN. [1] >> >> The latter is waiting for your reviews. >> >> If I got no complains in the next 48h, I'll advertise it on social >> networks pinging some news magazine holders like Michael Larabel >> (Phoronix). > >As promised, I advertised LOWN 5 on social networks [1] [2] > >Even, if LOWN was not intended as a public release [3], the >advertising on G+ and a ping to Michael Larabel is just a test to see >how the public will react, on the marketing POV. LOL don't worry it is always good to spread the word out. I will beat the drums tomorrow too. Best, Charles. > >[1] https://plus.google.com/112998591790866541202/posts/Spst6H9bgUb >[2] https://twitter.com/willubuntu/status/511247560368201728 >[3] "This newsletter is not really meant for people outside our >community." from >http://standardsandfreedom.net/index.php/2014/09/14/strategy-workshop/ > > >- -- >William Gathoye > >-BEGIN PGP SIGNATURE- >Version: GnuPG v2 > >iQIcBAEBAgAGBQJUFfmXAAoJEA595SwE1xaDdcUP/AxDJV9EJqGR/xPtAPy7YJ7b >KGl9RptEaKbH/PTh/QOYfwx5sivWFFZMGzSvEfyfs53LDH6537o0ITh2I3yarYbz >bgi9UeyKYaFVPwPtWhXGep3RKjd5NZO08dPt/l6d/T3Bq8ivVU57+hQ+d0LvR0fJ >aUNpBS3i2SxQNevGtSS2ep9+jlARTecOxU8ZYkWdxBQdpDWwilzAT0z0P1TV+RlE >I1sex1uMVuR/wFpM5NgwiRERiIKLtFJ/lhPO3mTmIcIexe/NBgUdsnW810Ah1am1 >DRgwvvgKqpqVGHu+UGUbnABUo2AT2yQibitvdxfiMjfJnSMDTeiMRgdS9wrmK2Bq >3+EEByZkOa5KG43BBemXhqKfwY05Hv4RnJ6nfNW9SvGqhvONZwB8u8jZgcTK5gFt >eEr4GyL6mwzzkdFJOWgFhOk47LwF4ffJ1RzMKi7j35SHt3yQTVKbtuad0pBNgR0F >C+H1PqdEPGz4hY19+gSPy5ZDm6T0II0JRizdSEmvIjERGIp9EMtuoEUlEUcax8RG >NFtMQ1AL4xkjntpnab2c45Tgm+VNUAHvrz8e2hfe4UMbxeR+xtraWcfC9md5I4Rf >/c61SVOeURZWmwbsXtRRRFR2MmUrmtDPJoK2SXB1OkLU12VTQn2Ved7F5trrhko+ >k1injeOy7LZQrciGqfx1 >=DiMk >-END PGP SIGNATURE- >___ >LibreOffice mailing list >LibreOffice@lists.freedesktop.org >http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Envoyé de mon téléphone avec Kaiten Mail. Excusez la brièveté. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Building pb OTools.cxx in MacOs (connectivity part)
Hello, On Mac OS 10.9 and master sources updated about 2 days ago, I've got this building problem: lo/core/connectivity/source/drivers/odbc/OTools.cxx:462:23: error: no matching member function for call to 'append' aData.append(waCharArray, nReadChars); ~~^~ lo/core/include/rtl/ustrbuf.hxx:475:22: note: candidate function not viable: no known conversion from 'SQLWCHAR [2048]' to 'const sal_Unicode *' (aka 'const unsigned short *') for 1st argument OUStringBuffer & append( const sal_Unicode * str, sal_Int32 len) ^ lo/core/include/rtl/ustrbuf.hxx:661:22: note: candidate function not viable: no known conversion from 'SQLWCHAR [2048]' to 'sal_Int32' (aka 'int') for 1st argument OUStringBuffer & append(sal_Int32 i, sal_Int16 radix = 10 ) ^ lo/core/include/rtl/ustrbuf.hxx:679:22: note: candidate function not viable: no known conversion from 'SQLWCHAR [2048]' to 'sal_Int64' (aka 'long') for 1st argument OUStringBuffer & append(sal_Int64 l, sal_Int16 radix = 10 ) ^ lo/core/include/rtl/ustrbuf.hxx:488:87: note: candidate function template not viable: requires single argument 'literal', but 2 arguments were provided typename libreoffice_internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type append( T& literal ) ^ lo/core/include/rtl/ustrbuf.hxx:502:21: note: candidate function template not viable: requires single argument 'c', but 2 arguments were provided OUStringBuffer& append( const OUStringConcat< T1, T2 >& c ) ^ lo/core/include/rtl/ustrbuf.hxx:586:9: note: candidate function template not viable: requires 1 argument, but 2 were provided append( T* ) SAL_DELETED_FUNCTION; ^ lo/core/include/rtl/ustrbuf.hxx:420:22: note: candidate function not viable: requires single argument 'str', but 2 arguments were provided OUStringBuffer & append(const OUString &str) ^ lo/core/include/rtl/ustrbuf.hxx:437:22: note: candidate function not viable: requires single argument 'str', but 2 arguments were provided OUStringBuffer & append(const OUStringBuffer &str) ^ lo/core/include/rtl/ustrbuf.hxx:457:22: note: candidate function not viable: requires single argument 'str', but 2 arguments were provided OUStringBuffer & append( const sal_Unicode * str ) ^ lo/core/include/rtl/ustrbuf.hxx:573:22: note: candidate function not viable: requires single argument 'b', but 2 arguments were provided OUStringBuffer & append(bool b) ^ lo/core/include/rtl/ustrbuf.hxx:594:22: note: candidate function not viable: requires single argument 'str', but 2 arguments were provided OUStringBuffer & append(rtl_uString* str) ^ lo/core/include/rtl/ustrbuf.hxx:610:22: note: candidate function not viable: requires single argument 'b', but 2 arguments were provided OUStringBuffer & append(sal_Bool b) ^ lo/core/include/rtl/ustrbuf.hxx:628:22: note: candidate function not viable: requires single argument 'c', but 2 arguments were provided OUStringBuffer & append(char c) ^ lo/core/include/rtl/ustrbuf.hxx:644:22: note: candidate function not viable: requires single argument 'c', but 2 arguments were provided OUStringBuffer & append(sal_Unicode c) ^ lo/core/include/rtl/ustrbuf.hxx:696:22: note: candidate function not viable: requires single argument 'f', but 2 arguments were provided OUStringBuffer & append(float f) ^ lo/core/include/rtl/ustrbuf.hxx:713:22: note: candidate function not viable: requires single argument 'd', but 2 arguments were provided OUStringBuffer & append(double d) ^ 1 error generated. make[1]: *** [/Users/marylinevogel/lo/core/workdir/CxxObject/connectivity/source/drivers/odbc/OTools.o] Error 1 Any idea? Julien -- View this message in context: http://nabble.documentfoundation.org/Building-pb-OTools-cxx-in-MacOs-connectivity-part-tp4122263.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice Weekly News #5 waiting for reviews
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 09/13/2014 03:25 AM, William Gathoye wrote: > Hi *, > > I've just finished to write the fifth edition of LOWN. [1] > > The latter is waiting for your reviews. > > If I got no complains in the next 48h, I'll advertise it on social > networks pinging some news magazine holders like Michael Larabel > (Phoronix). As promised, I advertised LOWN 5 on social networks [1] [2] Even, if LOWN was not intended as a public release [3], the advertising on G+ and a ping to Michael Larabel is just a test to see how the public will react, on the marketing POV. [1] https://plus.google.com/112998591790866541202/posts/Spst6H9bgUb [2] https://twitter.com/willubuntu/status/511247560368201728 [3] "This newsletter is not really meant for people outside our community." from http://standardsandfreedom.net/index.php/2014/09/14/strategy-workshop/ - -- William Gathoye -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQIcBAEBAgAGBQJUFfmXAAoJEA595SwE1xaDdcUP/AxDJV9EJqGR/xPtAPy7YJ7b KGl9RptEaKbH/PTh/QOYfwx5sivWFFZMGzSvEfyfs53LDH6537o0ITh2I3yarYbz bgi9UeyKYaFVPwPtWhXGep3RKjd5NZO08dPt/l6d/T3Bq8ivVU57+hQ+d0LvR0fJ aUNpBS3i2SxQNevGtSS2ep9+jlARTecOxU8ZYkWdxBQdpDWwilzAT0z0P1TV+RlE I1sex1uMVuR/wFpM5NgwiRERiIKLtFJ/lhPO3mTmIcIexe/NBgUdsnW810Ah1am1 DRgwvvgKqpqVGHu+UGUbnABUo2AT2yQibitvdxfiMjfJnSMDTeiMRgdS9wrmK2Bq 3+EEByZkOa5KG43BBemXhqKfwY05Hv4RnJ6nfNW9SvGqhvONZwB8u8jZgcTK5gFt eEr4GyL6mwzzkdFJOWgFhOk47LwF4ffJ1RzMKi7j35SHt3yQTVKbtuad0pBNgR0F C+H1PqdEPGz4hY19+gSPy5ZDm6T0II0JRizdSEmvIjERGIp9EMtuoEUlEUcax8RG NFtMQ1AL4xkjntpnab2c45Tgm+VNUAHvrz8e2hfe4UMbxeR+xtraWcfC9md5I4Rf /c61SVOeURZWmwbsXtRRRFR2MmUrmtDPJoK2SXB1OkLU12VTQn2Ved7F5trrhko+ k1injeOy7LZQrciGqfx1 =DiMk -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - l10ntools/source
l10ntools/source/export.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 40716a03b60e4d5014a2ddf194f02a474b122a18
Author: David Tardon
Date: Sun Sep 14 13:20:29 2014 +0200
fdo#80650 src transl. merge must be case sensitive
This makes the desired changes in
workdir/SrsPartMergeTarget/starmath/source/symbol.src. The only other
merged file that is changed is
workdir/SrsPartMergeTarget/sw/source/ui/misc/numberingtypelistbox.src,
with changes like
< "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC
- < "a, b, c, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
+ < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
< "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ;
This looks okay to me too :-)
Change-Id: I729075209027ed1f3fec311c05b631c0f681708b
(cherry picked from commit 03626d7940d5e2fc2abf65ef1b49a7a89623f08f)
Reviewed-on: https://gerrit.libreoffice.org/11443
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index d3d4cfb..3d0096d 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -275,7 +275,7 @@ Export::~Export()
if ( bMergeMode ) {
if ( !pMergeDataFile )
-pMergeDataFile = new MergeDataFile(sMergeSrc,
global::inputPathname, false);
+pMergeDataFile = new MergeDataFile(sMergeSrc,
global::inputPathname, true);
delete pMergeDataFile;
}
@@ -1062,14 +1062,14 @@ void Export::ResData2Output( MergeEntrys *pEntry,
sal_uInt16 nType, const OStrin
void Export::MergeRest( ResData *pResData )
{
if ( !pMergeDataFile ){
-pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname,
false );
+pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname,
true );
aLanguages = pMergeDataFile->GetLanguages();
}
MergeEntrys *pEntry = 0;
if( pResData->bText || pResData->bQuickHelpText || pResData->bTitle )
-pEntry = pMergeDataFile->GetMergeEntrys( pResData );
+pEntry = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
if ( pEntry )
{
@@ -1154,7 +1154,7 @@ void Export::MergeRest( ResData *pResData )
ConvertExportContent( pResData->sId );
}
-MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrys(
pResData );
+MergeEntrys* pEntrys =
pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
OString sText;
bool bText = pEntrys && pEntrys->GetText( sText,
STRING_TYP_TEXT, sCur, true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - configure.ac external/boost include/svtools include/vcl svtools/source vcl/inc vcl/source
configure.ac |7
external/boost/UnpackedTarball_boost.mk |1
external/boost/boost.signals2.unused.parameters.patch | 20 +
include/svtools/inettbc.hxx |3 +-
include/vcl/combobox.hxx |9 --
include/vcl/edit.hxx |5 +--
include/vcl/lstbox.hxx|6 ++--
svtools/source/control/inettbc.cxx|9 +-
vcl/inc/ilstbox.hxx | 26 ++
vcl/source/control/combobox.cxx | 25 -
vcl/source/control/edit.cxx | 24 ++--
vcl/source/control/ilstbox.cxx| 10 --
vcl/source/control/lstbox.cxx | 15 --
13 files changed, 85 insertions(+), 75 deletions(-)
New commits:
commit 051b29e1025253f35f87a04e297760aa8b40611f
Author: LuboÅ¡ LuÅák
Date: Sun Sep 14 15:45:02 2014 +0200
convert Edit autocomplete Hdl to boost signals2
Here it also keep track of the connection, as it needs to be explicitly
disconnected in one place.
Change-Id: Id3e2882106ae55c2d880898956a36f84d3ce70ef
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 82e3248..8d073a8 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -48,9 +48,10 @@ friend class SvtURLBox_Impl;
SVT_DLLPRIVATE bool ProcessKey( const vcl::KeyCode& rCode );
SVT_DLLPRIVATE void TryAutoComplete();
SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl();
-DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* );
SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID);
+SAL_DLLPRIVATE void AutoCompleteHandler( Edit* );
+
protected:
virtual boolNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual voidSelect() SAL_OVERRIDE;
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 95e3519..b80d088 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_VCL_COMBOBOX_HXX
#define INCLUDED_VCL_COMBOBOX_HXX
+#include
#include
#include
#include
@@ -50,6 +51,7 @@ private:
sal_Int32 m_nMaxWidthChars;
LinkmaSelectHdl;
LinkmaDoubleClickHdl;
+boost::signals2::scoped_connection mAutocompleteConnection;
struct ComboBoxBounds
{
@@ -71,11 +73,11 @@ private:
DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, void* );
DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* );
DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* );
-DECL_DLLPRIVATE_LINK( ImplAutocompleteHdl, Edit* );
DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* );
SAL_DLLPRIVATE void ImplClickButtonHandler( ImplBtn* );
SAL_DLLPRIVATE void ImplUserDrawHandler( UserDrawEvent* );
+SAL_DLLPRIVATE void ImplAutocompleteHandler( Edit* );
protected:
using Window::ImplInit;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 391e825..5d41a1b 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_VCL_EDIT_HXX
#define INCLUDED_VCL_EDIT_HXX
+#include
#include
#include
#include
@@ -94,7 +95,6 @@ private:
mbActivePopup:1;
LinkmaModifyHdl;
LinkmaUpdateDataHdl;
-LinkmaAutocompleteHdl;
css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC;
@@ -238,8 +238,7 @@ public:
voidSetSubEdit( Edit* pEdit );
Edit* GetSubEdit() const { return mpSubEdit; }
-voidSetAutocompleteHdl( const Link& rHdl );
-const Link& GetAutocompleteHdl() const { return maAutocompleteHdl;
}
+boost::signals2::signal< void ( Edit* ) > autocompleteSignal;
AutocompleteAction GetAutocompleteAction() const { return
meAutocompleteAction; }
virtual SizeCalcMinimumSize() const;
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index e8e4d1c..a585053 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -899,7 +899,7 @@ void SvtURLBox::Init(bool bSetDefaultHelpID)
SetText( OUString() );
-GetSubEdit()->SetAutocompleteHdl( LINK( this, SvtURLBox,
AutoCompleteHdl_Impl ) );
+GetSubEdit()->autocompleteSignal.connect( boost::bind(
&SvtURLBox::AutoCompleteHandler, this, _1 ) );
UpdatePicklistForSmartProtocol_Impl();
EnableAutoSize(GetStyle() & WB_AUTOSIZE);
@@ -1127,15 +1127,10 @@ bool SvtURLBox::PreNotify( NotifyEvent& rNEvt )
}
-IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl)
+void SvtURLBox::AutoCompleteHa
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
writerfilter/inc/dmapper/DomainMapper.hxx |2
writerfilter/source/dmapper/DomainMapper.cxx | 83 +
writerfilter/source/ooxml/model.xml| 36 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 42 ++--
4 files changed, 99 insertions(+), 64 deletions(-)
New commits:
commit aa3696b1ac6c66865d24300e92eed57fff8efbef
Author: Miklos Vajna
Date: Sun Sep 14 21:47:35 2014 +0200
Use constants for ST_Underline values
The integers were a leftover from doctok's Kul enumeration.
Change-Id: I71ee4add743af9ae5b5dee877536c09ca48b854c
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index ea743be..6c44d02 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -161,7 +161,7 @@ private:
// Table
virtual void lcl_entry(int pos,
writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE;
-void handleUnderlineType(const sal_Int32 nIntValue, const
::boost::shared_ptr pContext);
+void handleUnderlineType(const Id nId, const
::boost::shared_ptr pContext);
void handleParaJustification(const sal_Int32 nIntValue, const
::boost::shared_ptr pContext, const bool bExchangeLeftRight);
bool getColorFromId(const Id, sal_Int32 &nColor);
sal_Int16 getEmphasisValue(const sal_Int32 nIntValue);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index b7aec84..b0d4f82 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3145,33 +3145,68 @@ void DomainMapper::lcl_info(const std::string &
/*info_*/)
{
}
-void DomainMapper::handleUnderlineType(const sal_Int32 nIntValue, const
::boost::shared_ptr pContext)
+void DomainMapper::handleUnderlineType(const Id nId, const
::boost::shared_ptr pContext)
{
-sal_Int16 eUnderline = awt::FontUnderline::NONE;
+sal_Int16 nUnderline = awt::FontUnderline::NONE;
-switch(nIntValue)
+switch (nId)
{
-case 0: eUnderline = awt::FontUnderline::NONE; break;
-case 2: pContext->Insert(PROP_CHAR_WORD_MODE, uno::makeAny( true ) ); //
TODO: how to get rid of it?
-case 1: eUnderline = awt::FontUnderline::SINGLE; break;
-case 3: eUnderline = awt::FontUnderline::DOUBLE; break;
-case 4: eUnderline = awt::FontUnderline::DOTTED; break;
-case 7: eUnderline = awt::FontUnderline::DASH; break;
-case 9: eUnderline = awt::FontUnderline::DASHDOT; break;
-case 10:eUnderline = awt::FontUnderline::DASHDOTDOT; break;
-case 6: eUnderline = awt::FontUnderline::BOLD; break;
-case 11:eUnderline = awt::FontUnderline::WAVE; break;
-case 20:eUnderline = awt::FontUnderline::BOLDDOTTED; break;
-case 23:eUnderline = awt::FontUnderline::BOLDDASH; break;
-case 39:eUnderline = awt::FontUnderline::LONGDASH; break;
-case 55:eUnderline = awt::FontUnderline::BOLDLONGDASH; break;
-case 25:eUnderline = awt::FontUnderline::BOLDDASHDOT; break;
-case 26:eUnderline = awt::FontUnderline::BOLDDASHDOTDOT;break;
-case 27:eUnderline = awt::FontUnderline::BOLDWAVE; break;
-case 43:eUnderline = awt::FontUnderline::DOUBLEWAVE; break;
-default: ;
-}
-pContext->Insert(PROP_CHAR_UNDERLINE, uno::makeAny( eUnderline ) );
+case NS_ooxml::LN_Value_ST_Underline_none:
+nUnderline = awt::FontUnderline::NONE;
+break;
+case NS_ooxml::LN_Value_ST_Underline_words:
+pContext->Insert(PROP_CHAR_WORD_MODE, uno::makeAny(true));
+// fall-through intended
+case NS_ooxml::LN_Value_ST_Underline_single:
+nUnderline = awt::FontUnderline::SINGLE;
+break;
+case NS_ooxml::LN_Value_ST_Underline_double:
+nUnderline = awt::FontUnderline::DOUBLE;
+break;
+case NS_ooxml::LN_Value_ST_Underline_dotted:
+nUnderline = awt::FontUnderline::DOTTED;
+break;
+case NS_ooxml::LN_Value_ST_Underline_dash:
+nUnderline = awt::FontUnderline::DASH;
+break;
+case NS_ooxml::LN_Value_ST_Underline_dotDash:
+nUnderline = awt::FontUnderline::DASHDOT;
+break;
+case NS_ooxml::LN_Value_ST_Underline_dotDotDash:
+nUnderline = awt::FontUnderline::DASHDOTDOT;
+break;
+case NS_ooxml::LN_Value_ST_Underline_thick:
+nUnderline = awt::FontUnderline::BOLD;
+break;
+case NS_ooxml::LN_Value_ST_Underline_wave:
+nUnderline = awt::FontUnderline::WAVE;
+break;
+case NS_ooxml::LN_Value_ST_Underline_dottedHeavy:
+nUnderline = awt::FontUnderline::BOLDDOTTED;
+break;
+case NS_ooxml::LN_Value_ST_Underline_dashedHeavy:
+nUnderline = awt::FontUnderline::BOLDDASH;
+break;
+case NS_ooxml::LN_Value_ST_Underline_dashLong:
+nUnderline = awt::FontUnderline::LONGDASH;
+break;
+case NS_o
[Bug 35862] "Increase font" and "decrease font" could work even if the selection contains differing font sizes
https://bugs.freedesktop.org/show_bug.cgi?id=35862 --- Comment #25 from crys...@seznam.cz --- @jimc-6: you say: "...The button could be disabled if a multi sized string is selected because it is likely to be a little used feature..." I highly disagree. Moreover, I consider it right opposite - it is the very core feature. Just imagine you want to make your document fit into 4 pages instead of 5. With here being discussed feature properly implemented (or in MS Word), it is just question of Ctrl+A and . Done. On the contrary... I am asking: how you do it so effectively now in current implementation? -- 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 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 82777, which changed state. Bug 82777 Summary: EDITING: CRASH when "select all" or "select" on page with picture or object anchored to page https://bugs.freedesktop.org/show_bug.cgi?id=82777 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/trvlfrm.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 99cd15fa238886d23bdc429dc1133157d799487a
Author: LuboÅ¡ LuÅák
Date: Sun Sep 14 20:16:51 2014 +0200
avoid possible NULL dereference (fdo#82777)
Change-Id: Ifec915d5b2c9e5f7558e7850eb44e44300c9b374
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index f533365..ce15334 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2573,11 +2573,11 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
const SwFlyFrm* pFly = static_cast(pAnchoredObj);
const SwVirtFlyDrawObj* pObj = pFly->GetVirtDrawObj();
const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround();
-SwPosition anchoredAt =
*pAnchoredObj->GetFrmFmt().GetAnchor().GetCntntAnchor();
-bool inSelection = ( *pStartPos <= anchoredAt && anchoredAt <
*pEndPos );
-if( anchoredAt == *pEndPos )
+const SwPosition* anchoredAt =
pAnchoredObj->GetFrmFmt().GetAnchor().GetCntntAnchor();
+bool inSelection = ( anchoredAt != NULL && *pStartPos <=
*anchoredAt && *anchoredAt < *pEndPos );
+if( anchoredAt != NULL && *anchoredAt == *pEndPos )
{
-const SwNodes& nodes = anchoredAt.GetDoc()->GetNodes();
+const SwNodes& nodes = anchoredAt->GetDoc()->GetNodes();
if( *pEndPos == SwPosition( nodes.GetEndOfContent()))
inSelection = true;
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/moduldl2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a88b2d841856026ea1a0539d670e07fafd296c6e
Author: Caolán McNamara
Date: Sun Sep 14 16:20:12 2014 +0100
Resolves: fdo#81039 crash on adding new macro library
regression from
commit bf28399df0b73364b12309032e4a8b571389c2cf
Date: Fri Feb 7 15:54:45 2014 +0100
auto_ptr -> heap_ptr
Change-Id: Ib54c708cbdcb97a7489df4a1b3a7e9367f81ff6b
diff --git a/basctl/source/basicide/moduldl2.cxx
b/basctl/source/basicide/moduldl2.cxx
index 199c5d4..e727ccf 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1517,7 +1517,7 @@ void createLibImpl( Window* pWin, const ScriptDocument&
rDocument,
if( pNewLibEntry )
{
-o3tl::heap_ptr(new Entry(OBJ_TYPE_MODULE));
+e.reset(new Entry(OBJ_TYPE_MODULE));
SvTreeListEntry* pEntry_ = pBasicBox->AddEntry(
aModName,
Image( IDEResId( RID_IMG_MODULE ) ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 83633, which changed state. Bug 83633 Summary: FILESAVE: Crash when save in ODF 1.0/1.1 https://bugs.freedesktop.org/show_bug.cgi?id=83633 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/xmlstyle.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 9fecabec60d63b2b5eefafc81308f13f770e67b9 Author: Caolán McNamara Date: Sun Sep 14 14:59:16 2014 +0100 Resolves: fdo#83633 remove additional ++i Regression from 63ea2d467b50452ae0cab18b4151107a747ae70d Date: Wed Jul 2 19:10:24 2014 +0200 replace while with for Change-Id: I151e447446b9793cff6abe7633eca4d11059a390 diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index 0a05a56..50fe787 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -671,7 +671,6 @@ void ScXMLAutoStylePoolP::exportStyleAttributes( } break; } -++i; } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - icon-themes/galaxy officecfg/registry sd/inc sd/sdi sd/source sd/uiconfig
icon-themes/galaxy/links.txt |
2
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
8 ++
sd/inc/app.hrc |
1
sd/sdi/_drvwsh.sdi |
5 +
sd/sdi/sdraw.sdi |
24
sd/source/ui/func/fuzoom.cxx |
30 +++---
sd/source/ui/view/drviews2.cxx |
3 -
sd/source/ui/view/drviews7.cxx |
1
sd/source/ui/view/drviewsc.cxx |
1
sd/source/ui/view/drviewse.cxx |
14
sd/source/ui/view/outlnvs2.cxx |
10 ++-
sd/uiconfig/sdraw/toolbar/zoombar.xml|
1
sd/uiconfig/simpress/toolbar/zoombar.xml |
1
13 files changed, 89 insertions(+), 12 deletions(-)
New commits:
commit dffe40bc4e8be7c845d66a8118248d02dd70a707
Author: Maxim Monastirsky
Date: Sun Sep 14 15:06:27 2014 +0300
Related: fdo#83572 Improve zoom mode
Make this mode permanent, and add also zoom out/pan
functionality. Hold Ctrl for zoom out, Shift for pan.
Change-Id: I5bd8adfcc4d403c35b33185e5894a2b020d604d0
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index f3bda04..daf1f16 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -82,12 +82,19 @@ bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
aBeginPosPix = rMEvt.GetPosPixel();
aBeginPos = mpWindow->PixelToLogic(aBeginPosPix);
+aZoomRect.SetSize( Size( 0, 0 ) );
+aZoomRect.SetPos( aBeginPos );
return true;
}
bool FuZoom::MouseMove(const MouseEvent& rMEvt)
{
+if (rMEvt.IsShift())
+mpWindow->SetPointer(Pointer(POINTER_HAND));
+else if (nSlotId != SID_ZOOM_PANNING)
+mpWindow->SetPointer(Pointer(POINTER_MAGNIFY));
+
if (bStartDrag)
{
if (bVisible)
@@ -101,7 +108,7 @@ bool FuZoom::MouseMove(const MouseEvent& rMEvt)
aEndPos = mpWindow->PixelToLogic(aPosPix);
aBeginPos = mpWindow->PixelToLogic(aBeginPosPix);
-if (nSlotId == SID_ZOOM_PANNING)
+if (nSlotId == SID_ZOOM_PANNING || (rMEvt.IsShift() && !bVisible) )
{
// Panning
@@ -123,9 +130,8 @@ bool FuZoom::MouseMove(const MouseEvent& rMEvt)
aZoomRect = aRect;
aZoomRect.Justify();
mpViewShell->DrawMarkRect(aZoomRect);
+bVisible = true;
}
-
-bVisible = true;
}
return bStartDrag;
@@ -145,19 +151,27 @@ bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
Point aPosPix = rMEvt.GetPosPixel();
-if(SID_ZOOM_PANNING != nSlotId)
+if(SID_ZOOM_PANNING != nSlotId && !rMEvt.IsShift())
{
// Zoom
Size aZoomSizePixel = mpWindow->LogicToPixel(aZoomRect).GetSize();
sal_uLong nTol = DRGPIX + DRGPIX;
-if ( aZoomSizePixel.Width() < (long) nTol && aZoomSizePixel.Height() <
(long) nTol )
+if ( ( aZoomSizePixel.Width() < (long) nTol && aZoomSizePixel.Height()
< (long) nTol ) || rMEvt.IsMod1() )
{
// click at place: double zoom factor
Point aPos = mpWindow->PixelToLogic(aPosPix);
Size aSize =
mpWindow->PixelToLogic(mpWindow->GetOutputSizePixel());
-aSize.Width() /= 2;
-aSize.Height() /= 2;
+if ( rMEvt.IsMod1() )
+{
+aSize.Width() *= 2;
+aSize.Height() *= 2;
+}
+else
+{
+aSize.Width() /= 2;
+aSize.Height() /= 2;
+}
aPos.X() -= aSize.Width() / 2;
aPos.Y() -= aSize.Height() / 2;
aZoomRect.SetPos(aPos);
@@ -165,6 +179,7 @@ bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
}
mpViewShell->SetZoomRect(aZoomRect);
+mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArrayZoom );
}
Rectangle aVisAreaWin = mpWindow->PixelToLogic(Rectangle(Point(0,0),
@@ -173,7 +188,6 @@ bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
bStartDrag = false;
mpWindow->ReleaseMouse();
-mpViewShell->Cancel();
return true;
}
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 8a21b68..59ece90 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1227,7 +1227,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
mbZoomOnPage = false;
SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(),
mpDrawView, GetDoc(), rReq) );
-// finis
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/export.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 03626d7940d5e2fc2abf65ef1b49a7a89623f08f
Author: David Tardon
Date: Sun Sep 14 13:20:29 2014 +0200
fdo#80650 src transl. merge must be case sensitive
This makes the desired changes in
workdir/SrsPartMergeTarget/starmath/source/symbol.src. The only other
merged file that is changed is
workdir/SrsPartMergeTarget/sw/source/ui/misc/numberingtypelistbox.src,
with changes like
< "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC
- < "a, b, c, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
+ < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
< "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ;
This looks okay to me too :-)
Change-Id: I729075209027ed1f3fec311c05b631c0f681708b
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 49805cc..6052e24 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -275,7 +275,7 @@ Export::~Export()
if ( bMergeMode ) {
if ( !pMergeDataFile )
-pMergeDataFile = new MergeDataFile(sMergeSrc,
global::inputPathname, false);
+pMergeDataFile = new MergeDataFile(sMergeSrc,
global::inputPathname, true);
delete pMergeDataFile;
}
@@ -1062,14 +1062,14 @@ void Export::ResData2Output( MergeEntrys *pEntry,
sal_uInt16 nType, const OStrin
void Export::MergeRest( ResData *pResData )
{
if ( !pMergeDataFile ){
-pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname,
false );
+pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname,
true );
aLanguages = pMergeDataFile->GetLanguages();
}
MergeEntrys *pEntry = 0;
if( pResData->bText || pResData->bQuickHelpText || pResData->bTitle )
-pEntry = pMergeDataFile->GetMergeEntrys( pResData );
+pEntry = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
if ( pEntry )
{
@@ -1154,7 +1154,7 @@ void Export::MergeRest( ResData *pResData )
ConvertExportContent( pResData->sId );
}
-MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrys(
pResData );
+MergeEntrys* pEntrys =
pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
OString sText;
bool bText = pEntrys && pEntrys->GetText( sText,
STRING_TYP_TEXT, sCur, true );
___
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 80650, which changed state. Bug 80650 Summary: lower case greek alphabet missing in localized Math symbol table https://bugs.freedesktop.org/show_bug.cgi?id=80650 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ABANDONNED] Re: About recent commits for C++11 building
On 14/09/2014 12:14, Noel Grandin wrote: log1p is only supported in Visual Studio 2013, I believe even with the recent changes, our minimum version is Visual Studio 2010. Ok since I'm on Debian Linux, I didn't know about this problem on Windows. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ABANDONNED] Re: About recent commits for C++11 building
log1p is only supported in Visual Studio 2013, I believe even with the recent changes, our minimum version is Visual Studio 2010. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONNED] Re: About recent commits for C++11 building
Ok we're still not compatible C++11, see http://ci.libreoffice.org/job/buildbot/2477/ Sorry for the noise. Julien -- View this message in context: http://nabble.documentfoundation.org/About-recent-commits-for-C-11-building-tp4122219p413.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/oox oox/inc oox/source
include/oox/drawingml/ThemeOverrideFragmentHandler.hxx | 40 -- include/oox/drawingml/clrschemecontext.hxx | 62 --- include/oox/drawingml/colorchoicecontext.hxx | 77 --- include/oox/drawingml/customshapegeometry.hxx | 71 --- include/oox/drawingml/customshapeproperties.hxx| 169 include/oox/drawingml/drawingmltypes.hxx |3 include/oox/drawingml/embeddedwavaudiofile.hxx | 51 -- include/oox/drawingml/fillproperties.hxx | 18 include/oox/drawingml/fillpropertiesgroupcontext.hxx | 253 - include/oox/drawingml/guidcontext.hxx | 41 -- include/oox/drawingml/linepropertiescontext.hxx| 51 -- include/oox/drawingml/objectdefaultcontext.hxx | 43 -- include/oox/drawingml/scene3dcontext.hxx | 67 --- include/oox/drawingml/shape.hxx|5 include/oox/drawingml/shape3dproperties.hxx| 98 - include/oox/drawingml/shapecontext.hxx |1 include/oox/drawingml/shapepropertiescontext.hxx | 43 -- include/oox/drawingml/shapestylecontext.hxx| 44 -- include/oox/drawingml/spdefcontext.hxx | 42 -- include/oox/drawingml/textbody.hxx | 73 --- include/oox/drawingml/textbodycontext.hxx | 62 --- include/oox/drawingml/textbodyproperties.hxx | 59 --- include/oox/drawingml/textbodypropertiescontext.hxx| 46 -- include/oox/drawingml/textcharacterproperties.hxx | 92 include/oox/drawingml/textcharacterpropertiescontext.hxx | 47 -- include/oox/drawingml/texteffectscontext.hxx | 50 -- include/oox/drawingml/textfield.hxx| 63 --- include/oox/drawingml/textfieldcontext.hxx | 50 -- include/oox/drawingml/textfont.hxx | 76 --- include/oox/drawingml/textliststyle.hxx| 64 --- include/oox/drawingml/textliststylecontext.hxx | 44 -- include/oox/drawingml/textparagraph.hxx| 72 --- include/oox/drawingml/textparagraphproperties.hxx | 132 -- include/oox/drawingml/textparagraphpropertiescontext.hxx | 55 -- include/oox/drawingml/textrun.hxx | 63 --- include/oox/drawingml/textspacing.hxx | 70 --- include/oox/drawingml/theme.hxx|4 include/oox/drawingml/themeelementscontext.hxx | 46 -- include/oox/drawingml/transform2dcontext.hxx | 48 -- include/oox/ppt/pptshapepropertiescontext.hxx |2 include/oox/ppt/presentationfragmenthandler.hxx|1 include/oox/ppt/slidepersist.hxx |2 oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx | 40 ++ oox/inc/drawingml/chart/axismodel.hxx |1 oox/inc/drawingml/clrschemecontext.hxx | 62 +++ oox/inc/drawingml/colorchoicecontext.hxx | 77 +++ oox/inc/drawingml/customshapegeometry.hxx | 71 +++ oox/inc/drawingml/customshapeproperties.hxx| 169 oox/inc/drawingml/embeddedwavaudiofile.hxx | 39 ++ oox/inc/drawingml/fillpropertiesgroupcontext.hxx | 253 + oox/inc/drawingml/graphicproperties.hxx| 56 ++ oox/inc/drawingml/guidcontext.hxx | 41 ++ oox/inc/drawingml/linepropertiescontext.hxx| 50 ++ oox/inc/drawingml/objectdefaultcontext.hxx | 43 ++ oox/inc/drawingml/scene3dcontext.hxx | 67 +++ oox/inc/drawingml/shape3dproperties.hxx| 98 + oox/inc/drawingml/shapepropertiescontext.hxx | 43 ++ oox/inc/drawingml/shapestylecontext.hxx| 44 ++ oox/inc/drawingml/spdefcontext.hxx | 42 ++ oox/inc/drawingml/table/tablecell.hxx |2 oox/inc/drawingml/table/tablestylepart.hxx |2 oox/inc/drawingml/table/tablestyletextstylecontext.hxx |2 oox/inc/drawingml/textbody.hxx | 73 +++ oox/inc/drawingml/textbodycontext.hxx | 62 +++ oox/inc/drawingml/textbodyproperties.hxx | 59 +++ oox/inc/drawingml/textbodypropertiescontext.hxx| 46 ++ oox/inc/drawingml/textcharacterproperties.hxx | 92 oox/inc/drawingml/textcharacterpropertiescontext.hxx | 47 ++ oox/inc/drawingml/texteffectscontext.hxx | 50 ++ oox/inc/drawingml/textfield.hxx| 63 +++ oox/inc/drawingml/textfieldcontext.hxx
About recent commits for C++11 building
Hello, Following last commits for MacOs which increases compatibility with C++11, I'd like to know if: 1) we can replace all the workaround about the erase iterator management for some containers (with a temp iterator) and directly use for every case for eg: it = itcontainer.erase(it); 2) we can use expm1, log1p (eg: https://gerrit.libreoffice.org/#/c/11434/2) Julien -- View this message in context: http://nabble.documentfoundation.org/About-recent-commits-for-C-11-building-tp4122219.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |7 ++-
writerfilter/source/ooxml/factoryimpl.py |4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit df344855e1c90e6be333afc143044bb04114c683
Author: Miklos Vajna
Date: Sun Sep 14 09:20:38 2014 +0200
Use oox::getNamespace()
Change-Id: I43df705a6cf5371ee495336d9dbe2b87020cf0e0
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 268400d..634af43 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1797,9 +1797,8 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext
bool bGroupShape = Element == Token_t(NMSP_vml | XML_group);
// drawingML version also counts as a group shape.
bGroupShape |= mrShapeContext->getStartToken() == Token_t(NMSP_wpg |
XML_wgp);
-sal_uInt32 nNamespace = Element & 0x;
-switch (nNamespace)
+switch (oox::getNamespace(Element))
{
case NMSP_doc:
case NMSP_vmlWord:
@@ -1977,9 +1976,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
{
uno::Reference< xml::sax::XFastContextHandler > xResult;
-Id nNameSpace = Element & 0x;
-
-bool bInNamespaces = mMyNamespaces.find(nNameSpace) != mMyNamespaces.end();
+bool bInNamespaces = mMyNamespaces.find(oox::getNamespace(Element)) !=
mMyNamespaces.end();
bool bInTokens = mMyTokens.find( Element ) != mMyTokens.end( );
// We have methods to _add_ individual tokens or whole namespaces to be
diff --git a/writerfilter/source/ooxml/factoryimpl.py
b/writerfilter/source/ooxml/factoryimpl.py
index dcd6248..c2a627d 100644
--- a/writerfilter/source/ooxml/factoryimpl.py
+++ b/writerfilter/source/ooxml/factoryimpl.py
@@ -64,7 +64,7 @@ def getFactoryForNamespace(model):
{
OOXMLFactory_ns::Pointer_t pResult;
-switch (nId & 0x)
+switch (oox::getNamespace(nId))
{""")
for namespace in [ns.getAttribute("name") for ns in
model.getElementsByTagName("namespace")]:
@@ -122,7 +122,7 @@ std::string fastTokenToId(sal_uInt32 nToken)
std::string sResult;
-switch (nToken & 0x)
+switch (oox::getNamespace(nToken))
{""")
aliases = []
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
