Re: Remove ActiveX from LibreOffice
On 13/01/2016 5:27, Bryan Quigley wrote:
Hi Rick,
ActiveX is deprecated by Microsoft and will be less useful (or not at
all) on newer MS browsers. I'm unsure if it ever worked (or was
supposed to) let you embed ActiveX controls into LibreOffice itself.
Basic code running a Windows Mediaplayer:
if oSimpleFileAcces.Exists(filelocation) then
MPlayer = CreateObject("WMPlayer.OCX.7")
MPlayer.OpenPlayer(Filelocation)
endif
works still fine under 5.1.0
Kind regards,
Bryan
On Mon, Jan 11, 2016 at 10:08 PM, Rick C. Hodgin
wrote:
Why are you removing ActiveX from LibreOffice? Excel supports it, and it is
desirable for integration with Windows apps like C#, Visual Basic, Visual
FoxPro. It allows those other apps to integrate the app directly into their
app.
I have tried to use it previously, but could not find documentation for it.
If it's an unused feature, I'd suggest that's why than for other reasons.
Best regards,
Rick C. Hodgin
Original Message
From: Chris Sherlock
Sent: Mon, 11/01/2016 08:21 PM
To: Ashod Nakashian
CC: libreoffice ; Bryan Quigley
Subject: Re: Remove ActiveX from LibreOffice
That sounds pretty reasonable to me.
Out of interest, just how “integrated” is this with the code? If someone
wanted to create an external project on GitHub or some place like this,
would it be feasible?
I guess I’m trying to understand how much of core it touches… to reimplement
an ActiveX control outside of the main tree, would a developer need to fork
LibreOffice entirely, or could they maintain their codebranch entirely
seperately and update the control if necessary after we do our changes to
the main codebase?
I’m definitely for removing all vestiges of ActiveX from LO, but the more I
think about it the more I can see that some corporation somewhere might be
affected, far more so than the remove of NPAPI… giving them the option of a
control that can be maintained outside of the main project would be nice :-)
Chris
On 12 Jan 2016, at 9:37 AM, Ashod Nakashian wrote:
On Mon, Jan 11, 2016 at 2:32 PM, Bryan Quigley wrote:
Anywhere else we should post this?
Ideally the note would show up unintrusively upon loading/using the ActiveX
itself. Unfortunately we can't show a message box or some such UI, in case
the ActiveX is used non-interactively (in which case it'd block forever,
becoming unusable).
So the next best thing to do is include the note in the installation, which
should be hard to miss if made prominent (unless automated in silent mode).
This would get the attention of possibly the users, if not the developers
(who might not even test out new versions as they come out, and expect
things to work as before). Users can contact developers, I expect, or at
least plan accordingly. Regardless, all we want is to give advance warning
before the day someone installs a newer version and be met with the surprise
of missing ActiveX altogether.
The installation and release notes seem to be the most reasonable places, if
not upon using the ActiveX itself. Unless others have better ideas.
___
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
[Libreoffice-commits] online.git: loleaflet/reference.html
loleaflet/reference.html | 354 +--
1 file changed, 250 insertions(+), 104 deletions(-)
New commits:
commit 2af63d4b2e894efc63b6b4aeaa1db6f52558e78f
Author: Jan Holesovsky
Date: Wed Jan 13 08:53:02 2016 +0100
loleaflet: Add more commands to the documentation.
diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index a73b8ae..d098fea 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -8156,9 +8156,34 @@ for (var i = 0, len = tables.length; i < len; i++) {
-// I've tried to order them alphabetically, feel free to modify if some are
not in the correct order
var unoCommands = [
{
+header: 'Global operations',
+},
+
+{
+uno: '.uno:Redo',
+parameter: null,
+description: 'Redo.'
+},
+
+{
+uno: '.uno:Save',
+parameter: null,
+description: 'Save the document.'
+},
+
+{
+uno: '.uno:Undo',
+parameter: null,
+description: 'Undo.'
+},
+
+{
+header: 'Text formatting',
+},
+
+{
uno: '.uno:BackColor',
parameter: {
'BackColor': {
@@ -8187,12 +8212,6 @@ var unoCommands = [
},
{
-uno: '.uno:CenterPara',
-parameter: null,
-description: 'Center horizontally.'
-},
-
-{
uno: '.uno:CharBackColor',
parameter: {
'CharBackColor': {
@@ -8226,6 +8245,80 @@ var unoCommands = [
},
{
+uno: '.uno:FontColor',
+parameter: {
+'FontColor': {
+type: 'long',
+value: 16750848
+}
+},
+description: 'Apply a font color for a text document (the value can be
obtained by converting the base 16 color to base 10).'
+},
+
+{
+uno: '.uno:FontHeight',
+parameter: {
+'FontHeight.Height': {
+type: 'float',
+value: '11.5'
+}
+},
+description: 'Apply font size.'
+},
+
+{
+uno: '.uno:Italic',
+parameter: null,
+description: 'Italic.'
+},
+
+{
+uno: '.uno:OutlineFont',
+parameter: null,
+description: 'Outline.'
+},
+
+{
+uno: '.uno:Shadowed',
+parameter: null,
+description: 'Shadowed.'
+},
+
+{
+uno: '.uno:SubScript',
+parameter: null,
+description: 'Subscript.'
+},
+
+{
+uno: '.uno:SuperScript',
+parameter: null,
+description: 'Superscript.'
+},
+
+{
+uno: '.uno:Strikeout',
+parameter: null,
+description: 'Strikeout / strike-through.'
+},
+
+{
+uno: '.uno:Underline',
+parameter: null,
+description: 'Underline.'
+},
+
+{
+header: 'Paragraph formatting',
+},
+
+{
+uno: '.uno:CenterPara',
+parameter: null,
+description: 'Center horizontally.'
+},
+
+{
uno: '.uno:DecrementIndent',
parameter: null,
description: 'Decrement paragraph indentation.'
@@ -8244,66 +8337,53 @@ var unoCommands = [
},
{
-uno: '.uno:DeleteComment',
+uno: '.uno:IncrementIndent',
parameter: null,
-description: 'Delete comment.'
+description: 'Increment paragraph indentation.'
},
{
-uno: '.uno:EnterString',
-parameter: {
-'StringName': {
-type: 'string',
-value: '=SUM()'
-}
-},
-description: 'Enters the string in the selected cell.'
+uno: '.uno:JustifyPara',
+parameter: null,
+description: 'Justified.'
},
{
-uno: '.uno:FontColor',
-parameter: {
-'FontColor': {
-type: 'long',
-value: 16750848
-}
-},
-description: 'Apply a font color for a text document (the value can be
obtained by converting the base 16 color to base 10).'
+uno: '.uno:LeftPara',
+parameter: null,
+description: 'Align left.'
},
{
-uno: '.uno:FontHeight',
-parameter: {
-'FontHeight.Height': {
-type: 'float',
-value: '11.5'
-}
-},
-description: 'Apply font size.'
+uno: '.uno:RightPara',
+parameter: null,
+description: 'Align right.'
},
{
-uno: '.uno:HideWhitespace',
+uno: '.uno:SetHyperlink',
parameter: {
-'type': 'boolean',
-'value': 'false'
+'Hyperlink.Text': {
+type: 'string',
+value: 'some text'
+},
+'Hyperlink.URL': {
+type: 'string',
+value: 'url'
+}
},
-description: 'Continous web view of the document'
+description: 'Creates a hyperlink. If Hyperlink.Text is not specified, the
hyperlink will be set for the current ' +
+ 'selection. Hyperlink.URL can be a web URL or a bookmark
from the document.'
},
{
-uno: '.uno:ShowBorderShadow',
-parameter: {
-'type': 'boolean',
-'value': 'true'
-},
-description: 'Paint a shadow around Write page / Impress slide border.'
+header: 'Comments',
},
{
-uno: '.uno:IncrementIndent',
+uno: '.uno:DeleteComment',
parameter: null,
-description: 'Increment paragraph indentation.'
+description: 'Delete comment.'
},
{
@@ -8318,60 +83
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loleaflet/reference.html
loleaflet/reference.html | 354 +--
1 file changed, 250 insertions(+), 104 deletions(-)
New commits:
commit 70d6d0b0767775f0f47bb3eafee00711c616fff0
Author: Jan Holesovsky
Date: Wed Jan 13 08:53:02 2016 +0100
loleaflet: Add more commands to the documentation.
diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index a73b8ae..d098fea 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -8156,9 +8156,34 @@ for (var i = 0, len = tables.length; i < len; i++) {
-// I've tried to order them alphabetically, feel free to modify if some are
not in the correct order
var unoCommands = [
{
+header: 'Global operations',
+},
+
+{
+uno: '.uno:Redo',
+parameter: null,
+description: 'Redo.'
+},
+
+{
+uno: '.uno:Save',
+parameter: null,
+description: 'Save the document.'
+},
+
+{
+uno: '.uno:Undo',
+parameter: null,
+description: 'Undo.'
+},
+
+{
+header: 'Text formatting',
+},
+
+{
uno: '.uno:BackColor',
parameter: {
'BackColor': {
@@ -8187,12 +8212,6 @@ var unoCommands = [
},
{
-uno: '.uno:CenterPara',
-parameter: null,
-description: 'Center horizontally.'
-},
-
-{
uno: '.uno:CharBackColor',
parameter: {
'CharBackColor': {
@@ -8226,6 +8245,80 @@ var unoCommands = [
},
{
+uno: '.uno:FontColor',
+parameter: {
+'FontColor': {
+type: 'long',
+value: 16750848
+}
+},
+description: 'Apply a font color for a text document (the value can be
obtained by converting the base 16 color to base 10).'
+},
+
+{
+uno: '.uno:FontHeight',
+parameter: {
+'FontHeight.Height': {
+type: 'float',
+value: '11.5'
+}
+},
+description: 'Apply font size.'
+},
+
+{
+uno: '.uno:Italic',
+parameter: null,
+description: 'Italic.'
+},
+
+{
+uno: '.uno:OutlineFont',
+parameter: null,
+description: 'Outline.'
+},
+
+{
+uno: '.uno:Shadowed',
+parameter: null,
+description: 'Shadowed.'
+},
+
+{
+uno: '.uno:SubScript',
+parameter: null,
+description: 'Subscript.'
+},
+
+{
+uno: '.uno:SuperScript',
+parameter: null,
+description: 'Superscript.'
+},
+
+{
+uno: '.uno:Strikeout',
+parameter: null,
+description: 'Strikeout / strike-through.'
+},
+
+{
+uno: '.uno:Underline',
+parameter: null,
+description: 'Underline.'
+},
+
+{
+header: 'Paragraph formatting',
+},
+
+{
+uno: '.uno:CenterPara',
+parameter: null,
+description: 'Center horizontally.'
+},
+
+{
uno: '.uno:DecrementIndent',
parameter: null,
description: 'Decrement paragraph indentation.'
@@ -8244,66 +8337,53 @@ var unoCommands = [
},
{
-uno: '.uno:DeleteComment',
+uno: '.uno:IncrementIndent',
parameter: null,
-description: 'Delete comment.'
+description: 'Increment paragraph indentation.'
},
{
-uno: '.uno:EnterString',
-parameter: {
-'StringName': {
-type: 'string',
-value: '=SUM()'
-}
-},
-description: 'Enters the string in the selected cell.'
+uno: '.uno:JustifyPara',
+parameter: null,
+description: 'Justified.'
},
{
-uno: '.uno:FontColor',
-parameter: {
-'FontColor': {
-type: 'long',
-value: 16750848
-}
-},
-description: 'Apply a font color for a text document (the value can be
obtained by converting the base 16 color to base 10).'
+uno: '.uno:LeftPara',
+parameter: null,
+description: 'Align left.'
},
{
-uno: '.uno:FontHeight',
-parameter: {
-'FontHeight.Height': {
-type: 'float',
-value: '11.5'
-}
-},
-description: 'Apply font size.'
+uno: '.uno:RightPara',
+parameter: null,
+description: 'Align right.'
},
{
-uno: '.uno:HideWhitespace',
+uno: '.uno:SetHyperlink',
parameter: {
-'type': 'boolean',
-'value': 'false'
+'Hyperlink.Text': {
+type: 'string',
+value: 'some text'
+},
+'Hyperlink.URL': {
+type: 'string',
+value: 'url'
+}
},
-description: 'Continous web view of the document'
+description: 'Creates a hyperlink. If Hyperlink.Text is not specified, the
hyperlink will be set for the current ' +
+ 'selection. Hyperlink.URL can be a web URL or a bookmark
from the document.'
},
{
-uno: '.uno:ShowBorderShadow',
-parameter: {
-'type': 'boolean',
-'value': 'true'
-},
-description: 'Paint a shadow around Write page / Impress slide border.'
+header: 'Comments',
},
{
-uno: '.uno:IncrementIndent',
+uno: '.uno:DeleteComment',
parameter: null,
-description: 'Increment paragraph indentation.'
+description: 'Delete comment.'
},
{
@@ -8318,60 +83
Re: Remove ActiveX from LibreOffice
Bryan,
OK but someone must confirm that removing activeX has no influence on
this API functions and the LO codebase can use the ATL stuff without
activeX and the "CreateObject" will still been functioning.
greetez
Fernand
On 13/01/2016 5:19, Bryan Quigley wrote:
My understanding is that ATL can do the same thing with or without ActiveX.
https://en.wikipedia.org/wiki/Active_Template_Library
Although as I mentioned previously I'm not much of a Windows developer.
Thanks,
bryan
On Tue, Jan 12, 2016 at 3:25 AM, SOS wrote:
On 11/01/2016 20:32, Bryan Quigley wrote:
I propose we add it to the 5.1 release notes (and 5.2 notes too) as:
Intent to Remove ActiveX support in the 5.2 release. If this change
negatively affects your Windows application please email the
LibreOffice development list with your use case and plan for moving
off of ActiveX. We specifically only want feedback if use ActiveX to
embed LibreOffice components into your application.
I aam wondering if the ActiveX stuff is used to build COM objects from
external DLL's ?
I uses (as example) a Windows videoplayer using basic and our API
Basic code:
if oSimpleFileAcces.Exists(filelocation) then
MPlayer = CreateObject("WMPlayer.OCX.7")
MPlayer.OpenPlayer(Filelocation)
endif
Greetz
Fernand
If no response, one week after 5.1.2 (Apr 10) is released let's make
the call to remove it (and update the release notes). If we do get
responses we can obviously decide to change the plan as needed.
Anywhere else we should post this?
Thoughts?
Bryan
[1]
https://wiki.documentfoundation.org/ReleaseNotes/5.1#Feature_removal_.2F_deprecation
[2] https://wiki.documentfoundation.org/ReleaseNotes/5.2
On Sun, Jan 10, 2016 at 11:54 PM, Chris Sherlock
wrote:
On 11 Jan 2016, at 10:41 AM, Bryan Quigley wrote:
To look at this issue from another POV.. If someone showed up today
with an issue with a LO ActiveX control embedded in their application
that didn't work - what would our response be? It's an outdated
technology that we're not investing in.
It probably shows a lack of adoption, but it doesn’t look like anyone
actually has reported issues with it...
My position on ActiveX is to leave it (lest we break applications in
the
wild,) and to *announce its deprecation* with two goals: first, solicit
the
feedback of LO ActiveX consumers and, if so inclined to continue using
it,
help in its support. And second, to flag a date in the future when
ActiveX
will be completely removed from LO codebase, pending sufficient reason
and
support by its consumers.
I'm happy with this. I'd say a quicker timeframe is fine though.
From the announce, if no one has found an application that uses
LO-embedded ActiveX remove it in a month or something. I expect that
if there are some users they might not hear until the install the
version without it regardless of what we do.
Perhaps it should be announced in the release notes, with an actual
version where it will be removed.
Chris
___
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
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appcfg.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 9dd258e7029847537e61f34936e1ef200f3b7233
Author: Stephan Bergmann
Date: Wed Jan 13 08:51:22 2016 +0100
Revert "svl, sfx2: WaE - unused variables removed"
This reverts commit d2dc3c20ab6240884164ab89f9388958069697fc, conflicts with
200434b1419afe375e104da76c68f81253374645 "-Werror=unused-but-set-variable"
pushed slightly earlier.
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 12ebdff..0f8b319 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -151,6 +151,7 @@ IMPL_LINK_TYPED(SfxEventAsyncer_Impl, IdleHdl, Idle*,
pAsyncIdle, void)
void SfxApplication::GetOptions( SfxItemSet& rSet )
{
+bool bRet = false;
SfxItemPool &rPool = GetPool();
const sal_uInt16 *pRanges = rSet.GetRanges();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appcfg.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit d2dc3c20ab6240884164ab89f9388958069697fc
Author: Chris Sherlock
Date: Wed Jan 13 18:36:00 2016 +1100
svl, sfx2: WaE - unused variables removed
Change-Id: Icb465506f945ab35a732db488ae9cef8f248d09f
Reviewed-on: https://gerrit.libreoffice.org/21417
Reviewed-by: Chris Sherlock
Tested-by: Chris Sherlock
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 0f8b319..12ebdff 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -151,7 +151,6 @@ IMPL_LINK_TYPED(SfxEventAsyncer_Impl, IdleHdl, Idle*,
pAsyncIdle, void)
void SfxApplication::GetOptions( SfxItemSet& rSet )
{
-bool bRet = false;
SfxItemPool &rPool = GetPool();
const sal_uInt16 *pRanges = rSet.GetRanges();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appcfg.cxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 200434b1419afe375e104da76c68f81253374645 Author: Stephan Bergmann Date: Wed Jan 13 08:36:46 2016 +0100 -Werror=unused-but-set-variable Change-Id: I142e95b9736545c7771274e315419cec12d9cf49 diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 50f7fad..0f8b319 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -483,10 +483,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet ) SAL_INFO( "sfx", "W1:Wrong ID while getting Options!" ); break; } -#ifdef DBG_UTIL -if ( !bRet ) -OSL_FAIL( "Putting options failed!" ); -#endif +SAL_WARN_IF(!bRet, "sfx.appl", "Putting options failed!"); } pRanges++; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zformat.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit c70bc04224e5ad909d2c907ad2b489739837dd43
Author: Stephan Bergmann
Date: Wed Jan 13 08:28:50 2016 +0100
-Werror=unused-but-set-variable
Change-Id: I01c18a1b8193f491a82988426ac4e673dd68897a
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 1c7f33b..db9cfe8 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1899,7 +1899,6 @@ void SvNumberformat::GetOutputString(const OUString&
sString,
}
*ppColor = NumFor[nIx].GetColor();
const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
-bool bRes = false;
if (rInfo.eScannedType == css::util::NumberFormat::TEXT)
{
const sal_uInt16 nAnz = NumFor[nIx].GetCount();
@@ -1910,7 +1909,7 @@ void SvNumberformat::GetOutputString(const OUString&
sString,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-bRes = lcl_appendStarFillChar( sOutBuff,
rInfo.sStrArray[i]);
+lcl_appendStarFillChar( sOutBuff, rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/items/itempool.cxx | 53 +-
1 file changed, 27 insertions(+), 26 deletions(-)
New commits:
commit dc85ef3aeb28edc51a61115d15ebe6dba8bd1ef8
Author: Stephan Bergmann
Date: Wed Jan 13 08:26:27 2016 +0100
tdf#97077: So ppStaticDefaults can be null after all
...at least in Base, and the assumption in
43de9a5b0f68a77a10595b3f69c6145cd9be05b6 "What these SAL_INFO probably want
to
tell us..." was wrong
Change-Id: Ic9377b72f35c130ecd34dbf76c1f6a0f4b235c69
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index f58dbad..1ecf9b8 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -402,12 +402,12 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool )
if ( pImp->mpSecondary )
{
#ifdef DBG_UTIL
-// Delete() did not yet run?
-if ( !pImp->maPoolItems.empty() &&
!pImp->mpSecondary->pImp->maPoolItems.empty() )
+if (pImp->ppStaticDefaults != nullptr && !pImp->maPoolItems.empty()
+&& !pImp->mpSecondary->pImp->maPoolItems.empty())
+// Delete() did not yet run?
{
// Does the Master have SetItems?
bool bHasSetItems = false;
-assert(pImp->ppStaticDefaults);
for ( sal_uInt16 i = 0; !bHasSetItems && i < pImp->mnEnd -
pImp->mnStart; ++i )
bHasSetItems = dynamic_cast(pImp->ppStaticDefaults[i]) != nullptr;
@@ -517,35 +517,36 @@ void SfxItemPool::Delete()
sal_uInt16 nArrCnt;
// Collect the SetItems first
-assert(pImp->ppStaticDefaults);
-for ( nArrCnt = GetSize_Impl();
- nArrCnt;
- --nArrCnt, ++itrItemArr, ++ppDefaultItem, ++ppStaticDefaultItem )
-{
-// *ppStaticDefaultItem could've already been deleted in a class
derived
-// from SfxItemPool
-// This causes chaos in Itempool!
-if ( *ppStaticDefaultItem && dynamic_cast< const SfxSetItem*
>(*ppStaticDefaultItem) != nullptr )
+if (pImp->ppStaticDefaults != nullptr) {
+for ( nArrCnt = GetSize_Impl();
+ nArrCnt;
+ --nArrCnt, ++itrItemArr, ++ppDefaultItem, ++ppStaticDefaultItem )
{
-if ( *itrItemArr )
+// *ppStaticDefaultItem could've already been deleted in a class
derived
+// from SfxItemPool
+// This causes chaos in Itempool!
+if ( *ppStaticDefaultItem && dynamic_cast< const SfxSetItem*
>(*ppStaticDefaultItem) != nullptr )
{
-SfxPoolItemArrayBase_Impl::iterator ppHtArr =
(*itrItemArr)->begin();
-for ( size_t n = (*itrItemArr)->size(); n; --n, ++ppHtArr )
-if (*ppHtArr)
-{
+if ( *itrItemArr )
+{
+SfxPoolItemArrayBase_Impl::iterator ppHtArr =
(*itrItemArr)->begin();
+for ( size_t n = (*itrItemArr)->size(); n; --n, ++ppHtArr )
+if (*ppHtArr)
+{
#ifdef DBG_UTIL
-ReleaseRef( **ppHtArr, (*ppHtArr)->GetRefCount() );
+ReleaseRef( **ppHtArr, (*ppHtArr)->GetRefCount() );
#endif
-delete *ppHtArr;
-}
-DELETEZ( *itrItemArr );
-}
-if ( *ppDefaultItem )
-{
+delete *ppHtArr;
+}
+DELETEZ( *itrItemArr );
+}
+if ( *ppDefaultItem )
+{
#ifdef DBG_UTIL
-SetRefCount( **ppDefaultItem, 0 );
+SetRefCount( **ppDefaultItem, 0 );
#endif
-DELETEZ( *ppDefaultItem );
+DELETEZ( *ppDefaultItem );
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - embeddedobj/source filter/source include/filter sd/source vcl/source
embeddedobj/source/general/dummyobject.cxx |8 +++-
embeddedobj/source/inc/dummyobject.hxx | 11 ---
filter/source/msfilter/svdfppt.cxx |9 +
include/filter/msfilter/svdfppt.hxx|6 ++
sd/source/filter/sdpptwrp.cxx |2 ++
vcl/source/outdev/font.cxx |1 +
6 files changed, 21 insertions(+), 16 deletions(-)
New commits:
commit 14c42d4b3c60cb2a95cb73c9b20e51a29e5f9810
Author: Stephan Bergmann
Date: Tue Jan 12 16:53:50 2016 +0100
Fix memory leak
Change-Id: I346a88a802ed5b1f373cd10cff794f93cf6d909a
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index ef3929d..923347c 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -926,6 +926,7 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType
nType, LanguageType eLan
aFont.SetName(
pFontInstance->maFontSelData.mpFontData->GetFamilyName() );
else
aFont.SetName(
pFontInstance->maFontSelData.maTargetName );
+pOutDev->mpFontCache->Release(pFontInstance);
}
}
}
commit 13ca560d136e833efabef843c57771c96d865964
Author: Stephan Bergmann
Date: Tue Jan 12 16:53:38 2016 +0100
Fix memory leak
Change-Id: I82ce013a42ac1cd9bb4f3842e9fba8fbc6056b3c
diff --git a/embeddedobj/source/general/dummyobject.cxx
b/embeddedobj/source/general/dummyobject.cxx
index caaf388..9af31b6 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -30,8 +30,6 @@
#include
#include
-#include
-
#include
@@ -594,7 +592,7 @@ void SAL_CALL ODummyEmbeddedObject::addStateChangeListener(
const uno::Reference
return;
if ( !m_pInterfaceContainer )
-m_pInterfaceContainer = new
::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+m_pInterfaceContainer.reset(new
::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
m_pInterfaceContainer->addInterface(
cppu::UnoType::get(),
xListener );
@@ -676,7 +674,7 @@ void SAL_CALL ODummyEmbeddedObject::addCloseListener( const
uno::Reference< util
return;
if ( !m_pInterfaceContainer )
-m_pInterfaceContainer = new
::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+m_pInterfaceContainer.reset(new
::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
m_pInterfaceContainer->addInterface(
cppu::UnoType::get(), xListener );
}
@@ -700,7 +698,7 @@ void SAL_CALL ODummyEmbeddedObject::addEventListener( const
uno::Reference< docu
return;
if ( !m_pInterfaceContainer )
-m_pInterfaceContainer = new
::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+m_pInterfaceContainer.reset(new
::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
m_pInterfaceContainer->addInterface(
cppu::UnoType::get(), xListener );
}
diff --git a/embeddedobj/source/inc/dummyobject.hxx
b/embeddedobj/source/inc/dummyobject.hxx
index 1a0739c..2587bcc 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -20,12 +20,17 @@
#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_DUMMYOBJECT_HXX
#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_DUMMYOBJECT_HXX
+#include
+
+#include
+
#include
#include
#include
#include
#include
#include
+#include
namespace com { namespace sun { namespace star {
namespace embed {
@@ -49,7 +54,8 @@ class ODummyEmbeddedObject : public ::cppu::WeakImplHelper
, css::embed::XEmbedPersist >
{
::osl::Mutexm_aMutex;
-::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
+std::unique_ptr
+m_pInterfaceContainer;
bool m_bDisposed;
OUString m_aEntryName;
@@ -75,8 +81,7 @@ protected:
public:
ODummyEmbeddedObject()
-: m_pInterfaceContainer( nullptr )
-, m_bDisposed( false )
+: m_bDisposed( false )
, m_nObjectState( -1 )
, m_nCachedAspect( 0 )
, m_bHasCachedSize( false )
commit 55a754cca0f299b658d99684caa9e15cbdd90cc6
Author: Stephan Bergmann
Date: Tue Jan 12 10:15:57 2016 +0100
Fix memory leak
Change-Id: Icf46bc3c086a8221e08a4bb18e1f64355043cdbb
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 02b9e39..f5318b0 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -109,6 +109,8 @@ bool SdPPTFilter::Import()
if ( !bRet )
mrMedium.SetError( SVSTREAM_WRONGVERSION,
OSL_LOG_PREFIX );
+pLibrary->release(); //TODO: let it get unloaded?
+delete pLibrary;
}
#else
bRet = ImportPPT( &mrDocument, *pDocStream, *pStorage,
mrMedium );
commit b497655a48f75ef377ac7428e
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/untbl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 70d2673ba06878ee84c99d7877e4b71749ac06f0
Author: Oliver Specht
Date: Tue Jan 12 13:05:56 2016 +0100
tdf#96067: fix crash in undo of table row insertion
create SwIterator with SwLayoutFrame instead of SwTabFrame
the wrong usage worked with tools/rtti because of incomplete
type information above of SwLayoutFrame
Change-Id: I9967fa1b534fc28dc5e0cd1fa5b64179faa9b94d
Reviewed-on: https://gerrit.libreoffice.org/21394
Tested-by: Jenkins
Reviewed-by: Oliver Specht
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index d9efba0..d80142b 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -1093,7 +1093,7 @@ void _SaveTable::NewFrameFormat( const SwTableLine*
pTableLn, const SwTableBox*
}
// first re-assign Frames
-SwIterator aIter( *pOldFormat );
+SwIterator aIter( *pOldFormat );
for( SwFrame* pLast = aIter.First(); pLast; pLast = aIter.Next() )
{
if( pTableLn ? static_cast(pLast)->GetTabLine() ==
pTableLn
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - dbaccess/source editeng/source include/editeng include/sfx2 include/sot include/store include/svl include/svx sc/source sfx2/source sot/source svl/source sv
dbaccess/source/core/dataaccess/ModelImpl.cxx |3 - dbaccess/source/core/dataaccess/ModelImpl.hxx |2 - editeng/source/items/frmitems.cxx | 21 +++--- editeng/source/items/textitem.cxx |9 +--- include/editeng/boxitem.hxx |4 +- include/editeng/fhgtitem.hxx |2 - include/editeng/fwdtitem.hxx |2 - include/editeng/kernitem.hxx |2 - include/editeng/lineitem.hxx |2 - include/editeng/lrspitem.hxx |2 - include/editeng/shaditem.hxx |2 - include/editeng/sizeitem.hxx |2 - include/editeng/ulspitem.hxx |2 - include/sfx2/app.hxx |6 +-- include/sfx2/docfile.hxx | 10 ++--- include/sfx2/docmacromode.hxx |2 - include/sfx2/ipclient.hxx |2 - include/sfx2/linkmgr.hxx |4 +- include/sfx2/lnkbase.hxx |2 - include/sfx2/mnumgr.hxx |4 +- include/sfx2/objsh.hxx|4 +- include/sfx2/printer.hxx |2 - include/sfx2/shell.hxx|2 - include/sfx2/sidebar/FocusManager.hxx |4 +- include/sfx2/styfitem.hxx |5 -- include/sfx2/tbxctrl.hxx |2 - include/sfx2/templateabstractview.hxx | 15 --- include/sfx2/viewfrm.hxx |4 +- include/sfx2/viewsh.hxx |2 - include/sot/stg.hxx | 12 +++--- include/sot/storage.hxx |2 - include/store/store.hxx | 14 --- include/svl/filerec.hxx | 25 - include/svl/itemset.hxx |4 +- include/svl/macitem.hxx |4 +- include/svl/metitem.hxx |2 - include/svl/nranges.hxx |2 - include/svl/ondemand.hxx |5 -- include/svl/ownlist.hxx |6 +-- include/svl/poolitem.hxx |2 - include/svl/style.hxx |2 - include/svl/zforlist.hxx |3 - include/svl/zformat.hxx |2 - include/svx/sdmetitm.hxx |2 - include/svx/sdtaaitm.hxx |2 - include/svx/xflhtit.hxx |2 - include/svx/xlndsit.hxx |2 - sc/source/ui/docshell/docsh.cxx |6 --- sc/source/ui/inc/docsh.hxx|2 - sfx2/source/appl/appbas.cxx |3 - sfx2/source/appl/appcfg.cxx |4 -- sfx2/source/appl/appinit.cxx |6 +-- sfx2/source/appl/linkmgr2.cxx | 12 +++--- sfx2/source/appl/lnkbase2.cxx |4 -- sfx2/source/control/shell.cxx |5 +- sfx2/source/control/templateabstractview.cxx |7 --- sfx2/source/dialog/styfitem.cxx | 50 ++ sfx2/source/doc/docfile.cxx | 28 -- sfx2/source/doc/objmisc.cxx |5 -- sfx2/source/doc/objstor.cxx |3 - sfx2/source/doc/objxtor.cxx |3 - sfx2/source/doc/sfxbasemodel.cxx |2 - sfx2/source/inc/objshimp.hxx |2 - sfx2/source/menu/mnumgr.cxx |5 +- sfx2/source/sidebar/FocusManager.cxx | 18 - sfx2/source/toolbox/tbxitem.cxx |4 -- sfx2/source/view/ipclient.cxx |5 -- sfx2/source/view/printer.cxx |4 +- sfx2/source/view/viewfrm.cxx | 10 + sfx2/source/view/viewprn.cxx |3 - sfx2/source/view/viewsh.cxx |2 - sot/source/sdstor/stg.cxx | 11 ++--- sot/source/sdstor/storage.cxx |3 - sot/source/sdstor/ucbstorage.cxx | 14 ++- svl/source/items/intitem.cxx |3 - svl/source/items/itemset.cxx |8 +--- svl/source/items/macitem.cxx |9 +--- svl/source/items/poolitem.cxx |3 - svl/source/items/style.cxx|3 - svl/source/misc/ownlist.cxx | 19 ++--- svl/source/numbers/zforlist.cxx |5 +- svl/source/numbers/zformat.cxx|5 +- svx/source/svdraw/svdattr.cxx |8 +--- svx/source/xoutdev/xattr.cxx |6 +-- sw/inc/docsh.hxx |2 - sw/source/uibase/app/docsh.cxx| 10 + 86 files changed, 1
Deprecation (was Re: Remove ActiveX from LibreOffice)
But Bryan, Rick is pointing out that ActiveX usage is not limited to browsers only. If its usage is deprecated then I assume there is a functionally equivalent alternative but the *effective* life cycle of applications that use ActiveX is almost certain to stretch past the start of LO 6. I would define effective life cycle of an application as being AT LEAST two half lives of the application beyond the first release of the application that replaces the final LEGITIMATE release with an 18 month minimum (36 months if there is no subsequent application update release). All support for Windows XP has been discontinued by Microsoft yet many computers still use it. Requiring a Windows XP upgrade to support EXISTING functionality in LO is quite possibly premature even now. Depreciation means to me that products should cease requiring use of something in ongoing development cycles but that for its effective life cycle its use WRT previously developed programs will not be abridged. I'm told that ActiveX has been a security nightmare since it was first released. That's probably a better reason to not support it than citing its depreciation status. I realize that on volunteer projects such as LO such standards are a bit of a burden but they warrant at least a nodding recognition. -- Jim -Original Message- From: Bryan Quigley To: "Rick C. Hodgin" Cc: Chris Sherlock , Ashod Nakashian , libreoffice Sent: Tue, 12 Jan 2016 20:27 Subject: Re: Remove ActiveX from LibreOffice Hi Rick, ActiveX is deprecated by Microsoft and will be less useful (or not at all) on newer MS browsers. I'm unsure if it ever worked (or was supposed to) let you embed ActiveX controls into LibreOffice itself. Kind regards, Bryan On Mon, Jan 11, 2016 at 10:08 PM, Rick C. Hodgin wrote: > Why are you removing ActiveX from LibreOffice? Excel supports it, and it is > desirable for integration with Windows apps like C#, Visual Basic, Visual > FoxPro. It allows those other apps to integrate the app directly into their > app. > > I have tried to use it previously, but could not find documentation for it. > If it's an unused feature, I'd suggest that's why than for other reasons. > > Best regards, > Rick C. Hodgin > > > > > Original Message > From: Chris Sherlock > Sent: Mon, 11/01/2016 08:21 PM > To: Ashod Nakashian > CC: libreoffice ; Bryan Quigley > Subject: Re: Remove ActiveX from LibreOffice > > That sounds pretty reasonable to me. > > Out of interest, just how “integrated” is this with the code? If someone > wanted to create an external project on GitHub or some place like this, > would it be feasible? > > I guess I’m trying to understand how much of core it touches… to reimplement > an ActiveX control outside of the main tree, would a developer need to fork > LibreOffice entirely, or could they maintain their codebranch entirely > seperately and update the control if necessary after we do our changes to > the main codebase? > > I’m definitely for removing all vestiges of ActiveX from LO, but the more I > think about it the more I can see that some corporation somewhere might be > affected, far more so than the remove of NPAPI… giving them the option of a > control that can be maintained outside of the main project would be nice :-) > > Chris > > On 12 Jan 2016, at 9:37 AM, Ashod Nakashian wrote: > > > > On Mon, Jan 11, 2016 at 2:32 PM, Bryan Quigley wrote: >> >> >> Anywhere else we should post this? >> > > Ideally the note would show up unintrusively upon loading/using the ActiveX > itself. Unfortunately we can't show a message box or some such UI, in case > the ActiveX is used non-interactively (in which case it'd block forever, > becoming unusable). > > So the next best thing to do is include the note in the installation, which > should be hard to miss if made prominent (unless automated in silent mode). > > This would get the attention of possibly the users, if not the developers > (who might not even test out new versions as they come out, and expect > things to work as before). Users can contact developers, I expect, or at > least plan accordingly. Regardless, all we want is to give advance warning > before the day someone installs a newer version and be met with the surprise > of missing ActiveX altogether. > > The installation and release notes seem to be the most reasonable places, if > not upon using the ActiveX itself. Unless others have better ideas. > > ___ 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
[Libreoffice-commits] core.git: vcl/inc vcl/opengl
vcl/inc/openglgdiimpl.hxx |1 -
vcl/opengl/gdiimpl.cxx|5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 2fc2f752447725ece32ce55d5db21b912902b3cf
Author: Tor Lillqvist
Date: Tue Jan 12 17:11:15 2016 +0200
Bin unused field
Change-Id: I664e3815bcdaff82a03309ae387154914471a80b
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index df2e914..4e38cb7 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -69,7 +69,6 @@ protected:
SalGraphics& mrParent;
/// Pointer to the SalFrame or SalVirtualDevice
SalGeometryProvider* mpProvider;
-OpenGLFramebuffer* mpFramebuffer;
OpenGLProgram* mpProgram;
/// This idle handler is used to swap buffers after rendering.
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 73804c7..fc738ca 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -65,7 +65,6 @@ OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics&
rParent, SalGeometryPr
: mpContext(nullptr)
, mrParent(rParent)
, mpProvider(pProvider)
-, mpFramebuffer(nullptr)
, mpProgram(nullptr)
, mpFlush(new OpenGLFlushIdle(this))
, mbUseScissor(false)
@@ -470,13 +469,13 @@ bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
// TODO: lfrb: User GL_ARB_copy_image?
OpenGLTexture aNewTex = OpenGLTexture( GetWidth(), GetHeight() );
-mpFramebuffer = mpContext->AcquireFramebuffer( aNewTex );
+mpContext->AcquireFramebuffer( aNewTex );
DrawTexture( maOffscreenTex, aPosAry );
maOffscreenTex = aNewTex;
}
else
{
-mpFramebuffer = mpContext->AcquireFramebuffer( maOffscreenTex );
+mpContext->AcquireFramebuffer( maOffscreenTex );
CHECK_GL_ERROR();
if( bClearTexture )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/qa vcl/source
include/vcl/metric.hxx|4 +++-
vcl/inc/impfont.hxx | 10 ++
vcl/qa/cppunit/fontmetric.cxx | 21 +
vcl/source/gdi/metric.cxx | 21 ++---
vcl/source/outdev/font.cxx|3 +--
5 files changed, 45 insertions(+), 14 deletions(-)
New commits:
commit bfd690701ff414496ad77c2b268bf7200947dc3a
Author: Chris Sherlock
Date: Wed Jan 13 12:13:12 2016 +1100
vcl: Create accessor and mutator for full stop centered in FontMetric
Accessor and mutator created for full stop centered flag, removed
bit field.
See commit description in 8bfccd3a71d911b6d ("vcl: Create accessor
and mutator for font scaling in FontMetric") for reasoning behind
patch.
Unit tests
- check to ensure that can set full stop centered flag
- check equality operator on FontMetric after setting full stop
centered flag
Change-Id: I9cacb0fbf9ea65cfebcaebdc9f0481c0a796cbcf
Reviewed-on: https://gerrit.libreoffice.org/21413
Reviewed-by: Chris Sherlock
Tested-by: Chris Sherlock
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index e289b72..f3de018 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -52,11 +52,13 @@ public:
longGetExtLeading() const;
longGetLineHeight() const;
longGetSlant() const;
+longGetBulletOffset() const;
+
boolIsScalable() const;
boolIsFullstopCentered() const;
-longGetBulletOffset() const;
voidSetScalableFlag(bool);
+voidSetFullstopCenteredFlag(bool);
FontMetric& operator=( const FontMetric& rMetric );
booloperator==( const FontMetric& rMetric ) const;
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 376c0cb..5367a77 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -105,6 +105,7 @@ private:
sal_uInt32 mnRefCount;// Reference Counter
boolmbScalableFont;
+boolmbFullstopCentered;
// TODO: As these are progressively moved from bit fields into boolean
variables, comment them out.
// Eventually this enum will not be needed and we can remove it.
@@ -113,8 +114,8 @@ private:
/* SCALABLE_FLAG=2, */
LATIN_FLAG=4,
CJK_FLAG=8,
-CTL_FLAG=16,
-FULLSTOP_CENTERED_FLAG=32
+CTL_FLAG=16
+/* FULLSTOP_CENTERED_FLAG=32 */
};
public:
@@ -131,12 +132,13 @@ public:
longGetExtLeading() const { return
mnExtLeading; }
longGetLineHeight() const { return
mnLineHeight; }
longGetSlant() const{ return
mnSlant; }
+longGetBulletOffset() const { return
mnBulletOffset; }
boolIsScalable() const { return
mbScalableFont; }
-boolIsFullstopCentered() const { return
((mnMiscFlags & FULLSTOP_CENTERED_FLAG ) != 0); }
-longGetBulletOffset() const { return
mnBulletOffset; }
+boolIsFullstopCentered() const { return
mbFullstopCentered; }
voidSetScalableFlag(bool bScalable) {
mbScalableFont = bScalable; }
+voidSetFullstopCenteredFlag(bool bCentered) {
mbFullstopCentered = bCentered; }
};
diff --git a/vcl/qa/cppunit/fontmetric.cxx b/vcl/qa/cppunit/fontmetric.cxx
index b7db7df..1428cfb 100644
--- a/vcl/qa/cppunit/fontmetric.cxx
+++ b/vcl/qa/cppunit/fontmetric.cxx
@@ -22,10 +22,12 @@ public:
VclFontMetricTest() : BootstrapFixture(true, false) {}
void testScalableFlag();
+void testFullstopCenteredFlag();
void testEqualityOperator();
CPPUNIT_TEST_SUITE(VclFontMetricTest);
CPPUNIT_TEST(testScalableFlag);
+CPPUNIT_TEST(testFullstopCenteredFlag);
CPPUNIT_TEST(testEqualityOperator);
CPPUNIT_TEST_SUITE_END();
};
@@ -42,6 +44,20 @@ void VclFontMetricTest::testScalableFlag()
CPPUNIT_ASSERT_MESSAGE( "Scalable flag should be true",
aFontMetric.IsScalable() );
}
+
+void VclFontMetricTest::testFullstopCenteredFlag()
+{
+// default constructor should set scalable flag to false
+FontMetric aFontMetric;
+
+CPPUNIT_ASSERT_MESSAGE( "Fullstop centered flag should be false after
default constructor called", !aFontMetric.IsFullstopCentered() );
+
+aFontMetric.SetFullstopCenteredFlag(true);
+
+CPPUNIT_ASSERT_MESSAGE( "Fullstop centered flag should be true",
aFontMetric.IsFullstopCentered() );
+}
+
+
void VclFontMetricTest::testEqualityOperator()
{
// default constructor should set scalable flag to false
@@ -51,6 +67,11 @@ void VclFontMetricTest::testE
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/impfont.hxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 78efa95b8088f7e23a77d7a746186ae2ecd0055c
Author: Chris Sherlock
Date: Wed Jan 13 11:25:39 2016 +1100
vcl: format enum in ImplFontMetric to make it easier to rebase
Change-Id: Ic2e7213254b60cf3c384dd7ab4696092dbbc5108
Reviewed-on: https://gerrit.libreoffice.org/21412
Tested-by: Jenkins
Reviewed-by: Chris Sherlock
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 400eb19..376c0cb 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -108,7 +108,14 @@ private:
// TODO: As these are progressively moved from bit fields into boolean
variables, comment them out.
// Eventually this enum will not be needed and we can remove it.
-enum { DEVICE_FLAG=1, /* SCALABLE_FLAG=2, */ LATIN_FLAG=4, CJK_FLAG=8,
CTL_FLAG=16, FULLSTOP_CENTERED_FLAG=32 };
+enum {
+DEVICE_FLAG=1,
+/* SCALABLE_FLAG=2, */
+LATIN_FLAG=4,
+CJK_FLAG=8,
+CTL_FLAG=16,
+FULLSTOP_CENTERED_FLAG=32
+};
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Remove ActiveX from LibreOffice
Hi Rick, ActiveX is deprecated by Microsoft and will be less useful (or not at all) on newer MS browsers. I'm unsure if it ever worked (or was supposed to) let you embed ActiveX controls into LibreOffice itself. Kind regards, Bryan On Mon, Jan 11, 2016 at 10:08 PM, Rick C. Hodgin wrote: > Why are you removing ActiveX from LibreOffice? Excel supports it, and it is > desirable for integration with Windows apps like C#, Visual Basic, Visual > FoxPro. It allows those other apps to integrate the app directly into their > app. > > I have tried to use it previously, but could not find documentation for it. > If it's an unused feature, I'd suggest that's why than for other reasons. > > Best regards, > Rick C. Hodgin > > > > > Original Message > From: Chris Sherlock > Sent: Mon, 11/01/2016 08:21 PM > To: Ashod Nakashian > CC: libreoffice ; Bryan Quigley > Subject: Re: Remove ActiveX from LibreOffice > > That sounds pretty reasonable to me. > > Out of interest, just how “integrated” is this with the code? If someone > wanted to create an external project on GitHub or some place like this, > would it be feasible? > > I guess I’m trying to understand how much of core it touches… to reimplement > an ActiveX control outside of the main tree, would a developer need to fork > LibreOffice entirely, or could they maintain their codebranch entirely > seperately and update the control if necessary after we do our changes to > the main codebase? > > I’m definitely for removing all vestiges of ActiveX from LO, but the more I > think about it the more I can see that some corporation somewhere might be > affected, far more so than the remove of NPAPI… giving them the option of a > control that can be maintained outside of the main project would be nice :-) > > Chris > > On 12 Jan 2016, at 9:37 AM, Ashod Nakashian wrote: > > > > On Mon, Jan 11, 2016 at 2:32 PM, Bryan Quigley wrote: >> >> >> Anywhere else we should post this? >> > > Ideally the note would show up unintrusively upon loading/using the ActiveX > itself. Unfortunately we can't show a message box or some such UI, in case > the ActiveX is used non-interactively (in which case it'd block forever, > becoming unusable). > > So the next best thing to do is include the note in the installation, which > should be hard to miss if made prominent (unless automated in silent mode). > > This would get the attention of possibly the users, if not the developers > (who might not even test out new versions as they come out, and expect > things to work as before). Users can contact developers, I expect, or at > least plan accordingly. Regardless, all we want is to give advance warning > before the day someone installs a newer version and be met with the surprise > of missing ActiveX altogether. > > The installation and release notes seem to be the most reasonable places, if > not upon using the ActiveX itself. Unless others have better ideas. > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.1.0.2'
Tag 'libreoffice-5.1.0.2' created by Christian Lohmaier at 2016-01-13 01:56 -0800 Tag libreoffice-5.1.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWla7aAAoJEPQ0oe+v7q6jOxsQAMp0kUbL9ZlwClJHgU9WVXq6 /tB3ptDKOMhjcQjZSpArysB2qu61qkNz/N1MphSsiZI0gDX9P9F1KiFQIumKwWDC 90pmFcS4rLqXMMuk7XhVQ+AWYcNJbyHMu/g53RDoSFZ5llHefRQb9WO9aSMPwF0D CGw3FMlgNaWVXbvz5Nm/Xlh4OA9tvnbThwB5zqnOIrNuATS6VWR4UXVU74k/5FiW 15rvv3TOHS2ans8CwDb/z38rWDyN2KZ8vpdBOzy/jKPqI56rRnQngwnELTD+e/Zz AufbHX7doYzLaS95AOsDWo3mbgshQzGymHk1SjaQ92OTPTX7hcLSPkJ3nM0q8hQz j5CY3WdkpGYabVkCK9gen2bVgqXqhWy09c96QOJPx1JaRLluUh4+VjIPPjcXrbA1 yJPB1upAH+MNG87epUu6vUAyA3LrmAzDTWu60hq22vFcylAm3P6Bigo8oD3Q2vJj upE2Nq7jwiJcFjb8RJR0y9nRHPsxq7uVKpgMt6iWrzx/llDdo9P3VhAG9uTelZoS mMPBDEBeQd2d3wZy3dKihjvBhfungZa+FQJMgo6MWUhLxPc0ozhsmwgI25+m7Nh9 tzUQxM63zYihs82PgbiK8gHDOxahDZH9G/+xiumpsvwXAzip+DX84sIJDuTdeSG3 ftGZIAs8u4C4nSPCKp3g =hb28 -END PGP SIGNATURE- Changes since libreoffice-5-1-branch-point-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.1.0.2'
Tag 'libreoffice-5.1.0.2' created by Christian Lohmaier at 2016-01-13 01:56 -0800 Tag libreoffice-5.1.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWla7TAAoJEPQ0oe+v7q6jB68P/juhd+pQhSL4EO0N9N+zuZgy 1fsq7cSYKT5Al+rJGtQezPSOwlqdCbw1F2HpDPtV+em9LTQcG26w74opT8FGXSXd WZkLLVgystkbz9mT+IDT4ULne2hE9xSKfZNgKcUl+AEvqfP2YAZ2LxBkqvbSnIBn VOlqE0b3AEQPvZa6wgjC02e8GEyS2FTk1e7p17Uf+fP3CcbBf6Wr47RMTJXdACLF AXL9PAcMEhn+a0X5PSoJnh7fl4+P0CeqGOzZHu5ma7Lls9XzAkPLqQUbDCFA0hoE EjoD87kdHbZ25f4Ur3OYfjxVfKhxuQOm0/do9ha4IXOJJnKldGFI4t3Dk9IK/D1/ SPvNIxjhqBlNYjMAbiq2dyMB3LN6DoDzj0GSvDLmC8Y2lxBzT3XGfMoJobD6Cuyd EOGxsDsX4I76W3moTTXdBN59qUkF7RI4NNBoiuZ/oWjbA1fr8fW2nZlUYx6C4hvX EBW2G28ukOM5wWC5vtVzd//gMJXa5iiUf2/yMuPSX81acYJfk+KiiQHmopI/Nvt1 BQIhX0HoIU2pRIHfxXCWxr1RMwWH8X1xiQBFLabwUtV0QzeGqqQ5M1g7mrA+gddB 3sJLlqZ4htJA4Pzpuh5unRYXsb/6wAElDzQSKVU1OhIXbtHmmerxQ+50Ta8tKSNo coGGQjMVwGttJ6+IfL0L =k4xL -END PGP SIGNATURE- Changes since libreoffice-5-1-branch-point-5: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e9dc7651451c5cff74a2409984514109338ee758 Author: Christian Lohmaier Date: Wed Jan 13 02:58:29 2016 +0100 bump product version to 5.1.0.2.0+ Change-Id: Iba9db6634ac79e52cd0d31d7a3e6a06b09fe8934 diff --git a/configure.ac b/configure.ac index 63bec8a..6e5abf8 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.1.0.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.1.0.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.1.0.2'
Tag 'libreoffice-5.1.0.2' created by Christian Lohmaier at 2016-01-13 01:56 -0800 Tag libreoffice-5.1.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWla7XAAoJEPQ0oe+v7q6jSGsP/A54BxANgg8ZS7eKY5AjMsav hceB21DmbEoRR0MhRdzDMpXFKa+HAiJtX/fBAQoMyYMxQaSZmbwH7kuww4VRg1DS JevZ5uIrjothcIk7RgVrAkmQOFA04NTWeUhMehBMB8qUthE333zLiXA7qB6Vq/GX LN3Hcv/0LgZ5n00u5cN6byj4mM9R5CxQQjBDhTDkAEkON3ipSVogB6x1ov1kiXa5 RH/HwwUs50R1jHKjVcoYYRMz2Y/DR2xndLtrIXxJU/I0TctjSd8a/z0qMYEfAY58 YX5ybtBfzgcVxO6gzLASV/J1z2Kcd5gN/WSLvQQmgFGWD4O9eqi2zIU94adeDu4x EFbQ5ILjTPcCFekTbp+DBVYOIry6RrnI4R7Md/sZMCeNZTeP36qeMwRVinur6UsM 37cj0bhr1Xs/S67dqofdvD9mHKzgSE8ueDG5g/ZO+tTmFDm3ebnhMYMFpZAB9j7e s9uq4HWjjst2uuhfM4X+rfac8Gbi7yMs0Wsq8rvtK8sASlKTIJJeUHrjEitbQaKN wCYKLyZ/kfUBPAfQO2VFvUys9JNQ3LK3+aXbBM5vPScIvCgDwKmudVRi+xxgdids Ohaa03zkqd4PMUcP3OyQ+eNrAX1RB2B1pjDhzxD5o2BANtFO/WSp/oLQxIdY9DDF XU/ij23ed2CUEVrgNa9z =ht37 -END PGP SIGNATURE- Changes since libreoffice-5-1-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.1.0.2'
Tag 'libreoffice-5.1.0.2' created by Christian Lohmaier at 2016-01-13 01:56 -0800 Tag libreoffice-5.1.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWla7dAAoJEPQ0oe+v7q6jANsQAKFxxxQs2qtjdoXcng/mOT4k lucUPXOFeLVuwOxgqwFlebGleqx2GdHEe9iP0igiPO5oft0nEzp9zhaMzeZtsXx8 JsMjS14LHZyKhwk3RDjKjYGlESajp8D+hG8N8QXF+KaDNJ1fIGjpWKM47zH8Ceuq A2HRmX87yZs0HBC7vWj8X65XRm3Up7iCiMTNGUua4WPRmjinUHZg42elzkglWeES 1lL+DPpzXV+imfdkxJJWQNFLtgOwrSw7lEuDcr4nQYO7G834GRqb3ITaZWhpbOi+ tBIrZkEjMVoLRxoiXV3936KEN+Fxgrzn9QVNsirRxVBy44YZEvsHQppieKLphSOr GgCnSNqzegBO1we+rJkDdjjQKl7UgCYZ7nZEIOGikFG8+ElIicj2fHats3YtnkBp m3I6Y+JaL4gs8lJw5jlytPySpW7t+rEg6RxDY4gBVLwyb8jLAqW9QDjEPHB7UwlG GzfbHIkzFwD4rOHwautmVAFmq7vb8mFs5q+CGPmI6JZ0M2/KSOefwb9Zk0xbt9N0 zgT6dir4Xu1yQ7Rcu7Tmf6EvHaGjQJY4iZlMbaziQPkyvThpCD0hv/us7vze4me7 z4/pwxU3+RBCgOmqKx6Vr2QXkEXYDa4Gt4Sf06hrnZbuFVwueA9JpnAKxLq4p+En YJWEcsJRnC5tGyJm5A17 =CqKr -END PGP SIGNATURE- Changes since libreoffice-5.1.0.0.beta2-426: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - extras/source
extras/source/autocorr/lang/ca/DocumentList.xml | 191 -- extras/source/autocorr/lang/da/DocumentList.xml | 12 extras/source/autocorr/lang/fi/DocumentList.xml | 24 - extras/source/autocorr/lang/hr/DocumentList.xml | 319 extras/source/autocorr/lang/sv/DocumentList.xml | 166 5 files changed, 666 insertions(+), 46 deletions(-) New commits: commit c0407dc6f267a2a61dfd7a58de471250960581e4 Author: Christian Lohmaier Date: Wed Jan 13 02:53:00 2016 +0100 update emoji autocorrect files from po-files Change-Id: I1844e4fc7fa08ee5526e7b9ff76224572cd4d089 (cherry picked from commit a84cae5735a91e3c1e03dfed58bdf7c03500a53a) (cherry picked from commit c205c0fb4720f684001c96f3d79ad8ba90659363) diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index a301d1e..4085133 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -353,14 +353,12 @@ - - - - + + @@ -419,6 +417,10 @@ + + + + @@ -438,11 +440,11 @@ - + - + @@ -461,8 +463,7 @@ - - + @@ -470,11 +471,14 @@ - + + + + @@ -487,15 +491,21 @@ - + + + + + + + @@ -520,8 +530,11 @@ - + + + + @@ -529,8 +542,14 @@ + + + + + + @@ -545,6 +564,7 @@ + @@ -552,17 +572,24 @@ + + + + - + + + + @@ -576,11 +603,16 @@ + + + + + @@ -589,16 +621,19 @@ + + + - + @@ -611,14 +646,19 @@ + + - + + + + @@ -651,6 +691,9 @@ + + + @@ -659,8 +702,11 @@ + + + @@ -673,6 +719,7 @@ + @@ -683,16 +730,20 @@ + + + - + + @@ -701,8 +752,11 @@ + + + @@ -722,7 +776,6 @@ - @@ -738,21 +791,26 @@ + + + + + @@ -774,6 +832,7 @@ + @@ -781,6 +840,7 @@ + @@ -812,9 +872,11 @@ + + @@ -844,10 +906,12 @@ - + + - + + @@ -864,31 +928,41 @@ + + + + + - + + + + + + @@ -899,13 +973,20 @@ + + + + + + + @@ -914,9 +995,11 @@ + + @@ -931,12 +1014,15 @@ + + + @@ -960,6 +1046,7 @@ + @@ -967,10 +1054,14 @@ + + + + @@ -986,7 +1077,9 @@ + + @@ -996,7 +1089,7 @@ - + @@ -1004,10 +1097,16 @@ + + + + + + @@ -1018,6 +1117,7 @@ + @@ -1046,6 +1146,10 @@ + + + + @@ -1064,6 +1168,7 @@ + @@ -1079,7 +1184,9 @@ - + + + @@ -1094,17 +1201,22 @@ + + - + + + + @@ -1115,18 +1227,28 @@ + + + + + + + + + + @@ -1137,14 +1259,20 @@ + + + + + + - + @@ -1154,12 +1282,15 @@ + + + @@ -1168,8 +1299,10 @@ + + @@ -1180,11 +1313,14 @@ + + + @@ -1193,6 +1329,7 @@ + @@ -1203,19 +1340,24 @@ + + - + + + + @@ -1232,6 +1374,7 @@ + diff --git a/extras/source/autocorr/lang/da/DocumentList.xml b/extras/source/autocorr/lang/da/DocumentList.xml index cb0998a..cfbf795 100644 --- a/extras/source/autocorr/lang/da/DocumentList.xml +++ b/extras/source/autocorr/lang/da/DocumentList.xml @@ -901,6 +901,7 @@ + @@ -1072,6 +1073,7 @@ +
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/opengl
vcl/opengl/gdiimpl.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 6fa1b457fc90ca92a1e8e70d4446cd5462da3158
Author: Michael Meeks
Date: Tue Jan 12 21:13:13 2016 +
tdf#96385 - opengl: dynamically adjust priority of swap buffers.
Initially we start with a very low priority, so that the lame
bits of code that do eg. focus, and cursor rendering before the
document is visible do not cause a swap, flash. Then after we've
processed a REPAINT priority idle (hopefully our first paint) we
adjust the swap priority to highest.
Essentially a fusion of Tor's approach and mine.
Change-Id: Ib9b78a18fb9359ac8c3dee1cfeb30177c08fe162
Reviewed-on: https://gerrit.libreoffice.org/21410
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index b7276ed..7bb2ae2 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -47,7 +47,8 @@ public:
: Idle( "gl idle swap" )
, m_pImpl( pImpl )
{
-SetPriority( SchedulerPriority::HIGHEST );
+// We don't want to be swapping before we've painted.
+SetPriority( SchedulerPriority::POST_PAINT );
}
~OpenGLFlushIdle()
{
@@ -55,6 +56,7 @@ public:
virtual void Invoke() override
{
m_pImpl->doFlush();
+SetPriority( SchedulerPriority::HIGHEST );
Stop();
}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - extras/source
extras/source/autocorr/lang/ca/DocumentList.xml | 191 -- extras/source/autocorr/lang/da/DocumentList.xml | 12 extras/source/autocorr/lang/fi/DocumentList.xml | 24 - extras/source/autocorr/lang/hr/DocumentList.xml | 319 extras/source/autocorr/lang/sv/DocumentList.xml | 166 5 files changed, 666 insertions(+), 46 deletions(-) New commits: commit c205c0fb4720f684001c96f3d79ad8ba90659363 Author: Christian Lohmaier Date: Wed Jan 13 02:53:00 2016 +0100 update emoji autocorrect files from po-files Change-Id: I1844e4fc7fa08ee5526e7b9ff76224572cd4d089 (cherry picked from commit a84cae5735a91e3c1e03dfed58bdf7c03500a53a) diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index a301d1e..4085133 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -353,14 +353,12 @@ - - - - + + @@ -419,6 +417,10 @@ + + + + @@ -438,11 +440,11 @@ - + - + @@ -461,8 +463,7 @@ - - + @@ -470,11 +471,14 @@ - + + + + @@ -487,15 +491,21 @@ - + + + + + + + @@ -520,8 +530,11 @@ - + + + + @@ -529,8 +542,14 @@ + + + + + + @@ -545,6 +564,7 @@ + @@ -552,17 +572,24 @@ + + + + - + + + + @@ -576,11 +603,16 @@ + + + + + @@ -589,16 +621,19 @@ + + + - + @@ -611,14 +646,19 @@ + + - + + + + @@ -651,6 +691,9 @@ + + + @@ -659,8 +702,11 @@ + + + @@ -673,6 +719,7 @@ + @@ -683,16 +730,20 @@ + + + - + + @@ -701,8 +752,11 @@ + + + @@ -722,7 +776,6 @@ - @@ -738,21 +791,26 @@ + + + + + @@ -774,6 +832,7 @@ + @@ -781,6 +840,7 @@ + @@ -812,9 +872,11 @@ + + @@ -844,10 +906,12 @@ - + + - + + @@ -864,31 +928,41 @@ + + + + + - + + + + + + @@ -899,13 +973,20 @@ + + + + + + + @@ -914,9 +995,11 @@ + + @@ -931,12 +1014,15 @@ + + + @@ -960,6 +1046,7 @@ + @@ -967,10 +1054,14 @@ + + + + @@ -986,7 +1077,9 @@ + + @@ -996,7 +1089,7 @@ - + @@ -1004,10 +1097,16 @@ + + + + + + @@ -1018,6 +1117,7 @@ + @@ -1046,6 +1146,10 @@ + + + + @@ -1064,6 +1168,7 @@ + @@ -1079,7 +1184,9 @@ - + + + @@ -1094,17 +1201,22 @@ + + - + + + + @@ -1115,18 +1227,28 @@ + + + + + + + + + + @@ -1137,14 +1259,20 @@ + + + + + + - + @@ -1154,12 +1282,15 @@ + + + @@ -1168,8 +1299,10 @@ + + @@ -1180,11 +1313,14 @@ + + + @@ -1193,6 +1329,7 @@ + @@ -1203,19 +1340,24 @@ + + - + + + + @@ -1232,6 +1374,7 @@ + diff --git a/extras/source/autocorr/lang/da/DocumentList.xml b/extras/source/autocorr/lang/da/DocumentList.xml index cb0998a..cfbf795 100644 --- a/extras/source/autocorr/lang/da/DocumentList.xml +++ b/extras/source/autocorr/lang/da/DocumentList.xml @@ -901,6 +901,7 @@ + @@ -1072,6 +1073,7 @@ + @@ -1314,13 +1316,13 @@ + -
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/ca/DocumentList.xml | 191 -- extras/source/autocorr/lang/da/DocumentList.xml | 12 extras/source/autocorr/lang/fi/DocumentList.xml | 24 - extras/source/autocorr/lang/hr/DocumentList.xml | 319 extras/source/autocorr/lang/sv/DocumentList.xml | 166 5 files changed, 666 insertions(+), 46 deletions(-) New commits: commit a84cae5735a91e3c1e03dfed58bdf7c03500a53a Author: Christian Lohmaier Date: Wed Jan 13 02:53:00 2016 +0100 update emoji autocorrect files from po-files Change-Id: I1844e4fc7fa08ee5526e7b9ff76224572cd4d089 diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index a301d1e..4085133 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -353,14 +353,12 @@ - - - - + + @@ -419,6 +417,10 @@ + + + + @@ -438,11 +440,11 @@ - + - + @@ -461,8 +463,7 @@ - - + @@ -470,11 +471,14 @@ - + + + + @@ -487,15 +491,21 @@ - + + + + + + + @@ -520,8 +530,11 @@ - + + + + @@ -529,8 +542,14 @@ + + + + + + @@ -545,6 +564,7 @@ + @@ -552,17 +572,24 @@ + + + + - + + + + @@ -576,11 +603,16 @@ + + + + + @@ -589,16 +621,19 @@ + + + - + @@ -611,14 +646,19 @@ + + - + + + + @@ -651,6 +691,9 @@ + + + @@ -659,8 +702,11 @@ + + + @@ -673,6 +719,7 @@ + @@ -683,16 +730,20 @@ + + + - + + @@ -701,8 +752,11 @@ + + + @@ -722,7 +776,6 @@ - @@ -738,21 +791,26 @@ + + + + + @@ -774,6 +832,7 @@ + @@ -781,6 +840,7 @@ + @@ -812,9 +872,11 @@ + + @@ -844,10 +906,12 @@ - + + - + + @@ -864,31 +928,41 @@ + + + + + - + + + + + + @@ -899,13 +973,20 @@ + + + + + + + @@ -914,9 +995,11 @@ + + @@ -931,12 +1014,15 @@ + + + @@ -960,6 +1046,7 @@ + @@ -967,10 +1054,14 @@ + + + + @@ -986,7 +1077,9 @@ + + @@ -996,7 +1089,7 @@ - + @@ -1004,10 +1097,16 @@ + + + + + + @@ -1018,6 +1117,7 @@ + @@ -1046,6 +1146,10 @@ + + + + @@ -1064,6 +1168,7 @@ + @@ -1079,7 +1184,9 @@ - + + + @@ -1094,17 +1201,22 @@ + + - + + + + @@ -1115,18 +1227,28 @@ + + + + + + + + + + @@ -1137,14 +1259,20 @@ + + + + + + - + @@ -1154,12 +1282,15 @@ + + + @@ -1168,8 +1299,10 @@ + + @@ -1180,11 +1313,14 @@ + + + @@ -1193,6 +1329,7 @@ + @@ -1203,19 +1340,24 @@ + + - + + + + @@ -1232,6 +1374,7 @@ + diff --git a/extras/source/autocorr/lang/da/DocumentList.xml b/extras/source/autocorr/lang/da/DocumentList.xml index cb0998a..cfbf795 100644 --- a/extras/source/autocorr/lang/da/DocumentList.xml +++ b/extras/source/autocorr/lang/da/DocumentList.xml @@ -901,6 +901,7 @@ + @@ -1072,6 +1073,7 @@ + @@ -1314,13 +1316,13 @@ + - @@ -1332,7 +1334,7 @@ - + @@ -13
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9bd46abde6aceb05f896838aa0b1940f88903d5f Author: Christian Lohmaier Date: Wed Jan 13 02:48:00 2016 +0100 bump product version to 5.1.1.0.0+ Change-Id: I5e7c3f191e2c010c9811e63759bbc236aeabbfe9 diff --git a/configure.ac b/configure.ac index 63bec8a..cfef065 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.1.0.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.1.1.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-5-1-0'
New branch 'libreoffice-5-1-0' available with the following commits: commit e693291bc6724cab170bc41dad346d2c1ebd04c2 Author: Christian Lohmaier Date: Wed Jan 13 02:44:33 2016 +0100 Branch libreoffice-5-1-0 This is 'libreoffice-5-1-0' - the stable branch for the 5.1.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next .x release, please use the 'libreoffice-5-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I864712d2571713b3c9118585df1c1b0f32f5f92b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-1-0'
New branch 'libreoffice-5-1-0' available with the following commits: commit f93946c660b5c4a348f98a8b68be852ea4e15ee0 Author: Christian Lohmaier Date: Wed Jan 13 02:44:08 2016 +0100 Branch libreoffice-5-1-0 This is 'libreoffice-5-1-0' - the stable branch for the 5.1.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next .x release, please use the 'libreoffice-5-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I0dc88906507e5cebb36f8150217c5f792884aab7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-1-0'
New branch 'libreoffice-5-1-0' available with the following commits: commit 6c416d03aa62fbdc576efe6463d41ecad5fd16cf Author: Christian Lohmaier Date: Wed Jan 13 02:44:08 2016 +0100 Branch libreoffice-5-1-0 This is 'libreoffice-5-1-0' - the stable branch for the 5.1.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next .x release, please use the 'libreoffice-5-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I1353e106ce69f6f60ed0693c111637f89a10abc9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-5-1-0'
New branch 'libreoffice-5-1-0' available with the following commits: commit ea2c0e7b8bf0f6d15b311e5c9ec4bfce47da9938 Author: Christian Lohmaier Date: Wed Jan 13 02:44:08 2016 +0100 Branch libreoffice-5-1-0 This is 'libreoffice-5-1-0' - the stable branch for the 5.1.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next .x release, please use the 'libreoffice-5-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I61297061d189771ee4d2f51792f92264ae40edc6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3417 ++-- 1 file changed, 1713 insertions(+), 1704 deletions(-) New commits: commit 5ad188ef35eaaf1d379b256b4a37a88b85463363 Author: Christian Lohmaier Date: Wed Jan 13 02:34:12 2016 +0100 update credits Change-Id: I7d00e1eb3bb6d2da18ea2e6ae531aeb18e27c214 (cherry picked from commit e7d1b8a608096a1a999b9b610ce8862b0fbfc54a) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index c6f70ce..3169333 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 580 + 527 501 39980 22624 @@ -16,9 +16,9 @@ 3676 3471 501 - 580 + 527 40479 - 23202 + 23149 0 0 false @@ -68,7 +68,7 @@ false false true - 4416093 + 4535349 false false false @@ -311,55 +311,52 @@ - + - + - + - + - + - + - + - + - + - + - - - - + - + - + @@ -370,7 +367,7 @@ - + @@ -395,16 +392,16 @@ - + - + - + - + @@ -412,7 +409,7 @@ - + @@ -1035,7 +1032,7 @@ Credits -1118 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-12-14 16:06:17. +1106 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-13 00:52:38. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1062,10 +1059,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 18761Joined: 2000-10-10 + Caolán McNamaraCommits: 18869Joined: 2000-10-10 - Stephan BergmannCommits: 10992Joined: 2000-10-04 + Stephan BergmannCommits: 11080Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1073,38 +1070,38 @@ - Tor LillqvistCommits: 7210Joined: 2010-03-23 + Tor LillqvistCommits: 7245Joined: 2010-03-23 - Kohei YoshidaCommits: 5360Joined: 2009-06-19 +
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3417 ++-- 1 file changed, 1713 insertions(+), 1704 deletions(-) New commits: commit 35097f9a57a50ca6bd2d32c2f468d9b26bad4d1c Author: Christian Lohmaier Date: Wed Jan 13 02:34:12 2016 +0100 update credits Change-Id: I7d00e1eb3bb6d2da18ea2e6ae531aeb18e27c214 (cherry picked from commit e7d1b8a608096a1a999b9b610ce8862b0fbfc54a) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index c6f70ce..3169333 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 580 + 527 501 39980 22624 @@ -16,9 +16,9 @@ 3676 3471 501 - 580 + 527 40479 - 23202 + 23149 0 0 false @@ -68,7 +68,7 @@ false false true - 4416093 + 4535349 false false false @@ -311,55 +311,52 @@ - + - + - + - + - + - + - + - + - + - + - - - - + - + - + @@ -370,7 +367,7 @@ - + @@ -395,16 +392,16 @@ - + - + - + - + @@ -412,7 +409,7 @@ - + @@ -1035,7 +1032,7 @@ Credits -1118 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-12-14 16:06:17. +1106 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-13 00:52:38. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1062,10 +1059,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 18761Joined: 2000-10-10 + Caolán McNamaraCommits: 18869Joined: 2000-10-10 - Stephan BergmannCommits: 10992Joined: 2000-10-04 + Stephan BergmannCommits: 11080Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1073,38 +1070,38 @@ - Tor LillqvistCommits: 7210Joined: 2010-03-23 + Tor LillqvistCommits: 7245Joined: 2010-03-23 - Kohei YoshidaCommits: 5360Joined: 2009-06-19 +
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3417 ++-- 1 file changed, 1713 insertions(+), 1704 deletions(-) New commits: commit e7d1b8a608096a1a999b9b610ce8862b0fbfc54a Author: Christian Lohmaier Date: Wed Jan 13 02:34:12 2016 +0100 update credits Change-Id: I7d00e1eb3bb6d2da18ea2e6ae531aeb18e27c214 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index c6f70ce..3169333 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.0.4.2$Linux_X86_64 LibreOffice_project/2b9802c1994aa0b7dc6079e128979269cf95bc782012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 580 + 527 501 39980 22624 @@ -16,9 +16,9 @@ 3676 3471 501 - 580 + 527 40479 - 23202 + 23149 0 0 false @@ -68,7 +68,7 @@ false false true - 4416093 + 4535349 false false false @@ -311,55 +311,52 @@ - + - + - + - + - + - + - + - + - + - + - - - - + - + - + @@ -370,7 +367,7 @@ - + @@ -395,16 +392,16 @@ - + - + - + - + @@ -412,7 +409,7 @@ - + @@ -1035,7 +1032,7 @@ Credits -1118 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-12-14 16:06:17. +1106 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-01-13 00:52:38. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1062,10 +1059,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 18761Joined: 2000-10-10 + Caolán McNamaraCommits: 18869Joined: 2000-10-10 - Stephan BergmannCommits: 10992Joined: 2000-10-04 + Stephan BergmannCommits: 11080Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1073,38 +1070,38 @@ - Tor LillqvistCommits: 7210Joined: 2010-03-23 + Tor LillqvistCommits: 7245Joined: 2010-03-23 - Kohei YoshidaCommits: 5360Joined: 2009-06-19 + Kohei YoshidaCommits: 5364Joined: 2009-06-19 -
[Libreoffice-commits] core.git: include/vcl vcl/CppunitTest_vcl_fontmetric.mk vcl/inc vcl/Module_vcl.mk vcl/qa vcl/source
include/vcl/metric.hxx|3 + vcl/CppunitTest_vcl_fontmetric.mk | 53 + vcl/Module_vcl.mk |1 vcl/inc/impfont.hxx | 29 +++--- vcl/qa/cppunit/fontmetric.cxx | 61 ++ vcl/source/gdi/metric.cxx | 15 - vcl/source/outdev/font.cxx|6 +-- 7 files changed, 152 insertions(+), 16 deletions(-) New commits: commit 8bfccd3a71d911b6da6c108a1312b712431f99d8 Author: Chris Sherlock Date: Wed Jan 13 03:05:29 2016 +1100 vcl: Create accessor and mutator for font scaling in FontMetric This is fragile code! There are actually *two* classes that do almost precisely the same thing, they are: - ImplFontMetric, and - ImplFontMetricData They both have much in common, including their class name, and even most of their functionality. In fact, they both have common accessor functions. When I look at the code, it looks like OutputDevice is actually given an ImplFontMetricData object, which it then uses to populate an ImplFontMetric object... Basically, I'm going to merge these classes. To do so, I'm going to do the following: Step 1: Implement accessor functions for ImplFontMetric and FontMetric (then remove the friendship of this class to OutputDevice!) Step 2: Write a unit test for each accessor function in ImplFontMetric Step 3: Ensure that ImplFontMetric and ImplFontMetricData use some sort of smart pointer (probably an intrusive_ptr like I did ages ago with FontCharMap) Step 4: Merge the two classes together once their class interfaces are the same and I am satisfied they do the same thing Step 5: Find all instances of inefficient usage - for instance, I can do away with the code that copies the ImplFontMetricData attributes into an ImplFontMetric object. Change-Id: I07c1cb848774b130fa2ca60b51da53e07754dd00 Reviewed-on: https://gerrit.libreoffice.org/21399 Reviewed-by: Chris Sherlock Tested-by: Chris Sherlock diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index 28b582f..e289b72 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -52,9 +52,12 @@ public: longGetExtLeading() const; longGetLineHeight() const; longGetSlant() const; +boolIsScalable() const; boolIsFullstopCentered() const; longGetBulletOffset() const; +voidSetScalableFlag(bool); + FontMetric& operator=( const FontMetric& rMetric ); booloperator==( const FontMetric& rMetric ) const; booloperator!=( const FontMetric& rMetric ) const diff --git a/vcl/CppunitTest_vcl_fontmetric.mk b/vcl/CppunitTest_vcl_fontmetric.mk new file mode 100644 index 000..5206db2 --- /dev/null +++ b/vcl/CppunitTest_vcl_fontmetric.mk @@ -0,0 +1,53 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,vcl_fontmetric)) + +$(eval $(call gb_CppunitTest_set_include,vcl_fontmetric,\ +$$(INCLUDE) \ +-I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,vcl_fontmetric, \ + vcl/qa/cppunit/fontmetric \ +)) + +$(eval $(call gb_CppunitTest_use_externals,vcl_fontmetric,boost_headers)) + +$(eval $(call gb_CppunitTest_use_libraries,vcl_fontmetric, \ + comphelper \ + cppu \ + cppuhelper \ + sal \ + svt \ + test \ + tl \ + tk \ + unotest \ + vcl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_use_api,vcl_fontmetric,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,vcl_fontmetric)) +$(eval $(call gb_CppunitTest_use_vcl,vcl_fontmetric)) + +$(eval $(call gb_CppunitTest_use_components,vcl_fontmetric,\ + configmgr/source/configmgr \ + i18npool/util/i18npool \ + ucb/source/core/ucb1 \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,vcl_fontmetric)) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 1480504..0be5a4b 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -97,6 +97,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ CppunitTest_vcl_lifecycle \ CppunitTest_vcl_bitmap_test \ CppunitTest_vcl_fontcharmap \ + CppunitTest_vcl_fontmetric \ CppunitTest_vcl_complextext \ CppunitTest_vcl_filters_test \ CppunitTest_vcl_outdev \ diff --git a/vcl/inc/impfont.hx
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0cfe5ba5da8f7ae28819b1ff55041935b128a0f0 Author: Christian Lohmaier Date: Wed Jan 13 00:52:38 2016 +0100 Updated core Project: translations 9093975dc966c23eea564d481a706aff4e280039 update translations for 5.1.0 rc2 and force-fix errors using pocheck Change-Id: I24437fdaa13a74a85f58314771245375fec94108 (cherry picked from commit 3b2b4114cc4585399aa5db74ce702b0382bc01d8) diff --git a/translations b/translations index 43f4317..9093975 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 43f43172246e258a65afd8c6252cbf0181560811 +Subproject commit 9093975dc966c23eea564d481a706aff4e280039 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c71b5b4d2ec76c0a204f9515dece1e0e0689ce3c Author: Christian Lohmaier Date: Wed Jan 13 00:52:38 2016 +0100 Updated core Project: translations 3b2b4114cc4585399aa5db74ce702b0382bc01d8 update translations for 5.1.0 rc2 and force-fix errors using pocheck Change-Id: I24437fdaa13a74a85f58314771245375fec94108 diff --git a/translations b/translations index 3e76f6b..3b2b411 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 3e76f6b637c8034330436568b26302c4472c1a0f +Subproject commit 3b2b4114cc4585399aa5db74ce702b0382bc01d8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/all/log.cxx | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit c995196ff0e9f7041b03fc513d703d6e60b8c867
Author: Michael Meeks
Date: Tue Jan 12 21:50:34 2016 +
Fixup SAL_DEBUG_TRACE macro.
Change-Id: I276ce9a356086001c208902ba94641863c2f2fdb
Reviewed-on: https://gerrit.libreoffice.org/21408
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index a343403..665942b 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -107,8 +107,15 @@ char const * getEnvironmentVariable() {
#endif
+namespace {
+inline bool isDebug(sal_detail_LogLevel level) {
+return level == SAL_DETAIL_LOG_LEVEL_DEBUG ||
+ level == SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE;
+}
+}
+
bool report(sal_detail_LogLevel level, char const * area) {
-if (level == SAL_DETAIL_LOG_LEVEL_DEBUG)
+if (isDebug(level))
return true;
assert(area != nullptr);
char const * env = getEnvironmentVariable();
@@ -187,13 +194,13 @@ void log(
if (!sal_use_syslog) {
s << toString(level) << ':';
}
-if (level != SAL_DETAIL_LOG_LEVEL_DEBUG) {
+if (!isDebug(level)) {
s << area << ':';
}
s << OSL_DETAIL_GETPID << ':';
#endif
s << osl::Thread::getCurrentIdentifier() << ':';
-if (level == SAL_DETAIL_LOG_LEVEL_DEBUG) {
+if (isDebug(level)) {
s << ' ';
} else {
const size_t nStrLen(std::strlen(SRCDIR "/"));
@@ -203,7 +210,7 @@ void log(
}
s << message;
-if (level == SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE) {
+if (isDebug(level)) {
s << " at:\n";
s << OUString(osl_backtraceAsString(), SAL_NO_ACQUIRE);
}
@@ -219,6 +226,7 @@ void log(
android_log_level = ANDROID_LOG_WARN;
break;
case SAL_DETAIL_LOG_LEVEL_DEBUG:
+case SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE:
android_log_level = ANDROID_LOG_DEBUG;
break;
default:
@@ -243,6 +251,7 @@ void log(
prio = LOG_WARNING;
break;
case SAL_DETAIL_LOG_LEVEL_DEBUG:
+case SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE:
prio = LOG_DEBUG;
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/vcl svx/source
include/vcl/scheduler.hxx | 18 ++
svx/source/sdr/overlay/overlaymanagerbuffered.cxx |2 +-
2 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 928a7a3e92e085a880ecf0d3ad5e40d41b7779bf
Author: Michael Meeks
Date: Tue Jan 12 16:36:49 2016 +
tdf#97075 - don't render sdr overlays before we paint.
Change-Id: I0b22af14c7dd684c25cfee26e8c12b95b40479ee
Reviewed-on: https://gerrit.libreoffice.org/21406
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 13d1687..95303ee 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -27,14 +27,16 @@ struct ImplSVData;
struct ImplSchedulerData;
enum class SchedulerPriority {
-HIGHEST = 0,
-HIGH = 1,
-RESIZE= 2,
-REPAINT = 3,
-MEDIUM= 3,
-LOW = 4,
-LOWER = 5,
-LOWEST= 6
+HIGHEST = 0,
+HIGH = 1,
+RESIZE = 2,
+REPAINT = 3,
+MEDIUM = 3,
+POST_PAINT = 4,
+DEFAULT_IDLE = 5,
+LOW = 6,
+LOWER= 7,
+LOWEST = 8
};
class VCL_DLLPUBLIC Scheduler
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index cba94c6..ddc49ae 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -384,7 +384,7 @@ namespace sdr
mbRefreshWithPreRendering(bRefreshWithPreRendering)
{
// Init timer
-maBufferIdle.SetPriority( SchedulerPriority::HIGH );
+maBufferIdle.SetPriority( SchedulerPriority::POST_PAINT );
maBufferIdle.SetIdleHdl(LINK(this, OverlayManagerBuffered,
ImpBufferTimerHandler));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Suggestion
I don't know what in my message headers causes filters on this list to divert my posts to moderated status but here goes another one. Hi Rick, As I stated in another post to this list yesterday, I am a LO user. FWIW, I think of this idea as "human readable" formatting rather than as "metric" formatting. I hope this formatting will not be only for fractional values but will also provide human readable formatting for large values. So, does this formatting option extend into the positive domain of powers of 1,000 (Ku, Mu, Gu, Tu, etc.)? I think it should. Displaying such values as 1,300 watt hours as 1.3 KwH, 1,019 pascals as 1.019 Kpa, 2,250 meters as 2.25 Km, 10,000,000 bits as 10 Mb, or 2,030,000,000 bytes as 2.03 GB would be good. The "units" portion of this feature *could* be implemented by the existing custom formatting capability (e.g. append "V" in the formatting string to designated Volts) but if you have a better, less geeky, technique in mind to designate possibly custom units I say you should go for it. I hope you are remembering that whatever you do needs to be supported in Calc by the 2nd parameter in function FORMAT(value,format-string) as well. This is an exciting concept. Don't let Microsoft's lack of support for this stop you. We've gone out ahead of them before with support for 1,024 column spreadsheets. Give them another well developed feature to chase. In the long run it can only improve both the LO and MS office suites and enhance the prestige of LO as an innovative project. AOO and other FOSS office suites could benefit from our leadership as well. In any case we need not be relegated to the status of being simply a Microsoft clone! Aim high and hit the target! It's a home run of a concept on my scorecard. -- Jim -Original Message- From: "Rick C. Hodgin" To: libreoffice@lists.freedesktop.org Sent: Fri, 08 Jan 2016 16:52 Subject: Suggestion I am a developer and would be willing to make these changes for the project, but I've never worked on the LibreOffice code base and would need some help getting started with the correct source files. - I had an idea to allow for a new type of cell formatting under *"Category."* It would be for numbers, and operate similarly to the standard numbers on integer values, but for fractions it would perform some special processing. The category is called *"Metric."* When conveying fractional values, such that 1.2345E-08 (which is 0.000,000,012,345), it would do so in a metric-relative way using the standard milli (10^-3), micro (10^-6), nano (10^-9), pico (10^-12), and so on... In the example, the *Metric* display would cause the value to show up as "*12,345 pu*" (pico-units) if the thousands separator was used. There would be an option to override the default "u" character in use, changing it into something that may have significance for the cell, such as "s" or "seconds" for seconds, "m" or "meters" for meters, and so on. An ability to lock in a working range would also exist, such as *"show everything in nano-units"* so that everything is adjusted to that base. In such a case, the above example above would present as "*12.345 nu*" instead of in its default *pu*. Thank you in advance. Best regards, Rick C. Hodgin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: framework/inc framework/source icon-themes/galaxy
framework/inc/classes/resource.hrc|3 +++
framework/source/classes/resource.src |9 +
framework/source/uielement/popuptoolbarcontroller.cxx | 12 +---
icon-themes/galaxy/res/savemodified_large.png |binary
icon-themes/galaxy/res/savemodified_small.png |binary
5 files changed, 17 insertions(+), 7 deletions(-)
New commits:
commit 40f9ae367ca71e9dadb7cd76b08616b229726d7e
Author: Maxim Monastirsky
Date: Wed Jan 13 00:45:08 2016 +0200
Modified state icons not packaged into zip
It seems that images must be mentioned in some src file.
Unfortunately had to copy the save icon in place of the
modified icon in galaxy, to satisfy the resource compiler.
Change-Id: If3fa7a8a194a0289c79fa10987138dfb35eaeca2
diff --git a/framework/inc/classes/resource.hrc
b/framework/inc/classes/resource.hrc
index 4331a42..d1fdfeb 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -53,6 +53,9 @@
#define STR_OPEN_REMOTE (RID_STR_START+26)
#define STR_REMOTE_TITLE(RID_STR_START+27)
+#define IMG_SAVEMODIFIED_SMALL (RID_IMAGE_START+0)
+#define IMG_SAVEMODIFIED_LARGE (RID_IMAGE_START+1)
+
#define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION(RID_MENU_START+0)
#define MENUITEM_TOOLBAR_VISIBLEBUTTON 1
diff --git a/framework/source/classes/resource.src
b/framework/source/classes/resource.src
index 66f5a24..9e0fee8 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -205,4 +205,13 @@ String STR_LANGSTATUS_HINT
Text [ en-US ] = "Text Language. Right-click to set character or paragraph
language" ;
};
+Image IMG_SAVEMODIFIED_SMALL
+{
+ImageBitmap = Bitmap{File = "savemodified_small.png";};
+};
+Image IMG_SAVEMODIFIED_LARGE
+{
+ImageBitmap = Bitmap{File = "savemodified_large.png";};
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx
b/framework/source/uielement/popuptoolbarcontroller.cxx
index c076652..d2c272b 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+#include
+
#include
#include
#include
@@ -43,7 +46,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -417,12 +419,8 @@ void SaveToolbarController::updateImage()
}
else if ( m_xModifiable.is() && m_xModifiable->isModified() )
{
-const OUString aImageURL(
"private:graphicrepository/res/savemodified_" + ( bLargeIcons ? OUString(
"large.png" ) : OUString( "small.png" ) ) );
-const css::uno::Reference< css::graphic::XGraphicProvider >
xGraphicProvider( css::graphic::GraphicProvider::create( m_xContext ) );
-const css::uno::Reference< css::graphic::XGraphic > xGraphic(
-xGraphicProvider->queryGraphic( comphelper::InitPropertySequence(
{ { "URL", css::uno::makeAny( aImageURL ) } } ) ), css::uno::UNO_QUERY );
-if ( xGraphic.is() )
-aImage = Image( xGraphic );
+Image aResImage( bLargeIcons ? FwkResId( IMG_SAVEMODIFIED_LARGE ) :
FwkResId( IMG_SAVEMODIFIED_SMALL ) );
+aImage = aResImage;
}
if ( !aImage )
diff --git a/icon-themes/galaxy/res/savemodified_large.png
b/icon-themes/galaxy/res/savemodified_large.png
new file mode 100644
index 000..51505d7
Binary files /dev/null and b/icon-themes/galaxy/res/savemodified_large.png
differ
diff --git a/icon-themes/galaxy/res/savemodified_small.png
b/icon-themes/galaxy/res/savemodified_small.png
new file mode 100644
index 000..d893023
Binary files /dev/null and b/icon-themes/galaxy/res/savemodified_small.png
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/xmloff sw/source xmloff/source
include/xmloff/xmlexp.hxx |4
sw/source/filter/xml/xmlexp.cxx |4
xmloff/source/core/xmlexp.cxx | 32 ++--
3 files changed, 14 insertions(+), 26 deletions(-)
New commits:
commit 6640bfc66dca7fdad8a038b32fa062bff34219b7
Author: Michael Stahl
Date: Tue Jan 12 23:07:23 2016 +0100
xmloff: SvXMLExport::mbExtended is dead now
Change-Id: Ie679259deccce87949d7bf8767af707827b4134c
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 4c4e9ef..f1cf97e 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -154,8 +154,6 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public
::cppu::WeakImplHelper6<
XMLImageMapExport* mpImageMapExport;
XMLErrors* mpXMLErrors;
-boolmbExtended; // Does document contain
extens.
-
const enum ::xmloff::token::XMLTokenEnum meClass;
SAL_DLLPRIVATE void _InitCtor();
@@ -222,8 +220,6 @@ protected:
OUString GetSourceShellID() const;
OUString GetDestinationShellID() const;
-void SetExtended( bool bSet=true ) { mbExtended = bSet; }
-
// save linked sections? (may be false in global documents)
bool mbSaveLinkedSections;
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 4a3d479..f8abc46 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -131,7 +131,6 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass
)
SwDoc *pDoc = getDoc();
-bool bExtended = false;
if( getExportFlags() &
(SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::STYLES|
SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT))
{
@@ -174,7 +173,6 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass
)
pUnknown->GetNamespace( nIdx )
);
nIdx = pUnknown->GetNextNamespaceIndex( nIdx );
}
-bExtended = true;
}
}
}
@@ -189,8 +187,6 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass
)
pTwipUnitConv->SetXMLMeasureUnit( eUnit );
}
-SetExtended( bExtended );
-
if( getExportFlags() & SvXMLExportFlags::META)
{
// Update doc stat, so that correct values are exported and
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 012190e..389cb7e 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -450,7 +450,6 @@ SvXMLExport::SvXMLExport(
mpEventExport( nullptr ),
mpImageMapExport( nullptr ),
mpXMLErrors( nullptr ),
-mbExtended( false ),
meClass( eClass ),
mnExportFlags( nExportFlags ),
mnErrorFlags( SvXMLErrorFlags::NO ),
@@ -481,7 +480,6 @@ SvXMLExport::SvXMLExport(
mpEventExport( nullptr ),
mpImageMapExport( nullptr ),
mpXMLErrors( nullptr ),
-mbExtended( false ),
meClass( XML_TOKEN_INVALID ),
mnExportFlags( SvXMLExportFlags::NONE ),
mnErrorFlags( SvXMLErrorFlags::NO ),
@@ -520,7 +518,6 @@ SvXMLExport::SvXMLExport(
mpEventExport( nullptr ),
mpImageMapExport( nullptr ),
mpXMLErrors( nullptr ),
-mbExtended( false ),
meClass( XML_TOKEN_INVALID ),
mnExportFlags( SvXMLExportFlags::NONE ),
mnErrorFlags( SvXMLErrorFlags::NO ),
commit d277ac87455a599fbf4acd3c6401f09bc74d3dac
Author: Michael Stahl
Date: Tue Jan 12 23:01:34 2016 +0100
xmloff: there is no reason why office:version should be omitted
... if a document contains foreign elements or attributes.
In fact since ODF 1.2 the office:version attribute is mandatory and any
document that omits it is therefore invalid, while "extended conforming"
documents are allowed to contain foreign elements and attributes.
This mysterious check was there since CVS initial import, but without
any justification.
Change-Id: Ifeafad2b7af41f06356461adb7ae65dbf7bae11d
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index ff8db66..012190e 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1414,24 +1414,23 @@ sal_uInt32 SvXMLExport::exportDoc( enum
::xmloff::token::XMLTokenEnum eClass )
}
// office:version = ...
-if( !mbExtended )
+const sal_Char* pVersion = nullptr;
+switch (getDefaultVersion())
{
-const sal_Char* pVersion = nullptr;
-switch( getDefaultVersion() )
-{
-case SvtSaveOptions::ODFVER_LATEST: pVersion = sXML_1_2; break;
-case SvtSaveOptions::ODFVER_012_EXT_COMPAT: pVersion = sXML_1_2; break;
-case SvtSaveOptions::ODFVER_012: pVersion = sXML_1_2; break;
-case SvtSaveOptions::ODFVER_011: pVersion = sXML_1_1; break;
-case SvtSaveOptions::ODFVER_010: break;
+case SvtSaveOptions::ODFVER_LATEST: pVersion
[Libreoffice-commits] core.git: vcl/opengl
vcl/opengl/gdiimpl.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 8d6c1b6981f01bbc0057234f53fd139e87a5f010
Author: Michael Meeks
Date: Tue Jan 12 21:02:01 2016 +
tdf#96385 - opengl: dynamically adjust priority of swap buffers.
Initially we start with a very low priority, so that the lame
bits of code that do eg. focus, and cursor rendering before the
document is visible do not cause a swap, flash. Then after we've
processed a REPAINT priority idle (hopefully our first paint) we
adjust the swap priority to highest.
Essentially a fusion of Tor's approach and mine.
Change-Id: Ib9b78a18fb9359ac8c3dee1cfeb30177c08fe162
Reviewed-on: https://gerrit.libreoffice.org/21405
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index d01d66b..73804c7 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -47,7 +47,8 @@ public:
: Idle( "gl idle swap" )
, m_pImpl( pImpl )
{
-SetPriority( SchedulerPriority::HIGHEST );
+// We don't want to be swapping before we've painted.
+SetPriority( SchedulerPriority::POST_PAINT );
}
virtual ~OpenGLFlushIdle()
{
@@ -55,6 +56,7 @@ public:
virtual void Invoke() override
{
m_pImpl->doFlush();
+SetPriority( SchedulerPriority::HIGHEST );
Stop();
}
};
___
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-5.0' - sc/source
sc/source/ui/inc/tabcont.hxx |2 +-
sc/source/ui/inc/tabview.hxx |1 +
sc/source/ui/unoobj/docuno.cxx |5 -
sc/source/ui/view/tabview3.cxx |5 +
4 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 9074fcb3db9653ace243b0fd3373fa9d3956cd0a
Author: Henry Castro
Date: Tue Jan 12 15:37:25 2016 -0400
sc lokit: refactor setPart
Change-Id: I01786551aef0274ae11fe673cc5b0c250e8817cc
Reviewed-on: https://gerrit.libreoffice.org/21403
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
index d1515c5..4189a82 100644
--- a/sc/source/ui/inc/tabcont.hxx
+++ b/sc/source/ui/inc/tabcont.hxx
@@ -44,7 +44,6 @@ private:
DECL_LINK(ShowPageList, const CommandEvent*);
-void SwitchToPageId(sal_uInt16 nId);
protected:
virtual voidSelect() SAL_OVERRIDE;
virtual voidCommand( const CommandEvent& rCEvt ) SAL_OVERRIDE;
@@ -73,6 +72,7 @@ public:
voidUpdateStatus();
voidSetSheetLayoutRTL( bool bSheetRTL );
+voidSwitchToPageId( sal_uInt16 nId );
};
#endif
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 548742c..2150d2e 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -386,6 +386,7 @@ public:
SC_DLLPUBLIC void SetTabNo( SCTAB nTab, bool bNew = false, bool
bExtendSelection = false, bool bSameTabButMoved = false );
voidSelectNextTab( short nDir, bool bExtendSelection = false );
+voidSelectTabPage( const sal_uInt16 nTab );
voidActivateView( bool bActivate, bool bFirst );
voidActivatePart( ScSplitPos eWhich );
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 1a41391..0aada85 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -496,7 +496,10 @@ void ScModelObj::paintTile( VirtualDevice& rDevice,
void ScModelObj::setPart( int nPart )
{
ScViewData* pViewData = ScDocShell::GetViewData();
-pViewData->SetTabNo( nPart );
+ScTabView* pTabView = dynamic_cast< ScTabView* >( pViewData->GetView() );
+
+if (pTabView)
+pTabView->SelectTabPage(nPart + 1);
}
int ScModelObj::getParts()
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index ad84f1b..dd47fa2 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1515,6 +1515,11 @@ void ScTabView::SelectNextTab( short nDir, bool
bExtendSelection )
PaintExtras();
}
+void ScTabView::SelectTabPage( const sal_uInt16 nTab )
+{
+pTabControl->SwitchToPageId( nTab );
+}
+
// SetTabNo- angezeigte Tabelle
void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool
bSameTabButMoved )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source
vcl/source/window/status.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 2e098c48501ba193a7062b4afe2e768c0996464c
Author: Michael Meeks
Date: Sat Jan 9 23:32:00 2016 +
tdf#96655 - clear non-offscreen status bar controls before render.
Change-Id: I02a85ae4572dc23df2157af1cf164a0f82701613
Reviewed-on: https://gerrit.libreoffice.org/21301
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index c9649aa..1982a70 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -698,7 +698,7 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt )
}
}
-void StatusBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void StatusBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle&
rRect)
{
if (mbFormat)
ImplFormat();
@@ -737,10 +737,11 @@ void StatusBar::Paint(vcl::RenderContext& rRenderContext,
const Rectangle&)
if( OpenGLWrapper::isVCLOpenGLEnabled() )
bOffscreen = false;
+if (!bOffscreen)
+rRenderContext.Erase(rRect);
+
for (sal_uInt16 i = 0; i < nItemCount; i++)
-{
ImplDrawItem(rRenderContext, bOffscreen, i, true, true);
-}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/tabcont.hxx |2 +-
sc/source/ui/inc/tabview.hxx |1 +
sc/source/ui/unoobj/docuno.cxx | 20
sc/source/ui/view/tabview3.cxx |5 +
4 files changed, 11 insertions(+), 17 deletions(-)
New commits:
commit ab95fb7a19d7847dd1cbfad0059cc175a809a50f
Author: Henry Castro
Date: Tue Jan 12 15:37:25 2016 -0400
sc lokit: refactor setPart
Change-Id: I01786551aef0274ae11fe673cc5b0c250e8817cc
Reviewed-on: https://gerrit.libreoffice.org/21403
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
index 246a794..31503b4 100644
--- a/sc/source/ui/inc/tabcont.hxx
+++ b/sc/source/ui/inc/tabcont.hxx
@@ -44,7 +44,6 @@ private:
DECL_LINK_TYPED(ShowPageList, const CommandEvent&, void);
-void SwitchToPageId(sal_uInt16 nId);
protected:
virtual voidSelect() override;
virtual voidCommand( const CommandEvent& rCEvt ) override;
@@ -73,6 +72,7 @@ public:
voidUpdateStatus();
voidSetSheetLayoutRTL( bool bSheetRTL );
+voidSwitchToPageId( sal_uInt16 nId );
};
#endif
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 3b0c909..23b97ed 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -386,6 +386,7 @@ public:
SC_DLLPUBLIC void SetTabNo( SCTAB nTab, bool bNew = false, bool
bExtendSelection = false, bool bSameTabButMoved = false );
voidSelectNextTab( short nDir, bool bExtendSelection = false );
+voidSelectTabPage( const sal_uInt16 nTab );
voidActivateView( bool bActivate, bool bFirst );
voidActivatePart( ScSplitPos eWhich );
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 18fe18d..ebcb87b 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -495,22 +495,10 @@ void ScModelObj::paintTile( VirtualDevice& rDevice,
void ScModelObj::setPart( int nPart )
{
ScViewData* pViewData = ScDocShell::GetViewData();
-SfxUInt16Item aItem( SID_CURRENTTAB, nPart + 1 );
-SfxDispatcher& rDisp = pViewData->GetDispatcher();
-
-rDisp.Execute( SID_CURRENTTAB, SfxCallMode::SLOT | SfxCallMode::RECORD,
&aItem, nullptr );
-
-SfxBindings& rBind = pViewData->GetBindings();
-rBind.Invalidate( FID_FILL_TAB );
-rBind.Invalidate( FID_TAB_DESELECTALL );
-rBind.Invalidate( FID_INS_TABLE );
-rBind.Invalidate( FID_TAB_APPEND );
-rBind.Invalidate( FID_TAB_MOVE );
-rBind.Invalidate( FID_TAB_RENAME );
-rBind.Invalidate( FID_DELETE_TABLE );
-rBind.Invalidate( FID_TABLE_SHOW );
-rBind.Invalidate( FID_TABLE_HIDE );
-rBind.Invalidate( FID_TAB_SET_TAB_BG_COLOR );
+ScTabView* pTabView = dynamic_cast< ScTabView* >( pViewData->GetView() );
+
+if (pTabView)
+pTabView->SelectTabPage(nPart + 1);
}
int ScModelObj::getParts()
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 7bdeeae..10de038 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1514,6 +1514,11 @@ void ScTabView::SelectNextTab( short nDir, bool
bExtendSelection )
PaintExtras();
}
+void ScTabView::SelectTabPage( const sal_uInt16 nTab )
+{
+pTabControl->SwitchToPageId( nTab );
+}
+
// SetTabNo - set the displayed sheet
void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool
bSameTabButMoved )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - chart2/source
chart2/source/view/axes/ScaleAutomatism.cxx | 14 --
chart2/source/view/inc/ScaleAutomatism.hxx |1 +
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 98982ca06a87e8b63204b0acda2105c66ae57440
Author: Laurent Balland-Poirier
Date: Sat Jan 2 15:02:00 2016 +0100
tdf#96807 Reset min/max of auto scale
Y minimum for auto scale was accidentaly set to 0.
This avoided correct calculation of Y auto log scale (tdf#96807)
But also set linear Y auto scale from 0 (tdf#85690)
This fix detects if both min and max are equal to 0, and reset them (+-inf)
Change-Id: Ifaf306831f3b5a18a86483c88e807f478b447c77
Reviewed-on: https://gerrit.libreoffice.org/21055
Reviewed-by: jan iversen
Tested-by: jan iversen
Tested-by: Jenkins
(cherry picked from commit 5553d6a9314fd778b9a124d8a2c7e9dd1d7a58a3)
Reviewed-on: https://gerrit.libreoffice.org/21278
Reviewed-by: Christian Lohmaier
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx
b/chart2/source/view/axes/ScaleAutomatism.cxx
index f58bde4..61df0af 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -99,8 +99,7 @@ ScaleAutomatism::ScaleAutomatism( const ScaleData&
rSourceScale, const Date& rNu
, m_nTimeResolution(::com::sun::star::chart::TimeUnit::DAY)
, m_aNullDate(rNullDate)
{
-::rtl::math::setNan( &m_fValueMinimum );
-::rtl::math::setNan( &m_fValueMaximum );
+resetValueRange();
double fExplicitOrigin = 0.0;
if( m_aSourceScale.Origin >>= fExplicitOrigin )
@@ -110,8 +109,19 @@ ScaleAutomatism::~ScaleAutomatism()
{
}
+void ScaleAutomatism::resetValueRange( )
+{
+::rtl::math::setNan( &m_fValueMinimum );
+::rtl::math::setNan( &m_fValueMaximum );
+}
+
void ScaleAutomatism::expandValueRange( double fMinimum, double fMaximum )
{
+// if m_fValueMinimum and m_fValueMaximum == 0, it means that they were
not determined.
+// m_fValueMinimum == 0 makes impossible to determine real minimum,
+// so they need to be reseted tdf#96807
+if( (m_fValueMinimum == 0.0) && (m_fValueMaximum == 0.0) )
+resetValueRange();
if( (fMinimum < m_fValueMinimum) || ::rtl::math::isNan( m_fValueMinimum ) )
m_fValueMinimum = fMinimum;
if( (fMaximum > m_fValueMaximum) || ::rtl::math::isNan( m_fValueMaximum ) )
diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx
b/chart2/source/view/inc/ScaleAutomatism.hxx
index 17370fb..513cf7d 100644
--- a/chart2/source/view/inc/ScaleAutomatism.hxx
+++ b/chart2/source/view/inc/ScaleAutomatism.hxx
@@ -53,6 +53,7 @@ public:
* undefined (that is empty `uno::Any` objects).
*/
voidexpandValueRange( double fMinimum, double fMaximum );
+voidresetValueRange();
/** Sets additional auto scaling options.
@param bExpandBorderToIncrementRhythm If true, expands automatic
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/LibreOfficeKit libreofficekit/source
include/LibreOfficeKit/LibreOfficeKitGtk.h |4 +++-
libreofficekit/source/gtk/lokdocview.cxx | 29 +++--
2 files changed, 30 insertions(+), 3 deletions(-)
New commits:
commit bd85600aa4a81fba19c98e0a1c2d5ccdcb8fb3fc
Author: Pranav Kant
Date: Sat Dec 19 20:36:47 2015 +0530
tdf#96513: Limit LOKDocView's zoom in [0.25, 5.0]
Change-Id: Ibee485909dca1ea4a3774fca7a840afbf2d9883c
Reviewed-on: https://gerrit.libreoffice.org/20819
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit ba539fa91f9c3316107dcdf4a95718a49335d92e)
Reviewed-on: https://gerrit.libreoffice.org/21347
Reviewed-by: Christian Lohmaier
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 911bbdf..e06d154 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -107,7 +107,9 @@ LibreOfficeKitDocument*lok_doc_view_get_document
(LOKDocView*
* @pDocView: The #LOKDocView instance
* @fZoom: The new zoom level that pDocView must set it into.
*
- * Sets the new zoom level for the widget.
+ * Sets the new zoom level for the widget. Does nothing if fZoom is equal to
+ * existing zoom level. Values outside the range [0.25, 5.0] are clamped into
+ * the nearest allowed value in the interval.
*/
void lok_doc_view_set_zoom
(LOKDocView* pDocView,
float
fZoom);
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 21232df..2ece638 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -39,6 +39,10 @@
#define CURSOR_HANDLE_DIR "/android/source/res/drawable/"
// Number of handles around a graphic selection.
#define GRAPHIC_HANDLE_COUNT 8
+// Maximum Zoom allowed
+#define MAX_ZOOM 5.0f
+// Minimum Zoom allowed
+#define MIN_ZOOM 0.25f
/// Private struct used by this GObject type
struct LOKDocViewPrivateImpl
@@ -125,8 +129,8 @@ struct LOKDocViewPrivateImpl
m_aDocPath(nullptr),
m_nLoadProgress(0),
m_bIsLoading(false),
-m_bCanZoomIn(false),
-m_bCanZoomOut(false),
+m_bCanZoomIn(true),
+m_bCanZoomOut(true),
m_pOffice(nullptr),
m_pDocument(nullptr),
lokThreadPool(nullptr),
@@ -2475,6 +2479,13 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
LOKDocViewPrivate& priv = getPrivate(pDocView);
GError* error = nullptr;
+// Clamp the input value in [MIN_ZOOM, MAX_ZOOM]
+fZoom = fZoom < MIN_ZOOM ? MIN_ZOOM : fZoom;
+fZoom = fZoom > MAX_ZOOM ? MAX_ZOOM : fZoom;
+
+if (fZoom == priv->m_fZoom)
+return;
+
priv->m_fZoom = fZoom;
long nDocumentWidthPixels = twipToPixel(priv->m_nDocumentWidthTwips,
fZoom);
long nDocumentHeightPixels = twipToPixel(priv->m_nDocumentHeightTwips,
fZoom);
@@ -2489,6 +2500,20 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
g_object_notify_by_pspec(G_OBJECT(pDocView), properties[PROP_ZOOM]);
+// set properties to indicate if view can be further zoomed in/out
+bool bCanZoomIn = priv->m_fZoom < MAX_ZOOM;
+bool bCanZoomOut = priv->m_fZoom > MIN_ZOOM;
+if (bCanZoomIn != priv->m_bCanZoomIn)
+{
+priv->m_bCanZoomIn = bCanZoomIn;
+g_object_notify_by_pspec(G_OBJECT(pDocView),
properties[PROP_CAN_ZOOM_IN]);
+}
+if (bCanZoomOut != priv->m_bCanZoomOut)
+{
+priv->m_bCanZoomOut = bCanZoomOut;
+g_object_notify_by_pspec(G_OBJECT(pDocView),
properties[PROP_CAN_ZOOM_OUT]);
+}
+
// Update the client's view size
GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
LOEvent* pLOEvent = new LOEvent(LOK_SET_CLIENT_ZOOM);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Suggestion
The values won't round. And based on what the user has selected, they will display to the nearest power of 3 (10^(k*3)), or in an explicit form. The default option will be to auto-range the values into their metric named range. Here are some examples: http://www.libsf.org/misc/libreoffice_metric_example.ods Best regards, Rick C. Hodgin On Tue, Jan 12, 2016 at 2:55 PM, Anthonys Lists wrote: > On 12/01/2016 13:22, Rick C. Hodgin wrote: > >> The important part of the Metric feature is that it always wraps the >> value to the nearest power of 3, and shows values in those powers. 0.1234 >> would be shown as 123.4 milliunits, or 1,234 microunits, for example >> (however the user has set it up), and not as "0.1234 u" (unless they are >> explicitly stating to use "Units", which would be something they'd have to >> do manually). >> > > I'm not sure of the name, but the user might not want it to be in whole > units. Note that 0.1234 is a power of 3, and the user might want it to be > *0*.1234 UNITS. > > So yes, I like the idea of displaying it to a power of three, but it needs > a switch to say "greater than one or less than 1?", so that 0.012 units > might stay 0.012 units, or might become 12 milliunits. > > imho rounding to the *nearest* power of 3 is a mistake - users invariably > want either greater, or less, than one, but NEVER a mix of both. > > Cheers, > Wol > > ___ > 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
[Libreoffice-commits] core.git: include/vcl svx/source
include/vcl/scheduler.hxx | 18 ++
svx/source/sdr/overlay/overlaymanagerbuffered.cxx |2 +-
2 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 16c7f8916661df24f4681ec82f6bd4d7ad85d141
Author: Michael Meeks
Date: Tue Jan 12 16:36:49 2016 +
tdf#97075 - don't render sdr overlays before we paint.
Change-Id: I0b22af14c7dd684c25cfee26e8c12b95b40479ee
Reviewed-on: https://gerrit.libreoffice.org/21400
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 1f440c6..760c228 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -25,14 +25,16 @@
struct ImplSchedulerData;
enum class SchedulerPriority {
-HIGHEST = 0,
-HIGH = 1,
-RESIZE= 2,
-REPAINT = 3,
-MEDIUM= 3,
-LOW = 4,
-LOWER = 5,
-LOWEST= 6
+HIGHEST = 0,
+HIGH = 1,
+RESIZE = 2,
+REPAINT = 3,
+MEDIUM = 3,
+POST_PAINT = 4,
+DEFAULT_IDLE = 5,
+LOW = 6,
+LOWER= 7,
+LOWEST = 8
};
class VCL_DLLPUBLIC Scheduler
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index f68d7ea..9b62afe 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -384,7 +384,7 @@ namespace sdr
mbRefreshWithPreRendering(bRefreshWithPreRendering)
{
// Init timer
-maBufferIdle.SetPriority( SchedulerPriority::HIGH );
+maBufferIdle.SetPriority( SchedulerPriority::POST_PAINT );
maBufferIdle.SetIdleHdl(LINK(this, OverlayManagerBuffered,
ImpBufferTimerHandler));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On 11/01/2016 08:20, Jan Holesovsky wrote: To provide the indicator functionality, now the 'Save' icon changes when there are unsaved changes, and we'll have an alternative design (save icon with an added asterisk) for the "unsaved changes present" state. The updated icon is still to be provided, but should be in time for the RC2 tagging. Just opened a document in Writer and, as I expected, it displays the document name at the top of the window. Like Word, like WordPerfect, like pretty much any word processor I know. Iirc, WordPerfect added "(unmodified)" or something like that after the document name until you actually changed the document. Dunno how easy this would be to implement, but can't you make the code that tracks whether the save button should be enabled, update the document name as displayed in the top of the window? It's also nice because it tells the user at a glance whether the document is the original, or a modified version. Actually, isn't this almost exactly the way you know whether the document is read-only or not already? Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Suggestion
On 12/01/2016 13:22, Rick C. Hodgin wrote: The important part of the Metric feature is that it always wraps the value to the nearest power of 3, and shows values in those powers. 0.1234 would be shown as 123.4 milliunits, or 1,234 microunits, for example (however the user has set it up), and not as "0.1234 u" (unless they are explicitly stating to use "Units", which would be something they'd have to do manually). I'm not sure of the name, but the user might not want it to be in whole units. Note that 0.1234 is a power of 3, and the user might want it to be *0*.1234 UNITS. So yes, I like the idea of displaying it to a power of three, but it needs a switch to say "greater than one or less than 1?", so that 0.012 units might stay 0.012 units, or might become 12 milliunits. imho rounding to the *nearest* power of 3 is a mistake - users invariably want either greater, or less, than one, but NEVER a mix of both. Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/inc/swmodeltestbase.hxx | 14 +
sw/qa/extras/odfexport/data/userdefattr-tablecell.odt |binary
sw/qa/extras/odfexport/odfexport.cxx | 11 +++
sw/source/filter/xml/xmltble.cxx | 26 +-
4 files changed, 50 insertions(+), 1 deletion(-)
New commits:
commit a16cef75e829cd48445905fc67de625640bf6398
Author: aqcoder
Date: Thu Dec 17 21:22:34 2015 +0800
tdf#96412 Fix export text table cell UserDefinedAttributes to xml.
It also export to different Fmt when only have the difference of
UserDefinedAttributes for the text table cell.
Reviewed-on: https://gerrit.libreoffice.org/20765
Tested-by: Jenkins
Reviewed-by: jan iversen
Let's try to push it again, it's unclear what the tinderbox failures
were that caused it to be reverted.
Change-Id: I022b627926870b883eea363567a34b61c34ab353
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index b761116..ebfacd4 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
#include
+#include
#include
#include
#include
@@ -28,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
@@ -433,6 +435,18 @@ protected:
return properties->getPropertySetInfo()->hasPropertyByName(name);
}
+xml::AttributeData getUserDefineAttribute(const uno::Any& obj, const
OUString& name, const OUString& rValue = OUString()) const
+{
+uno::Reference
attrsCnt(getProperty(obj, "UserDefinedAttributes"),
uno::UNO_QUERY_THROW);
+
+xml::AttributeData aValue;
+attrsCnt->getByName(name) >>= aValue;
+if (!rValue.isEmpty())
+CPPUNIT_ASSERT_EQUAL_MESSAGE("attribtes of cell does not contain
expected value", rValue, aValue.Value);
+
+return aValue;
+}
+
/// Get number of paragraphs of the document.
int getParagraphs()
{
diff --git a/sw/qa/extras/odfexport/data/userdefattr-tablecell.odt
b/sw/qa/extras/odfexport/data/userdefattr-tablecell.odt
new file mode 100644
index 000..c8f6dcc
Binary files /dev/null and
b/sw/qa/extras/odfexport/data/userdefattr-tablecell.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 04d1d3c..6333b921 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -768,6 +768,17 @@ DECLARE_ODFEXPORT_TEST(testOdtBorderTypes,
"border_types.odt")
} while (xParaEnum->hasMoreElements());
}
+DECLARE_ODFEXPORT_TEST(testCellUserDefineAttr, "userdefattr-tablecell.odt")
+{
+uno::Reference xTable(getParagraphOrTable(0),
uno::UNO_QUERY);
+uno::Reference const xCellA1(xTable->getCellByName("A1"),
uno::UNO_SET_THROW);
+uno::Reference const xCellB1(xTable->getCellByName("B1"),
uno::UNO_SET_THROW);
+uno::Reference const xCellC1(xTable->getCellByName("C1"),
uno::UNO_SET_THROW);
+getUserDefineAttribute(uno::makeAny(xCellA1), "proName", "v1");
+getUserDefineAttribute(uno::makeAny(xCellB1), "proName", "v2");
+getUserDefineAttribute(uno::makeAny(xCellC1), "proName", "v3");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 47e6a0b..3e81a90 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -316,6 +317,7 @@ bool SwXMLTableFrameFormatsSort_Impl::AddCell(
SwFrameFormat& rFrameFormat,
const SvxBoxItem *pBox = nullptr;
const SwTableBoxNumFormat *pNumFormat = nullptr;
const SvxFrameDirectionItem *pFrameDir = nullptr;
+const SvXMLAttrContainerItem *pAttCnt = nullptr;
const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
const SfxPoolItem *pItem;
@@ -335,9 +337,12 @@ bool SwXMLTableFrameFormatsSort_Impl::AddCell(
SwFrameFormat& rFrameFormat,
if ( SfxItemState::SET == rItemSet.GetItemState( RES_FRAMEDIR,
false, &pItem ) )
pFrameDir = static_cast(pItem);
+if ( SfxItemState::SET == rItemSet.GetItemState( RES_UNKNOWNATR_CONTAINER,
+false, &pItem ) )
+pAttCnt = static_cast(pItem);
// empty styles have not to be exported
-if( !pVertOrient && !pBrush && !pBox && !pNumFormat && !pFrameDir )
+if( !pVertOrient && !pBrush && !pBox && !pNumFormat && !pFrameDir &&
!pAttCnt )
return false;
// order is: -/-/-/num,
@@ -355,6 +360,7 @@ bool SwXMLTableFrameFormatsSort_Impl::AddCell(
SwFrameFormat& rFrameFormat,
const SvxBoxItem *pTestBox = nullptr;
const SwTableBoxNumFormat *pTestNumFormat = nullptr;
const SvxFrameDirectionItem *pTestFrameDir = nullptr
[Libreoffice-commits] core.git: connectivity/Module_connectivity.mk
connectivity/Module_connectivity.mk | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) New commits: commit 8565cef55b172fd1b4825998b3e3762a530b6a6f Author: Michael Stahl Date: Tue Jan 12 15:35:58 2016 +0100 connectivity: remove MSVC 2012 specific hack Change-Id: I78a25118d68ab7ad1db5240910f0974ba1e8381f diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index dad2ef6..aee3178 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -110,23 +110,13 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\ endif ifeq ($(OS),WNT) -# HACK: FIXME: TODO: only disabled to not make the build fail when targeting Win XP with VS 2012 -#warn:legacy.osl:2120:7064:connectivity/source/commontools/dbmetadata.cxx:177: caught an exception! -#in function:const class rtl::OUString &__cdecl dbtools::`anonymous-namespace'::lcl_getConnectionStringSetting(const struct dbtools::DatabaseMetaData_Impl &,class boost::optional &,class rtl::OUString (__cdecl com::sun::star::sdbc::XDatabaseMetaData::* )(void)) -#type: com.sun.star.sdbc.SQLException -#message: Fehler bei einem aus mehreren Schritten bestehenden OLE DB-Vorgang. Pr�fen Sie die einzelnen OLE DB-Statuswerte, falls vorhanden. Daten wurden nicht verarbeitet . -#context: class connectivity::ado::ODatabaseMetaData -# -#Assertion failed: this->is_initialized(), file C:\cygwin\home\buildslave\build\workdir\wntmsci14.pro\UnpackedTarball\boost\boost/optional/optional.hpp, line 638 - -ifneq ($(VCVER)_$(WINDOWS_SDK_VERSION),110_70) +# "ADO is not available on 64bit" said the commit ifneq ($(CPUNAME),X86_64) $(eval $(call gb_Module_add_check_targets,connectivity,\ CppunitTest_connectivity_ado \ )) endif endif -endif ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1a12a6e4cc608b6517655eb6339ceb829c3318bc Author: David Tardon Date: Tue Jan 12 08:57:57 2016 +0100 upload librevenge 0.0.4 Change-Id: Icf631009134918d86d1a6e9bac82573488b01d8e (cherry picked from commit fd2eb598a5eddb54ad819d9e69f9f16c5e8ea9e9) Reviewed-on: https://gerrit.libreoffice.org/21385 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/download.lst b/download.lst index b3f0cad..b0837c0 100755 --- a/download.lst +++ b/download.lst @@ -138,8 +138,8 @@ endif export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz -export REVENGE_MD5SUM := 42d3fa020016196ec90012bcba4b8da2 -export REVENGE_VERSION_MICRO := 3 +export REVENGE_MD5SUM := 5b9ac52ec77d4d19157cf5962ebc0aea +export REVENGE_VERSION_MICRO := 4 export REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip export SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/source cui/uiconfig dbaccess/source framework/source icon-themes/tango include/svtools officecfg/registry reportdesign/source sc/source s
cui/source/options/optgdlg.cxx | 11 cui/source/options/optgdlg.hxx |1 cui/uiconfig/ui/optgeneralpage.ui | 70 - dbaccess/source/core/dataaccess/intercept.cxx | 54 dbaccess/source/core/dataaccess/intercept.hxx |8 dbaccess/source/ui/app/AppController.cxx |3 dbaccess/source/ui/app/AppController.hxx |2 dbaccess/source/ui/querydesign/querycontroller.cxx |2 dbaccess/source/ui/tabledesign/TableController.cxx | 10 dev/null |binary framework/source/uielement/popuptoolbarcontroller.cxx | 159 - icon-themes/tango/cmd/lc_save.png |binary icon-themes/tango/cmd/lc_saveas.png|binary icon-themes/tango/cmd/lc_saveas.xcf.bz2|binary icon-themes/tango/cmd/lc_saveastemplate.png|binary icon-themes/tango/cmd/lc_saveastemplate.xcf.bz2|binary icon-themes/tango/cmd/sc_save.png |binary icon-themes/tango/cmd/sc_saveas.png|binary icon-themes/tango/cmd/sc_saveas.xcf.bz2|binary icon-themes/tango/cmd/sc_saveastemplate.png|binary icon-themes/tango/cmd/sc_saveastemplate.xcf.bz2|binary icon-themes/tango/links.txt|1 icon-themes/tango/res/savemodified_large.png |binary icon-themes/tango/res/savemodified_small.png |binary icon-themes/tango/res/sc05502.png |binary include/svtools/miscopt.hxx|3 officecfg/registry/data/org/openoffice/Setup.xcu |1 officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 reportdesign/source/ui/report/ReportController.cxx |8 sc/source/ui/unoobj/docuno.cxx |4 sc/uiconfig/scalc/toolbar/standardbar.xml |2 sd/source/ui/unoidl/unomodel.cxx |4 sd/uiconfig/sdraw/toolbar/standardbar.xml |2 sd/uiconfig/simpress/toolbar/standardbar.xml |2 sfx2/sdi/sfx.sdi |2 sfx2/source/doc/guisaveas.cxx | 32 -- sfx2/source/doc/objserv.cxx|7 sfx2/source/view/viewfrm.cxx |1 svtools/source/config/miscopt.cxx | 42 --- sw/source/uibase/uno/unotxdoc.cxx |4 sw/uiconfig/sglobal/toolbar/standardbar.xml|2 sw/uiconfig/sweb/toolbar/standardbar.xml |2 sw/uiconfig/swform/toolbar/standardbar.xml |2 sw/uiconfig/swreport/toolbar/standardbar.xml |2 sw/uiconfig/swriter/toolbar/standardbar.xml|2 sw/uiconfig/swxform/toolbar/standardbar.xml|2 46 files changed, 185 insertions(+), 269 deletions(-) New commits: commit 677197b3459df2c89be32595e0cb1b8b3e144c69 Author: Maxim Monastirsky Date: Tue Dec 22 13:12:23 2015 +0200 New saving behavior Changes in this commit: - AlwaysAllowSave config is gone. Saving is always permitted, unless in a read only document. Also changed the behavior in dbaccess to match sfx2. - The toolbar save button is always enabled, to always give access to the dropdown. That's the case even in a read only document, except that it changes to DROPDOWNONLY, and the save as command icon+tooltip. In table/query designers we still disable the button in read only state. - When the document is modified, the toolbar button gets a special icon to indicate that. Reviewed-on: https://gerrit.libreoffice.org/20839 Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky (cherry picked from commit 22328a224df4619218b88205838307f70612207e) loplugin:unreffun (cherry picked from commit ea708936c4684668f9aefc3ce9ec2001dbd4bdf2) Change-Id: I56c169bf48b78faaf53c2989ce8624f8297ffb6e Tango: Update Save icons and support âsavemodifiedâ status Change-Id: I03589895437907b9048542f07128801577fe62dc (cherry picked from commit a7198d38f0294ab5db04a7f4457565ea8b2c32f1) Reviewed-on: https://gerrit.libreoffice.org/21260 Reviewed-by: Samuel Mehrbrodt Reviewed-by: Adolfo Jayme Barrientos Tested-by: Jenkins Tested-by: Samuel Mehrbrodt diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index dfb517f..52fc00c 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -273,7 +273,6 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent
[Libreoffice-commits] core.git: xmlsecurity/qa
xmlsecurity/qa/unit/signing/signing.cxx |4 1 file changed, 4 deletions(-) New commits: commit 569bbec54030ab4e7f45aa9e832cac3aa36430a3 Author: Miklos Vajna Date: Tue Jan 12 18:49:12 2016 +0100 CppunitTest_xmlsecurity_signing: enable on OS X Reviewed on: https://gerrit.libreoffice.org/21395 Change-Id: I4f96b322b0306a10d7d47d3b71db9b0716575fe4 diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 785fa85..c68a872 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -32,8 +32,6 @@ #include #include -#if !defined(MACOSX) - using namespace com::sun::star; namespace @@ -189,8 +187,6 @@ void SigningTest::testDescription() CPPUNIT_TEST_SUITE_REGISTRATION(SigningTest); -#endif - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [tdf-discuss] Re: Remove ActiveX from LibreOffice
OK, now that "reveal codes" was brought up, this thread definitely has jumped the shark. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [tdf-discuss] Re: Remove ActiveX from LibreOffice
On 12/01/2016 15:36, timofonic timofonic wrote: I would love: - Writer: The best of a "text processor". Become a powerful ide. Able to edit using markup languages. Able to use DVCS like Git. You've got me on my hobbyhorse :-) Both emacs and (el)vi(m)(s), iirc, allow multiple edit windows on the same document. Okay, Michael has said with Writer's then current - I don't know how much it's been cleaned up since then - internals that is pretty much impossible. But if we can get multiple windows on the one document, then implementing WordPerfect's "reveal codes" mode should be incredibly simple - just have one window in wysiwyg mode, and the other in markup mode. Pull that off, and you'll have all the old greybeard WP power users crying in delight ... Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/win
include/vcl/window.hxx |2 +-
vcl/inc/window.h |2 +-
vcl/source/window/mouse.cxx|2 +-
vcl/source/window/syschild.cxx |7 ++-
vcl/source/window/window.cxx | 13 +
vcl/source/window/winproc.cxx | 21 +++--
vcl/win/window/salframe.cxx|2 +-
7 files changed, 18 insertions(+), 31 deletions(-)
New commits:
commit e24ebfabf3dbcecaa52dba62397c4803571e5f81
Author: Miklos Vajna
Date: Tue Jan 12 17:44:52 2016 +0100
Revert "Re-work focus handling to use an idle handler"
This reverts commit 0ba752201dca6129cc6b4a19ec93eb369eb70890. It breaks
CppunitTest_desktop_lib on Linux.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 3ade2a8..6b383bd 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -537,7 +537,7 @@ public:
DECL_DLLPRIVATE_LINK_TYPED( ImplHandlePaintHdl, Idle*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplGenerateMouseMoveHdl, void*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void );
-DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncFocusHdl, Idle*, void );
+DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncFocusHdl, void*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplHandleResizeTimerHdl, Idle*, void );
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 4c8b541..64551af 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -143,7 +143,7 @@ struct ImplFrameData
sal_Int32 mnDPIY; //< Original Screen Resolution
ImplMapRes maMapUnitRes; //< for LogicUnitToPixel
sal_uIntPtr mnAllSaveBackSize; //< size of all bitmaps of
saved backgrounds
-Idle * mpFocusIdle;
+ImplSVEvent * mnFocusId; //< FocusId for PostUserLink
ImplSVEvent * mnMouseMoveId; //< MoveId for PostUserLink
longmnLastMouseX; //< last x mouse position
longmnLastMouseY; //< last y mouse position
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 4747abd..330cb70 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -256,7 +256,7 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags )
vcl::Window *pFrame = pSVData->maWinData.mpFirstFrame;
while( pFrame )
{
-if( pFrame != mpWindowImpl->mpFrameWindow.get() &&
pFrame->mpWindowImpl->mpFrameData->mpFocusIdle )
+if( pFrame != mpWindowImpl->mpFrameWindow.get() &&
pFrame->mpWindowImpl->mpFrameData->mnFocusId )
{
bAsyncFocusWaiting = true;
break;
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 7a007a9..d0c8e8c 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -79,13 +79,10 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject
*/,
// trigger a LoseFocus which matches the status
// of the window with matching Activate-Status
pWindow->ImplGetFrameData()->mbSysObjFocus = false;
-if ( !pWindow->ImplGetFrameData()->mpFocusIdle )
+if ( !pWindow->ImplGetFrameData()->mnFocusId )
{
pWindow->ImplGetFrameData()->mbStartFocusState = true;
-pWindow->ImplGetFrameData()->mpFocusIdle = new
Idle("loseFocus");
-pWindow->ImplGetFrameData()->mpFocusIdle->SetIdleHdl(LINK(
pWindow->ImplGetFrameWindow(), vcl::Window, ImplAsyncFocusHdl ));
-
pWindow->ImplGetFrameData()->mpFocusIdle->SetPriority(SchedulerPriority::LOW);
-pWindow->ImplGetFrameData()->mpFocusIdle->Start();
+pWindow->ImplGetFrameData()->mnFocusId =
Application::PostUserEvent( LINK( pWindow->ImplGetFrameWindow(), vcl::Window,
ImplAsyncFocusHdl ), nullptr, true );
}
break;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 61e62b3..d508719 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -498,12 +498,9 @@ void Window::dispose()
if ( mpWindowImpl->mpFrameData )
{
-if ( mpWindowImpl->mpFrameData->mpFocusIdle )
-{
-mpWindowImpl->mpFrameData->mpFocusIdle->Stop();
-delete mpWindowImpl->mpFrameData->mpFocusIdle;
-mpWindowImpl->mpFrameData->mpFocusIdle = nullptr;
-}
+if ( mpWindowImpl->mpFrameData->mnFocusId )
+Application::RemoveUserEvent( mpWindowImpl->mpFrameData->mnFocusId
);
+mpWindowImpl->mpFrameData->mnFocusId = nullptr;
if ( mpWindowImpl->mpFrameData->mnMouseMoveId )
Application::RemoveUserEvent(
mpWindowImpl->mpFrameData->mnMouseMoveId );
mpWindowImpl->mpFrameData->mnMouseMoveId = nullptr;
@@ -573,7 +570,7 @@ void Window::dispose()
}
mpWindowImpl->mpFrame->SetCallback( nullptr, nullptr );
pSVData->mpDefInst->Des
Re: [Libreoffice-commits] core.git: initialize new member variables
> On 13 Jan 2016, at 12:00 AM, jan iversen wrote: > > > > Sent from my iPad, please excuse any misspellings > >> On 12 Jan 2016, at 12:05, Chris Sherlock wrote: >> >> Hi all, >> >> Unfortunately that was the case - I definitely went down the wrong path with >> that merge. >> >> I've reverted it now - the commit can be found on >> http://cgit.freedesktop.org/libreoffice/core/commit/?id=b4b0cc2a5eef4243e51fda4a13fc48183aa0 >> >> I need to check that UBSan tool more regularly. >> >> But I definitely have to put my hand up for causing these errors. Apologies >> for this, I will do my level best not to let this occur again. >> >> When I'm back home I've been meaning to send a post to the list summarising >> how font handling works and some ideas and questions around the code. > Even better would be to make a wiki page :-) > > rgds > jan i Not a bad idea :-) I’ll see what I can do later on down the track. FWIW, I’ve been thinking for some time now that I need to start implementing unit tests around fragile code I poke. It might not have caught this issue, but I’m going to try to ensure I put together unit tests whenever possible. My first attempt at doing so is queued into gerrit already, it’s a very simple one where I’ve implemented an accessor and mutator on ImplFontMetric and FontMetric, with the aim of deduplicating the ImplFontMetric and ImplFontMetricData classes. Obviously the test is very basic, but given the fragility of the code I’m working on, and the direct impact of changing something inadvertantly, I’m taking a cautious approach! Gerrit patch is here: https://gerrit.libreoffice.org/#/c/21399/ Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - filter/source
filter/source/pdf/pdfexport.cxx | 18 --
filter/source/pdf/pdfexport.hxx |3 +--
2 files changed, 5 insertions(+), 16 deletions(-)
New commits:
commit feebc5953fb416c5dc8cdf8c7e924a9ff9c70f17
Author: Julien Nabet
Date: Mon Dec 28 17:32:19 2015 +0100
tdf#65439: Export to PDF/A-1a gives transparency warning
There was a use of transparency because Watermark was always defined
Now we test if text of Watermark is empty or not
Remark: it seems we don't cope not-text Watermark in pdf export
(additional cleaning+renaming)
Change-Id: I9d9c759a80c0a61e4f0a94c0fa295f2950caa3bc
Reviewed-on: https://gerrit.libreoffice.org/20990
Tested-by: Jenkins
Tested-by: Jan-Marek Glogowski
Reviewed-by: Michael Stahl
(cherry picked from commit 5c5017ea37e1bee205c6c1b9cafe753fcaf1a9a4)
Reviewed-on: https://gerrit.libreoffice.org/21397
Tested-by: Michael Stahl
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 3ad411e..5a67041 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -115,7 +115,6 @@ PDFExport::PDFExport( const Reference< XComponent >&
rxSrcDoc,
mbAllowDuplicateFieldNames ( false ),
mnProgressValue ( 0 ),
mbRemoveTransparencies ( false ),
-mbWatermark ( false ),
mbHideViewerToolbar ( false ),
mbHideViewerMenubar ( false ),
@@ -503,10 +502,7 @@ bool PDFExport::Export( const OUString& rFile, const
Sequence< PropertyValue >&
else if ( rFilterData[ nData ].Name == "IsAddStream" )
rFilterData[ nData ].Value >>= mbAddStream;
else if ( rFilterData[ nData ].Name == "Watermark" )
-{
-maWatermark = rFilterData[ nData ].Value;
-mbWatermark = true;
-}
+rFilterData[ nData ].Value >>= msWatermark;
//now all the security related properties...
else if ( rFilterData[ nData ].Name == "EncryptFile" )
rFilterData[ nData ].Value >>= mbEncrypt;
@@ -1051,7 +1047,7 @@ bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter,
vcl::PDFExtOutDevData&
rPDFExtOutDevData.ResetSyncData();
-if( mbWatermark )
+if (!msWatermark.isEmpty())
ImplWriteWatermark( rWriter, aSizePDF );
return bRet;
@@ -1061,7 +1057,6 @@ bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter,
vcl::PDFExtOutDevData&
void PDFExport::ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size&
rPageSize )
{
-OUString aText( "Watermark" );
vcl::Font aFont( OUString( "Helvetica" ), Size( 0, 3*rPageSize.Height()/4
) );
aFont.SetItalic( ITALIC_NONE );
aFont.SetWidthType( WIDTH_NORMAL );
@@ -1074,18 +1069,13 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter&
rWriter, const Size& rPageSi
aFont.SetOrientation( 2700 );
}
-if( ! ( maWatermark >>= aText ) )
-{
-// more complicated watermark ?
-}
-
// adjust font height for text to fit
OutputDevice* pDev = rWriter.GetReferenceDevice();
pDev->Push();
pDev->SetFont( aFont );
pDev->SetMapMode( MapMode( MAP_POINT ) );
int w = 0;
-while( ( w = pDev->GetTextWidth( aText ) ) > nTextWidth )
+while( ( w = pDev->GetTextWidth( msWatermark ) ) > nTextWidth )
{
if (w == 0)
break;
@@ -1127,7 +1117,7 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter&
rWriter, const Size& rPageSi
}
rWriter.SetClipRegion();
rWriter.BeginTransparencyGroup();
-rWriter.DrawText( aTextPoint, aText );
+rWriter.DrawText( aTextPoint, msWatermark );
rWriter.EndTransparencyGroup( aTextRect, 50 );
rWriter.Pop();
}
diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx
index b37cf15..75ac0aa4 100644
--- a/filter/source/pdf/pdfexport.hxx
+++ b/filter/source/pdf/pdfexport.hxx
@@ -66,8 +66,7 @@ private:
sal_Int32 mnProgressValue;
boolmbRemoveTransparencies;
-boolmbWatermark;
-uno::AnymaWatermark;
+OUStringmsWatermark;
//these variable are here only to have a location in filter/pdf to set the
default
//to be used by the macro (when the FilterData are set by the macro itself)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - canvas/source
canvas/source/cairo/cairo_textlayout.cxx | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) New commits: commit cfaf07f88332dfe0476d559787c508a1688b5956 Author: Caolán McNamara Date: Mon Dec 21 21:21:20 2015 + Resolves: tdf#93703 0 scaling is CAIRO_STATUS_INVALID_MATRIX so more drawing to the surface fails prior to 4ac876084bb89b6460b31e090a666b395f66b1e8 we had a new cairo context each time to the error was thrown away along with the context and the new one would work Change-Id: I90ab1a943e8908e87f391bdfb8ccd5f3818e13d5 (cherry picked from commit f22d153a07231f2d41c7be9ba0e6b7ce963a0762) Reviewed-on: https://gerrit.libreoffice.org/20852 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 03d31947..414c29d 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -497,6 +497,14 @@ namespace cairocanvas if (cairo_glyphs.empty()) continue; +vcl::Font aFont = rOutDev.GetFont(); +long nWidth = aFont.GetWidth(); +long nHeight = aFont.GetHeight(); +if (nWidth == 0) +nWidth = nHeight; +if (nWidth == 0 || nHeight == 0) +continue; + /** * Setup font **/ @@ -548,17 +556,12 @@ namespace cairocanvas // Font rotation and scaling cairo_matrix_t m; -vcl::Font aFont = rOutDev.GetFont(); cairo_matrix_init_identity(&m); if (aSysLayoutData.orientation) cairo_matrix_rotate(&m, (3600 - aSysLayoutData.orientation) * M_PI / 1800.0); -long nWidth = aFont.GetWidth(); -long nHeight = aFont.GetHeight(); -if (nWidth == 0) -nWidth = nHeight; cairo_matrix_scale(&m, nWidth, nHeight); //faux italics ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source sw/qa
sax/source/tools/fastserializer.cxx | 25 ++---
sw/qa/extras/ooxmlexport/data/nonbmpchar.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |9 +
3 files changed, 11 insertions(+), 23 deletions(-)
New commits:
commit 7ec5ba47783ac8b2d0141109d0efe6b20b363ced
Author: Mark Hung
Date: Sun Jan 10 00:28:14 2016 +0800
Fix FastSaxSerializer::write() for non-BMP unicode characters.
Change-Id: I6ee9d028813c970b9ac5b9f0574af932e73111bd
Reviewed-on: https://gerrit.libreoffice.org/21293
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sax/source/tools/fastserializer.cxx
b/sax/source/tools/fastserializer.cxx
index 37ed847..8437ff0 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -94,29 +94,8 @@ namespace sax_fastparser {
void FastSaxSerializer::write( const OUString& sOutput, bool bEscape )
{
-const sal_Int32 nLength = sOutput.getLength();
-for (sal_Int32 i = 0; i < nLength; ++i)
-{
-const sal_Unicode cUnicode = sOutput[ i ];
-const char cChar = cUnicode;
-if (cUnicode & 0xff80)
-{
-write( OString(&cUnicode, 1, RTL_TEXTENCODING_UTF8) );
-}
-else if(bEscape) switch( cChar )
-{
-case '<': writeBytes( "<", 4 ); break;
-case '>': writeBytes( ">", 4 ); break;
-case '&': writeBytes( "&", 5 );break;
-case '\'': writeBytes( "'", 6 ); break;
-case '"': writeBytes( """, 6 ); break;
-case '\n': writeBytes( "
", 5 );break;
-case '\r': writeBytes( "
", 5 );break;
-default:writeBytes( &cChar, 1 ); break;
-}
-else
-writeBytes( &cChar, 1 );
-}
+write( sOutput.toUtf8(), bEscape );
+
}
void FastSaxSerializer::write( const OString& sOutput, bool bEscape )
diff --git a/sw/qa/extras/ooxmlexport/data/nonbmpchar.docx
b/sw/qa/extras/ooxmlexport/data/nonbmpchar.docx
new file mode 100644
index 000..a6b5d41
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/nonbmpchar.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 9deea3e..68c0e2d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1011,6 +1011,15 @@ DECLARE_OOXMLEXPORT_TEST(testOO106020, "ooo106020-1.odt")
assertXPath(pXmlDoc, "//w:tbl", 1);
}
+DECLARE_OOXMLEXPORT_TEST(testNonBMPChar, "nonbmpchar.docx")
+{
+sal_uInt32 nCh = 0x24b62;
+OUString aExpected( &nCh, 1);
+// Assert that UTF8 encoded non-BMP Unicode character is correct
+uno::Reference xTextRange1 = getRun(getParagraph(1), 1);
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange1->getString());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [tdf-discuss] Re: Remove ActiveX from LibreOffice
On Tue, Jan 12, 2016 at 10:36 AM, timofonic timofonic wrote: > Hello. > > I'm an humble and unskilled user, but here's my opinion: > > - I personally think technologies like ActiveX are a double sword, they > help others to get attached to the Microsoft ecosystem. This technology > isn't an open standard and has potential security risks. > - I see this issue is taken serious with ActiveX, but there's another > dangerous technology: Java. > * Do you remember what happened with Oracle vs Java? They are switching to > OpenJDK, but personally I think that environment is poisoned by a > corporation as greedy and corrupt like microsoft. > * I think Java is a security risk, not so multiplatform in reality and not > so efficient. It should be avoided and eliminated from LO codebase. > > > What about making Python and Lua more important in LibreOffice? > My first thoughts: Python and Lua are languages. Windows is an OS, meaning ActiveX works on Windows with any language that supports it, allowing the code which runs under ActiveX to be ported to any other application natively on Windows. Windows is no small OS. In 2015, it still maintains over 80% marketshare of all desktop OSes: http://netmarketshare.com/operating-system-market-share.aspx?qprid=10&qpcustomd=0 Plus, Python directly supports ActiveX and can import into itself, and I believe with ActivePython can also export: http://stackoverflow.com/questions/12039174/python-activex-automation > - Lua: > * It's extremely lightweight and it did born for configure files. > * It can be used to replace certain native code that is difficult to > maintain or prone to lots of changes. > * You can use a JIT or compile it as native code, there are different > approachs. > * It could make LibreOffice more customizable: Do you think LibreOffice UI > is awful? Are you a keyboard junkie that is used to console text editors? > Do you have some disability that requires a specific interface (visual, > tactile, eye movement, voice...) No problem if the UI could be easy to > adapt to make it work in different ways. > I have no experience with Lua. > - Python > * There's UNO: Who uses it? > * What about using the more faster Python implementations? > Blender uses a background python interface. It allows for some really nice features, though most everything is done through the GUI for most users. > I think LibreOffice needs to have a more disruptive and innovative > approach: > > - I always considered emacs something very interesting, but not practical. > * elisp and lack of multithreading make it very unusable. > * It's unusable until you master it. It's good you can do some magic with > programming skills and get used to keyboard use, but there should be a > friendly start and the default mode should be easy for unskilled computer > users. > * Despite of that, the Emacs community is impressive: There's constant > loads of new extensions for it, very enthusiast users t the level some of > them are unfortunately zealots. > > - I'm jealous of Atom, despite being "just" a text editor: > * It has loads of extensions. > * It could be used as an IDE for programing, web development and design. > * But I consider the "web native" apps really resource eaters. > > What's the future of LibreOffice? Does it want to be just a Microsoft > Office clone? > - Why not make it a more flexible but lightweight at same time? > - What about niches? Engineering, sciences, education, programming. > - What about making it not freeze while saving and all these annoying > stuff? > > I would love: > > - Writer: The best of a "text processor". Become a powerful ide. Able to > edit using markup languages. Able to use DVCS like Git. > - Calc: Make it more advanced > * Stadistic features of the old SMPS one or even better. > * Integrate CAS (Computer Algebra System) in some reliable and flexible > approach: Maxima, SageMath integration, resurrect CmathOOoCAS (it uses > Xcas/Giac), CoCoA. > - Make Math a real scientific tool. > * What about merging it with some CAS tool? > * What about provide RPN? > * What about making it able to be used as an advanced scientific > calculator and even interoperability with commercial ones? > * It needs some love in the boolean logic features, too. > > - All: What about RTCE? Interoperability with e-learning systems like > Moodle? Able to be used to embed scientific/technical information like CAD, > EDA, 3D? > > I know my ideas are insane, but that's what my insane mind think about the > ideal LO :) > > Kind regards. > > LibreOffice only goes to get the low hanging fruit. It may seem a good > approach, but makes it a curse. > > On Tue, Jan 12, 2016 at 2:03 PM, Rick C. Hodgin > wrote: > >> If you search for "Microsoft Excel Automation" you'll find many references >> online of how ActiveX is used in other applications to allow the Excel >> engine to compute things in a spreadsheet form. Were the same ability >> well-documented in LibreOffice, many people would switch
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/landscape.rtf | 13
sw/qa/extras/rtfimport/data/lndscpsxn.rtf | 17 +
sw/qa/extras/rtfimport/rtfimport.cxx | 73 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 ++-
4 files changed, 111 insertions(+), 1 deletion(-)
New commits:
commit cbc0c1b64bff517b27104c6335d45fb59a884931
Author: Guillaume Smaha
Date: Wed Nov 25 10:18:51 2015 +0100
RTF import, fix landscape flag & implement lndscpsxn
Change-Id: Id2e8e9c1a9686fd674d712498acb7374a81077d7
Reviewed-on: https://gerrit.libreoffice.org/20163
Tested-by: Jenkins
Reviewed-by: Mark Hung
Tested-by: Mark Hung
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/rtfimport/data/landscape.rtf
b/sw/qa/extras/rtfimport/data/landscape.rtf
new file mode 100644
index 000..9bbc3f7
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/landscape.rtf
@@ -0,0 +1,13 @@
+{\rtf1 \ansi \landscape \paperw16837 \paperh11905
+{\sectd
+Test
+\par
+\sect}
+{\sectd
+TEST
+\par
+\sect}
+{\sectd
+Test
+\par}
+}
diff --git a/sw/qa/extras/rtfimport/data/lndscpsxn.rtf
b/sw/qa/extras/rtfimport/data/lndscpsxn.rtf
new file mode 100644
index 000..d904a54
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/lndscpsxn.rtf
@@ -0,0 +1,17 @@
+{\rtf1 \ansi
+{\sectd \paperw16837 \paperh11905 \lndscpsxn
+Test
+\par
+\sect}
+{\sectd \paperw11905 \paperh16837
+TEST
+\par
+\sect}
+{\sectd \paperw16837 \paperh11905 \lndscpsxn
+Test
+\par
+\sect}
+{\sectd \paperw11905 \paperh16837
+TEST
+\par}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 43d0fcb..c3edad9 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2400,6 +2400,79 @@ DECLARE_RTFIMPORT_TEST(testTdf96308Tabpos,
"tdf96308-tabpos.rtf")
CPPUNIT_ASSERT(!aTabStops.hasElements());
}
+DECLARE_RTFIMPORT_TEST(testLndscpsxn, "lndscpsxn.rtf")
+{
+// Check landscape flag.
+CPPUNIT_ASSERT_EQUAL(4, getPages());
+
+uno::Reference pageStyles =
getStyles("PageStyles");
+
+// get a page cursor
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference xTextViewCursorSupplier(
+xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference xCursor(
+xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+
+// check that the first page has landscape flag
+xCursor->jumpToFirstPage();
+OUString pageStyleName = getProperty(xCursor, "PageStyleName");
+uno::Reference
xStylePage(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_True, getProperty(xStylePage,
"IsLandscape"));
+
+// check that the second page has no landscape flag
+xCursor->jumpToPage(2);
+pageStyleName = getProperty(xCursor, "PageStyleName");
+xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_False, getProperty(xStylePage,
"IsLandscape"));
+
+// check that the third page has landscape flag
+xCursor->jumpToPage(3);
+pageStyleName = getProperty(xCursor, "PageStyleName");
+xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_True, getProperty(xStylePage,
"IsLandscape"));
+
+// check that the last page has no landscape flag
+xCursor->jumpToLastPage();
+pageStyleName = getProperty(xCursor, "PageStyleName");
+xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_False, getProperty(xStylePage,
"IsLandscape"));
+}
+
+DECLARE_RTFIMPORT_TEST(testLandscape, "landscape.rtf")
+{
+// Check landscape flag.
+CPPUNIT_ASSERT_EQUAL(3, getPages());
+
+// All pages should have flag orientiation
+uno::Reference pageStyles =
getStyles("PageStyles");
+
+// get a page cursor
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference xTextViewCursorSupplier(
+xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference xCursor(
+xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+
+// check that the first page has landscape flag
+xCursor->jumpToFirstPage();
+OUString pageStyleName = getProperty(xCursor, "PageStyleName");
+uno::Reference
xStylePage(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_True, getProperty(xStylePage,
"IsLandscape"));
+
+// check that the second page has landscape flag
+xCursor->jumpToPage(2);
+pageStyleName = getProperty(xCursor, "PageStyleName");
+xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_True, getProperty(xStylePage,
"IsLandscape"));
+
+// check that the last page has landscape flag
+xCursor->jumpToLastPage();
+pageStyleName = getProperty(xCursor, "PageStyleName");
+xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUA
Re: [tdf-discuss] Re: Remove ActiveX from LibreOffice
Hello.
I'm an humble and unskilled user, but here's my opinion:
- I personally think technologies like ActiveX are a double sword, they
help others to get attached to the Microsoft ecosystem. This technology
isn't an open standard and has potential security risks.
- I see this issue is taken serious with ActiveX, but there's another
dangerous technology: Java.
* Do you remember what happened with Oracle vs Java? They are switching to
OpenJDK, but personally I think that environment is poisoned by a
corporation as greedy and corrupt like microsoft.
* I think Java is a security risk, not so multiplatform in reality and not
so efficient. It should be avoided and eliminated from LO codebase.
What about making Python and Lua more important in LibreOffice?
- Lua:
* It's extremely lightweight and it did born for configure files.
* It can be used to replace certain native code that is difficult to
maintain or prone to lots of changes.
* You can use a JIT or compile it as native code, there are different
approachs.
* It could make LibreOffice more customizable: Do you think LibreOffice UI
is awful? Are you a keyboard junkie that is used to console text editors?
Do you have some disability that requires a specific interface (visual,
tactile, eye movement, voice...) No problem if the UI could be easy to
adapt to make it work in different ways.
- Python
* There's UNO: Who uses it?
* What about using the more faster Python implementations?
I think LibreOffice needs to have a more disruptive and innovative approach:
- I always considered emacs something very interesting, but not practical.
* elisp and lack of multithreading make it very unusable.
* It's unusable until you master it. It's good you can do some magic with
programming skills and get used to keyboard use, but there should be a
friendly start and the default mode should be easy for unskilled computer
users.
* Despite of that, the Emacs community is impressive: There's constant
loads of new extensions for it, very enthusiast users t the level some of
them are unfortunately zealots.
- I'm jealous of Atom, despite being "just" a text editor:
* It has loads of extensions.
* It could be used as an IDE for programing, web development and design.
* But I consider the "web native" apps really resource eaters.
What's the future of LibreOffice? Does it want to be just a Microsoft
Office clone?
- Why not make it a more flexible but lightweight at same time?
- What about niches? Engineering, sciences, education, programming.
- What about making it not freeze while saving and all these annoying stuff?
I would love:
- Writer: The best of a "text processor". Become a powerful ide. Able to
edit using markup languages. Able to use DVCS like Git.
- Calc: Make it more advanced
* Stadistic features of the old SMPS one or even better.
* Integrate CAS (Computer Algebra System) in some reliable and flexible
approach: Maxima, SageMath integration, resurrect CmathOOoCAS (it uses
Xcas/Giac), CoCoA.
- Make Math a real scientific tool.
* What about merging it with some CAS tool?
* What about provide RPN?
* What about making it able to be used as an advanced scientific calculator
and even interoperability with commercial ones?
* It needs some love in the boolean logic features, too.
- All: What about RTCE? Interoperability with e-learning systems like
Moodle? Able to be used to embed scientific/technical information like CAD,
EDA, 3D?
I know my ideas are insane, but that's what my insane mind think about the
ideal LO :)
Kind regards.
LibreOffice only goes to get the low hanging fruit. It may seem a good
approach, but makes it a curse.
On Tue, Jan 12, 2016 at 2:03 PM, Rick C. Hodgin
wrote:
> If you search for "Microsoft Excel Automation" you'll find many references
> online of how ActiveX is used in other applications to allow the Excel
> engine to compute things in a spreadsheet form. Were the same ability
> well-documented in LibreOffice, many people would switch as LibreOffice is
> free, and Excel costs hundreds of dollars.
>
> I urge you not to remove it, but to improve it for simpler integration. It
> should work like this:
>
> lo = CreateObject("libreoffice.application")
> lo.open("c:\path\to\my\document\file.ext")
> lo.visible = .t.
>
> And in that way, an application can directly integrate operations into
> their app which loads LibreOffice. Note that these examples are in Visual
> Basic, but the same general form works from any application, including C++
> (see below):
>
> Here are some automation examples for Excel, Word, Outlook, and PowerPoint:
> Excel: https://support.microsoft.com/en-us/kb/219151
> Word: https://support.microsoft.com/en-us/kb/316383
> Outlook: https://support.microsoft.com/en-us/kb/220595
>
> A more example-by-example based tutorial:
> PowerPoint:
> https://msdn.microsoft.com/en-us/library/bb871574%28v=vs.80%29.aspx
>
> Here's a code snippet on how to access ActiveX from another application
> using C++ from MSDN:
> https://support
[Libreoffice-commits] core.git: filter/source starmath/qa
filter/source/config/fragments/filters/MathML_XML__Math_.xcu |2 +- filter/source/config/fragments/types/math_MathML_XML_Math.xcu |2 +- starmath/qa/extras/mmlimport-test.cxx |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit bcfc60c35e7f7d6436bba0f2554c66bcf699758e Author: Takeshi Abe Date: Sun Jan 10 11:43:34 2016 +0900 tdf#87118 LibreOffice should not claim to use version 1.01 of MathML Call it MathML 2.0 instead. Change-Id: Ifecd52cfcded680bbddf680f2600a42b1c7568d9 Reviewed-on: https://gerrit.libreoffice.org/21304 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/filter/source/config/fragments/filters/MathML_XML__Math_.xcu b/filter/source/config/fragments/filters/MathML_XML__Math_.xcu index af3b6c3..5a6e24a 100644 --- a/filter/source/config/fragments/filters/MathML_XML__Math_.xcu +++ b/filter/source/config/fragments/filters/MathML_XML__Math_.xcu @@ -21,7 +21,7 @@ -MathML 1.01 +MathML 2.0 6200 math_MathML_XML_Math diff --git a/filter/source/config/fragments/types/math_MathML_XML_Math.xcu b/filter/source/config/fragments/types/math_MathML_XML_Math.xcu index 41891f2..b8a4ae3 100644 --- a/filter/source/config/fragments/types/math_MathML_XML_Math.xcu +++ b/filter/source/config/fragments/types/math_MathML_XML_Math.xcu @@ -23,7 +23,7 @@ false MathML XML (Math) -MathML 1.01 +MathML 2.0 diff --git a/starmath/qa/extras/mmlimport-test.cxx b/starmath/qa/extras/mmlimport-test.cxx index 4313019..1ab9d62 100644 --- a/starmath/qa/extras/mmlimport-test.cxx +++ b/starmath/qa/extras/mmlimport-test.cxx @@ -48,7 +48,7 @@ private: OUString(), SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::TEMPLATE, SotClipboardFormatId::STARCALC_8, - "MathML 1.01", + "MathML 2.0", 0, OUString(), OUString(), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/pdfexport.cxx | 18 --
filter/source/pdf/pdfexport.hxx |3 +--
2 files changed, 5 insertions(+), 16 deletions(-)
New commits:
commit 5c5017ea37e1bee205c6c1b9cafe753fcaf1a9a4
Author: Julien Nabet
Date: Mon Dec 28 17:32:19 2015 +0100
tdf#65439: Export to PDF/A-1a gives transparency warning
There was a use of transparency because Watermark was always defined
Now we test if text of Watermark is empty or not
Remark: it seems we don't cope not-text Watermark in pdf export
(additional cleaning+renaming)
Change-Id: I9d9c759a80c0a61e4f0a94c0fa295f2950caa3bc
Reviewed-on: https://gerrit.libreoffice.org/20990
Tested-by: Jenkins
Tested-by: Jan-Marek Glogowski
Reviewed-by: Michael Stahl
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 458edd8..da1f2d9 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -116,7 +116,6 @@ PDFExport::PDFExport( const Reference< XComponent >&
rxSrcDoc,
mbAllowDuplicateFieldNames ( false ),
mnProgressValue ( 0 ),
mbRemoveTransparencies ( false ),
-mbWatermark ( false ),
mbHideViewerToolbar ( false ),
mbHideViewerMenubar ( false ),
@@ -504,10 +503,7 @@ bool PDFExport::Export( const OUString& rFile, const
Sequence< PropertyValue >&
else if ( rFilterData[ nData ].Name == "IsAddStream" )
rFilterData[ nData ].Value >>= mbAddStream;
else if ( rFilterData[ nData ].Name == "Watermark" )
-{
-maWatermark = rFilterData[ nData ].Value;
-mbWatermark = true;
-}
+rFilterData[ nData ].Value >>= msWatermark;
//now all the security related properties...
else if ( rFilterData[ nData ].Name == "EncryptFile" )
rFilterData[ nData ].Value >>= mbEncrypt;
@@ -1046,7 +1042,7 @@ bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter,
vcl::PDFExtOutDevData&
rPDFExtOutDevData.ResetSyncData();
-if( mbWatermark )
+if (!msWatermark.isEmpty())
ImplWriteWatermark( rWriter, aSizePDF );
return bRet;
@@ -1056,7 +1052,6 @@ bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter,
vcl::PDFExtOutDevData&
void PDFExport::ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size&
rPageSize )
{
-OUString aText( "Watermark" );
vcl::Font aFont( OUString( "Helvetica" ), Size( 0, 3*rPageSize.Height()/4
) );
aFont.SetItalic( ITALIC_NONE );
aFont.SetWidthType( WIDTH_NORMAL );
@@ -1069,18 +1064,13 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter&
rWriter, const Size& rPageSi
aFont.SetOrientation( 2700 );
}
-if( ! ( maWatermark >>= aText ) )
-{
-// more complicated watermark ?
-}
-
// adjust font height for text to fit
OutputDevice* pDev = rWriter.GetReferenceDevice();
pDev->Push();
pDev->SetFont( aFont );
pDev->SetMapMode( MapMode( MAP_POINT ) );
int w = 0;
-while( ( w = pDev->GetTextWidth( aText ) ) > nTextWidth )
+while( ( w = pDev->GetTextWidth( msWatermark ) ) > nTextWidth )
{
if (w == 0)
break;
@@ -1122,7 +1112,7 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter&
rWriter, const Size& rPageSi
}
rWriter.SetClipRegion();
rWriter.BeginTransparencyGroup();
-rWriter.DrawText( aTextPoint, aText );
+rWriter.DrawText( aTextPoint, msWatermark );
rWriter.EndTransparencyGroup( aTextRect, 50 );
rWriter.Pop();
}
diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx
index 3f2ad46..cdba3a6 100644
--- a/filter/source/pdf/pdfexport.hxx
+++ b/filter/source/pdf/pdfexport.hxx
@@ -66,8 +66,7 @@ private:
sal_Int32 mnProgressValue;
boolmbRemoveTransparencies;
-boolmbWatermark;
-uno::AnymaWatermark;
+OUStringmsWatermark;
//these variable are here only to have a location in filter/pdf to set the
default
//to be used by the macro (when the FilterData are set by the macro itself)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |2 +-
sw/qa/extras/ooxmlimport/data/tdf95213.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 ++
writerfilter/source/dmapper/DomainMapper.cxx |6 +++---
writerfilter/source/dmapper/DomainMapper.hxx |2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
writerfilter/source/dmapper/NumberingManager.cxx |2 +-
writerfilter/source/dmapper/StyleSheetTable.cxx |5 +++--
writerfilter/source/dmapper/StyleSheetTable.hxx |2 +-
9 files changed, 25 insertions(+), 10 deletions(-)
New commits:
commit 7787395c25d182e4c802881ec852b8d3ad3dd46a
Author: Miklos Vajna
Date: Thu Jan 7 08:19:17 2016 +0100
tdf#95213 DOCX import: don't reuse list label styles
We used to optimize the creation of these styles, so in case two list
label had the same character properties, then we could avoid creating
two styles for those.
This isn't correct though: it means if the style is changed later by the
user, then unexpected other places in the document will change as well.
Do what the binary DOC filter does: create one character style for each
level of a numbering separately.
(cherry picked from commit f9c8d97d82a85b897520a2fe897352ee5ad879d9)
Change-Id: I967b30fc078b1be30f7ef81b2706df2962fc3fb0
Reviewed-on: https://gerrit.libreoffice.org/21386
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 0f68506..3626d57 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -460,7 +460,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo76934, "fdo76934.docx")
return;
// Ensure that after fix LO is preserving AutoSpacing property in
styles.xml
-assertXPath ( pXmlDoc, "/w:styles[1]/w:style[36]/w:pPr[1]/w:spacing[1]",
"beforeAutospacing", "1" );
+assertXPath ( pXmlDoc,
"/w:styles[1]/w:style[@w:styleId='Title']/w:pPr[1]/w:spacing[1]",
"beforeAutospacing", "1" );
}
DECLARE_OOXMLEXPORT_TEST(testfdo79540, "fdo79540.docx")
diff --git a/sw/qa/extras/ooxmlimport/data/tdf95213.docx
b/sw/qa/extras/ooxmlimport/data/tdf95213.docx
new file mode 100644
index 000..831d543
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf95213.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ab8dabe..5c18000 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -3018,6 +3018,20 @@ DECLARE_OOXMLIMPORT_TEST(testTdf92045, "tdf92045.docx")
CPPUNIT_ASSERT_EQUAL(false, getProperty(getRun(getParagraph(1), 1),
"CharFlash"));
}
+DECLARE_OOXMLIMPORT_TEST(testTdf95213, "tdf95213.docx")
+{
+// Get the second paragraph's numbering style's 2nd level's character
style name.
+uno::Reference xParagraph = getParagraph(2);
+auto xLevels = getProperty< uno::Reference
>(xParagraph, "NumberingRules");
+uno::Sequence aLevel;
+xLevels->getByIndex(1) >>= aLevel; // 2nd level
+OUString aName = std::find_if(aLevel.begin(), aLevel.end(), [](const
beans::PropertyValue& rValue) { return rValue.Name == "CharStyleName";
})->Value.get();
+
+uno::Reference
xStyle(getStyles("CharacterStyles")->getByName(aName), uno::UNO_QUERY);
+// This was awt::FontWeight::BOLD.
+CPPUNIT_ASSERT_EQUAL(awt::FontWeight::NORMAL, getProperty(xStyle,
"CharWeight"));
+}
+
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 6d7eb17..bd5f65e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3054,7 +3054,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
{
PropertyMapPtr pContext = m_pImpl->GetTopContext();
PropertyValueVector_t aProps = comphelper::sequenceToContainer<
PropertyValueVector_t >(pContext->GetPropertyValues());
-OUString sStyle = getOrCreateCharStyle(aProps);
+OUString sStyle = getOrCreateCharStyle(aProps,
/*bAlwaysCreate=*/false);
m_pImpl->SetRubyText(sText,sStyle);
return;
}
@@ -3515,10 +3515,10 @@ uno::Reference< text::XTextRange >
DomainMapper::GetCurrentTextRange()
return m_pImpl->GetTopTextAppend()->getEnd();
}
-OUString DomainMapper::getOrCreateCharStyle( PropertyValueVector_t&
rCharProperties )
+OUString DomainMapper::getOrCreateCharStyle( PropertyValueVector_t&
rCharProperties, bool bAlwaysCreate )
{
StyleSheetTablePtr pStyleSheets = m_pImpl->GetStyleSheetTable();
-return pStyleSheets->getOrCreateCharStyle( rCharProperties );
+return pStyleSheets->getOrCreateCharStyle( rCharProperties, bAlwaysCreate
);
}
StyleSheetTablePtr DomainMapper::
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/win
include/vcl/window.hxx |2 +-
vcl/inc/window.h |2 +-
vcl/source/window/mouse.cxx|2 +-
vcl/source/window/syschild.cxx |7 +--
vcl/source/window/window.cxx | 13 -
vcl/source/window/winproc.cxx | 21 ++---
vcl/win/window/salframe.cxx|2 +-
7 files changed, 31 insertions(+), 18 deletions(-)
New commits:
commit 0ba752201dca6129cc6b4a19ec93eb369eb70890
Author: Tor Lillqvist
Date: Mon Jan 11 17:17:10 2016 +0200
Re-work focus handling to use an idle handler
Gets rid of some flashing when using OpenGL.
Change-Id: I1273b960725bf868e7340eac3f2bad2f20e73d91
Reviewed-on: https://gerrit.libreoffice.org/21390
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 6b383bd..3ade2a8 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -537,7 +537,7 @@ public:
DECL_DLLPRIVATE_LINK_TYPED( ImplHandlePaintHdl, Idle*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplGenerateMouseMoveHdl, void*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void );
-DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncFocusHdl, void*, void );
+DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncFocusHdl, Idle*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplHandleResizeTimerHdl, Idle*, void );
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 64551af..4c8b541 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -143,7 +143,7 @@ struct ImplFrameData
sal_Int32 mnDPIY; //< Original Screen Resolution
ImplMapRes maMapUnitRes; //< for LogicUnitToPixel
sal_uIntPtr mnAllSaveBackSize; //< size of all bitmaps of
saved backgrounds
-ImplSVEvent * mnFocusId; //< FocusId for PostUserLink
+Idle * mpFocusIdle;
ImplSVEvent * mnMouseMoveId; //< MoveId for PostUserLink
longmnLastMouseX; //< last x mouse position
longmnLastMouseY; //< last y mouse position
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 330cb70..4747abd 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -256,7 +256,7 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags )
vcl::Window *pFrame = pSVData->maWinData.mpFirstFrame;
while( pFrame )
{
-if( pFrame != mpWindowImpl->mpFrameWindow.get() &&
pFrame->mpWindowImpl->mpFrameData->mnFocusId )
+if( pFrame != mpWindowImpl->mpFrameWindow.get() &&
pFrame->mpWindowImpl->mpFrameData->mpFocusIdle )
{
bAsyncFocusWaiting = true;
break;
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index d0c8e8c..7a007a9 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -79,10 +79,13 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject
*/,
// trigger a LoseFocus which matches the status
// of the window with matching Activate-Status
pWindow->ImplGetFrameData()->mbSysObjFocus = false;
-if ( !pWindow->ImplGetFrameData()->mnFocusId )
+if ( !pWindow->ImplGetFrameData()->mpFocusIdle )
{
pWindow->ImplGetFrameData()->mbStartFocusState = true;
-pWindow->ImplGetFrameData()->mnFocusId =
Application::PostUserEvent( LINK( pWindow->ImplGetFrameWindow(), vcl::Window,
ImplAsyncFocusHdl ), nullptr, true );
+pWindow->ImplGetFrameData()->mpFocusIdle = new
Idle("loseFocus");
+pWindow->ImplGetFrameData()->mpFocusIdle->SetIdleHdl(LINK(
pWindow->ImplGetFrameWindow(), vcl::Window, ImplAsyncFocusHdl ));
+
pWindow->ImplGetFrameData()->mpFocusIdle->SetPriority(SchedulerPriority::LOW);
+pWindow->ImplGetFrameData()->mpFocusIdle->Start();
}
break;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d508719..61e62b3 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -498,9 +498,12 @@ void Window::dispose()
if ( mpWindowImpl->mpFrameData )
{
-if ( mpWindowImpl->mpFrameData->mnFocusId )
-Application::RemoveUserEvent( mpWindowImpl->mpFrameData->mnFocusId
);
-mpWindowImpl->mpFrameData->mnFocusId = nullptr;
+if ( mpWindowImpl->mpFrameData->mpFocusIdle )
+{
+mpWindowImpl->mpFrameData->mpFocusIdle->Stop();
+delete mpWindowImpl->mpFrameData->mpFocusIdle;
+mpWindowImpl->mpFrameData->mpFocusIdle = nullptr;
+}
if ( mpWindowImpl->mpFrameData->mnMouseMoveId )
Application::RemoveUserEvent(
mpWindowImpl->mpFrameData->mnMouseMoveId );
mpWindowImpl->mpFrameData->mnMouseMoveId = nullptr;
@@ -570,7 +573,7 @@ void Window::dispose()
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/cmis/cmis_content.cxx |2 +-
ucb/source/ucp/cmis/cmis_url.cxx | 10 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 7a32b6f247b2cb92373bbce6fc2a314cb043e3bb
Author: Giuseppe Castagno
Date: Wed Jan 6 15:53:20 2016 +0100
Related tdf#96174: save again on Google Drive.
Files can no longer be saved on Google Drive.
The bug was introduced in 0398e1e3967332c49b6451b5d41bcf0357052d0b.
Google Drive may have user name in the form:
name.surn...@domain.com
In some places the user name should be escaped before using it.
Change-Id: Idee3e57c0ad1dcbbd517b60c387868bfc706f27e
Reviewed-on: https://gerrit.libreoffice.org/21198
Tested-by: Jenkins
Reviewed-by: jan iversen
Tested-by: jan iversen
Reviewed-by: Stephan Bergmann
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 44dba89..1e7aa84 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -2019,7 +2019,7 @@ namespace cmis
// TODO Cache the objects
INetURLObject aURL( m_sURL );
-OUString sUser = aURL.GetUser( INetURLObject::NO_DECODE );
+OUString sUser = aURL.GetUser(
INetURLObject::DECODE_WITH_CHARSET );
URL aUrl( m_sURL );
OUString sPath( m_sObjectPath );
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 533ebf2..103ccad 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -61,13 +61,21 @@ namespace cmis
OUString URL::asString( )
{
OUString sUrl;
+// Related tdf#96174, can no longer save on Google Drive
+// the user field may contain characters that need to be escaped
according to
+// RFC3896 userinfo URI field
+// see
+OUString sEncodedUser = ( m_sUser.isEmpty() ?
+ OUString() :
+ rtl::Uri::encode( m_sUser,
rtl_UriCharClassUserinfo,
+
rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8) );
OUString sEncodedBinding = rtl::Uri::encode(
m_sBindingUrl + "#" + m_sRepositoryId,
rtl_UriCharClassRelSegment,
rtl_UriEncodeKeepEscapes,
RTL_TEXTENCODING_UTF8 );
sUrl = "vnd.libreoffice.cmis://" +
-( m_sUser.isEmpty() ? OUString( ) : (m_sUser + "@") ) +
+( sEncodedUser.isEmpty() ? OUString( ) : (sEncodedUser + "@")
) +
sEncodedBinding;
if ( !m_sPath.isEmpty( ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/detfunc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 24af10f6c1aaff9fd25e969dd010f798618f2813
Author: Stephan Bergmann
Date: Tue Jan 12 15:34:29 2016 +0100
Revert "Stick to exact-type check"
This reverts commit 791ad3e170bcb5a2daedac77932dc9822f7f1092, as discussed
on
IRC:
os_cib, ^ or was that intentional?
sberg: There was no reason for an exact type check. Afterwards the
pointer is static_casted to an SdrRectObj anyway.
os_cib, but how is that "Afterwards..." part relevant for what the
if()
should actually check?
sberg: The detective function puts some object types into a certain
drawing layer (polygons, circles and rectangles). It won't find any other
object type in that layer.
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index a045c36..11810e3 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -742,7 +742,7 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nR
while (pObject)
{
if ( pObject->GetLayer() == SC_LAYER_INTERN &&
-typeid(*pObject) == typeid(SdrRectObj) )
+dynamic_cast< const SdrRectObj* >(pObject) != nullptr )
{
aObjRect = static_cast(pObject)->GetLogicRect();
aObjRect.Justify();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39468] translate German comments, removing redundant ones
https://bugs.documentfoundation.org/show_bug.cgi?id=39468 --- Comment #228 from Commit Notification --- Chris Sherlock committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=9d310b03e1ae6729144e149c0b25f94a54db7c33 tdf#39468 translate OSL_ENSURE German text It will be available in 5.2.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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/text/txtfrm.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9d310b03e1ae6729144e149c0b25f94a54db7c33 Author: Chris Sherlock Date: Tue Jan 12 20:19:40 2016 +1100 tdf#39468 translate OSL_ENSURE German text Change-Id: I41d66f7b19217d0ba7780c1a999bc1289a6d3234 Reviewed-on: https://gerrit.libreoffice.org/21387 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 8e13867..0cc84d9 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -1756,7 +1756,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid, // line has to be formatted, so that the first line of the Follow can flow up. // Which had flowed to the next page to be together with the footnote (this is // especially true for areas with columns) -OSL_ENSURE( GetFollow(), "PREP_FTN_GONE darf nur vom Follow gerufen werden" ); +OSL_ENSURE( GetFollow(), "PREP_FTN_GONE may only be called by Follow" ); sal_Int32 nPos = GetFollow()->GetOfst(); if( IsFollow() && GetOfst() == nPos ) // If we don't have a mass of text, we call our FindMaster()->Prepare( PREP_FTN_GONE ); // Master's Prepare ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc
starmath/inc/node.hxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 1de4bd9088bf9311e41bbe3eef098ba79504c071
Author: Takeshi Abe
Date: Sat Jan 2 12:29:50 2016 +0900
starmath: Assert that SmRootNode always has three children
Change-Id: I9d1b47fc7fc26254f331967dd58f60d88bd2112f
Reviewed-on: https://gerrit.libreoffice.org/21036
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index cf6e472..90e7a57 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -26,6 +26,7 @@
#include "rect.hxx"
#include "format.hxx"
+#include
#include
#include
#include
@@ -1319,7 +1320,7 @@ public:
inline SmNode* SmRootNode::Argument()
{
-OSL_ASSERT( GetNumSubNodes() > 0 );
+assert( GetNumSubNodes() == 3 );
return GetSubNode( 0 );
}
inline const SmNode* SmRootNode::Argument() const
@@ -1328,7 +1329,8 @@ inline const SmNode* SmRootNode::Argument() const
}
inline SmRootSymbolNode* SmRootNode::Symbol()
{
-OSL_ASSERT( GetNumSubNodes() > 1 && GetSubNode( 1 )->GetType() ==
NROOTSYMBOL );
+assert( GetNumSubNodes() == 3 );
+OSL_ASSERT( GetSubNode( 1 )->GetType() == NROOTSYMBOL );
return static_cast< SmRootSymbolNode* >( GetSubNode( 1 ));
}
inline const SmRootSymbolNode* SmRootNode::Symbol() const
@@ -1337,7 +1339,7 @@ inline const SmRootSymbolNode* SmRootNode::Symbol() const
}
inline SmNode* SmRootNode::Body()
{
-OSL_ASSERT( GetNumSubNodes() > 2 );
+assert( GetNumSubNodes() == 3 );
return GetSubNode( 2 );
}
inline const SmNode* SmRootNode::Body() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/faileddyncast.cxx | 122
1 file changed, 122 insertions(+)
New commits:
commit 75f0f9d5538577e0d4923b4d46ba6f88b6199814
Author: Stephan Bergmann
Date: Tue Jan 12 15:00:33 2016 +0100
New loplugin:faileddyncast
Offline discussion about tdf#96067 "Crash on undo row inserts" brought up
the
idea to warn about cases where uses of dynamic_cast are statically knwon to
always fail. Clang's clang::AST::CXXDynamicCastExpr::isAlwaysNull already
implements such a check, reporting true if the casted-from class is final,
but
has two issues:
For one, it does not work for template code, when one of the involved types
is a
template parameter type (so e.g., DestType->castAs() can
crash).
For another, it misses the opportunity to report true if the casted-to type
is
final and only derives from the casted-from type non-publicly. My hope was
that
this, after the "final" decorations in
548c43238d02b34cf73e7c2ca1a912ee4fe82544
"Mark some classes as final," might turn up the culprit of tdf#96067 (with a
scenario similar to the failed dynamic_cast on private derivation in
63b67ab5cab8cf7576a68cabe5fb1a42c6ad800c "Use public derivation, and remove
then-unnecessary downcasts")---but not so.
Change-Id: I962ee19820758f9c601f4a292da7f37fa9dff5ce
diff --git a/compilerplugins/clang/faileddyncast.cxx
b/compilerplugins/clang/faileddyncast.cxx
new file mode 100644
index 000..6fef227
--- /dev/null
+++ b/compilerplugins/clang/faileddyncast.cxx
@@ -0,0 +1,122 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include "clang/AST/CXXInheritance.h"
+
+#include "plugin.hxx"
+
+namespace {
+
+// cf. Clang's clang::AST::CXXDynamicCastExpr::isAlwaysNull
+// (lib/AST/ExprCXX.cpp):
+bool isAlwaysNull(CXXDynamicCastExpr const * expr) {
+ QualType SrcType = expr->getSubExpr()->getType();
+ QualType DestType = expr->getType();
+
+ if (const PointerType *SrcPTy = SrcType->getAs()) {
+SrcType = SrcPTy->getPointeeType();
+#if 0
+DestType = DestType->castAs()->getPointeeType();
+#else
+auto DstPTy = DestType->getAs();
+if (!DstPTy)
+ return false;
+DestType = DstPTy->getPointeeType();
+#endif
+ }
+
+ if (DestType->isVoidType())
+return false;
+
+#if 0
+ const CXXRecordDecl *SrcRD =
+cast(SrcType->castAs()->getDecl());
+#else
+ auto SrcRT = SrcType->getAs();
+ if (!SrcRT)
+return false;
+ const CXXRecordDecl *SrcRD = cast(SrcRT->getDecl());
+#endif
+
+#if 0
+ if (!SrcRD->hasAttr())
+return false;
+#endif
+
+#if 0
+ const CXXRecordDecl *DestRD =
+cast(DestType->castAs()->getDecl());
+#else
+ auto DestRT = DestType->getAs();
+ if (!DestRT)
+return false;
+ const CXXRecordDecl *DestRD = cast(DestRT->getDecl());
+#endif
+
+#if 1
+ if (!(SrcRD && DestRD))
+return false;
+
+ if (DestRD->hasAttr()) {
+CXXBasePaths Paths(/*FindAmbiguities=*/false, /*RecordPaths=*/true,
+ /*DetectVirtual=*/false);
+if (DestRD->isDerivedFrom(SrcRD, Paths) &&
+std::all_of(Paths.begin(), Paths.end(),
+[](CXXBasePath const & Path) {
+return Path.Access != AS_public; }))
+ return true;
+ }
+
+ if (!SrcRD->hasAttr())
+return false;
+#endif
+
+ return !DestRD->isDerivedFrom(SrcRD);
+}
+
+class FailedDynCast:
+public RecursiveASTVisitor, public loplugin::Plugin
+{
+public:
+explicit FailedDynCast(InstantiationData const & data): Plugin(data) {}
+
+bool shouldVisitTemplateInstantiations() const { return true; }
+
+void run() override;
+
+bool VisitCXXDynamicCastExpr(CXXDynamicCastExpr const * expr);
+};
+
+void FailedDynCast::run() {
+if (compiler.getLangOpts().CPlusPlus) {
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+}
+}
+
+bool FailedDynCast::VisitCXXDynamicCastExpr(CXXDynamicCastExpr const * expr) {
+if (ignoreLocation(expr)) {
+return true;
+}
+if (isAlwaysNull(expr)) {
+report(
+DiagnosticsEngine::Warning,
+"dynamic_cast from %0 to %1 always fails", expr->getLocStart())
+<< expr->getSubExpr()->getType() << expr->getType()
+<< expr->getSourceRange();
+}
+return true;
+}
+
+loplugin::Plugin::Registration X("faileddyncast");
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/MasterProcessSession.cpp
loolwsd/MasterProcessSession.cpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d51972c28d400870794e203f2170dd483f5cdc8b
Author: Jan Holesovsky
Date: Tue Jan 12 14:51:32 2016 +0100
loolwsd: Don't cache empty partpagerectangles.
This is implemented only for Writer, so they are empty for Calc and Impress;
and yet they can confuse loleaflet terribly...
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 2440e71..e427328 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -177,7 +177,8 @@ bool MasterProcessSession::_handleInput(const char *buffer,
int length)
}
else if (tokens[0] == "partpagerectangles:")
{
-peer->_tileCache->saveTextFile(std::string(buffer, length),
"partpagerectangles.txt");
+if (tokens.count() > 1 && !tokens[1].empty())
+peer->_tileCache->saveTextFile(std::string(buffer,
length), "partpagerectangles.txt");
}
else if (tokens[0] == "invalidatecursor:")
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loolwsd/LOOLSession.cpp
loolwsd/LOOLSession.cpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b7648fab14bc75ab96c9a1b0e79d71477251ac82
Author: Jan Holesovsky
Date: Tue Jan 12 14:51:32 2016 +0100
loolwsd: Don't cache empty partpagerectangles.
This is implemented only for Writer, so they are empty for Calc and Impress;
and yet they can confuse loleaflet terribly...
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 85e6f0e..e920adb 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -287,7 +287,8 @@ bool MasterProcessSession::handleInput(const char *buffer,
int length)
}
else if (tokens[0] == "partpagerectangles:")
{
-peer->_tileCache->saveTextFile(std::string(buffer, length),
"partpagerectangles.txt");
+if (tokens.count() > 1 && !tokens[1].empty())
+peer->_tileCache->saveTextFile(std::string(buffer,
length), "partpagerectangles.txt");
}
else if (tokens[0] == "invalidatecursor:")
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/editeng include/svl sc/source
include/editeng/flditem.hxx | 18 +-
include/svl/poolitem.hxx|2 +-
sc/source/ui/inc/docsh.hxx |2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 548c43238d02b34cf73e7c2ca1a912ee4fe82544
Author: Stephan Bergmann
Date: Tue Jan 12 14:44:42 2016 +0100
Mark some classes as final
...namely exactly those for which fa91dd31f39a24329d288d4e1cda28db3a16af0d
"5th step to remove tools/rtti.hxx" (which is assumed the culprit in
tdf#96067
"Crash on undo row inserts") had replaced exact-type checks of the form
v->Type() == TYPE(X)
with type-or-subtype-of checks of the form
dynamic_cast(v) != nullptr
which is only sound if X is a final class. (Except for one case already
handled
differently in 791ad3e170bcb5a2daedac77932dc9822f7f1092 "Stick to exact-type
check.")
Change-Id: Ia822c55c7c0e982d42c6a97589307e577721e324
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 2dcaa06..bef6297 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -177,7 +177,7 @@ public:
virtual MetaAction* createBeginComment() const override;
};
-class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxPageField final: public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxPageField, SvxFieldData,
css::text::textfield::Type::PAGE )
@@ -189,7 +189,7 @@ public:
virtual MetaAction* createBeginComment() const override;
};
-class EDITENG_DLLPUBLIC SvxPageTitleField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxPageTitleField final: public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxPageTitleField, SvxFieldData,
css::text::textfield::Type::PAGE_NAME )
@@ -201,7 +201,7 @@ public:
virtual MetaAction* createBeginComment() const override;
};
-class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxPagesField final: public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxPagesField, SvxFieldData,
css::text::textfield::Type::PAGES )
@@ -211,7 +211,7 @@ public:
virtual booloperator==( const SvxFieldData& ) const override;
};
-class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxTimeField final: public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxTimeField, SvxFieldData,
css::text::textfield::Type::TIME )
@@ -223,7 +223,7 @@ public:
virtual MetaAction* createBeginComment() const override;
};
-class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxFileField final: public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxFileField, SvxFieldData,
css::text::textfield::Type::DOCINFO_TITLE )
@@ -233,7 +233,7 @@ public:
virtual booloperator==( const SvxFieldData& ) const override;
};
-class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxTableField final: public SvxFieldData
{
int mnTab;
public:
@@ -378,7 +378,7 @@ public:
/** this field is used as a placeholder for a header&footer in impress. The
actual
value is stored at the page */
-class EDITENG_DLLPUBLIC SvxHeaderField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxHeaderField final: public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData,
css::text::textfield::Type::PRESENTATION_HEADER )
@@ -390,7 +390,7 @@ public:
/** this field is used as a placeholder for a header&footer in impress. The
actual
value is stored at the page */
-class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxFooterField final: public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxFooterField, SvxFieldData,
css::text::textfield::Type::PRESENTATION_FOOTER )
@@ -401,7 +401,7 @@ public:
/** this field is used as a placeholder for a header&footer in impress. The
actual
value is stored at the page */
-class EDITENG_DLLPUBLIC SvxDateTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxDateTimeField final: public SvxFieldData
{
public:
SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData,
css::text::textfield::Type::PRESENTATION_DATE_TIME )
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 6f143bb..0ae6bea 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -247,7 +247,7 @@ inline bool IsInvalidItem(const SfxPoolItem *pItem)
return pItem == reinterpret_cast(-1);
}
-class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxVoidItem final: public SfxPoolItem
{
SfxVoidItem & operator=( const SfxVoidItem& ) = delete;
public:
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 93c5b4c..82b0f49 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -80,7 +80,7 @@ typedef std::unordered_map< sal_uLong, sal_uLong >
ScChangeActionMergeMap;
#define SC_PF_TESTMERGE 2
#def
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/detfunc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 791ad3e170bcb5a2daedac77932dc9822f7f1092
Author: Stephan Bergmann
Date: Tue Jan 12 14:40:20 2016 +0100
Stick to exact-type check
fa91dd31f39a24329d288d4e1cda28db3a16af0d "5th step to remove
tools/rtti.hxx" had
changed this from an exact-type check
pObject->Type() == TYPE(SdrRectObj)
to a type-or-subtype-of check
dynamic_cast< const SdrRectObj* >(pObject) != nullptr
but SdrRectObject is not a final class (SdrCaptionObj, SdrCircObj, ...
derive
from it).
Change-Id: Ia820ee5475fbaf7a00ab0093d949c3cbd3406f83
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 11810e3..a045c36 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -742,7 +742,7 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nR
while (pObject)
{
if ( pObject->GetLayer() == SC_LAYER_INTERN &&
-dynamic_cast< const SdrRectObj* >(pObject) != nullptr )
+typeid(*pObject) == typeid(SdrRectObj) )
{
aObjRect = static_cast(pObject)->GetLogicRect();
aObjRect.Justify();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Suggestion
> The important part of the Metric feature is that it always wraps the value to the > nearest power of 3, and shows values in those powers. 0.1234 would be shown > as 123.4 milliunits, or 1,234 microunits, Correction: should be 123,400 microunits. Best regards, Rick C. Hodgin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Suggestion
On Tue, Jan 12, 2016 at 8:00 AM, Eike Rathke wrote: > Hi Rick, > > On Friday, 2016-01-08 19:52:49 -0500, Rick C. Hodgin wrote: > > > The category is called *"Metric."* > > > > When conveying fractional values, such that 1.2345E-08 (which is > > 0.000,000,012,345), it would do so in a metric-relative way using the > > standard milli (10^-3), micro (10^-6), nano (10^-9), pico (10^-12), and > so > > on... > > > > In the example, the *Metric* display would cause the value to show up > > as "*12,345 > > pu*" (pico-units) if the thousands separator was used. > > Could you give some examples what you think how the format code actually > should look like? > If you're referring to the internal format codes, then "Metric" by default (like "General"), and to override the name something like "Metric:seconds" as an override of the default "u" to use "seconds". > > > There would be an > > option to override the default "u" character in use, changing it into > > something that may have significance for the cell, such as "s" or > "seconds" > > for seconds, "m" or "meters" for meters, and so on. > > So, the unit itself would be a cell property, which replaces the generic > "u"? > Yes. And by default, it would simply be a "u", but then the user could set it to be anything they want. > > That sounds related to the feature branch Markus already mentioned. > The important part of the Metric feature is that it always wraps the value to the nearest power of 3, and shows values in those powers. 0.1234 would be shown as 123.4 milliunits, or 1,234 microunits, for example (however the user has set it up), and not as "0.1234 u" (unless they are explicitly stating to use "Units", which would be something they'd have to do manually). > > > An ability to lock in a working range would also exist, such as *"show > > everything in nano-units"* so that everything is adjusted to that base. > In > > such a case, the above example above would present as "*12.345 nu*" > instead > > of in its default *pu*. > > Where/how should that "lock-in" happen? By applying a different number > format to that range? > It would force it to be in a particular power of 3 range. The example above of 0.1234 could be locked into nanounits (10^(-9)), which would then show as 123,400,000 nu, rather than its default form of 123.4 mu, etc. > One main problem with inventing new format code features is, that they > don't survive an Excel roundtrip unless Excel has the same feature. > I guess it doesn't. > Agreed. It doesn't exist in Excel to my knowledge. > > Eike > > -- > LibreOffice Calc developer. Number formatter stricken i18n > transpositionizer. > GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 > 2D3A > Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ > Care about Free Software, support the FSFE https://fsfe.org/support/?erack > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Shubham Tibra license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Suggestion
Hi Chris, On Tuesday, 2016-01-12 12:28:16 +1100, Chris Sherlock wrote: > > All in all this sounds a bit like the idea behind the unit verification > > that has been planned and partly been implemented in a feature branch. It > > might be a good idea to have a look at that before implementing it > > completely in the number formatter. > > > > Which branch is this on? Should be feature/unitver Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Remove ActiveX from LibreOffice
If you search for "Microsoft Excel Automation" you'll find many references
online of how ActiveX is used in other applications to allow the Excel
engine to compute things in a spreadsheet form. Were the same ability
well-documented in LibreOffice, many people would switch as LibreOffice is
free, and Excel costs hundreds of dollars.
I urge you not to remove it, but to improve it for simpler integration. It
should work like this:
lo = CreateObject("libreoffice.application")
lo.open("c:\path\to\my\document\file.ext")
lo.visible = .t.
And in that way, an application can directly integrate operations into
their app which loads LibreOffice. Note that these examples are in Visual
Basic, but the same general form works from any application, including C++
(see below):
Here are some automation examples for Excel, Word, Outlook, and PowerPoint:
Excel: https://support.microsoft.com/en-us/kb/219151
Word: https://support.microsoft.com/en-us/kb/316383
Outlook: https://support.microsoft.com/en-us/kb/220595
A more example-by-example based tutorial:
PowerPoint:
https://msdn.microsoft.com/en-us/library/bb871574%28v=vs.80%29.aspx
Here's a code snippet on how to access ActiveX from another application
using C++ from MSDN:
https://support.microsoft.com/en-us/kb/196776
ActiveX allows applications to integrate each other, and to have windowed
portions within an application which are actually a "portal" through to the
other application, though it appears to be fully integrated. It is a
powerful tool. And as I say, I have not used LibreOffice for integration
because I could not find good documentation on how to do it, whereas there
are many online resources on how to use Microsoft Office integration. If
the documentation were better, Windows people would use it as it is highly
desirable.
Best regards,
Rick C. Hodgin
On Mon, Jan 11, 2016 at 9:52 AM, James E Lang wrote:
>
>
> -Original Message-
> From: Bryan Quigley
> To: libreoffice
> Sent: Sun, 10 Jan 2016 15:41
> Subject: Re: Remove ActiveX from LibreOffice
>
> -->8=
>
> >My position on ActiveX is to leave it (lest we break applications in the
> wild,) and to *announce its deprecation* with two goals: first, solicit the
> feedback of LO ActiveX consumers and, if so inclined to continue using it,
> help in its support. And second, to flag a date in the future when ActiveX
> will be completely removed from LO codebase, pending sufficient reason and
> support by its consumers.
>
> [Just to toss in a comment from a NOT NECESSARILY typical USER, I would
> probably fail to see any depreciation notice unless it were thrown in my
> face each time I used the feature until I say (in effect), "all right,
> Enough Already, SHUT UP!" aka, "Don't show this notice again." The same
> should apply to revising any existing menu accelerators. --jl]
>
> -->8=
>
> --
> Jim
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] core.git: initialize new member variables
Sent from my iPad, please excuse any misspellings > On 12 Jan 2016, at 12:05, Chris Sherlock wrote: > > Hi all, > > Unfortunately that was the case - I definitely went down the wrong path with > that merge. > > I've reverted it now - the commit can be found on > http://cgit.freedesktop.org/libreoffice/core/commit/?id=b4b0cc2a5eef4243e51fda4a13fc48183aa0 > > I need to check that UBSan tool more regularly. > > But I definitely have to put my hand up for causing these errors. Apologies > for this, I will do my level best not to let this occur again. > > When I'm back home I've been meaning to send a post to the list summarising > how font handling works and some ideas and questions around the code. Even better would be to make a wiki page :-) rgds jan i > > Thanks all (especially Caolon and Stephan)! > > Chris > >>> On 12 Jan 2016, at 7:20 PM, Stephan Bergmann wrote: >>> >>> On 01/11/2016 06:29 PM, Caolán McNamara wrote: >>> commit c93a43c0c9113bc1c787fe6b3c5e58a8bfd80be0 >>> Author: Caolán McNamara >>> Date: Mon Jan 11 17:08:39 2016 + >>> >>>initialize new member variables >>> >>>Change-Id: I3839bc134b337ccb7cfdb2ee70524e4721c8f83c >>> >>> diff --git a/vcl/source/font/fontattributes.cxx >>> b/vcl/source/font/fontattributes.cxx >>> index be3ab68..49060f0 100644 >>> --- a/vcl/source/font/fontattributes.cxx >>> +++ b/vcl/source/font/fontattributes.cxx >>> @@ -93,7 +93,18 @@ bool >>> FontAttributes::CompareDeviceIndependentFontAttributes(const FontAttributes >>> } >>> >>> FontAttributes::FontAttributes() >>> -: mnWidth ( 0 ) >>> +: meWeight(WEIGHT_DONTKNOW) >>> +, meItalic(ITALIC_DONTKNOW) >>> +, meFamily(FAMILY_DONTKNOW) >>> +, mePitch(PITCH_DONTKNOW) >>> +, meWidthType(WIDTH_DONTKNOW) >>> +, mbSymbolFlag(false) >>> +, mnQuality(0) >>> +, mbOrientation(false) >>> +, mbDevice(false) >>> +, mbSubsettable(false) >>> +, mbEmbeddable(false) >>> +, mnWidth ( 0 ) >>> , mnOrientation( 0 ) >>> , mnAscent( 0 ) >>> , mnDescent( 0 ) >> [...] >> >> Tools like UBSan or Valgrind's memcheck started to complain about reads of >> uninitialized members after a series of commits that merged font-related >> structs in VCL together. What looked fishy is that those members had not >> been default-initialized in the original structs, the number of setter calls >> had not changed, and yet the code started to grow uninitialized reads of the >> members. Without a clear understanding of what was going on, we were >> reluctant to blindly default-initialize those members now, as it might hide >> problems (at least from the eyes of UBSan and Valgrind) instead of fixing >> them. >> >> Now, as I understand, Chris is going to revert those merges, as he came to >> the conclusion that they went in the wrong direction after all, and I assume >> that will obsolete the above potentially problematic commit anyway. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Suggestion
Hi Rick, On Friday, 2016-01-08 19:52:49 -0500, Rick C. Hodgin wrote: > The category is called *"Metric."* > > When conveying fractional values, such that 1.2345E-08 (which is > 0.000,000,012,345), it would do so in a metric-relative way using the > standard milli (10^-3), micro (10^-6), nano (10^-9), pico (10^-12), and so > on... > > In the example, the *Metric* display would cause the value to show up > as "*12,345 > pu*" (pico-units) if the thousands separator was used. Could you give some examples what you think how the format code actually should look like? > There would be an > option to override the default "u" character in use, changing it into > something that may have significance for the cell, such as "s" or "seconds" > for seconds, "m" or "meters" for meters, and so on. So, the unit itself would be a cell property, which replaces the generic "u"? That sounds related to the feature branch Markus already mentioned. > An ability to lock in a working range would also exist, such as *"show > everything in nano-units"* so that everything is adjusted to that base. In > such a case, the above example above would present as "*12.345 nu*" instead > of in its default *pu*. Where/how should that "lock-in" happen? By applying a different number format to that range? One main problem with inventing new format code features is, that they don't survive an Excel roundtrip unless Excel has the same feature. I guess it doesn't. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/olinetab.hxx |7 +--
sc/source/core/data/olinetab.cxx | 84 +++
2 files changed, 45 insertions(+), 46 deletions(-)
New commits:
commit e39602ae02d7cd99f95861febb3f53d07f97414c
Author: Michael Stahl
Date: Tue Jan 12 13:36:04 2016 +0100
sc: try to fix MSVC build
Guess we don't actually need the unique_ptr there.
Change-Id: I9b041b084567be6d8d354558da4e6916fcf81639
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index a6038ff..ec0a83f 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -23,7 +23,6 @@
#include "scdllapi.h"
#include "address.hxx"
-#include
#include
#define SC_OL_MAXDEPTH 7
@@ -64,8 +63,8 @@ public:
class ScOutlineCollection
{
-typedef std::map> MapType;
-MapType maEntries;
+typedef std::map MapType;
+MapType m_Entries;
public:
typedef MapType::iterator iterator;
@@ -75,7 +74,7 @@ public:
size_t size() const;
void clear();
-void insert(std::unique_ptr pEntry);
+void insert(ScOutlineEntry const& rEntry);
iterator begin();
iterator end();
const_iterator begin() const;
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index 8039e88..a90e0b1 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -91,53 +91,53 @@ ScOutlineCollection::ScOutlineCollection() {}
size_t ScOutlineCollection::size() const
{
-return maEntries.size();
+return m_Entries.size();
}
void ScOutlineCollection::clear()
{
-maEntries.clear();
+m_Entries.clear();
}
-void ScOutlineCollection::insert(std::unique_ptr pEntry)
+void ScOutlineCollection::insert(ScOutlineEntry const& rEntry)
{
-SCCOLROW nStart = pEntry->GetStart();
-maEntries.insert(std::make_pair(nStart, std::move(pEntry)));
+SCCOLROW nStart = rEntry.GetStart();
+m_Entries.insert(std::make_pair(nStart, rEntry));
}
ScOutlineCollection::iterator ScOutlineCollection::begin()
{
-return maEntries.begin();
+return m_Entries.begin();
}
ScOutlineCollection::iterator ScOutlineCollection::end()
{
-return maEntries.end();
+return m_Entries.end();
}
ScOutlineCollection::const_iterator ScOutlineCollection::begin() const
{
-return maEntries.begin();
+return m_Entries.begin();
}
ScOutlineCollection::const_iterator ScOutlineCollection::end() const
{
-return maEntries.end();
+return m_Entries.end();
}
void ScOutlineCollection::erase(iterator pos)
{
-maEntries.erase(pos);
+m_Entries.erase(pos);
}
bool ScOutlineCollection::empty() const
{
-return maEntries.empty();
+return m_Entries.empty();
}
ScOutlineCollection::iterator ScOutlineCollection::FindStart(SCCOLROW
nMinStart)
{
-return maEntries.lower_bound(nMinStart);
+return m_Entries.lower_bound(nMinStart);
}
ScOutlineArray::ScOutlineArray() :
@@ -152,8 +152,8 @@ ScOutlineArray::ScOutlineArray( const ScOutlineArray&
rArray ) :
ScOutlineCollection::const_iterator it = rColl.begin(), itEnd =
rColl.end();
for (; it != itEnd; ++it)
{
-const ScOutlineEntry *const pEntry = it->second.get();
-
aCollections[nLevel].insert(o3tl::make_unique(ScOutlineEntry(*pEntry)));
+const ScOutlineEntry *const pEntry = &it->second;
+aCollections[nLevel].insert(ScOutlineEntry(*pEntry));
}
}
}
@@ -173,7 +173,7 @@ void ScOutlineArray::FindEntry(
ScOutlineCollection::iterator it = pCollect->begin(), itEnd =
pCollect->end();
for (; it != itEnd; ++it)
{
-ScOutlineEntry *const pEntry = it->second.get();
+ScOutlineEntry *const pEntry = &it->second;
if (pEntry->GetStart() <= nSearchPos && pEntry->GetEnd() >=
nSearchPos)
{
rFindLevel = nLevel + 1; // Next Level (for insertion)
@@ -212,7 +212,7 @@ bool ScOutlineArray::Insert(
{
ScOutlineCollection::const_iterator it =
aCollections[nStartLevel-1].begin();
std::advance(it, nStartIndex);
-if (it->second->GetStart() == nStartCol)
+if (it->second.GetStart() == nStartCol)
FindEntry(nStartCol, nStartLevel, nStartIndex,
nFindMax);
}
@@ -220,7 +220,7 @@ bool ScOutlineArray::Insert(
{
ScOutlineCollection::const_iterator it =
aCollections[nEndLevel-1].begin();
std::advance(it, nEndIndex);
-if (it->second->GetEnd() == nEndCol)
+if (it->second.GetEnd() == nEndCol)
FindEntry(nEndCol, nEndLevel, nEndIndex, nFindMax);
}
bCont = true;
@@ -244,7 +244,7 @@ bool ScOutlineArray::Insert(
ScOutlineCollection::iterator it = rColl.begin(), itEnd =
rColl.end();
Re: [Libreoffice-qa] Bugzilla Tip: Ever want to make private notes on a bug report?
Hi Robinson, On Saturday, 2016-01-09 14:06:34 -0600, Robinson Tryon wrote: > > Btw, can the tags list be edited somehow? > > Not that I'm aware of. > > > Unfortunately it is also not > > possible to set tags in a mass change, in all bugs of a search result. > > Correct. I feel like that one might be a bit easier to implement than > the former feature. Is bulk-update something that you'd find very > useful, or just a nice-to-have? Just nice, with that it would be possible to move a bunch of issues to another tag (or remove the tag), but for that it would even better to be able to remove the then unused tag from the suggestion list ;) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82797] use modern OpenGL for OGL Transitions
https://bugs.documentfoundation.org/show_bug.cgi?id=82797 --- Comment #8 from Tor Lillqvist --- (And this was hardly an EasyHack, surely?) -- 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: 7 commits - include/osl sc/inc sc/source xmloff/source
include/osl/file.hxx |2 -
sc/inc/olinetab.hxx |7 ++--
sc/inc/unitconv.hxx |5 +--
sc/source/core/data/bcaslot.cxx | 18 ++-
sc/source/core/data/formulacell.cxx | 25 ---
sc/source/core/data/olinetab.cxx | 54 +-
sc/source/core/inc/bcaslot.hxx|8 +++--
sc/source/core/tool/unitconv.cxx |8 ++---
sc/source/filter/excel/frmbase.cxx| 18 ++-
sc/source/filter/inc/formel.hxx |9 +++--
sc/source/ui/docshell/docfuncutil.cxx |6 ++-
sc/source/ui/inc/undobase.hxx |5 +--
xmloff/source/text/txtimp.cxx |2 -
13 files changed, 91 insertions(+), 76 deletions(-)
New commits:
commit 7a6ce0d408f1cc08f63a05357049082de50a0e31
Author: Michael Stahl
Date: Tue Jan 12 11:52:12 2016 +0100
sc: replace boost::ptr_map with std::map
Change-Id: I596cafb971d522b0f1414d0ebe0bea36d8f30e59
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 450cf40..f4110f5 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -48,6 +48,7 @@
#include
#include
#include
+#include
#include
#include "formulagroup.hxx"
#include "listenercontext.hxx"
@@ -62,7 +63,7 @@
#include
#include
-#include
+#include
using namespace formula;
@@ -553,13 +554,13 @@ struct AreaListenerKey
}
};
-typedef boost::ptr_map
AreaListenersType;
+typedef std::map> AreaListenersType;
}
struct ScFormulaCellGroup::Impl
{
-AreaListenersType maAreaListeners;
+AreaListenersType m_AreaListeners;
};
ScFormulaCellGroup::ScFormulaCellGroup() :
@@ -624,31 +625,31 @@ sc::FormulaGroupAreaListener*
ScFormulaCellGroup::getAreaListener(
{
AreaListenerKey aKey(rRange, bStartFixed, bEndFixed);
-AreaListenersType::iterator it = mpImpl->maAreaListeners.lower_bound(aKey);
-if (it == mpImpl->maAreaListeners.end() ||
mpImpl->maAreaListeners.key_comp()(aKey, it->first))
+AreaListenersType::iterator it = mpImpl->m_AreaListeners.lower_bound(aKey);
+if (it == mpImpl->m_AreaListeners.end() ||
mpImpl->m_AreaListeners.key_comp()(aKey, it->first))
{
// Insert a new one.
-it = mpImpl->maAreaListeners.insert(
-it, aKey, new sc::FormulaGroupAreaListener(
-rRange, *(*ppTopCell)->GetDocument(), (*ppTopCell)->aPos,
mnLength, bStartFixed, bEndFixed));
+it = mpImpl->m_AreaListeners.insert(
+it, std::make_pair(aKey,
o3tl::make_unique(
+rRange, *(*ppTopCell)->GetDocument(), (*ppTopCell)->aPos,
mnLength, bStartFixed, bEndFixed)));
}
-return it->second;
+return it->second.get();
}
void ScFormulaCellGroup::endAllGroupListening( ScDocument& rDoc )
{
-AreaListenersType::iterator it = mpImpl->maAreaListeners.begin(), itEnd =
mpImpl->maAreaListeners.end();
+AreaListenersType::iterator it = mpImpl->m_AreaListeners.begin(), itEnd =
mpImpl->m_AreaListeners.end();
for (; it != itEnd; ++it)
{
-sc::FormulaGroupAreaListener* pListener = it->second;
+sc::FormulaGroupAreaListener *const pListener = it->second.get();
ScRange aListenRange = pListener->getListeningRange();
// This "always listen" special range is never grouped.
bool bGroupListening = (aListenRange != BCA_LISTEN_ALWAYS);
rDoc.EndListeningArea(aListenRange, bGroupListening, pListener);
}
-mpImpl->maAreaListeners.clear();
+mpImpl->m_AreaListeners.clear();
}
ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos ) :
commit e10f7dd302a0cd42cc6fce3972f32bfb7aa33349
Author: Michael Stahl
Date: Tue Jan 12 11:51:52 2016 +0100
sc: replace boost::ptr_map with std::map
Change-Id: I2fbce996afcd7d1dabd7c540272d8877d034cf14
diff --git a/sc/source/ui/docshell/docfuncutil.cxx
b/sc/source/ui/docshell/docfuncutil.cxx
index 3c71dc5..86d82d9 100644
--- a/sc/source/ui/docshell/docfuncutil.cxx
+++ b/sc/source/ui/docshell/docfuncutil.cxx
@@ -24,6 +24,8 @@
#include
#include
+#include
+
#include
#include
@@ -99,11 +101,11 @@ std::unique_ptr
DocFuncUtil::getNonEmptyCellSpans(
SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
std::pair r =
-pDataSpans->insert(nTab, new sc::ColumnSpanSet(false));
+pDataSpans->insert(std::make_pair(nTab,
o3tl::make_unique(false)));
if (r.second)
{
-sc::ColumnSpanSet* pSet = r.first->second;
+sc::ColumnSpanSet *const pSet = r.first->second.get();
pSet->scan(rDoc, nTab, nCol1, nRow1, nCol2, nRow2, true);
}
}
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index f501f5b..b81af20 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -26,7 +26,8 @@
#include "docsh.hxx"
#
[Bug 30425] Making Icon Themes is Far too Difficult
https://bugs.documentfoundation.org/show_bug.cgi?id=30425 Adolfo Jayme changed: What|Removed |Added Status|ASSIGNED|NEW Assignee|dent@gmail.com |libreoffice-b...@lists.free ||desktop.org Whiteboard|target:4.5.0|target:5.0.0 -- 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 64575] Photo Album: Better Image Layout
https://bugs.documentfoundation.org/show_bug.cgi?id=64575 --- Comment #5 from Samuel Mehrbrodt --- https://gerrit.libreoffice.org/#/c/14912 has some code, if someone wants to continue that. -- 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: desktop/source
desktop/source/deployment/unopkg/unopkg.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b501417f23f2d87c774603b687094c8017e13bb6
Author: Samuel Mehrbrodt
Date: Tue Jan 12 13:49:44 2016 +0100
Typo: 'It as' -> 'It is'
Change-Id: I6ce5dc2333429fa472e2d605a95385912175910e
diff --git a/desktop/source/deployment/unopkg/unopkg.src
b/desktop/source/deployment/unopkg/unopkg.src
index 47fe49f..d36 100644
--- a/desktop/source/deployment/unopkg/unopkg.src
+++ b/desktop/source/deployment/unopkg/unopkg.src
@@ -64,7 +64,7 @@ String RID_STR_UNOPKG_ACCEPT_LIC_N
String RID_STR_CONCURRENTINSTANCE
{
-Text [ en-US ] = "unopkg cannot be started. The lock file indicates it as
already running. "
+Text [ en-US ] = "unopkg cannot be started. The lock file indicates it is
already running. "
"If this does not apply, delete the lock file at:";
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: initialize new member variables
Hi all, Unfortunately that was the case - I definitely went down the wrong path with that merge. I've reverted it now - the commit can be found on http://cgit.freedesktop.org/libreoffice/core/commit/?id=b4b0cc2a5eef4243e51fda4a13fc48183aa0 I need to check that UBSan tool more regularly. But I definitely have to put my hand up for causing these errors. Apologies for this, I will do my level best not to let this occur again. When I'm back home I've been meaning to send a post to the list summarising how font handling works and some ideas and questions around the code. Thanks all (especially Caolon and Stephan)! Chris > On 12 Jan 2016, at 7:20 PM, Stephan Bergmann wrote: > >> On 01/11/2016 06:29 PM, Caolán McNamara wrote: >> commit c93a43c0c9113bc1c787fe6b3c5e58a8bfd80be0 >> Author: Caolán McNamara >> Date: Mon Jan 11 17:08:39 2016 + >> >> initialize new member variables >> >> Change-Id: I3839bc134b337ccb7cfdb2ee70524e4721c8f83c >> >> diff --git a/vcl/source/font/fontattributes.cxx >> b/vcl/source/font/fontattributes.cxx >> index be3ab68..49060f0 100644 >> --- a/vcl/source/font/fontattributes.cxx >> +++ b/vcl/source/font/fontattributes.cxx >> @@ -93,7 +93,18 @@ bool >> FontAttributes::CompareDeviceIndependentFontAttributes(const FontAttributes >> } >> >> FontAttributes::FontAttributes() >> -: mnWidth ( 0 ) >> +: meWeight(WEIGHT_DONTKNOW) >> +, meItalic(ITALIC_DONTKNOW) >> +, meFamily(FAMILY_DONTKNOW) >> +, mePitch(PITCH_DONTKNOW) >> +, meWidthType(WIDTH_DONTKNOW) >> +, mbSymbolFlag(false) >> +, mnQuality(0) >> +, mbOrientation(false) >> +, mbDevice(false) >> +, mbSubsettable(false) >> +, mbEmbeddable(false) >> +, mnWidth ( 0 ) >> , mnOrientation( 0 ) >> , mnAscent( 0 ) >> , mnDescent( 0 ) > [...] > > Tools like UBSan or Valgrind's memcheck started to complain about reads of > uninitialized members after a series of commits that merged font-related > structs in VCL together. What looked fishy is that those members had not > been default-initialized in the original structs, the number of setter calls > had not changed, and yet the code started to grow uninitialized reads of the > members. Without a clear understanding of what was going on, we were > reluctant to blindly default-initialize those members now, as it might hide > problems (at least from the eyes of UBSan and Valgrind) instead of fixing > them. > > Now, as I understand, Chris is going to revert those merges, as he came to > the conclusion that they went in the wrong direction after all, and I assume > that will obsolete the above potentially problematic commit anyway. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82797] use modern OpenGL for OGL Transitions
https://bugs.documentfoundation.org/show_bug.cgi?id=82797 Tor Lillqvist changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED --- Comment #7 from Tor Lillqvist --- Yep. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0d3d43f2f31274dfd00df894bf9b616f4f1280e9 Author: Christian Lohmaier Date: Tue Jan 12 13:24:45 2016 +0100 Updated core Project: help 6cc37b6e75e7aca982e89a185d9b4055b1155ec2 should not be empty/self-closing element () f5fa46ed8626910d710fd535518ddf9e756f9356 already fixed (tried to) the empty/self-closing ahelp tag, however is merged to by "make translations", so po files ended up with the self-closing form again. Surrounding a child/PCDATA with the tag solves the problem. Change-Id: I58725f6a7e5999609262abec2987a6d05445a7b2 (cherry picked from commit 8ecafdaa4e5b954941031e384b88c34309b7b27e) diff --git a/helpcontent2 b/helpcontent2 index c1ceff5..6cc37b6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c1ceff53b1e8f453a4451616a1ddcb49460dfca6 +Subproject commit 6cc37b6e75e7aca982e89a185d9b4055b1155ec2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - oox/source
oox/source/export/shapes.cxx | 283 ++-
1 file changed, 146 insertions(+), 137 deletions(-)
New commits:
commit 6a1f52054fefdcf5905a5ba3616b20fee7e5e26f
Author: Caolán McNamara
Date: Sun Jan 10 16:24:27 2016 +
crashtesting: don't fail on export of fdo65321-3.ods to xlsx
with broken ole object
Change-Id: I8dc9e1035893d5cb931d13eafcc3e3ec1c9c00d4
(cherry picked from commit 680abab7710b7e8e6f2ba9cee37a5ccd224e2993)
Reviewed-on: https://gerrit.libreoffice.org/21354
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index e602533..9f028e6 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1587,14 +1587,18 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference<
XShape > xShape )
if (!xPropSet.is())
return *this;
+bool bIsChart(false);
OUString clsid;
xPropSet->getPropertyValue("CLSID") >>= clsid;
-assert(!clsid.isEmpty());
-SvGlobalName aClassID;
-bool const isValid(aClassID.MakeId(clsid));
-assert(isValid); (void)isValid;
+if (!clsid.isEmpty())
+{
+SvGlobalName aClassID;
+bool const isValid = aClassID.MakeId(clsid);
+assert(isValid); (void)isValid;
+bIsChart = SotExchange::IsChart(aClassID);
+}
-if (SotExchange::IsChart(aClassID))
+if (bIsChart)
{
Reference< XChartDocument > xChartDoc;
xPropSet->getPropertyValue("Model") >>= xChartDoc;
@@ -1604,154 +1608,160 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference<
XShape > xShape )
ChartExport aChartExport( mnXmlNamespace, GetFS(), xModel, GetFB(),
GetDocumentType() );
static sal_Int32 nChartCount = 0;
aChartExport.WriteChartObj( xShape, ++nChartCount );
+return *this;
}
-else
+
+uno::Reference const xObj(
+xPropSet->getPropertyValue("EmbeddedObject"), uno::UNO_QUERY);
+
+if (!xObj.is())
{
-uno::Reference const xObj(
-xPropSet->getPropertyValue("EmbeddedObject"), uno::UNO_QUERY);
+SAL_WARN("oox", "ShapeExport::WriteOLE2Shape: no object");
+return *this;
+}
-uno::Reference const xParent(
-uno::Reference(xObj,
uno::UNO_QUERY)->getParent(),
-uno::UNO_QUERY);
+uno::Reference const xParent(
+uno::Reference(xObj, uno::UNO_QUERY)->getParent(),
+uno::UNO_QUERY);
-uno::Sequence grabBag;
-xParent->getPropertyValue("InteropGrabBag") >>= grabBag;
+uno::Sequence grabBag;
+xParent->getPropertyValue("InteropGrabBag") >>= grabBag;
-OUString const entryName(
-uno::Reference(xObj,
uno::UNO_QUERY)->getEntryName());
-OUString progID;
+OUString const entryName(
+uno::Reference(xObj,
uno::UNO_QUERY)->getEntryName());
+OUString progID;
-for (auto const& it : grabBag)
+for (auto const& it : grabBag)
+{
+if (it.Name == "EmbeddedObjects")
{
-if (it.Name == "EmbeddedObjects")
+uno::Sequence objects;
+it.Value >>= objects;
+for (auto const& object : objects)
{
-uno::Sequence objects;
-it.Value >>= objects;
-for (auto const& object : objects)
+if (object.Name == entryName)
{
-if (object.Name == entryName)
+uno::Sequence props;
+object.Value >>= props;
+for (auto const& prop : props)
{
-uno::Sequence props;
-object.Value >>= props;
-for (auto const& prop : props)
+if (prop.Name == "ProgID")
{
-if (prop.Name == "ProgID")
-{
-prop.Value >>= progID;
-break;
-}
+prop.Value >>= progID;
+break;
}
-break;
}
+break;
}
-break;
}
+break;
}
+}
-OUString sMediaType;
-OUString sRelationType;
-OUString sSuffix;
-const char * pProgID(nullptr);
+OUString sMediaType;
+OUString sRelationType;
+OUString sSuffix;
+const char * pProgID(nullptr);
-uno::Reference const xInStream =
-oox::GetOLEObjectStream(
-mpFB->getComponentContext(), xObj, progID,
-sMediaType, sRelationType, sSuffix, pProgID);
+uno::Reference const xInStream =
+oox::GetOLEObjectStream(
+mpFB->getComponentContext(), xObj, progID,
+
Re: Remove ActiveX from LibreOffice
-Original Message- From: Bryan Quigley To: libreoffice Sent: Sun, 10 Jan 2016 15:41 Subject: Re: Remove ActiveX from LibreOffice -->8= >My position on ActiveX is to leave it (lest we break applications in the >wild,) and to *announce its deprecation* with two goals: first, solicit the >feedback of LO ActiveX consumers and, if so inclined to continue using it, >help in its support. And second, to flag a date in the future when ActiveX >will be completely removed from LO codebase, pending sufficient reason and >support by its consumers. [Just to toss in a comment from a NOT NECESSARILY typical USER, I would probably fail to see any depreciation notice unless it were thrown in my face each time I used the feature until I say (in effect), "all right, Enough Already, SHUT UP!" aka, "Don't show this notice again." The same should apply to revising any existing menu accelerators. --jl] -->8= -- Jim___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
