[Libreoffice-commits] dev-tools.git: scripts/rtf-anonymiser.py
scripts/rtf-anonymiser.py |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 31d92501bc8738009884f818bc1beb8c96b7fe51 Author: Miklos Vajna vmik...@suse.cz Date: Tue Jun 11 09:39:46 2013 +0200 rtf-anonymiser: no need to replace spaces Change-Id: I6c05ba2f0bf0d9173a54309e9c56e1db7eebb90e diff --git a/scripts/rtf-anonymiser.py b/scripts/rtf-anonymiser.py index de8a596..d505389 100755 --- a/scripts/rtf-anonymiser.py +++ b/scripts/rtf-anonymiser.py @@ -85,7 +85,9 @@ class RtfAnonymiser(RtfParser): if self.hexCount 0: self.handleHexChar(ch) else: -if ch.isupper(): +if ch == : +self.out.append( ) +elif ch.isupper(): self.out.append(X) else: self.out.append(x) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - drawinglayer/source editeng/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |4 ++--
editeng/source/editeng/impedit3.cxx| 18 +-
2 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit a49614e0b38424fa8c23b62c142141b49ba50af3
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jun 11 09:19:03 2013 +0200
Revert fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.
It caused some regressions. For example, see fdo65414 and fdo65562
This reverts commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3.
Change-Id: I0108463c78bbcb48a4c218d78e51deaa39caec0c
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 1a50490..1dfc2f4 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@ namespace drawinglayer
if(rTextCandidate.getFontAttribute().getRTL())
{
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED));
-nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL |
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
+nRTLLayoutMode |=
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
}
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 5fd8362..d56ea0e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4306,13 +4306,18 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice*
pOutDev, String* pString, x
void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16
nPara, sal_uInt16 nIndex )
{
+sal_Bool bCTL = sal_False;
sal_Bool bR2L = sal_False;
if ( nIndex == 0x )
{
+bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
bR2L = IsRightToLeft( nPara );
}
else
{
+ContentNode* pNode = GetEditDoc().GetObject( nPara );
+short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
+bCTL = nScriptType == i18n::ScriptType::COMPLEX;
// this change was discussed in issue 37190
bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
// it also works for issue 55927
@@ -4321,18 +4326,21 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice*
pOutDev, sal_uInt16 nPara,
sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
// We always use the left postion for DrawText()
-// Let VCL do CTL checking
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
-if ( !bR2L )
+if ( !bCTL !bR2L)
{
// No CTL/Bidi checking neccessary
nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
}
else
{
-//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT |
TEXT_LAYOUT_BIDI_STRONG;
+// CTL/Bidi checking neccessary
+// Don't use BIDI_STRONG, VCL must do some checks.
+nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
+
+if ( bR2L )
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
}
pOutDev-SetLayoutMode( nLayoutMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b07a9b535987a7d1a5e91a4937d0ed0572eb1053 Author: Petr Mladek pmla...@suse.cz Date: Wed Jun 5 15:37:01 2013 +0200 bump product version to 4.1.0.0.beta2+ Change-Id: I2adf92dad2e0701a63ba167d031a2da7694dd35b diff --git a/configure.ac b/configure.ac index 8c7999d..add9ba2 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],[4.1.0.0.beta1+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.0.0.beta2+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-4' - drawinglayer/source editeng/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |4 ++--
editeng/source/editeng/impedit3.cxx| 18 +-
2 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 41900bab0d07332aa720c92f787d90c4d8fff571
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jun 11 09:19:03 2013 +0200
Revert fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.
It caused some regressions. For example, see fdo65414 and fdo65562
This reverts commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3.
Change-Id: I0108463c78bbcb48a4c218d78e51deaa39caec0c
Reviewed-on: https://gerrit.libreoffice.org/4226
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 1a50490..1dfc2f4 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@ namespace drawinglayer
if(rTextCandidate.getFontAttribute().getRTL())
{
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED));
-nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL |
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
+nRTLLayoutMode |=
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
}
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 5fd8362..d56ea0e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4306,13 +4306,18 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice*
pOutDev, String* pString, x
void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16
nPara, sal_uInt16 nIndex )
{
+sal_Bool bCTL = sal_False;
sal_Bool bR2L = sal_False;
if ( nIndex == 0x )
{
+bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
bR2L = IsRightToLeft( nPara );
}
else
{
+ContentNode* pNode = GetEditDoc().GetObject( nPara );
+short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
+bCTL = nScriptType == i18n::ScriptType::COMPLEX;
// this change was discussed in issue 37190
bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
// it also works for issue 55927
@@ -4321,18 +4326,21 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice*
pOutDev, sal_uInt16 nPara,
sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
// We always use the left postion for DrawText()
-// Let VCL do CTL checking
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
-if ( !bR2L )
+if ( !bCTL !bR2L)
{
// No CTL/Bidi checking neccessary
nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
}
else
{
-//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT |
TEXT_LAYOUT_BIDI_STRONG;
+// CTL/Bidi checking neccessary
+// Don't use BIDI_STRONG, VCL must do some checks.
+nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
+
+if ( bR2L )
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
}
pOutDev-SetLayoutMode( nLayoutMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source editeng/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |4 ++--
editeng/source/editeng/impedit3.cxx| 18 +-
2 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 0de49e5d365a0ca3e667bcdd68630296b5e840d6
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jun 11 09:19:03 2013 +0200
Revert fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.
It caused some regressions. For example, see fdo65414 and fdo65562
This reverts commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3.
Change-Id: I0108463c78bbcb48a4c218d78e51deaa39caec0c
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index e209f18..cd7bd57 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@ namespace drawinglayer
if(rTextCandidate.getFontAttribute().getRTL())
{
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED));
-nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL |
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
+nRTLLayoutMode |=
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
}
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 2fd5b5a..9a82eb3 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4294,13 +4294,18 @@ void ImpEditEngine::ImplInitDigitMode(OutputDevice*
pOutDev, LanguageType eCurLa
void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32
nPara, sal_uInt16 nIndex )
{
+sal_Bool bCTL = sal_False;
sal_Bool bR2L = sal_False;
if ( nIndex == 0x )
{
+bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
bR2L = IsRightToLeft( nPara );
}
else
{
+ContentNode* pNode = GetEditDoc().GetObject( nPara );
+short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
+bCTL = nScriptType == i18n::ScriptType::COMPLEX;
// this change was discussed in issue 37190
bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
// it also works for issue 55927
@@ -4309,18 +4314,21 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice*
pOutDev, sal_Int32 nPara,
sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
// We always use the left postion for DrawText()
-// Let VCL do CTL checking
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
-if ( !bR2L )
+if ( !bCTL !bR2L)
{
// No CTL/Bidi checking necessary
nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
}
else
{
-//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT |
TEXT_LAYOUT_BIDI_STRONG;
+// CTL/Bidi checking neccessary
+// Don't use BIDI_STRONG, VCL must do some checks.
+nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
+
+if ( bR2L )
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
}
pOutDev-SetLayoutMode( nLayoutMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - drawinglayer/source editeng/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |4 ++--
editeng/source/editeng/impedit3.cxx| 18 +-
2 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 361c25f0ea5c0bae486fb7083d09138ffc8fcedc
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jun 11 09:19:03 2013 +0200
Revert fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.
It caused some regressions. For example, see fdo65414 and fdo65562
This reverts commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3.
Change-Id: I0108463c78bbcb48a4c218d78e51deaa39caec0c
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index e209f18..cd7bd57 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@ namespace drawinglayer
if(rTextCandidate.getFontAttribute().getRTL())
{
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED));
-nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL |
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
+nRTLLayoutMode |=
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
}
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 2fd5b5a..9a82eb3 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4294,13 +4294,18 @@ void ImpEditEngine::ImplInitDigitMode(OutputDevice*
pOutDev, LanguageType eCurLa
void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32
nPara, sal_uInt16 nIndex )
{
+sal_Bool bCTL = sal_False;
sal_Bool bR2L = sal_False;
if ( nIndex == 0x )
{
+bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
bR2L = IsRightToLeft( nPara );
}
else
{
+ContentNode* pNode = GetEditDoc().GetObject( nPara );
+short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
+bCTL = nScriptType == i18n::ScriptType::COMPLEX;
// this change was discussed in issue 37190
bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
// it also works for issue 55927
@@ -4309,18 +4314,21 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice*
pOutDev, sal_Int32 nPara,
sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
// We always use the left postion for DrawText()
-// Let VCL do CTL checking
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
-if ( !bR2L )
+if ( !bCTL !bR2L)
{
// No CTL/Bidi checking necessary
nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
}
else
{
-//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT |
TEXT_LAYOUT_BIDI_STRONG;
+// CTL/Bidi checking neccessary
+// Don't use BIDI_STRONG, VCL must do some checks.
+nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED |
TEXT_LAYOUT_BIDI_STRONG );
+
+if ( bR2L )
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
}
pOutDev-SetLayoutMode( nLayoutMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC weekly update] iOS remote control
Hello all, Thanks for your help, it's great to have many helping hands here :) I think I would write my own implementation since it doesn't seem to be really complicated... I will not create a separate utility class but instead add it to a category for NSData. I will test that today and let you know what I get there. All the best! Siqi 2013/6/10 Cedric Bosdonnat cbosdon...@suse.com On Mon, 2013-06-10 at 11:21 +0300, Tor Lillqvist wrote: I don't think we want to drag in boost in an otherwise clean Objective-C -only app. (Cédric's code at least includes a boost header, too.) Just pay attention with my code: I wanted it to work on streams when I don't have the full content to encode. The boost header used in that file is not used by the EncodedData class actually doing the base64 encode/decode work. Note that Base64 isn't that complex, you can even write one in objective-C pretty quickly. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/gsoc-writer-char-borders'
New branch 'feature/gsoc-writer-char-borders' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 65562, which changed state. Bug 65562 Summary: Text changes directionality when hyperlinked https://bugs.freedesktop.org/show_bug.cgi?id=65562 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Depends on||65450 -- 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
Firebird Dependencies Upload
Hi everyone, Could the following 2 files please be uploaded to the TDF servers for me: Firebird 2.5: http://sourceforge.net/projects/firebird/files/firebird/2.5.2-Release/Firebird-2.5.2.26540-0.tar.bz2/download Libatomic-ops 7.2d (firebird dependency): https://github.com/ivmai/libatomic_ops/archive/libatomic_ops-7_2d.zip (The GPL license in libatomic_ops only applies to to libatomic_ops_gpl which we don't use, we/firebird only need libatomic_ops itself which is MIT licensed.) Thanks, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: 2 commits - gerritbot/send-daily-digest
gerritbot/send-daily-digest | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 7ae28f0bde27cedfeaef9eda3725b36c37eafac2
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Jun 11 11:26:03 2013 +0200
we want to highlight old changes that are either CR-1 OR V-1, not requiring
both
diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index 47b258d..c7847ae 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -42,7 +42,7 @@ def create_message(gerrit, age):
body += '\n\n* Abandoned changes on master for project core changed in the
last %d hours:\n\n' % age
body += get_digest(gerrit, get_daily_query('abandoned', age))
body += '\n\n* Open changes needing tweaks, but being untouched for more
than a week:\n\end-daily-digest'
-body += get_digest(gerrit, 'project:core branch:master status:open
(label:Code-Review=-1 label:Verified=-1) age:1w')
+body += get_digest(gerrit, 'project:core branch:master status:open
(label:Code-Review=-1 OR label:Verified=-1) age:1w')
body += '''
Best,
commit 45f825621e3c40065e88052e916ec602d45c016d
Author: Mathias Michel m...@gmx.fr
Date: Tue Jun 11 01:19:35 2013 +0200
Improve mail formatting fix query parsing
diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index f18579f..47b258d 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -24,24 +24,24 @@ def get_daily_query(status, age):
def get_digest(gerrit, query):
digest = ''
-for line in sh.ssh(gerrit, 'gerrit query --format=JSON \'%s\'' %
query).strip().split('\n'):
+for line in sh.ssh(gerrit, 'gerrit query --format=JSON -- \'%s\'' %
query).strip().split('\n'):
change = json.loads(line)
if 'url' in change.keys():
-digest += '%s %s %s\n' % (change['url'],
change['subject'].ljust(75)[:75], change['owner']['email'])
+digest += '%s\n in %s from %s\n' %
(change['subject'].ljust(75)[:75], change['url'], change['owner']['name'])
if digest == '':
digest = 'None'
return digest
-
+
def create_message(gerrit, age):
now = datetime.datetime.now()
body = 'Moin!\n\n'
-body += 'open changes on master for project core changed in the last %d
hours:\n' % age
+body += '* Open changes on master for project core changed in the last %d
hours:\n\n' % age
body += get_digest(gerrit, get_daily_query('open', age))
-body += '\n\nmerged changes on master for project core changed in the last
%d hours:\n' % age
+body += '\n\n* Merged changes on master for project core changed in the
last %d hours:\n\n' % age
body += get_digest(gerrit, get_daily_query('merged', age))
-body += '\n\nabandoned changes on master for project core changed in the
last %d hours:\n' % age
+body += '\n\n* Abandoned changes on master for project core changed in the
last %d hours:\n\n' % age
body += get_digest(gerrit, get_daily_query('abandoned', age))
-body += '\n\nOpen changes needing tweaks, but being untouched for more
than a week:\n'
+body += '\n\n* Open changes needing tweaks, but being untouched for more
than a week:\n\end-daily-digest'
body += get_digest(gerrit, 'project:core branch:master status:open
(label:Code-Review=-1 label:Verified=-1) age:1w')
body += '''
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 41/52ce982bc8c1aca6859d9b803cefd16ba11de0 88/8e64505474808166c29ada24178cc3e58d6c18
41/52ce982bc8c1aca6859d9b803cefd16ba11de0 |1 + 88/8e64505474808166c29ada24178cc3e58d6c18 |1 + 2 files changed, 2 insertions(+) New commits: commit 563abaccceae623f2a82bc8473407aa4a3953684 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 10:34:01 2013 +0100 Notes added by 'git notes add' diff --git a/41/52ce982bc8c1aca6859d9b803cefd16ba11de0 b/41/52ce982bc8c1aca6859d9b803cefd16ba11de0 new file mode 100644 index 000..f417fed --- /dev/null +++ b/41/52ce982bc8c1aca6859d9b803cefd16ba11de0 @@ -0,0 +1 @@ +merged as: 5e39bc0937940e8d0f78668366e9de447269f0df commit 69f1cfb07840b9f9bbfd042a44883ab8c58add3d Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 10:33:48 2013 +0100 Notes added by 'git notes add' diff --git a/88/8e64505474808166c29ada24178cc3e58d6c18 b/88/8e64505474808166c29ada24178cc3e58d6c18 new file mode 100644 index 000..6e7e09f --- /dev/null +++ b/88/8e64505474808166c29ada24178cc3e58d6c18 @@ -0,0 +1 @@ +merged as: 59db4be207ca6651a29366d326436ba2f40bb6ab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 05/785d283e718aab182a5ea848de72e4a4b2efe3 f7/d4af835cf308bc9ece6fd84cbd14ba5be0adcd
05/785d283e718aab182a5ea848de72e4a4b2efe3 |1 + f7/d4af835cf308bc9ece6fd84cbd14ba5be0adcd |1 + 2 files changed, 2 insertions(+) New commits: commit 14f0fedc2093de8d89cd1651d37cb7ed87a4025b Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 10:34:22 2013 +0100 Notes added by 'git notes add' diff --git a/f7/d4af835cf308bc9ece6fd84cbd14ba5be0adcd b/f7/d4af835cf308bc9ece6fd84cbd14ba5be0adcd new file mode 100644 index 000..99c1114 --- /dev/null +++ b/f7/d4af835cf308bc9ece6fd84cbd14ba5be0adcd @@ -0,0 +1 @@ +merged as: 385bb4547359027bca6d5158e00e541f094b277e commit 598ffaad2ef604d6ff86ac19b14e39d3feeaa6d7 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 10:34:15 2013 +0100 Notes added by 'git notes add' diff --git a/05/785d283e718aab182a5ea848de72e4a4b2efe3 b/05/785d283e718aab182a5ea848de72e4a4b2efe3 new file mode 100644 index 000..99c1114 --- /dev/null +++ b/05/785d283e718aab182a5ea848de72e4a4b2efe3 @@ -0,0 +1 @@ +merged as: 385bb4547359027bca6d5158e00e541f094b277e ___ 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-4.0.4.2'
Tag 'libreoffice-4.0.4.2' created by Petr Mladek pmla...@suse.cz at 2013-06-11 10:33 -0700 Tag libreoffice-4.0.4.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRtu8BAAoJEPQ0oe+v7q6j11oQALyMuspku1DvkbwaHdUqNiYg SVCMnZ23SSK4CJdpYdmsKYzI7S0ytJro9pW3m30rr8CPcphcztn0GXg2ky48ce33 zjncnNw/RGxUPE+9a7SSwEuf1Yi+YdQVZ0/VYzPs0bwu9z0i9ldEdfm0puczTjY3 0Y3arBGod/82/tZInGSfNzeIzYYLBteu/bdIJ2t26oudKa3OEUttFDewms4i73mi vgLR1fIVSpleK+mZYs6YoesWu9HWPxydyW9R55pGQlqI/hEDqiHYLEjWHlZquH6E XuvlK2Qi7+8lbm3df3f++VLiNlJhuhklVj1pUEPRkwR2A5Ewp00Bhv6B3vvi2U/N MtgN6CHhUu6OMBxbUNN7XOFRD2rovBwUjsuK1vqqR2hEEUX7gPYNMLqFjBFkAam6 /ghAUchyWMPK3cMQwifi9yqIa5nTXoCk2arGWSfPce7Q6XmmcGHvUbAPFdOWPyvn 7xcRxLEhvYkfH3YIbM4d8pEKfKpVQfWHMhQA7JjY/p53lqkKskW/+9TVxVJqwDJ9 mvL52cjTj4akivF9/i5RJwZ5G13z6TEZgZwZC9emZuPo9VRxjuU+7neP8R6zrFWK 4cEzoNGkokXU8F4FDRZP1fAJQULmft14VrkTnwynaWJL5vEWsOsgZtWTFzH4VVq0 zlR+eUrfrcVa7sTIoZnz =VMia -END PGP SIGNATURE- Changes since sdremote-1.0.2-12: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.0.4.2'
Tag 'libreoffice-4.0.4.2' created by Petr Mladek pmla...@suse.cz at 2013-06-11 10:33 -0700 Tag libreoffice-4.0.4.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRtu8BAAoJEPQ0oe+v7q6jeZkP/RNckwwF0bVHnCnqJFXE7G76 hdymm2Jfp5f+ZEfSY0Q+jaQl2U0q3fpg+4hYqj2HYvuX4pGtb/LdWnae417t1bcF i1vB3g21o465fYpnZW8yaPdhDXdJgS9ZaO+L8Kj11wvMeXHXt0oAUV38btNhvlMp uFXJecgPLk0JsZtyxbLX/8AMdFGsLFEqGSqYZ2TvASx00A6YaIQXsEafAuzlsHzY 5sZdwbJPvsh8Ky31XbACncIWBgqy6a6DSKqem+31n2KTqfItXJvhua6P7RaJEd98 YggYbcT4lnpm09JmLgRzWd6UdQIy8jwpVRxkj5r8El+a63y4uLHAJUCibbKJXIsA 3piQWCz+lZQRyhSv1n5ZFjTS4Ay4AhugdDVTy1fn/JMVMHv0pRDS08wmtHg7kcIL f9KT34njQlStIE/jG9F/mkohyCUTPC4+BNrukZRucN+hqepaC5WwN9jJLuSxdIDK 3D6fSKNBoeTyxhxihO/2uBYMNAXB+2UEtHRgSkjoi4hL04VREw0fwD6wu7HFSeHE diOEODMSp6Ys3ZsDoRSQQXruXEdtCF5cAAnii2O2OjFC+jDDvjydaapnoCVnWmCB wfdZjGMPbzdpKdxZFCdEvRmdkMr5jkVT14HzSUQmfOYZRgiRFfZKgEd6pGD2ZacV il+R66ExFipsF0Wh9ZPE =MD1F -END PGP SIGNATURE- Changes since sdremote-1.0.2-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-4.0.4.2'
Tag 'libreoffice-4.0.4.2' created by Petr Mladek pmla...@suse.cz at 2013-06-11 10:33 -0700 Tag libreoffice-4.0.4.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRtu8CAAoJEPQ0oe+v7q6jMD4QAI3as7HO7v5kPoTr08hEgUJo omvmNR9VEUAOMSAUWLyMNtCoG4csiYUqeSDjQDY4o7l66hErhuhoiPKs4hK4iAfd emrntUkuHWDe5DQPQuK81msrKw5433JHxMitH14Ki1vodTE1Fh2rLrBVhG6ohBQ2 zUTeuJbgcZK7gtDdDOeyHvRI+h8VCYb75hzTVt7nFzu25+1ToEoNCpQe/jEFMhes zMn283LshYXPVHzv80jiWjSp/qoNSc3LtkUA6hbirZGiP8PxhaK0Yho9sJZi3ty1 /62VF2d3+9SDaWdC0S6Kf/w5m3frsuxfWC/8Vuxk5YUI2OvDb62yQZDu4xuhmX9P gc89UOTha4TwxbRac6jpadZrvrKQA9DwwKyv94kW5KUw5dXBa7oB4TPDlEH6yEZ4 veCgnyTZ57w0rwaKxj4sH0HAVl+eeCJMN1Y25K92EDa+bhDifO/wCEaZ/qi/HQcb zBtfwNvFRZxlLLwxwd6Q/BIsBb7nHDEpRu95yzmGto5OHVClJEdfWIQqPMSspUN+ WMgCO8zB4MStgpt1Pwi92mBb6xDsR581C7GPTA02oGlgfCtfwRyav/1d/wqt/rjT A7/LSn9n6zrWveAJG0SkCB9+BI+Jp/BkzLYD+FP+Ep48crZOgs72MsDPaAfZnxNB kmvfsZ3cNgT1O0rJNrEI =k8aQ -END PGP SIGNATURE- Changes since sdremote-1.0.0-637: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.0.4.2'
Tag 'libreoffice-4.0.4.2' created by Petr Mladek pmla...@suse.cz at 2013-06-11 10:33 -0700 Tag libreoffice-4.0.4.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRtu8BAAoJEPQ0oe+v7q6j/lwP/2hnNVtGpAr/ydWPZOmIvAxE 5plk9VqdjHMnbXF98Z/EO1zpKjOQzqQ0nIzRrOdU0GckOMB6JjNbM7rILeTBYgg/ olo8kZ2vSqRmANn9fI+sqLOsCMvcDcdM+20O4Wi6ECj6HStvlSDoyxlxsKdI7cVq E3DSio2npmDHZcZKMxS93TVHw+z04rLewSVF2JfHNwS7o1iX0VYnlfWhNccsd8ZL URa+fGOzgozWVTb40WXpFMiLClD1MFRi5QbRQzn5J6aeUv1+BTG0wDLkhQBde6ea dSOKWU9s428ni3yJ8J2XqGV0//jZBfHAAN6zoy3+bGhhPbyy8NG+RUdLjuVfbYf3 bpXlrzMfVzy/JnIUtKacHCCwPtTv3LARzzRp/N5/1yPB/V/CjIfPuDH44xyZk6wG xvoy3D4n3a/qA7YqdfbWgbkzm4unXTy1QkJK+WSMpvLSmeZbvxzTc6/hUq16k61L OAz9NJGXXUrJklClp7HNSZ60ENJlLoZS8ZHx7PpBphiQ40WCydLTXowz0/cmzNui 7Yj//lwVqlvivqhBMMyMlwmTFMM9kQEVAjNyq7H9LMeI7R28+ofqqqG5watpdTdK bOEJhqg4WVaF05YHenhG88vhMGo3Sxnn8KbhZsNiRVeOzpa+NTB1tkGP2wCIhWDv Zj1d6C6nGK+MRgWldxxo =AosG -END PGP SIGNATURE- Changes since sdremote-1.0.2-13: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 48 +++
1 file changed, 12 insertions(+), 36 deletions(-)
New commits:
commit 721f82c9bff871cd11c6a7c41ae080375463a690
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jun 11 11:41:09 2013 +0200
Use a local variable for the points
Change-Id: Ibd274ecd7eaeadaaef9f2a17a0d721355a561431
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 7817a79..47fa726 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1618,11 +1618,13 @@ namespace cppcanvas
double cellSize = setFont (flags 0xff,
rFactoryParms, rState);
rState.textColor = COLOR( brushId );
+::basegfx::B2DPoint point( Map( lx +
0.15*cellSize, ly + cellSize ) );
+
ActionSharedPtr pTextAction(
TextActionFactory::createTextAction(
//
position is just rough guess for now
// we
should calculate it exactly from layoutRect or font
-::vcl::unotools::pointFromB2DPoint (
Map( lx + 0.15*cellSize, ly + cellSize ) ),
+::vcl::unotools::pointFromB2DPoint (
point ),
::Size(),
::Color(),
::Size(),
@@ -1863,9 +1865,11 @@ namespace cppcanvas
if( flags 0x8000 )
rState.textColor = COLOR( brushIndexOrColor );
+::basegfx::B2DPoint point( Map( charsPosX[0],
charsPosY[0] ) );
+
ActionSharedPtr pTextAction(
TextActionFactory::createTextAction(
-::vcl::unotools::pointFromB2DPoint (
Map( charsPosX[0], charsPosY[0] ) ),
+::vcl::unotools::pointFromB2DPoint (
point ),
::Size(),
::Color(),
::Size(),
commit eb0a738d1b3f1a9df41d55a1defd349264486920
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jun 11 11:21:56 2013 +0200
Refactor a bit the code while reading it
Change-Id: I58693bb4ffe0f59365069a87fc30081ddf226eaa
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 7b74047..7817a79 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1474,50 +1474,22 @@ namespace cppcanvas
EMFPPath path (points, true);
path.Read (rMF, flags, *this);
-
EMFPPlusFillPolygon (path.GetPolygon (*this),
rFactoryParms, rState, rCanvas, flags 0x8000, brushIndexOrColor);
break;
}
case EmfPlusRecordTypeDrawLines:
{
-sal_uInt32 index = flags 0xff;
sal_uInt32 points;
rMF points;
-SAL_INFO(cppcanvas.emf, EMF+ DrawLines in slot:
index points: points);
+SAL_INFO(cppcanvas.emf, EMF+ DrawLines in slot:
(flags 0xff) points: points);
EMFPPath path (points, true);
path.Read (rMF, flags, *this);
-EMFPPen* pen = (EMFPPen*) aObjects [index];
-
-rState.isFillColorSet = false;
-rState.isLineColorSet = true;
-rState.lineColor =
::vcl::unotools::colorToDoubleSequence (pen-GetColor (),
-
rCanvas-getUNOCanvas ()-getDevice()-getDeviceColorSpace() );
-::basegfx::B2DPolyPolygon polygon
(path.GetPolygon (*this));
-
-polygon.transform( rState.mapModeTransform );
-
-rendering::StrokeAttributes aStrokeAttributes;
-
-pen-SetStrokeAttributes (aStrokeAttributes,
*this, rState);
-
-ActionSharedPtr pPolyAction(
-
internal::PolyPolyActionFactory::createPolyPolyAction(
-polygon, rFactoryParms.mrCanvas, rState,
aStrokeAttributes ) );
-
-if( pPolyAction )
-{
-
message Sebastien Delvaux
some news: http://www.hotelovysystem.sk/fnoj/nausauxctarhi/osylv/bkxa.htm ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-4' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |4 +--
2 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 01d064366279ced9dcb45851c9f09496eeea2609
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jun 11 11:56:50 2013 +0200
bump product version to 4.0.4.2+, release number to 2
Change-Id: Ic4f0891d41930df7a066b9f72c04f48b4ca745d8
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 7f6366b..568d97e 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.4.1
+UREPACKAGEVERSION 4.0.4.2
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .4.1
+PRODUCTEXTENSION .4.2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.4.1
+ABOUTBOXPRODUCTVERSION 4.0.4.2
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.4.1
+PACKAGEVERSION 4.0.4.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .4.1
+PRODUCTEXTENSION .4.2
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.4.1
+ABOUTBOXPRODUCTVERSION 4.0.4.2
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.4.1
+PACKAGEVERSION 4.0.4.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.4.1
+PACKAGEVERSION 4.0.4.2
PACKAGEREVISION 1
-PRODUCTEXTENSION .4.1
+PRODUCTEXTENSION .4.2
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .4.1
+PRODUCTEXTENSION .4.2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.4.1
+PACKAGEVERSION 4.0.4.2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .4.1
+PRODUCTEXTENSION .4.2
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.4.1
+PACKAGEVERSION 4.0.4.2
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .4.1
+PRODUCTEXTENSION .4.2
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.4.1
+PACKAGEVERSION 4.0.4.2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .4.1
+PRODUCTEXTENSION .4.2
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.4.1
+
[ANNOUNCE] libreoffice-4.0.4.2 tag created
Hi, there have been created the tag libreoffice-4.0.4.2, aka rc2. The corresponding official builds will be available within next few days. It will be used as final if no blocker is found. See the attached list of changes against 4.0.4.1. Now, you might switch your current 4-0 source tree to it using: ./g fetch --tags ./g checkout -b tag-libreoffice-4.0.4.2 libreoffice-4.0.4.2 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will be available from the official page together with the builds. See also the schedule at http://wiki.documentfoundation.org/ReleasePlan#4.0_release and release criteria at http://wiki.documentfoundation.org/Release_Criteria Best Regards, Petr + FILEOPEN: Incorrect displaying attached VSD document (fdo#64797) [Fridrich Štrba] fdo#64797 FILEOPEN: Incorrect displaying attached VSD document [Fridrich Štrba] + common + version 4.0.4.2, tag libreoffice-4.0.4.2 [Petr Mladek] + core + accept even more corrupted zip documents as long as we can read them [Fridrich Štrba] + fix crash with fdo60063-1.docx [Fridrich Štrba] + revert fix Set TEXT_LAYOUT_BIDI_STRONG flag. (fdo#60533) [Petr Mladek] + transform the clipping polygon before using it [Fridrich Štrba] + updated core [Andras Timar] + uploading libvisio-0.0.28 fixing regression (fdo#64797) [Fridrich Štrba] + translations + update translations for LibreOffice 4.0.4 rc2 [Andras Timar] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/gdi/sallayout.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 6115cd0bf8ef8d7e063615636175e148c8d57da1
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Jun 11 10:02:35 2013 +
method MultiSalLayout::AdjustLayout(..) - limit next codepoint index to
the minindex..endindex bounds
Patch by: hdu
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index c800403..b858517 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1863,15 +1863,23 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs
rArgs )
}
mnLevel = nLevel;
-// merge the fallback levels
+// prepare merge the fallback levels
long nXPos = 0;
double fUnitMul = 1.0;
for( n = 0; n nLevel; ++n )
maFallbackRuns[n].ResetPos();
+// get the next codepoint index that needs fallback
+// and limit it to the minindex..endindex bounds
int nActiveCharPos = nCharPos[0];
+if( nActiveCharPos mnMinCharPos)
+nActiveCharPos = mnMinCharPos;
+else if( nActiveCharPos = rArgs.mnEndCharPos )
+nActiveCharPos = rArgs.mnEndCharPos - 1;
+// get the end index of the active run
int nLastRunEndChar = (vRtl[nActiveCharPos - mnMinCharPos])?
rArgs.mnEndCharPos : rArgs.mnMinCharPos - 1;
int nRunVisibleEndChar = nCharPos[0];
+// merge the fallback levels
while( nValid[0] (nLevel 0))
{
// find best fallback level
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit a5caaad1b83ecb8d6a17f0608c2716a5e69ae86c
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jun 8 15:28:55 2013 +0200
Related fdo#33895 add some checks against NULL derefs
Change-Id: I9c62a063788a494125ce8dc27748ed66022f5c48
Reviewed-on: https://gerrit.libreoffice.org/4199
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
Reviewed-on: https://gerrit.libreoffice.org/4223
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 205f821..fc6eb3e 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1161,8 +1161,13 @@ void OOXMLFastContextHandler::resolveFooter
// Add the data pointed to by the reference as another property.
void OOXMLFastContextHandler::resolveData(const OUString rId)
{
+OOXMLDocument * objDocument = getDocument();
+SAL_WARN_IF(!objDocument, writerfilter, no document to resolveData);
+if (!objDocument)
+return;
+
uno::Referenceio::XInputStream xInputStream
-(mpParserState-getDocument()-getInputStreamForId(rId));
+(objDocument-getInputStreamForId(rId));
OOXMLValue::Pointer_t aValue(new OOXMLInputStreamValue(xInputStream));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 8f50adc18112877214495e723976f18fa41cc18d
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jun 8 15:28:55 2013 +0200
Related fdo#33895 add some checks against NULL derefs
Change-Id: I9c62a063788a494125ce8dc27748ed66022f5c48
Reviewed-on: https://gerrit.libreoffice.org/4199
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
Reviewed-on: https://gerrit.libreoffice.org/4224
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index c8af924..aae56aa 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1161,8 +1161,13 @@ void OOXMLFastContextHandler::resolveFooter
// Add the data pointed to by the reference as another property.
void OOXMLFastContextHandler::resolveData(const OUString rId)
{
+OOXMLDocument * objDocument = getDocument();
+SAL_WARN_IF(!objDocument, writerfilter, no document to resolveData);
+if (!objDocument)
+return;
+
uno::Referenceio::XInputStream xInputStream
-(mpParserState-getDocument()-getInputStreamForId(rId));
+(objDocument-getInputStreamForId(rId));
OOXMLValue::Pointer_t aValue(new OOXMLInputStreamValue(xInputStream));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo65265.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 +
sw/source/filter/ww8/docxattributeoutput.cxx | 64 +--
3 files changed, 73 insertions(+), 3 deletions(-)
New commits:
commit f7595decdfb5f9aac61ccc61ad38de4a1faa402d
Author: Adam Co rattles2...@gmail.com
Date: Sun Jun 9 19:08:32 2013 +0300
fdo#65265 : fix for DOCX export of formatting data
Change-Id: Iab3c56e5c3e3cf359e42cf7080883d1408cc3304
Reviewed-on: https://gerrit.libreoffice.org/4215
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/qa/extras/ooxmlexport/data/fdo65265.docx
b/sw/qa/extras/ooxmlexport/data/fdo65265.docx
new file mode 100644
index 000..6267085
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo65265.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ca6fad6..bcecf95 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -72,6 +72,7 @@ public:
void testI120928();
void testFdo64826();
void testPageBackground();
+void testFdo65265();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -121,6 +122,7 @@ void Test::run()
{i120928.docx, Test::testI120928},
{fdo64826.docx, Test::testFdo64826},
{page-background.docx, Test::testPageBackground},
+{fdo65265.docx, Test::testFdo65265},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -688,6 +690,16 @@ void Test::testPageBackground()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x92D050),
getPropertysal_Int32(xPageStyle, BackColor));
}
+void Test::testFdo65265()
+{
+// Redline (tracked changes) of text formatting were not exported
+uno::Referencetext::XTextRange xParagraph1 = getParagraph(1);
+uno::Referencetext::XTextRange xParagraph2 = getParagraph(2);
+
+CPPUNIT_ASSERT_EQUAL(OUString(Format),
getPropertyOUString(getRun(xParagraph1, 3), RedlineType));
+CPPUNIT_ASSERT_EQUAL(OUString(Format),
getPropertyOUString(getRun(xParagraph2, 2), RedlineType));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index bd54f5a..7e4f49c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1049,8 +1049,12 @@ void DocxAttributeOutput::WriteCollectedRunProperties()
m_pSerializer-mergeTopMarks();
}
-void DocxAttributeOutput::EndRunProperties( const SwRedlineData*
/*pRedlineData*/ )
+void DocxAttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData )
{
+// Call the 'Redline' function. This will add redline (change-tracking)
information that regards to run properties.
+// This includes changes like 'Bold', 'Underline', 'Strikethrough' etc.
+Redline( pRedlineData );
+
WriteCollectedRunProperties();
m_pSerializer-endElementNS( XML_w, XML_rPr );
@@ -1329,11 +1333,65 @@ void DocxAttributeOutput::FieldVanish( const String
rTxt, ww::eField eType )
WriteField_Impl( NULL, eType, rTxt, WRITEFIELD_ALL );
}
-void DocxAttributeOutput::Redline( const SwRedlineData* /*pRedline*/ )
+// The difference between 'Redline' and 'StartRedline'+'EndRedline' is that:
+// 'Redline' is used for tracked changes of formatting information of a run
like Bold, Underline. (the 'w:rPrChange' is inside the 'run' node)
+// 'StartRedline' is used to output tracked changes of run insertion and
deletion (the run is inside the 'w:ins' node)
+void DocxAttributeOutput::Redline( const SwRedlineData* pRedline)
{
-OSL_TRACE( TODO DocxAttributeOutput::Redline( const SwRedlineData*
pRedline ) );
+if ( !pRedline )
+return;
+
+OString aId( OString::valueOf( sal_Int32(pRedline-GetSeqNo()) ) );
+const String rAuthor( SW_MOD()-GetRedlineAuthor( pRedline-GetAuthor() )
);
+OString aAuthor( OUStringToOString( rAuthor, RTL_TEXTENCODING_UTF8 ) );
+OString aDate( msfilter::util::DateTimeToOString( pRedline-GetTimeStamp()
) );
+
+OUString sVal;
+OString sOVal;
+
+switch( pRedline-GetType() )
+{
+case nsRedlineType_t::REDLINE_INSERT:
+break;
+
+case nsRedlineType_t::REDLINE_DELETE:
+break;
+
+case nsRedlineType_t::REDLINE_FORMAT:
+m_pSerializer-startElementNS( XML_w, XML_rPrChange,
+FSNS( XML_w, XML_id ), aId.getStr(),
+FSNS( XML_w, XML_author ), aAuthor.getStr(),
+FSNS( XML_w, XML_date ), aDate.getStr(),
+FSEND );
+
+if ( m_pCharLangAttrList )
+{
+if (m_pCharLangAttrList-hasAttribute(FSNS(XML_w, XML_val)))
+{
+m_pSerializer-mark();
+
[PATCH] Sidebar conversion to .ui for CellAppearancePropertyPanel
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4227
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/4227/1
Sidebar conversion to .ui for CellAppearancePropertyPanel
Change-Id: I90df6ebe428ec201aa204f26447c1728b2120c69
---
M sc/AllLangResTarget_sc.mk
M sc/UIConfig_scalc.mk
M sc/inc/sc.hrc
M sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
M sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
M sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
M sc/source/ui/sidebar/CellAppearancePropertyPanel.src
M sc/source/ui/src/scstring.src
A sc/uiconfig/scalc/ui/sidebarcellappearance.ui
9 files changed, 259 insertions(+), 307 deletions(-)
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index b83e0f9..6c9cfde 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -86,7 +86,6 @@
sc/source/ui/formdlg/formdlgs.src \
sc/source/ui/formdlg/dwfunctr.src \
sc/source/ui/sidebar/AlignmentPropertyPanel.src \
-sc/source/ui/sidebar/CellAppearancePropertyPanel.src \
sc/source/ui/sidebar/NumberFormatPropertyPanel.src \
sc/source/core/src/compiler.src \
))
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 94a8aea..4abee5c 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -84,6 +84,7 @@
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/sheetprintpage \
+ sc/uiconfig/scalc/ui/sidebarcellappearance \
sc/uiconfig/scalc/ui/rightfooterdialog \
sc/uiconfig/scalc/ui/rightheaderdialog \
sc/uiconfig/scalc/ui/selectrange \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 6fbe3f0..5de0877 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -939,6 +939,9 @@
#define SCSTR_FIELDSEP_TAB (STR_START + 412)
#define SCSTR_FIELDSEP_SPACE(STR_START + 413)
+#define SCSTR_FILLCOLOR (STR_START + 414)
+#define SCSTR_NOFILLCOLOR (STR_START + 415)
+#define SCSTR_LINECOLOR (STR_START + 416)
#define STR_END (SCSTR_FIELDSEP_SPACE)
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 2ee40a9..c083906 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -45,6 +45,12 @@
using namespace css;
using namespace cssu;
+const char UNO_CELLBACKGROUND[] = .uno:CellBackground;
+const char UNO_BORDERTYPE[] = .uno:BorderType;
+const char UNO_BORDERLINESTYLE[] = .uno:BorderLineStyle;
+const char UNO_BORDERLINECOLOR[] = .uno:BorderLineColor;
+const char UNO_GRIDLINESVISIBLE[] = .uno:GridLinesVisible;
+
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
//
@@ -67,13 +73,13 @@
svx::sidebar::PopupControl*
CellAppearancePropertyPanel::CreateFillColorPopupControl(svx::sidebar::PopupContainer*
pParent)
{
-const ScResId aResId(VS_NOFILLCOLOR);
+const ScResId aResId(SCSTR_NOFILLCOLOR);
return new svx::sidebar::ColorControl(
pParent,
mpBindings,
ScResId(RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR),
-ScResId(VS_FILLCOLOR),
+ScResId(SCSTR_FILLCOLOR),
::boost::bind(GetTransparentColor),
::boost::bind(CellAppearancePropertyPanel::SetFillColor, this, _1,
_2),
pParent,
@@ -97,7 +103,7 @@
pParent,
mpBindings,
ScResId(RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR),
-ScResId(VS_LINECOLOR),
+ScResId(SCSTR_LINECOLOR),
::boost::bind(GetTransparentColor),
::boost::bind(CellAppearancePropertyPanel::SetLineColor, this, _1,
_2),
pParent,
@@ -122,7 +128,7 @@
void CellAppearancePropertyPanel::EndCellLineStylePopupMode(void)
{
-if(mpCellLineStylePopup.get())
+if(mpCellLineStylePopup)
{
mpCellLineStylePopup-Hide();
}
@@ -137,7 +143,7 @@
void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void)
{
-if(mpCellBorderStylePopup.get())
+if(mpCellBorderStylePopup)
{
mpCellBorderStylePopup-Hide();
}
@@ -149,28 +155,7 @@
Window* pParent,
const cssu::Referencecss::frame::XFrame rxFrame,
SfxBindings* pBindings)
-: Control(
-pParent,
-ScResId(RID_PROPERTYPANEL_SC_APPEAR)),
-
-mpFTFillColor(new FixedText(this, ScResId(FT_BK_COLOR))),
-
mpTBFillColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
-
mpTBFillColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBFillColorBackground.get(),
ScResId(TB_BK_COLOR))),
-mpFillColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_BRUSH,
TBI_BK_COLOR, mpTBFillColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)),
-
-mpFTCellBorder(new FixedText(this, ScResId(FT_BORDER))),
-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 60/f299f255a8a2fd2c4aabde6933d4388af3643b
60/f299f255a8a2fd2c4aabde6933d4388af3643b |1 + 1 file changed, 1 insertion(+) New commits: commit c23881b07224037c483cac4cc17876f7c5ed1095 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 11:31:18 2013 +0100 Notes added by 'git notes add' diff --git a/60/f299f255a8a2fd2c4aabde6933d4388af3643b b/60/f299f255a8a2fd2c4aabde6933d4388af3643b new file mode 100644 index 000..a23a9ef --- /dev/null +++ b/60/f299f255a8a2fd2c4aabde6933d4388af3643b @@ -0,0 +1 @@ +merged as: dbc7c605d65cc2dc37af3d2077ac553754bc4f7d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - drawinglayer/source filter/source sd/source vcl/source
drawinglayer/source/processor2d/vclhelperbitmaprender.cxx |5 +
filter/source/msfilter/escherex.cxx | 49 --
sd/source/filter/eppt/eppt.cxx|6 +
sd/source/filter/eppt/epptbase.hxx|1
sd/source/filter/eppt/pptx-epptbase.cxx |1
vcl/source/window/menu.cxx| 42
6 files changed, 70 insertions(+), 34 deletions(-)
New commits:
commit dbc7c605d65cc2dc37af3d2077ac553754bc4f7d
Author: Armin Le Grand a...@apache.org
Date: Tue Oct 9 14:41:38 2012 +
Resolves: #i121183# enhance export of ppt hatch masterpagebackground
(cherry picked from commit 60f299f255a8a2fd2c4aabde6933d4388af3643b)
Conflicts:
filter/source/msfilter/escherex.cxx
sd/source/filter/eppt/eppt.cxx
sd/source/filter/eppt/eppt.hxx
Change-Id: I62d772ab67ed03bfa964040bd07b3684cf2dee8f
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index c530081..a517f32 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1389,26 +1389,30 @@ sal_Bool
EscherPropertyContainer::CreateEmbeddedBitmapProperties(
namespace {
-GraphicObject lclDrawHatch( const ::com::sun::star::drawing::Hatch rHatch,
const Color rBackColor, bool bFillBackground )
+GraphicObject lclDrawHatch( const ::com::sun::star::drawing::Hatch rHatch,
const Color rBackColor, bool bFillBackground, const Rectangle rRect )
{
-const MapMode aMap100( MAP_100TH_MM );
-VirtualDevice aVDev( *Application::GetDefaultDevice(), 0, 1 );
-aVDev.SetMapMode( aMap100 );
-
-const Size aOutSize = aVDev.PixelToLogic( Size( 28, 28 ) );
-aVDev.SetOutputSize( aOutSize );
-
-Rectangle aRectangle( Point( 0, 0 ), aOutSize );
-const PolyPolygon aPolyPoly( aRectangle );
-
-aVDev.SetLineColor();
-aVDev.SetFillColor( bFillBackground ? rBackColor : Color( COL_TRANSPARENT
) );
-aVDev.DrawRect( Rectangle( Point(), aOutSize ) );
-
-Hatch aVclHatch( (HatchStyle) rHatch.Style, Color( rHatch.Color ),
rHatch.Distance, (sal_uInt16)rHatch.Angle );
-aVDev.DrawHatch( aPolyPoly, aVclHatch );
-
-return GraphicObject( Graphic( aVDev.GetBitmapEx( Point(), aOutSize ) ) );
+// #i121183# For hatch, do no longer create a bitmap with the fixed size
of 28x28 pixels. Also
+// do not create a bitmap in page size, that would explode file sizes (and
have no good quality).
+// Better use a MetaFile graphic in page size; thus we have good quality
due to vector format and
+// no bit file sizes.
+VirtualDevice aOut;
+GDIMetaFile aMtf;
+
+aOut.SetOutputSizePixel(Size(2, 2));
+aOut.EnableOutput(false);
+aOut.SetMapMode(MapMode(MAP_100TH_MM));
+aMtf.Clear();
+aMtf.Record(aOut);
+aOut.SetLineColor();
+aOut.SetFillColor(bFillBackground ? rBackColor : Color(COL_TRANSPARENT));
+aOut.DrawRect(rRect);
+aOut.DrawHatch(PolyPolygon(rRect), Hatch((HatchStyle)rHatch.Style,
Color(rHatch.Color), rHatch.Distance, (sal_uInt16)rHatch.Angle));
+aMtf.Stop();
+aMtf.WindStart();
+aMtf.SetPrefMapMode(MapMode(MAP_100TH_MM));
+aMtf.SetPrefSize(rRect.GetSize());
+
+return GraphicObject(Graphic(aMtf));
}
} // namespace
@@ -1416,7 +1420,8 @@ GraphicObject lclDrawHatch( const
::com::sun::star::drawing::Hatch rHatch, cons
sal_Bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const
::com::sun::star::drawing::Hatch rHatch, const Color rBackColor, bool
bFillBackground )
{
-GraphicObject aGraphicObject = lclDrawHatch( rHatch, rBackColor,
bFillBackground );
+const Rectangle aRect(pShapeBoundRect ? *pShapeBoundRect :
Rectangle(Point(0,0), Size(28000, 21000)));
+GraphicObject aGraphicObject = lclDrawHatch( rHatch, rBackColor,
bFillBackground, aRect );
OString aUniqueId = aGraphicObject.GetUniqueID();
sal_Bool bRetValue = ImplCreateEmbeddedBmp( aUniqueId );
if ( bRetValue )
@@ -1515,7 +1520,9 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
{
aAny = bFillBackground;
}
-aGraphicObject = lclDrawHatch( aHatch, aBackColor,
bFillBackground );
+
+const Rectangle aRect(Point(0, 0), pShapeBoundRect ?
pShapeBoundRect-GetSize() : Size(28000, 21000));
+aGraphicObject = lclDrawHatch( aHatch, aBackColor,
bFillBackground, aRect );
aUniqueId = aGraphicObject.GetUniqueID();
eBitmapMode = ::com::sun::star::drawing::BitmapMode_REPEAT;
bIsGraphicMtf = aGraphicObject.GetType() ==
GRAPHIC_GDIMETAFILE;
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index dc05938..861d06a 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1202,8 +1202,10 @@ void PPTWriter::ImplWriteBackground(
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1f/0b83f0e62094257a1c69ff18969f07422772dc
1f/0b83f0e62094257a1c69ff18969f07422772dc |1 + 1 file changed, 1 insertion(+) New commits: commit aa085a5753aaa408eeb63f8764c94bbf1c6640e8 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 11:31:42 2013 +0100 Notes added by 'git notes add' diff --git a/1f/0b83f0e62094257a1c69ff18969f07422772dc b/1f/0b83f0e62094257a1c69ff18969f07422772dc new file mode 100644 index 000..9e3dd40 --- /dev/null +++ b/1f/0b83f0e62094257a1c69ff18969f07422772dc @@ -0,0 +1 @@ +merged as: 45d011ba375c469771ef652c25bd42ce85d3071f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/sallayout.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 30a98a585102793b4bc77c4ba4706f8199cfe85e
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Jun 11 10:02:35 2013 +
limit next codepoint index to the minindex..endindex bounds
Patch by: hdu
(cherry picked from commit 6115cd0bf8ef8d7e063615636175e148c8d57da1)
Change-Id: I62265b3021f86bee1f78a79a2c668c1ce09c5521
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index bd7a326..4be0ce7 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1731,15 +1731,23 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs
rArgs )
}
mnLevel = nLevel;
-// merge the fallback levels
+// prepare merge the fallback levels
long nXPos = 0;
double fUnitMul = 1.0;
for( n = 0; n nLevel; ++n )
maFallbackRuns[n].ResetPos();
+// get the next codepoint index that needs fallback
+// and limit it to the minindex..endindex bounds
int nActiveCharPos = nCharPos[0];
+if( nActiveCharPos mnMinCharPos)
+nActiveCharPos = mnMinCharPos;
+else if( nActiveCharPos = rArgs.mnEndCharPos )
+nActiveCharPos = rArgs.mnEndCharPos - 1;
+// get the end index of the active run
int nLastRunEndChar = (vRtl[nActiveCharPos - mnMinCharPos])?
rArgs.mnEndCharPos : rArgs.mnMinCharPos - 1;
int nRunVisibleEndChar = nCharPos[0];
+// merge the fallback levels
while( nValid[0] (nLevel 0))
{
// find best fallback level
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 61/15cd0bf8ef8d7e063615636175e148c8d57da1
61/15cd0bf8ef8d7e063615636175e148c8d57da1 |1 + 1 file changed, 1 insertion(+) New commits: commit 9e77b63e7c8f24cadd1a393468d31e318543c169 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 11:35:58 2013 +0100 Notes added by 'git notes add' diff --git a/61/15cd0bf8ef8d7e063615636175e148c8d57da1 b/61/15cd0bf8ef8d7e063615636175e148c8d57da1 new file mode 100644 index 000..0d992b5 --- /dev/null +++ b/61/15cd0bf8ef8d7e063615636175e148c8d57da1 @@ -0,0 +1 @@ +merged as: 30a98a585102793b4bc77c4ba4706f8199cfe85e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 65050, which changed state. Bug 65050 Summary: EDITING: automatic insertion of non-breaking space before specific punctuation marks in French texts broken https://bugs.freedesktop.org/show_bug.cgi?id=65050 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 54/c0f6f5b605ae05eade910fd2b672adf1d0d7fc
54/c0f6f5b605ae05eade910fd2b672adf1d0d7fc |1 + 1 file changed, 1 insertion(+) New commits: commit d940af0e97f84bdcf11557d57a706366a1e11589 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 11:55:04 2013 +0100 Notes added by 'git notes add' diff --git a/54/c0f6f5b605ae05eade910fd2b672adf1d0d7fc b/54/c0f6f5b605ae05eade910fd2b672adf1d0d7fc new file mode 100644 index 000..d41e17d --- /dev/null +++ b/54/c0f6f5b605ae05eade910fd2b672adf1d0d7fc @@ -0,0 +1 @@ +merged as: 7567b64e7d1009e8a51e06204480c341c99c0410 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impimagetree.cxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit c0b78901dba033ed112a023a787575ae54ef877d
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jun 11 12:05:46 2013 +0100
Missing zip files now result in a DeploymentException so ignore that.
DeploymentException seems to be a hard RuntimeException, so this is a
new behaviour. We need to think if zip::ZipFileAccess::createWithURL
should return that; see 28e3aff576f06b0b02c7232da5d723e865b3c7ed
Change-Id: Ie99ea4c7519cbc1aa7790768d7e9e0c2edef68e0
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 6f7c566..fbeccef 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -301,8 +301,6 @@ bool ImplImageTree::find(
if (!m_path.second.is()) {
try {
m_path.second =
css::packages::zip::ZipFileAccess::createWithURL(comphelper::getProcessComponentContext(),
m_path.first + .zip);
-} catch (css::uno::RuntimeException ) {
-throw;
} catch (const css::uno::Exception e) {
SAL_INFO(vcl, ImplImageTree::find exception
e.Message for m_path.first);
@@ -344,10 +342,6 @@ void ImplImageTree::loadImageLinks()
{
m_path.second =
css::packages::zip::ZipFileAccess::createWithURL(comphelper::getProcessComponentContext(),
m_path.first + .zip);
}
-catch (css::uno::RuntimeException )
-{
-throw;
-}
catch (const css::uno::Exception e)
{
SAL_INFO(vcl, ImplImageTree::find exception
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/window/menu.cxx | 42 +++---
1 file changed, 31 insertions(+), 11 deletions(-)
New commits:
commit cbfc61a6ca075eb3fbd9a41dea7f9489c5d56770
Author: Isamu Mogi saturda...@gmail.com
Date: Sat Jun 8 06:54:34 2013 +
fdo#65450 Not to call MenuBar's selection logic for rollover effect
Currently when we rollovers on MenuBar, MenuBar's selection logic
(ChangeHighlightItem et al) is called. But calling these logic on background
window seems to illegal and causes fdo#65450.
(cherry picked from commit 29474304550512f56ef597464bfdb5304bf56bb1)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 9b4b32f..2d39189 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -676,6 +676,7 @@ private:
Menu* pMenu;
PopupMenu* pActivePopup;
sal_uInt16 nHighlightedItem;
+sal_uInt16 nRolloveredItem;
sal_uLong nSaveFocusId;
sal_BoolmbAutoPopup;
sal_BoolbIgnoreFirstMove;
@@ -5152,6 +5153,7 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) :
pActivePopup = NULL;
nSaveFocusId = 0;
nHighlightedItem = ITEMPOS_INVALID;
+nRolloveredItem = ITEMPOS_INVALID;
mbAutoPopup = sal_True;
nSaveFocusId = 0;
bIgnoreFirstMove = sal_True;
@@ -5416,11 +5418,29 @@ void MenuBarWindow::MouseMove( const MouseEvent rMEvt )
if ( rMEvt.IsSynthetic() || rMEvt.IsEnterWindow() )
return;
-if ( rMEvt.IsLeaveWindow() !pActivePopup )
+if ( rMEvt.IsLeaveWindow() )
{
-ChangeHighlightItem( ITEMPOS_INVALID, sal_False );
+if ( nRolloveredItem != ITEMPOS_INVALID nRolloveredItem !=
nHighlightedItem )
+HighlightItem( nRolloveredItem, sal_False );
+
+nRolloveredItem = ITEMPOS_INVALID;
+return;
+}
+
+sal_uInt16 nEntry = ImplFindEntry( rMEvt.GetPosPixel() );
+if ( nHighlightedItem == ITEMPOS_INVALID )
+{
+if ( nRolloveredItem != nEntry )
+{
+if ( nRolloveredItem != ITEMPOS_INVALID )
+HighlightItem( nRolloveredItem, sal_False );
+
+nRolloveredItem = nEntry;
+HighlightItem( nRolloveredItem, sal_True );
+}
return;
}
+nRolloveredItem = nEntry;
if( bIgnoreFirstMove )
{
@@ -5428,15 +5448,9 @@ void MenuBarWindow::MouseMove( const MouseEvent rMEvt )
return;
}
-sal_uInt16 nEntry = ImplFindEntry( rMEvt.GetPosPixel() );
if ( ( nEntry != ITEMPOS_INVALID )
( nEntry != nHighlightedItem ) )
-{
-if ( ! pActivePopup )
-mbAutoPopup = sal_False;
-
ChangeHighlightItem( nEntry, sal_False );
-}
}
void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry,
sal_Bool bAllowRestoreFocus, sal_Bool bDefaultToDocument)
@@ -5505,13 +5519,19 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n,
sal_Bool bSelectEntry, sa
if ( nHighlightedItem != ITEMPOS_INVALID )
{
-HighlightItem( nHighlightedItem, sal_False );
+if ( nHighlightedItem != nRolloveredItem )
+HighlightItem( nHighlightedItem, sal_False );
+
pMenu-ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT,
nHighlightedItem );
}
nHighlightedItem = (sal_uInt16)n;
DBG_ASSERT( ( nHighlightedItem == ITEMPOS_INVALID ) ||
pMenu-ImplIsVisible( nHighlightedItem ), ChangeHighlightItem: Not visible! );
-HighlightItem( nHighlightedItem, sal_True );
+if ( nHighlightedItem != ITEMPOS_INVALID )
+HighlightItem( nHighlightedItem, sal_True );
+else if ( nRolloveredItem != ITEMPOS_INVALID )
+HighlightItem( nRolloveredItem, sal_True );
+
pMenu-ImplCallHighlight( nHighlightedItem );
if( mbAutoPopup )
@@ -5540,7 +5560,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos,
sal_Bool bHighlight )
Rectangle aRect = Rectangle( Point( nX, 1 ), Size(
pData-aSz.Width(), GetOutputSizePixel().Height()-2 ) );
Push( PUSH_CLIPREGION );
IntersectClipRegion( aRect );
-bool bRollover = bHighlight ( !pActivePopup !mbAutoPopup
);
+bool bRollover = bHighlight nPos != nHighlightedItem;
if ( bHighlight )
{
if( IsNativeControlSupported( CTRL_MENUBAR, PART_MENU_ITEM
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 65450, which changed state. Bug 65450 Summary: Writer crash on File-Open https://bugs.freedesktop.org/show_bug.cgi?id=65450 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - formula/source include/formula sc/CppunitTest_sc_ucalc.mk sc/inc sc/Library_sc.mk sc/qa sc/source vcl/source
formula/source/core/resource/core_resource.src | 24 +++
include/formula/compiler.hrc |8 -
include/formula/opcode.hxx |4
sc/CppunitTest_sc_ucalc.mk |4
sc/Library_sc.mk |4
sc/inc/helpids.h |4
sc/qa/unit/ucalc.cxx |4
sc/source/core/inc/interpre.hxx|4
sc/source/core/tool/interpr1.cxx | 177 +
sc/source/core/tool/interpr4.cxx |4
sc/source/filter/excel/xlformula.cxx |4
sc/source/filter/oox/formulabase.cxx |8 -
sc/source/ui/src/scfuncs.src | 124 +
vcl/source/gdi/impgraph.cxx| 116 +---
14 files changed, 432 insertions(+), 57 deletions(-)
New commits:
commit 0946de1e2fbf8bd5ad3919429f648359d4464eca
Author: Wang Lei l...@apache.org
Date: Wed Oct 10 06:08:12 2012 +
Resolves: #i121120 Support RightB(), LeftB(), LenB() and MidB()
Patch by: Zhang Lu
Review by: Wang Lei
(cherry picked from commit 424079cb8348d77e40f7d3291578bdffbe662f34)
Conflicts:
formula/inc/formula/compiler.hrc
formula/inc/formula/opcode.hxx
oox/source/xls/formulabase.cxx
sc/inc/helpids.h
sc/util/hidother.src
sc/util/makefile.mk
Change-Id: Ia04aa69aa2764842507b36ba7cc8c99e99a314e9
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 42d8b53..f4c5f96 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -260,6 +260,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_RIGHT { Text = RIGHT ; };
String SC_OPCODE_SEARCH { Text = SEARCH ; };
String SC_OPCODE_MID { Text = MID ; };
+String SC_OPCODE_LENB { Text = LENB ; };
+String SC_OPCODE_RIGHTB{ Text = RIGHTB ; };
+String SC_OPCODE_LEFTB { Text = LEFTB ; };
+String SC_OPCODE_MIDB { Text = MIDB ; };
String SC_OPCODE_TEXT { Text = TEXT ; };
String SC_OPCODE_SUBSTITUTE { Text = SUBSTITUTE ; };
String SC_OPCODE_REPT { Text = REPT ; };
@@ -601,6 +605,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_RIGHT { Text = RIGHT ; };
String SC_OPCODE_SEARCH { Text = SEARCH ; };
String SC_OPCODE_MID { Text = MID ; };
+String SC_OPCODE_LENB { Text = LENB ; };
+String SC_OPCODE_RIGHTB { Text = RIGHTB ; };
+String SC_OPCODE_LEFTB { Text = LEFTB ; };
+String SC_OPCODE_MIDB { Text = MIDB ; };
String SC_OPCODE_TEXT { Text = TEXT ; };
String SC_OPCODE_SUBSTITUTE { Text = SUBSTITUTE ; };
String SC_OPCODE_REPT { Text = REPT ; };
@@ -1578,6 +1586,22 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = MID ;
};
+String SC_OPCODE_LENB
+{
+Text [ en-US ] = LENB ;
+};
+String SC_OPCODE_RIGHTB
+{
+Text [ en-US ] = RIGHTB ;
+};
+String SC_OPCODE_LEFTB
+{
+Text [ en-US ] = LEFTB ;
+};
+String SC_OPCODE_MIDB
+{
+Text [ en-US ] = MIDB ;
+};
String SC_OPCODE_TEXT
{
Text [ en-US ] = TEXT ;
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 053947c..e6c6ef3 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -403,9 +403,13 @@
#define SC_OPCODE_COUNT_IFS 405
#define SC_OPCODE_SKEWP 406
#define SC_OPCODE_STOP_2_PAR407
-#define SC_OPCODE_LAST_OPCODE_ID406 /* last OpCode */
+#define SC_OPCODE_LENB 408
+#define SC_OPCODE_RIGHTB409
+#define SC_OPCODE_LEFTB 410
+#define SC_OPCODE_MIDB 412
+#define SC_OPCODE_LAST_OPCODE_ID413 /* last OpCode */
-#define SC_OPCODE_STOP_FUNCTION 407
+#define SC_OPCODE_STOP_FUNCTION 412
/*** Internal ***/
#define SC_OPCODE_INTERNAL_BEGIN
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index b94c066..47e2cdc 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -301,6 +301,10 @@ enum OpCodeEnum
ocSubstitute= SC_OPCODE_SUBSTITUTE,
ocRept = SC_OPCODE_REPT,
ocConcat= SC_OPCODE_CONCAT,
+ocLenB = SC_OPCODE_LENB,
+ocRightB= SC_OPCODE_RIGHTB,
+ocLeftB = SC_OPCODE_LEFTB,
+ocMidB = SC_OPCODE_MIDB,
ocNumberValue = SC_OPCODE_NUMBERVALUE,
// Matrix functions
ocMatValue = SC_OPCODE_MAT_VALUE,
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index acf7bdb..dd1e64d 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -26,6 +26,10 @@ $(eval
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 42/4079cb8348d77e40f7d3291578bdffbe662f34
42/4079cb8348d77e40f7d3291578bdffbe662f34 |1 + 1 file changed, 1 insertion(+) New commits: commit 1ae11f6bbea1b92788cc02a72bcd93ec66151a98 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 12:31:07 2013 +0100 Notes added by 'git notes add' diff --git a/42/4079cb8348d77e40f7d3291578bdffbe662f34 b/42/4079cb8348d77e40f7d3291578bdffbe662f34 new file mode 100644 index 000..86fe04f --- /dev/null +++ b/42/4079cb8348d77e40f7d3291578bdffbe662f34 @@ -0,0 +1 @@ +merged as: 0946de1e2fbf8bd5ad3919429f648359d4464eca ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk|1
sc/inc/scabstdlg.hxx|1
sc/source/ui/attrdlg/scdlgfact.cxx |3
sc/source/ui/attrdlg/scdlgfact.hxx |1
sc/source/ui/inc/groupdlg.hxx | 10 --
sc/source/ui/miscdlgs/groupdlg.cxx | 27 ++
sc/source/ui/view/cellsh1.cxx |4
sc/uiconfig/scalc/ui/groupdialog.ui | 159
8 files changed, 176 insertions(+), 30 deletions(-)
New commits:
commit 8da13c55405f1a5789401b280d15f77efbf908e8
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date: Sun Jun 9 11:13:56 2013 +0300
groupdialog.ui widget
Change-Id: Ic19184c1250b59a4dac7c2bb42893d63c6b1a602
Reviewed-on: https://gerrit.libreoffice.org/4208
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 9e7fb46..46692c8 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/footerdialog \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/goalseekdlg \
+ sc/uiconfig/scalc/ui/groupdialog \
sc/uiconfig/scalc/ui/headerdialog \
sc/uiconfig/scalc/ui/headerfootercontent \
sc/uiconfig/scalc/ui/headerfooterdialog \
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9a0edf4..a041451a 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -385,7 +385,6 @@ public:
int nId) = 0;
virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent,
//add for ScGroupDlg
-sal_uInt16 nResId,
int nId,
sal_Bool
bUnGroup = false,
sal_BoolbRows
= sal_True ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 4a8b9be..fe68814 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -856,7 +856,6 @@ AbstractScFillSeriesDlg*
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg(
Window* pParent,
-sal_uInt16 nResId,
int nId,
sal_Bool
bUnGroup ,
sal_BoolbRows
)
@@ -866,7 +865,7 @@ AbstractScGroupDlg*
ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Wind
{
case RID_SCDLG_GRP_KILL :
case RID_SCDLG_GRP_MAKE :
-pDlg = new ScGroupDlg( pParent, nResId,bUnGroup, bRows);
+pDlg = new ScGroupDlg( pParent, bUnGroup, bRows);
break;
default:
break;
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index f207558..2be305e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -452,7 +452,6 @@ public:
sal_uInt16
nPossDir,
int nId);
virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent,
//add for ScGroupDlg
-sal_uInt16 nResId,
int nId,
sal_Bool
bUnGroup = false,
sal_BoolbRows
= sal_True );
diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx
index 7c54800..538d601 100644
--- a/sc/source/ui/inc/groupdlg.hxx
+++ b/sc/source/ui/inc/groupdlg.hxx
@@ -31,7 +31,6 @@ class ScGroupDlg : public ModalDialog
{
public:
ScGroupDlg( Window* pParent,
-sal_uInt16 nResId,
sal_BoolbUnGroup = false,
sal_BoolbRows= sal_True );
~ScGroupDlg();
@@ -39,12 +38,9 @@ public:
sal_Bool GetColsChecked() const;
private:
-FixedLine aFlFrame;
-RadioButton aBtnRows;
-RadioButton aBtnCols;
-OKButtonaBtnOk;
-CancelButtonaBtnCancel;
-HelpButton aBtnHelp;
+FixedText* m_pFtLabel;
+RadioButton* m_pBtnRows;
+RadioButton* m_pBtnCols;
};
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx
b/sc/source/ui/miscdlgs/groupdlg.cxx
index 6cdf306..bc37423 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++
[Libreoffice-commits] core.git: 2 commits - include/svx svx/Library_svx.mk svx/source
include/svx/sidebar/SidebarDialControl.hxx |3
svx/Library_svx.mk |1
svx/source/dialog/dialcontrol.cxx| 42 ++---
svx/source/sidebar/possize/SidebarDialControl.cxx| 17 +--
svx/source/sidebar/possize/SidebarDialControlBmp.cxx | 87 ---
svx/source/sidebar/possize/SidebarDialControlBmp.hxx | 43 -
6 files changed, 40 insertions(+), 153 deletions(-)
New commits:
commit 0aa7a033cb392dd0e8fc7f065dcfd07cc6aa4401
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 11 13:59:13 2013 +0200
sidebar: Allow smaller SidebarDialControl, to fit nicely.
Change-Id: I6e0b86527a3c458be563b1fb5a71d45d05aeb5ca
diff --git a/include/svx/sidebar/SidebarDialControl.hxx
b/include/svx/sidebar/SidebarDialControl.hxx
index 4f2c118..68293e6 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -31,6 +31,9 @@ public:
SidebarDialControl (Window* pParent, const ResId rResId);
virtual ~SidebarDialControl (void);
+virtual Size GetOptimalSize() const;
+virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags = WINDOW_POSSIZE_ALL);
+
virtual void MouseButtonDown (const MouseEvent rMEvt);
protected:
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx
b/svx/source/sidebar/possize/SidebarDialControl.cxx
index d7c80e9..a0c1024 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -47,8 +47,16 @@ SidebarDialControl::~SidebarDialControl (void)
{
}
+Size SidebarDialControl::GetOptimalSize() const
+{
+return LogicToPixel(Size(10, 10), MAP_APPFONT);
+}
-
+void SidebarDialControl::setPosSizePixel(long nX, long nY, long nWidth, long
nHeight, sal_uInt16 nFlags)
+{
+long nMax = std::max(nWidth, nHeight);
+DialControl::setPosSizePixel(nX, nY, nMax, nMax, nFlags);
+}
void SidebarDialControl::MouseButtonDown( const MouseEvent rMEvt )
{
commit 7945e4e5870c00dc41000776540030d4b8660cc8
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 11 12:55:30 2013 +0200
sidebar: Let the sidebar's dial control use the same graphics as
DialControl.
It is not the most pretty one under the sun, but at least any general
improvements in the DialControl will improve the look of the sidebar too :-)
Change-Id: Ib26b097b322b69516898a5dd80bed3f8a0fa89d7
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 385e5a3..efe2127 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -195,7 +195,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/sidebar/line/LineWidthPopup \
svx/source/sidebar/possize/PosSizePropertyPanel \
svx/source/sidebar/possize/SidebarDialControl \
-svx/source/sidebar/possize/SidebarDialControlBmp \
svx/source/sidebar/tools/ColorControl \
svx/source/sidebar/tools/ColorPopup \
svx/source/sidebar/tools/PopupControl \
diff --git a/svx/source/dialog/dialcontrol.cxx
b/svx/source/dialog/dialcontrol.cxx
index 40c818e..5ebb396 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -72,23 +72,37 @@ void DialControlBmp::DrawBackground( const Size rSize,
bool bEnabled )
void DialControlBmp::DrawElements( const String rText, sal_Int32 nAngle )
{
-// *** rotated text ***
-
-Font aFont( GetFont() );
-aFont.SetColor( GetTextColor() );
-aFont.SetOrientation( static_cast short ( (nAngle + 5) / 10 ) ); //
Font uses 1/10 degrees
-aFont.SetWeight( WEIGHT_BOLD );
-SetFont( aFont );
-
double fAngle = nAngle * F_PI180 / 100.0;
double fSin = sin( fAngle );
double fCos = cos( fAngle );
double fWidth = GetTextWidth( rText ) / 2.0;
double fHeight = GetTextHeight() / 2.0;
-long nX = static_cast long ( mnCenterX - fWidth * fCos - fHeight * fSin
);
-long nY = static_cast long ( mnCenterY + fWidth * fSin - fHeight * fCos
);
-Rectangle aRect( nX, nY, 2 * mnCenterX - nX, 2 * mnCenterY - nY );
-DrawText( aRect, rText, mbEnabled ? 0 : TEXT_DRAW_DISABLE );
+
+if ( rText.Len() 0 )
+{
+// rotated text
+Font aFont( GetFont() );
+aFont.SetColor( GetTextColor() );
+aFont.SetOrientation( static_cast short ( (nAngle + 5) / 10 ) ); //
Font uses 1/10 degrees
+aFont.SetWeight( WEIGHT_BOLD );
+SetFont( aFont );
+
+long nX = static_cast long ( mnCenterX - fWidth * fCos - fHeight *
fSin );
+long nY = static_cast long ( mnCenterY + fWidth * fSin - fHeight *
fCos );
+Rectangle aRect( nX, nY, 2 * mnCenterX - nX, 2 * mnCenterY - nY );
+DrawText( aRect, rText, mbEnabled ? 0 : TEXT_DRAW_DISABLE );
+}
+else
+{
+// only a line
+const sal_Int32 nDx (fCos * (maRect.GetWidth()-4) / 2);
+const sal_Int32 nDy (-fSin * (maRect.GetHeight()-4) / 2);
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/filter/ww8/ww8par.cxx | 39 +---
sw/source/filter/ww8/ww8scan.cxx | 175 +++
sw/source/filter/ww8/ww8scan.hxx | 14 +++
3 files changed, 195 insertions(+), 33 deletions(-)
New commits:
commit e10868b72c253f00b04437692a527c076b2cfbbe
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Jun 11 10:25:37 2013 +
WW8 import: assure that read PLCF position arrays contain valid values
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 65945c8..70dbea9 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -,6 +,11 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss,
const SwPosition rPos)
pSBase = new WW8ScannerBase(pStrm,pTableStream,pDataStream,pWwFib);
+if ( !pSBase-IsValid() )
+{
+return ERR_SWG_READ_ERROR;
+}
+
static const SvxExtNumType eNumTA[16] =
{
SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
@@ -4519,23 +4524,25 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary
*pGloss, const SwPosition rPos)
if (pGloss)
{
WW8PLCF aPlc(pTableStream, pWwFib-fcPlcfglsy, pWwFib-lcbPlcfglsy, 0);
-
-WW8_CP nStart, nEnd;
-void* pDummy;
-
-for (int i=0;ipGloss-GetNoStrings();i++,aPlc++)
+if ( aPlc.IsValid() )
{
-SwNodeIndex aIdx( rDoc.GetNodes().GetEndOfContent());
-SwTxtFmtColl* pColl =
-rDoc.GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
-false);
-SwStartNode *pNode =
-rDoc.GetNodes().MakeTextSection(aIdx,
-SwNormalStartNode,pColl);
-pPaM-GetPoint()-nNode = pNode-GetIndex()+1;
-pPaM-GetPoint()-nContent.Assign(pPaM-GetCntntNode(),0);
-aPlc.Get( nStart, nEnd, pDummy );
-ReadText(nStart,nEnd-nStart-1,MAN_MAINTEXT);
+WW8_CP nStart, nEnd;
+void* pDummy;
+
+for (int i=0; ipGloss-GetNoStrings(); i++,aPlc++)
+{
+SwNodeIndex aIdx( rDoc.GetNodes().GetEndOfContent());
+SwTxtFmtColl* pColl =
+rDoc.GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
+false);
+SwStartNode *pNode =
+rDoc.GetNodes().MakeTextSection(aIdx,
+SwNormalStartNode,pColl);
+pPaM-GetPoint()-nNode = pNode-GetIndex()+1;
+pPaM-GetPoint()-nContent.Assign(pPaM-GetCntntNode(),0);
+aPlc.Get( nStart, nEnd, pDummy );
+ReadText(nStart,nEnd-nStart-1,MAN_MAINTEXT);
+}
}
}
else //ordinary case
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 1f6a3c3..010a36d 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -933,6 +933,28 @@ const sal_uInt8* WW8SprmIter::FindSprm(sal_uInt16 nId)
return 0; // SPRM _not_ found
}
+namespace {
+bool IsPLCFPosArrayValid(
+const sal_Int32* pPLCFPosArray,
+const sal_Int32 nMaxIndex )
+{
+bool bIsValid = true;
+
+WW8_CP nValue = 0;
+for ( sal_Int32 i = 0; i = nMaxIndex; ++i )
+{
+if ( pPLCFPosArray[i] nValue )
+{
+bIsValid = false;
+break;
+}
+nValue = pPLCFPosArray[i];
+}
+
+return bIsValid;
+}
+}
+
//-
// temporaerer Test
//-
@@ -1695,9 +1717,36 @@ void WW8ScannerBase::DeletePieceTable()
WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
SvStream* pDataSt, const WW8Fib* pWwFib )
-: pWw8Fib(pWwFib), pMainFdoa(0), pHdFtFdoa(0), pMainTxbx(0),
-pMainTxbxBkd(0), pHdFtTxbx(0), pHdFtTxbxBkd(0), pMagicTables(0),
-pSubdocs(0), pExtendedAtrds(0), pPieceGrpprls(0)
+: pWw8Fib(pWwFib)
+, pChpPLCF( 0 )
+, pPapPLCF( 0 )
+, pSepPLCF( 0 )
+, pFtnPLCF( 0 )
+, pEdnPLCF( 0 )
+, pAndPLCF( 0 )
+, pFldPLCF( 0 )
+, pFldHdFtPLCF( 0 )
+, pFldTxbxPLCF( 0 )
+, pFldTxbxHdFtPLCF( 0 )
+, pFldFtnPLCF( 0 )
+, pFldEdnPLCF( 0 )
+, pFldAndPLCF( 0 )
+, pMainFdoa(0)
+, pHdFtFdoa(0)
+, pMainTxbx(0)
+, pMainTxbxBkd(0)
+, pHdFtTxbx(0)
+, pHdFtTxbxBkd(0)
+, pMagicTables(0)
+, pSubdocs(0)
+, pExtendedAtrds(0)
+, pBook( 0 )
+, pPiecePLCF( 0 )
+, pPieceIter( 0 )
+, pPLCFx_PCD( 0 )
+, pPLCFx_PCDAttrs( 0 )
+, pPieceGrpprls(0)
+, nPieceGrpprls( 0 )
{
pPiecePLCF = OpenPieceTable( pTblSt, pWw8Fib ); // Complex
if( pPiecePLCF )
@@ -1800,14 +1849,14 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt,
SvStream* pTblSt,
pSubdocs = new WW8PLCFspecial( pTblSt,
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/hicontrast include/svx svx/source
dev/null |binary
include/svx/svdstr.hrc |1 -
svx/source/svdraw/svdstr.src |6 --
3 files changed, 7 deletions(-)
New commits:
commit da51ed67eee723843f2a4cb0f67eef0d386fe111
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 11 14:16:30 2013 +0200
sidebar: Cleanup leftovers after the SidebarDialControlBmp removal.
Change-Id: I9e729ee6bbe6df23556f6f7c674a5d3ae12aaa0a
diff --git a/icon-themes/galaxy/svx/res/rotation.png
b/icon-themes/galaxy/svx/res/rotation.png
deleted file mode 100644
index 57f75b9..000
Binary files a/icon-themes/galaxy/svx/res/rotation.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/rotation.png
b/icon-themes/galaxy/svx/res/symphony/rotation.png
deleted file mode 100644
index 3d197de..000
Binary files a/icon-themes/galaxy/svx/res/symphony/rotation.png and /dev/null
differ
diff --git a/icon-themes/hicontrast/svx/res/rotation.png
b/icon-themes/hicontrast/svx/res/rotation.png
deleted file mode 100644
index e8adbfc..000
Binary files a/icon-themes/hicontrast/svx/res/rotation.png and /dev/null differ
diff --git a/icon-themes/hicontrast/svx/res/symphony/rotation.png
b/icon-themes/hicontrast/svx/res/symphony/rotation.png
deleted file mode 100644
index 874fb82..000
Binary files a/icon-themes/hicontrast/svx/res/symphony/rotation.png and
/dev/null differ
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index d7b19fe..a78d88d 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -714,6 +714,5 @@
#define STR_TABLE_STYLE (SIP_Begin + 274)
#define STR_TABLE_STYLE_SETTINGS(SIP_Begin + 275)
#define SIP_SA_CROP_MARKERS (SIP_Begin + 276)
-#define IMG_DIALCONTROL (SIP_Begin + 277)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index fe0e3f2..d7c0382 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -2817,12 +2817,6 @@ Bitmap SIP_SA_CROP_MARKERS
File = cropmarkers.png;
};
-// DialControl bitmaps
-Bitmap IMG_DIALCONTROL
-{
-File = rotation.png;
-};
-
String STR_ObjNameSingulFONTWORK
{
Text [ en-US ] = font work ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |3
sc/inc/sc.hrc |5 -
sc/inc/scabstdlg.hxx |5 -
sc/source/ui/attrdlg/scdlgfact.cxx| 28 --
sc/source/ui/attrdlg/scdlgfact.hxx|5 -
sc/source/ui/inc/groupdlg.hxx |9 -
sc/source/ui/miscdlgs/groupdlg.cxx| 17 +--
sc/source/ui/src/miscdlgs.src | 66 --
sc/source/ui/view/cellsh1.cxx |4
sc/uiconfig/scalc/ui/groupdialog.ui | 119 -
sc/uiconfig/scalc/ui/ungroupdialog.ui | 158 ++
11 files changed, 241 insertions(+), 178 deletions(-)
New commits:
commit f741d948b6910622d199e8d14ca1e3ecd7475156
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 11 13:19:51 2013 +0100
split group dialog into group and ungroup dialogs
Change-Id: If9f8e8a47bd8ce0207b7dec8470375d5fa48f6cd
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 46692c8..5b937a1 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/optchangespage \
sc/uiconfig/scalc/ui/optcompatibilitypage \
sc/uiconfig/scalc/ui/optdefaultpage \
+ sc/uiconfig/scalc/ui/optdlg \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/scgeneralpage \
@@ -103,7 +104,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
- sc/uiconfig/scalc/ui/optdlg \
+ sc/uiconfig/scalc/ui/ungroupdialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e98448c..0e9f049 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -971,7 +971,6 @@
#define RID_SCDLG_SELENTRY (SC_DIALOGS_START + 18)
#define RID_SCDLG_FILLSERIES(SC_DIALOGS_START + 19)
#define RID_SCDLG_AUTOFORMAT(SC_DIALOGS_START + 20)
-#define RID_SCDLG_GROUP (SC_DIALOGS_START + 21)
#define RID_SCDLG_NAMES (SC_DIALOGS_START + 22)
#define RID_SCDLG_DBNAMES (SC_DIALOGS_START + 23)
#define RID_SCDLG_SOLVER(SC_DIALOGS_START + 26)
@@ -1043,10 +1042,6 @@
#define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109)
-// derivations from RID_SCDLG_GROUP
-#define RID_SCDLG_GRP_MAKE (SC_DIALOGS_START + 110)
-#define RID_SCDLG_GRP_KILL (SC_DIALOGS_START + 111)
-
#define RID_SCDLG_COLROWNAMERANGES (SC_DIALOGS_START + 112)
#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index a041451a..ce45799 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -385,9 +385,8 @@ public:
int nId) = 0;
virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent,
//add for ScGroupDlg
-int nId,
-sal_Bool
bUnGroup = false,
-sal_BoolbRows
= sal_True ) = 0;
+bool bUnGroup =
false,
+bool bRows=
true ) = 0;
virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent,
//add for ScInsertCellDlg
int nId,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index fe68814..bc6db22 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -852,34 +852,14 @@ AbstractScFillSeriesDlg*
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
return 0;
}
-
-
-
AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg(
Window* pParent,
-int nId,
-sal_Bool
bUnGroup ,
-sal_BoolbRows
)
+bool bUnGroup,
+bool bRows )
{
-ScGroupDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_GRP_KILL :
-case RID_SCDLG_GRP_MAKE :
-pDlg = new ScGroupDlg( pParent, bUnGroup, bRows);
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScGroupDlg_Impl( pDlg );
-return 0;
+ScGroupDlg * pDlg = new ScGroupDlg( pParent, bUnGroup, bRows);
+return new AbstractScGroupDlg_Impl( pDlg );
}
-
-
-
-
AbstractScInsertCellDlg *
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e1/0868b72c253f00b04437692a527c076b2cfbbe
e1/0868b72c253f00b04437692a527c076b2cfbbe |1 + 1 file changed, 1 insertion(+) New commits: commit ef974482fd430540e8f709045a6c5470bb75347b Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 13:40:57 2013 +0100 Notes added by 'git notes add' diff --git a/e1/0868b72c253f00b04437692a527c076b2cfbbe b/e1/0868b72c253f00b04437692a527c076b2cfbbe new file mode 100644 index 000..547b31e --- /dev/null +++ b/e1/0868b72c253f00b04437692a527c076b2cfbbe @@ -0,0 +1 @@ +prefer: 9042604f1ba0e1e6e0dc8b8f45f9b67169fd462e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/merge.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 58a9d35b84947510f78e3ffeb6d1ef9a9adac0cb
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Tue Jun 11 11:37:53 2013 +0200
fdo#65483 Invalid po lines caused missing translations
L10ntools merge skipped reading po files entirely when got
an invalid entry from one of these po files, by now just
skip the invalid po file instead.
Change-Id: I787d531e1842e53e2074690b1300a204abd928f5
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index f9dd4da..fab9e6e 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -291,6 +291,7 @@ MergeDataFile::MergeDataFile(
bool bFirstLang = true;
while( !aInputStream.eof() )
{
+bool bSkipCurrentPOFile = false;
const OString sFileName( lcl_NormalizeFilename(rFile) );
const bool bReadAll = sFileName.isEmpty();
const OString sPoFileName(sPoFile.data(), sPoFile.length());
@@ -318,10 +319,11 @@ MergeDataFile::MergeDataFile(
{
if( !lcl_ReadPoChecked(aNextPo, aPoInput, sPoFileName) )
{
-return;
+bSkipCurrentPOFile = true;
+break;
}
} while( !aPoInput.eof() aNextPo.getSourceFile() != sFileName
!bReadAll );
-while( !aPoInput.eof() (aNextPo.getSourceFile() == sFileName ||
bReadAll ))
+while( !aPoInput.eof() (aNextPo.getSourceFile() == sFileName ||
bReadAll ) !bSkipCurrentPOFile )
{
PoEntry aActPo( aNextPo );
@@ -356,7 +358,8 @@ MergeDataFile::MergeDataFile(
}
if( !lcl_ReadPoChecked(aNextPo, aPoInput, sPoFileName) )
{
-return;
+bSkipCurrentPOFile = true;
+break;
}
} while( !aPoInput.eof()
( bInSameComp = PoEntry::IsInSameComp(aActPo, aNextPo) ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/options/optinet2.cxx|7 +++
cui/uiconfig/ui/optsecuritypage.ui |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 40a5fd4aa0eab1940fcbde4ff26342a5af0222ee
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 11 14:00:32 2013 +0100
Resolves: fdo#65595 wrap long checkbox string
Change-Id: Ied827721a1ceca69ed33b494f8b55cb4bb1b748b
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index b48986c..a2d0096 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -585,6 +585,13 @@ SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent,
const SfxItemSet rSet)
{
get(m_pSecurityOptionsPB, options);
get(m_pSavePasswordsCB, savepassword);
+
+//fdo#65595, we height-for-width support here, but for now we can
+//bodge it
+Size
aSize(m_pSavePasswordsCB-CalcMinimumSize(56*approximate_char_width()));
+m_pSavePasswordsCB-set_width_request(aSize.Width());
+m_pSavePasswordsCB-set_height_request(aSize.Height());
+
get(m_pShowConnectionsPB, connections);
get(m_pMasterPasswordCB, usemasterpassword);
get(m_pMasterPasswordFT, masterpasswordtext);
diff --git a/cui/uiconfig/ui/optsecuritypage.ui
b/cui/uiconfig/ui/optsecuritypage.ui
index bc53814..1ff3755 100644
--- a/cui/uiconfig/ui/optsecuritypage.ui
+++ b/cui/uiconfig/ui/optsecuritypage.ui
@@ -109,7 +109,7 @@
property name=hexpandTrue/property
property name=row_spacing12/property
child
- object class=GtkCheckButton id=savepassword
+ object class=GtkCheckButton id=savepassword:wrap
property name=label translatable=yesPersistently
_save passwords for web connections/property
property name=visibleTrue/property
property name=can_focusTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/qa
editeng/qa/unit/core-test.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 41e5c4b0dec83cc62c33262093eed29e6ebcb340 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jun 11 15:01:31 2013 +0200 Work around -Werror=strict-aliasing Change-Id: I0184488344bd11c50bddd1bb1726e0d1225aff7e diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index a4bd7f7..0975efb 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -324,8 +324,9 @@ void Test::testAutocorrect() OUString sExpected(foo); TestAutoCorrDoc aFoo(sInput, LANGUAGE_ENGLISH_US); +String const rInput2(reinterpret_castString const(aFoo.getResult())); aAutoCorrect.DoAutoCorrect(aFoo, -reinterpret_castString const(sInput), +rInput2, sInput.getLength(), cNextChar, true); CPPUNIT_ASSERT_EQUAL(sExpected, aFoo.getResult()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source cui/uiconfig
cui/source/options/optinet2.cxx|7 +++
cui/uiconfig/ui/optsecuritypage.ui |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 21c21e8fd0e94dbb9efcd1220d012fd80867eae2
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 11 14:00:32 2013 +0100
Resolves: fdo#65595 wrap long checkbox string
Change-Id: Ied827721a1ceca69ed33b494f8b55cb4bb1b748b
(cherry picked from commit 40a5fd4aa0eab1940fcbde4ff26342a5af0222ee)
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index b48986c..a2d0096 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -585,6 +585,13 @@ SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent,
const SfxItemSet rSet)
{
get(m_pSecurityOptionsPB, options);
get(m_pSavePasswordsCB, savepassword);
+
+//fdo#65595, we height-for-width support here, but for now we can
+//bodge it
+Size
aSize(m_pSavePasswordsCB-CalcMinimumSize(56*approximate_char_width()));
+m_pSavePasswordsCB-set_width_request(aSize.Width());
+m_pSavePasswordsCB-set_height_request(aSize.Height());
+
get(m_pShowConnectionsPB, connections);
get(m_pMasterPasswordCB, usemasterpassword);
get(m_pMasterPasswordFT, masterpasswordtext);
diff --git a/cui/uiconfig/ui/optsecuritypage.ui
b/cui/uiconfig/ui/optsecuritypage.ui
index bc53814..1ff3755 100644
--- a/cui/uiconfig/ui/optsecuritypage.ui
+++ b/cui/uiconfig/ui/optsecuritypage.ui
@@ -109,7 +109,7 @@
property name=hexpandTrue/property
property name=row_spacing12/property
child
- object class=GtkCheckButton id=savepassword
+ object class=GtkCheckButton id=savepassword:wrap
property name=label translatable=yesPersistently
_save passwords for web connections/property
property name=visibleTrue/property
property name=can_focusTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unodraw.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0b84b7d0f2bdd2d8c0620f3eafca8f0dd0761ed3
Author: Ciorba edmond_cio...@yahoo.com
Date: Tue Jun 11 14:08:32 2013 +0300
typing fix on postion - position
Change-Id: I3c5cda4be6020e91c3935a1bebb1d1bd90f9b927
Reviewed-on: https://gerrit.libreoffice.org/4228
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 7540b16..6fb4cfb 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2526,7 +2526,7 @@ void SwXShape::_AdjustPositionProperties( const
awt::Point _aPosition )
}
if ( eTextAnchorType != text::TextContentAnchorType_AS_CHARACTER )
{
-// determine current x-postion
+// determine current x-position
OUString aHoriPosPropStr(HoriOrientPosition);
uno::Any aHoriPos( getPropertyValue( aHoriPosPropStr ) );
sal_Int32 dCurrX = 0;
@@ -2556,7 +2556,7 @@ void SwXShape::_AdjustPositionProperties( const
awt::Point _aPosition )
// handle y-position
{
-// determine current y-postion
+// determine current y-position
OUString aVertPosPropStr(VertOrientPosition);
uno::Any aVertPos( getPropertyValue( aVertPosPropStr ) );
sal_Int32 dCurrY = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - forms/source include/oox oox/source sc/source svx/source
forms/source/component/FormComponent.cxx | 38 ++-
forms/source/inc/FormComponent.hxx |5 ++
forms/source/inc/frm_strings.hxx |2
forms/source/inc/property.hrc|2
include/oox/ole/olehelper.hxx|4 +
oox/source/helper/binaryoutputstream.cxx |3 -
oox/source/ole/olehelper.cxx | 31
sc/source/filter/excel/xeescher.cxx |9 ++-
sc/source/filter/excel/xiescher.cxx | 74 +
sc/source/filter/inc/xcl97esc.hxx| 14 -
sc/source/filter/inc/xeescher.hxx|7 +-
sc/source/filter/xcl97/xcl97esc.cxx | 77 +++
svx/source/unodraw/unoshap2.cxx |3 +
13 files changed, 228 insertions(+), 41 deletions(-)
New commits:
commit a8bb1fd10a39c692dd475e2e89dd2c6902c091d8
Author: Noel Power noel.po...@suse.com
Date: Tue Jun 11 11:29:21 2013 +0100
honour mbAutoClose in BinaryXOutputStream
presumably this mbAutoClose usages got clobbered mistakenly in some merging
operation
Change-Id: I7116827269cdbb555753f6678528c83ab804de46
diff --git a/oox/source/helper/binaryoutputstream.cxx
b/oox/source/helper/binaryoutputstream.cxx
index 23f89ae..790c250 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -60,7 +60,8 @@ void BinaryXOutputStream::close()
if( mxOutStrm.is() ) try
{
mxOutStrm-flush();
-mxOutStrm-closeOutput();
+if ( mbAutoClose )
+mxOutStrm-closeOutput();
}
catch( Exception )
{
commit 866845356629dd51660b73330bb9c8a2696147dd
Author: Noel Power noel.po...@suse.com
Date: Mon Jun 10 17:30:07 2013 +0100
fix build error, reinstate WriteOCXExcelKludgeStream to export ole control
new ole export used WriteOCXExcelKludgeStream but that function dissapeared
when
msocximex was stripped of ocx control import ( now we use the new filters
in oox )
When that stuff was moved WriteOCXExcelKludgeStream was #ifdef'ed out
Change-Id: I370983efa5e8c4ba2b210dfb7535ea211d13a8c1
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index e75a0cd..85cca19 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -39,6 +39,8 @@
#include oox/dllapi.h
#include sot/storage.hxx
+class SvGlobalName;
+
namespace oox {
class BinaryInputStream;
class BinaryOutputStream;
@@ -122,6 +124,7 @@ public:
representation (in uppercase characters).
*/
static OUString importGuid( BinaryInputStream rInStrm );
+static void exportGuid( BinaryOutputStream rOutStrm, const SvGlobalName
rId );
/** Imports an OLE StdFont font structure from the current position of the
passed binary stream.
@@ -175,6 +178,7 @@ public:
sal_Bool ReadOCXCtlsStream(SotStorageStreamRef rSrc1,
::com::sun::star::uno::Reference com::sun::star::form::XFormComponent
rxFormComp,
sal_Int32 nPos, sal_Int32 nSize );
static sal_Bool WriteOCXStream( const ::com::sun::star::uno::Reference
::com::sun::star::frame::XModel rxModel, SotStorageRef rSrc1, const
com::sun::star::uno::Reference com::sun::star::awt::XControlModel
rControlModel, const com::sun::star::awt::Size rSize,OUString rName);
+static sal_Bool WriteOCXExcelKludgeStream( const
::com::sun::star::uno::Reference ::com::sun::star::frame::XModel rxModel,
const ::com::sun::star::uno::Reference ::com::sun::star::io::XOutputStream
xOutStrm, const com::sun::star::uno::Reference
com::sun::star::awt::XControlModel rControlModel, const
com::sun::star::awt::Size rSize,OUString rName);
#ifdef SvxMSConvertOCXControlsRemoved
const com::sun::star::uno::Reference com::sun::star::drawing::XShapes
GetShapes();
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index e87f2cd..58aa67e 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -284,6 +284,22 @@ sal_uInt32 OleHelper::encodeOleColor( sal_Int32 nRgbColor )
return OLE_COLORTYPE_BGR | lclSwapRedBlue( static_cast sal_uInt32 (
nRgbColor 0xFF ) );
}
+void OleHelper::exportGuid( BinaryOutputStream rOStr, const SvGlobalName rId
)
+{
+const sal_uInt8* pBytes = rId.GetBytes();
+sal_uInt32 a;
+memcpy(a, pBytes, sizeof(sal_uInt32));
+rOStr a;
+
+sal_uInt16 b;
+memcpy(b, pBytes+4, sizeof(sal_uInt16));
+rOStr b;
+
+memcpy(b, pBytes+6, sizeof(sal_uInt16));
+rOStr b;
+
+rOStr.writeArray( (sal_Char *)pBytes[ 8 ], 8 );
+}
OUString OleHelper::importGuid( BinaryInputStream rInStrm )
{
OUStringBuffer aBuffer;
@@ -569,6 +585,21 @@ sal_Bool MSConvertOCXControls::ReadOCXStorage(
SotStorageRef xOleStg,
return sal_False;
}
+sal_Bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const
::com::sun::star::uno::Reference ::com::sun::star::frame::XModel rxModel,
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5d/9d53623553f8f1476d154f89ff636e740ca4f2
5d/9d53623553f8f1476d154f89ff636e740ca4f2 |1 + 1 file changed, 1 insertion(+) New commits: commit a3eace5a240c92bc540893407a4a2c91e5fbb747 Author: Noel Power noel.po...@suse.com Date: Tue Jun 11 14:18:10 2013 +0100 Notes added by 'git notes add' diff --git a/5d/9d53623553f8f1476d154f89ff636e740ca4f2 b/5d/9d53623553f8f1476d154f89ff636e740ca4f2 new file mode 100644 index 000..123edd0 --- /dev/null +++ b/5d/9d53623553f8f1476d154f89ff636e740ca4f2 @@ -0,0 +1 @@ +merged as: 74d631dfb37ec870575d873c82e982a58f65d60c ( 866845356629dd51660b73330bb9c8a2696147dd) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - l10ntools/source
l10ntools/source/merge.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 1f91be7dddafa67cd2985e1528e1cb1951bf8edf
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Tue Jun 11 11:37:53 2013 +0200
fdo#65483 Invalid po lines caused missing translations
L10ntools merge skipped reading po files entirely when got
an invalid entry from one of these po files, by now just
skip the invalid po file instead.
Change-Id: I787d531e1842e53e2074690b1300a204abd928f5
(cherry picked from commit 58a9d35b84947510f78e3ffeb6d1ef9a9adac0cb)
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index f9dd4da..fab9e6e 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -291,6 +291,7 @@ MergeDataFile::MergeDataFile(
bool bFirstLang = true;
while( !aInputStream.eof() )
{
+bool bSkipCurrentPOFile = false;
const OString sFileName( lcl_NormalizeFilename(rFile) );
const bool bReadAll = sFileName.isEmpty();
const OString sPoFileName(sPoFile.data(), sPoFile.length());
@@ -318,10 +319,11 @@ MergeDataFile::MergeDataFile(
{
if( !lcl_ReadPoChecked(aNextPo, aPoInput, sPoFileName) )
{
-return;
+bSkipCurrentPOFile = true;
+break;
}
} while( !aPoInput.eof() aNextPo.getSourceFile() != sFileName
!bReadAll );
-while( !aPoInput.eof() (aNextPo.getSourceFile() == sFileName ||
bReadAll ))
+while( !aPoInput.eof() (aNextPo.getSourceFile() == sFileName ||
bReadAll ) !bSkipCurrentPOFile )
{
PoEntry aActPo( aNextPo );
@@ -356,7 +358,8 @@ MergeDataFile::MergeDataFile(
}
if( !lcl_ReadPoChecked(aNextPo, aPoInput, sPoFileName) )
{
-return;
+bSkipCurrentPOFile = true;
+break;
}
} while( !aPoInput.eof()
( bInSameComp = PoEntry::IsInSameComp(aActPo, aNextPo) ) );
___
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 dcba638999139848771018b7db71c1606a31d2dd Author: Andras Timar ati...@suse.com Date: Tue Jun 11 15:29:28 2013 +0200 Updated core Project: translations 91d7065cae5bfbcfcf243fe9dcefbca6e13c42fa diff --git a/translations b/translations index de5d1bf..91d7065 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit de5d1bf0aa459e78c73782b5f9b5f2f7da5734c5 +Subproject commit 91d7065cae5bfbcfcf243fe9dcefbca6e13c42fa ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit caa09db6152bd6fb5078506cc961261119f588dd Author: Andras Timar ati...@suse.com Date: Tue Jun 11 15:29:28 2013 +0200 Updated core Project: translations e2402cb148bd65ccdb910857b6efccbe537d03aa diff --git a/translations b/translations index 94ead83..e2402cb 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 94ead83e93d7b34c7eea10117e2254b10273c3fd +Subproject commit e2402cb148bd65ccdb910857b6efccbe537d03aa ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/ui/report/SectionWindow.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 85165a18e9f8123d80246bedfad0acd8a314f715
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jun 11 15:36:32 2013 +0200
Lock Solar Mutex in rptui::OSectionWindow::_propertyChanged
https://bugs.freedesktop.org/show_bug.cgi?id=65478#c4 REPORTBUILDER:
Crash by
following case 2 from fdo#61725 + click cancel comment 4 discusses a
scenario
that leads to a fired DbgTestSolarMutex assertion in --enable-dbgutil
builds at:
0 0x003c80635ba5 in __GI_raise (sig=sig@entry=6) at
../nptl/sysdeps/unix/sysv/linux/raise.c:63
1 0x003c80637358 in __GI_abort () at abort.c:90
2 0x003c8062e972 in __assert_fail_base (fmt=0x3c807793e8 %s%s%s:%u:
%s%sAssertion `%s' failed.\n%n, assertion=assertion@entry=0x7fcbe332a8b8
ImplGetSVData()-mpDefInst-CheckYieldMutex(), file=file@entry=0x7fcbe332a880
lo/core/vcl/source/app/dbggui.cxx, line=line@entry=1747,
function=function@entry=0x7fcbe332b250
ImplDbgTestSolarMutex()::__PRETTY_FUNCTION__ void ImplDbgTestSolarMutex())
at assert.c:92
3 0x003c8062ea22 in __GI___assert_fail (assertion=0x7fcbe332a8b8
ImplGetSVData()-mpDefInst-CheckYieldMutex(), file=0x7fcbe332a880
lo/core/vcl/source/app/dbggui.cxx, line=1747, function=0x7fcbe332b250
ImplDbgTestSolarMutex()::__PRETTY_FUNCTION__ void ImplDbgTestSolarMutex())
at assert.c:101
4 0x7fcbe2bb5ea8 in ImplDbgTestSolarMutex () at
lo/core/vcl/source/app/dbggui.cxx:1747
5 0x7fcbe4053783 in DbgFunc (nAction=15, pParam=0x0) at
lo/core/tools/source/debug/debug.cxx:1119
6 0x7fcbe2e75465 in DbgTestSolarMutex () at
lo/core/include/tools/debug.hxx:295
7 0x7fcbe2e9b213 in OutputDevice::ImplGetGraphics (this=0x1ca8e98) at
lo/core/vcl/source/gdi/outdev.cxx:554
8 0x7fcbe2e9af4c in OutputDevice::ImplHasMirroredGraphics
(this=0x1ca8e98) at lo/core/vcl/source/gdi/outdev.cxx:511
9 0x7fcbe3163f1f in Window::ImplPosSizeWindow (this=0x1ca8e98, nX=127,
nY=1199, nWidth=2318, nHeight=13, nFlags=15) at
lo/core/vcl/source/window/window.cxx:3286
10 0x7fcbe31737c1 in Window::setPosSizePixel (this=0x1ca8e98, nX=127,
nY=1199, nWidth=2318, nHeight=13, nFlags=15) at
lo/core/vcl/source/window/window.cxx:7181
11 0x7fcbe314fa59 in Window::SetPosSizePixel (this=0x1ca8e98,
rNewPos=Point = {...}, rNewSize=Size = {...}) at
lo/core/vcl/source/window/window2.cxx:1717
12 0x7fcb8e0cfd2c in rptui::lcl_setScrollBar (_nNewValue=2318,
_aPos=Point = {...}, _aSize=Size = {...}, _rScrollBar=...) at
lo/core/reportdesign/source/ui/report/ScrollHelper.cxx:38
13 0x7fcb8e0d0b41 in rptui::OScrollWindowHelper::ResizeScrollBars
(this=0x1ca8cb0) at lo/core/reportdesign/source/ui/report/ScrollHelper.cxx:169
14 0x7fcb8e0d0c72 in rptui::OScrollWindowHelper::Resize
(this=0x1ca8cb0) at lo/core/reportdesign/source/ui/report/ScrollHelper.cxx:182
15 0x7fcb8e0d0665 in rptui::OScrollWindowHelper::setTotalSize
(this=0x1ca8cb0, _nWidth=1186, _nHeight=464) at
lo/core/reportdesign/source/ui/report/ScrollHelper.cxx:110
16 0x7fcb8e0cefba in rptui::OReportWindow::notifySizeChanged
(this=0x1ca96c0) at lo/core/reportdesign/source/ui/report/ReportWindow.cxx:255
17 0x7fcb8e0d3920 in rptui::OSectionWindow::_propertyChanged
(this=0x21688a0, _rEvent=...) at
lo/core/reportdesign/source/ui/report/SectionWindow.cxx:127
18 0x7fcbe7271dfb in
comphelper::OPropertyChangeMultiplexer::propertyChange (this=0x7fcb8c1f2668,
_rEvent=...) at lo/core/comphelper/source/property/propmultiplex.cxx:154
19 0x7fcbe6b0be20 in cppu::PropertySetMixinImpl::BoundListeners::notify
(this=0x7fff42dd9780) at lo/core/cppuhelper/source/propertysetmixin.cxx:399
20 0x7fcb8ed52b50 in reportdesign::OSection::setunsigned int
(this=0x7fcbd0199020, _sProperty=Height, _Value=@0x7fff42dd9804: 0,
_member=@0x7fcbd0199170: 0) at
lo/core/reportdesign/source/core/inc/Section.hxx:96
21 0x7fcb8ed4e2e2 in reportdesign::OSection::setHeight
(this=0x7fcbd0199020, _height=0) at
lo/core/reportdesign/source/core/api/Section.cxx:255
22 0x7fcbd42877de in gcc3::callVirtualMethod(void*, unsigned int,
void*, _typelib_TypeDescriptionReference*, bool, unsigned long*, unsigned int,
unsigned long*, unsigned int, double*, unsigned int) () from
lo/core/solver/unxlngx6/installation/opt/ure/lib/libgcc3_uno.so
23 0x7fcbd428681a in cpp_call (pThis=0x202ea90, aVtableSlot=...,
pReturnTypeRef=0x711840, nParams=1, pParams=0x7fff42dd9bc0, pUnoReturn=0x0,
pUnoArgs=0x7fff42dd9c80, ppUnoExc=0x7fff42dd9d48) at
lo/core/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:237
24 0x7fcbd4286fa8 in
bridges::cpp_uno::shared::unoInterfaceProxyDispatch (pUnoI=0x202ea90,
pMemberDescr=0x1e28590, pReturn=0x0, pArgs=0x7fff42dd9c80,
ppException=0x7fff42dd9d48) at
lo/core/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:368
[Libreoffice-commits] core.git: 6 commits - canvas/source cppcanvas/Module_cppcanvas.mk cppcanvas/qa include/vcl solenv/gbuild vcl/inc vcl/source vcl/unx
canvas/source/cairo/cairo_canvasbitmap.cxx | 161 -
canvas/source/cairo/cairo_canvasbitmap.hxx |4
canvas/source/cairo/cairo_xlib_cairo.cxx |7 -
canvas/source/cairo/cairo_xlib_cairo.hxx |1
cppcanvas/Module_cppcanvas.mk |7 +
cppcanvas/qa/unit/test.cxx | 92
include/vcl/bitmap.hxx |3
include/vcl/bitmapex.hxx | 11 +
solenv/gbuild/CppunitTest.mk |8 +
vcl/inc/salbmp.hxx |1
vcl/inc/unx/salbmp.h |7 -
vcl/inc/unx/salgdi.h |5
vcl/source/gdi/bitmap.cxx | 13 --
vcl/source/gdi/bitmapex.cxx| 78 +-
vcl/source/gdi/gdimtf.cxx | 59 +-
vcl/source/helper/canvastools.cxx | 25
vcl/source/window/window.cxx |2
vcl/unx/generic/gdi/salbmp.cxx | 18 ---
vcl/unx/generic/gdi/salgdi2.cxx| 152 ---
19 files changed, 345 insertions(+), 309 deletions(-)
New commits:
commit eb5e3e3a4e82a55abfb1894dead6a1fb3c10bb41
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jun 11 14:14:31 2013 +0100
create a cairo canvas unit test, if only I could use the XCanvas API.
Change-Id: I3b0fdbe92db751e59ecb3f3b59f27e160b3ca226
diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index fad05f1..9894f9c 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -24,4 +24,11 @@ $(eval $(call gb_Module_add_targets,cppcanvas,\
Library_mtfrenderer \
))
+# FIXME: should generalize these ...
+ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
+$(eval $(call gb_Module_add_check_targets,cppcanvas,\
+CppunitTest_cppcanvas_test \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx
new file mode 100644
index 000..03d0e73
--- /dev/null
+++ b/cppcanvas/qa/unit/test.cxx
@@ -0,0 +1,92 @@
+/* -*- 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 test/bootstrapfixture.hxx
+
+#include osl/file.hxx
+#include osl/process.h
+#include vcl/svapp.hxx
+#include vcl/wrkwin.hxx
+#include vcl/canvastools.hxx
+
+#include comphelper/processfactory.hxx
+#include com/sun/star/lang/XInitialization.hpp
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+
+#include com/sun/star/rendering/XBitmap.hpp
+#include com/sun/star/rendering/XCanvas.hpp
+#include com/sun/star/rendering/XBitmapCanvas.hpp
+
+using namespace ::com::sun::star;
+
+class CanvasTest : public test::BootstrapFixture
+{
+public:
+CanvasTest() : BootstrapFixture(true, false) {}
+
+void testComposite();
+
+CPPUNIT_TEST_SUITE(CanvasTest);
+CPPUNIT_TEST(testComposite);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void CanvasTest::testComposite()
+{
+#ifdef LINUX
+Window* pWin = new WorkWindow( (Window *)NULL );
+CPPUNIT_ASSERT( pWin != NULL );
+
+uno::Referencerendering::XCanvas xCanvas = pWin-GetCanvas ();
+CPPUNIT_ASSERT( xCanvas.is() );
+
+// a huge canvas ...
+Size aSize (1, 1);
+uno::Referencerendering::XBitmap xBitmap;
+xBitmap = xCanvas-getDevice ()-createCompatibleAlphaBitmap(
+vcl::unotools::integerSize2DFromSize( aSize ) );
+CPPUNIT_ASSERT( xBitmap.is() );
+
+uno::Reference rendering::XBitmapCanvas xBitmapCanvas( xBitmap,
uno::UNO_QUERY );
+CPPUNIT_ASSERT( xBitmapCanvas.is() );
+
+BitmapEx aBitmapEx;
+{
+// clear the canvas and basic sanity check ...
+xBitmapCanvas-clear();
+CPPUNIT_ASSERT( aBitmapEx.Create( xBitmapCanvas, aSize ) );
+CPPUNIT_ASSERT( aBitmapEx.IsAlpha() );
+CPPUNIT_ASSERT( aBitmapEx.GetAlpha() );
+}
+
+{
+// render something
+rendering::RenderState aDefaultState;
+uno::Sequence double aRedTransparent( 4 );
+aRedTransparent[0] = 1.0; // R
+aRedTransparent[1] = 0.0; // G
+aRedTransparent[2] = 0.0; // B
+aRedTransparent[3] = 0.5; // A
+aDefaultState.DeviceColor = aRedTransparent;
+#if 0
+// words fail me to describe the sheer beauty of allocating an UNO
+// object to represent a polygon, and manually handling the ViewState
+// and there being no public helper for this - to render ... a
rectangle.
+XCachedPrimitivefillPolyPolygon( [in] XPolyPolygon2D xPolyPolygon,
[in] ViewState aViewState, [in] RenderState aRenderState )
+#endif
+}
+
+#endif
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(CanvasTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/*
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/data/rtf/README |3 +++
sw/qa/core/data/rtf/pass/abi3241.rtf |9 +
sw/qa/core/filters-test.cxx |5 +
sw/source/core/txtnode/ndtxt.cxx |2 +-
4 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit a1762795e7c758bc55cfba039e280273a4f26cc5
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 11 15:24:40 2013 +0200
abi#3241 fix crash on RTF import
The problem was that SwTxtFmtColl::IsAssignedToListLevelOfOutlineStyle()
returned true, because the style name started with header. However,
there were no real assignment, so
SwTxtFmtColl::GetAssignedOutlineStyleLevel() returned -1 later, which
resulted in a (valid) assertion failure.
Fix this by handling -1 outline level as not assigned.
Change-Id: I522f75002cf064ce7bc4da949683ac4e5ff4ec72
diff --git a/sw/qa/core/data/rtf/README b/sw/qa/core/data/rtf/README
new file mode 100644
index 000..cd109d3
--- /dev/null
+++ b/sw/qa/core/data/rtf/README
@@ -0,0 +1,3 @@
+Put RTF crash-test files here only in case the crash is in Writer core. If the
+crash is in the RTF import itself, use the writerfilter RTF testsuite instead,
+that's faster.
diff --git a/sw/qa/core/data/rtf/fail/.gitignore
b/sw/qa/core/data/rtf/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/data/rtf/indeterminate/.gitignore
b/sw/qa/core/data/rtf/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/data/rtf/pass/abi3241.rtf
b/sw/qa/core/data/rtf/pass/abi3241.rtf
new file mode 100644
index 000..5bfec3d
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/abi3241.rtf
@@ -0,0 +1,9 @@
+{\rtf1
+{\stylesheet
+{\sa120 Normal;}
+{\s6\sbasedon0 \snext0 heading 6;}
+}
+\pard\plain \s6
+If more than one reaction channel is to be considered, use the keyword
+\par
+}
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 26fcd58..e5ba36b 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -112,6 +112,11 @@ void SwFiltersTest::testCVEs()
getURLFromSrc(/sw/qa/core/data/ooxml/),
OUString(),
SFX_FILTER_STARONEFILTER);
+
+testDir(OUString(Rich Text Format),
+getURLFromSrc(/sw/qa/core/data/rtf/),
+OUString(),
+SFX_FILTER_STARONEFILTER);
}
void SwFiltersTest::setUp()
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 07f36ef..8d4cdaf 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1067,7 +1067,7 @@ void SwTxtNode::_ChgTxtCollUpdateNum( const SwTxtFmtColl
*pOldColl,
const int nNewLevel = pNewColl
pNewColl-IsAssignedToListLevelOfOutlineStyle() ?
pNewColl-GetAssignedOutlineStyleLevel() : MAXLEVEL;
-if ( MAXLEVEL != nNewLevel )
+if ( MAXLEVEL != nNewLevel -1 != nNewLevel )
{
SetAttrListLevel(nNewLevel);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/CppunitTest_cppcanvas_test.mk
cppcanvas/CppunitTest_cppcanvas_test.mk | 58 1 file changed, 58 insertions(+) New commits: commit e1a40290871740ed9dd76c0c4bd91b3a4232f65a Author: Michael Meeks michael.me...@suse.com Date: Tue Jun 11 14:46:53 2013 +0100 add cppcanvas unit test makefile I forgot. Change-Id: Ic56a61d6c71870620ad2cda7899da8d0252dfc11 diff --git a/cppcanvas/CppunitTest_cppcanvas_test.mk b/cppcanvas/CppunitTest_cppcanvas_test.mk new file mode 100644 index 000..9a09565 --- /dev/null +++ b/cppcanvas/CppunitTest_cppcanvas_test.mk @@ -0,0 +1,58 @@ +# -*- 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,cppcanvas_test)) + +$(eval $(call gb_CppunitTest_add_exception_objects,cppcanvas_test, \ +cppcanvas/qa/unit/test \ +)) + +$(eval $(call gb_CppunitTest_unset_headless,cppcanvas_test)) + +$(eval $(call gb_CppunitTest_use_libraries,cppcanvas_test, \ + cppcanvas \ + basegfx \ + canvastools \ + comphelper \ + cppu \ + cppuhelper \ + i18nlangtag \ + sal \ + svt \ + test \ + tl \ + vcl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_use_api,cppcanvas_test,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,cppcanvas_test)) + +$(eval $(call gb_CppunitTest_use_components,cppcanvas_test,\ + canvas/source/cairo/cairocanvas \ + canvas/source/factory/canvasfactory \ +configmgr/source/configmgr \ +fileaccess/source/fileacc \ +i18npool/util/i18npool \ + linguistic/source/lng \ + package/util/package2 \ +sax/source/expatwrap/expwrap \ +ucb/source/core/ucb1 \ +unoxml/source/service/unoxml \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,cppcanvas_test)) + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/frmdlg/frmpage.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d330f3a2712b38c382767f668e751128b541624c
Author: pje335_NL meulentho...@gmail.com
Date: Mon Jun 10 07:35:44 2013 +0200
fdo#65199 mutible names for the same option.
Change-Id: Ib17c323b5a9a2dba5e3d32d8a1a418167a7e7fe5
Reviewed-on: https://gerrit.libreoffice.org/4222
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src
index a2af66e..e87d99f 100644
--- a/sw/source/ui/frmdlg/frmpage.src
+++ b/sw/source/ui/frmdlg/frmpage.src
@@ -259,7 +259,7 @@ TabPage TP_FRM_STD
Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_4 ) ;
Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_2) ,
RSC_CD_CHECKBOX_HEIGHT ) ;
TabStop = TRUE ;
-Text [ en-US ] = Automatic;
+Text [ en-US ] = AutoSize;
};
FixedText FT_HEIGHT
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Limit - New Database feature
Hi, Thomas Extend help is a good idea and adding a new dialog too. But I think this characteristic of hsqldb would be hide from the user instead, because if the deafult database change in the future (as I see there are some efforts to it) and this database supports LIMIT without adding GROUP BY or WHERE, than these things get unneeded and the behaviour of Base change. (Here I means that Base known by normal user who use it with the default driver). This is why I prefer adding table alias to the select statement behind GUI and allow the user to make queries like select * from table limit y. 2013/6/11 Thomas Hackert thack...@nexgo.de Hello Alex, On Montag, 10. Juni 2013 21:06 Zolnai Tamás wrote: thanks, Alex, to bringing my problem to this list :) Thanks for the note. I looked up the thread on german discuss list. The problem is not that doesn't insert the required WHERE clause before the LIMIT (it sounds like adding a criteria on GUI and this criteria not inserted into the select statement before the limit clause while running), but hsqldb does not support queries like select * from table limit y. In hsqldb's concept we have to use a WHERE or an ORDER BY clause before LIMIT or at least a Table alias. But should this not be mentioned in the help to SQL;LIMIT clause (so it is called in Germanophone OLH ... ;) In Pootle you can find it at https://translations.documentfoundation.org/de/libo_help/translate.html#unit=40700280 )? Something like quote ahelp hid=.Expands the created select statement of the link href=text/shared/explorer/database/02010100.xhp name=SQL QuerySQL Query/link by the LIMIT X clause/ahelp. This can be used to limit your SQL Query results to those that fall within the first X number of it. Note: LIMIT does not work with Base per se. If you want to use it with %PRODUCTNAME Base's integrated HSQL, you need to add either WHERE or ORDER BY clauses in SQL. /quote (or something like that)? Feel free to correct my errors and or improve it ... ;) In case of mysql, Base appends a table alias automatically to the select statement (read on the german list). I don't sure this appending's aim is to avoid this problem or not, but can use for hsqldb too. Is there a possibility to implement some kind of dialog to ask for the WHERE or ORDER BY clause in an easy way? I am not a programmer, so I could not be of any help, sorry ... :( Have a nice day Thomas. TOFU removed -- Good evening, gentlemen. I am a HAL 9000 computer. I became operational at the HAL plant in Urbana, Illinois, on January 11th, nineteen hundred ninety-five. My supervisor was Mr. Langley, and he taught me to sing a song. If you would like, I could sing it for you. ___ 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: Repository.mk
Repository.mk | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit e78fe7af3961098b72116faf6b95eebb3685670b Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Jun 11 16:02:34 2013 +0200 better conditions for registering executables Change-Id: I197b5e35ee8e7b80f6bba3e59c811ab4261c489c diff --git a/Repository.mk b/Repository.mk index 42363d1..359f841 100644 --- a/Repository.mk +++ b/Repository.mk @@ -151,16 +151,16 @@ endif endif -ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ - regmerge \ - regview \ - $(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS))),javaldx) \ + $(if $(filter-out IOS,$(OS)), \ + regmerge \ + regview \ + ) \ + $(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ )) $(eval $(call gb_Helper_register_executables,UREBIN,\ - uno \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) -endif ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES) $(eval $(call gb_Helper_register_executables,OOO,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svx sc/uiconfig svx/source
include/svx/sidebar/SidebarDialControl.hxx|2 --
sc/uiconfig/scalc/ui/sidebaralignment.ui |2 +-
svx/source/dialog/dialcontrol.cxx |7 +--
svx/source/sidebar/possize/SidebarDialControl.cxx | 15 ++-
4 files changed, 8 insertions(+), 18 deletions(-)
New commits:
commit 9e851b69d13935a055ffcf08b9171330bbf5ebbb
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 11 16:02:55 2013 +0200
sidebar: Remove the setPosSizePixel hack.
Change-Id: I3c074f0860bf9cb384a7189038a214199a2d7222
diff --git a/include/svx/sidebar/SidebarDialControl.hxx
b/include/svx/sidebar/SidebarDialControl.hxx
index 68293e6..a3e53d3 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -32,8 +32,6 @@ public:
virtual ~SidebarDialControl (void);
virtual Size GetOptimalSize() const;
-virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags = WINDOW_POSSIZE_ALL);
-
virtual void MouseButtonDown (const MouseEvent rMEvt);
protected:
diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui
b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index 0a14810..c437636 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -294,7 +294,7 @@
property name=use_action_appearanceFalse/property
/object
packing
-property name=expandFalse/property
+property name=expandTrue/property
property name=fillTrue/property
property name=position0/property
/packing
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx
b/svx/source/sidebar/possize/SidebarDialControl.cxx
index a0c1024..82163dd 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -40,9 +41,6 @@ SidebarDialControl::SidebarDialControl (
Init(GetOutputSizePixel());
}
-
-
-
SidebarDialControl::~SidebarDialControl (void)
{
}
@@ -52,12 +50,6 @@ Size SidebarDialControl::GetOptimalSize() const
return LogicToPixel(Size(10, 10), MAP_APPFONT);
}
-void SidebarDialControl::setPosSizePixel(long nX, long nY, long nWidth, long
nHeight, sal_uInt16 nFlags)
-{
-long nMax = std::max(nWidth, nHeight);
-DialControl::setPosSizePixel(nX, nY, nMax, nMax, nFlags);
-}
-
void SidebarDialControl::MouseButtonDown( const MouseEvent rMEvt )
{
if( rMEvt.IsLeft() )
@@ -69,9 +61,6 @@ void SidebarDialControl::MouseButtonDown( const MouseEvent
rMEvt )
}
}
-
-
-
void SidebarDialControl::HandleMouseEvent( const Point rPos, bool bInitial )
{
long nX = rPos.X() - mpImpl-mnCenterX;
@@ -94,4 +83,4 @@ void SidebarDialControl::HandleMouseEvent( const Point rPos,
bool bInitial )
} } // end of namespace svx::sidebar
-// eof
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3d0a22e8c3a848f7413d6bd090106371227260d0
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 11 15:56:24 2013 +0200
dialcontrol: Make it always fit a square.
Change-Id: I37e1d694a5e92b75bd68310f74671897887a60e1
diff --git a/svx/source/dialog/dialcontrol.cxx
b/svx/source/dialog/dialcontrol.cxx
index 5ebb396..3c9ce68 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -248,8 +248,11 @@ void DialControl::DialControl_Impl::Init( const Size
rWinSize, const Font rWin
void DialControl::DialControl_Impl::SetSize( const Size rWinSize )
{
-// (x - 1) | 1 creates odd value = x, to have a well-defined center
pixel position
-maWinSize = Size( (rWinSize.Width() - 1) | 1, (rWinSize.Height() - 1) | 1
);
+// make the control squared, and adjusted so that we have a well-defined
+// center [(x - 1) | 1 creates odd value = x]
+long nMin = (std::min(rWinSize.Width(), rWinSize.Height()) - 1) | 1;
+
+maWinSize = Size( nMin, nMin );
mnCenterX = maWinSize.Width() / 2;
mnCenterY = maWinSize.Height() / 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - writerfilter/Module_writerfilter.mk writerfilter/qa writerfilter/source
writerfilter/Module_writerfilter.mk |2 +-
writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf |6 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx|2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit a4fee33b23fbe68ba4b1a0701c4bfb2bec79e8b5
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 11 16:14:50 2013 +0200
abi#4817 attempt to access an element in an empty container
Change-Id: Ic51ef8b3db182dd34195c9bb808170d20953d406
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf
new file mode 100644
index 000..58d88f5
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf
@@ -0,0 +1,6 @@
+{\rtf1
+\super
+{
+\par
+\par }
+}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b2179c4..c70447e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4591,7 +4591,7 @@ int RTFDocumentImpl::popState()
if (aState.pCurrentBuffer == m_aSuperBuffer)
{
-OSL_ASSERT(m_aStates.top().pCurrentBuffer == 0);
+OSL_ASSERT(!m_aStates.empty() m_aStates.top().pCurrentBuffer == 0);
if (!m_bHasFootnote)
replayBuffer(m_aSuperBuffer);
commit e75a8b8eff811a1bfdca59fd1eb3e64bea1b02c1
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 11 16:17:53 2013 +0200
writerfilter: move the RTF tests to slowcheck
These now take around 5sec here, which is slow enough to be annoying --
if you have to wait for it after every partial build.
Change-Id: I795fefcd79889aca7b00a5b3d408ee3488b13b03
diff --git a/writerfilter/Module_writerfilter.mk
b/writerfilter/Module_writerfilter.mk
index fe73d1d..d6a1dc0 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,writerfilter,\
Library_writerfilter \
))
-$(eval $(call gb_Module_add_check_targets,writerfilter,\
+$(eval $(call gb_Module_add_slowcheck_targets,writerfilter,\
CppunitTest_writerfilter_rtftok \
))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xiescher.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c36348f20c4fcb6ae1acb0fd06c19edfa9fb1081
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jun 11 16:23:07 2013 +0200
-Werror=shadow
...shadowing typedef in include/vcl/salnativewidgets.hxx
Change-Id: Ibca5c99bb783d1788e6528ff7ccd0994af069adb
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 241a715..354ea14 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -486,7 +486,7 @@ SdrObject* XclImpDrawObjBase::CreateSdrObject(
XclImpDffConverter rDffConv, con
Reference XPropertySet xPropSet(xCtrlModel,UNO_QUERY);
const static rtl::OUString sPropertyName =
rtl::OUString::createFromAscii(ControlTypeinMSO);
-enum ControlType { eCreateFromOffice = 0,
eCreateFromMSTBXControl, eCreateFromMSOCXControl };
+enum { eCreateFromOffice = 0, eCreateFromMSTBXControl,
eCreateFromMSOCXControl };
if( mnObjType == 7 || (mnObjType 25 mnObjType 10) )//TBX
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/unotools sw/source vcl/unx writerfilter/source
include/unotools/fontdefs.hxx |1
sw/source/core/txtnode/fntcache.cxx | 17 ++
vcl/unx/kde4/KDE4FilePicker.cxx | 47 +++---
writerfilter/source/dmapper/FontTable.cxx |8 +
4 files changed, 31 insertions(+), 42 deletions(-)
New commits:
commit 03f666103d80f7a0c79150dae2367079b80e50a6
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Jun 10 15:26:40 2013 +0200
fix and simplify getting files from the KDE4 file dialog
- Fix multiple selection handling.
- The double click selection KDE4 bug does not exist (anymore?) as far
as I can tell.
- Apparently it's not true that multiselect needs the first item in the list
to be the directory.
- KFileDialog can already give full URLs.
Change-Id: I5bb651902fb6c1d75af40b78bf32c79b004b7358
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 4be3b9a..01493d0 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -218,48 +218,11 @@ OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
uno::Sequence OUString SAL_CALL KDE4FilePicker::getFiles()
throw( uno::RuntimeException )
{
-QStringList rawFiles = _dialog-selectedFiles();
-QStringList files;
-
-// Workaround for the double click selection KDE4 bug
-// kde file picker returns the file and directories for selectedFiles()
-// when a file is double clicked
-// make a true list of files
-const QString dir = KUrl(rawFiles[0]).directory();
-
-bool singleFile = true;
-if (rawFiles.size() 1)
-{
-singleFile = false;
-//for multi file sequences, oo expects the first param to be the
directory
-//can't treat all cases like multi file because in some instances
(inserting image)
-//oo WANTS only one entry in the final list
-files.append(dir);
-}
-
-for (sal_uInt16 i = 0; i rawFiles.size(); ++i)
-{
-// if the raw file is not the base directory (see above kde bug)
-// we add the file to list of avail files
-if ((dir + /) != ( rawFiles[i]))
-{
-QString filename = KUrl(rawFiles[i]).fileName();
-
-if (singleFile)
-filename.prepend(dir + /);
-files.append(filename);
-}
-}
-
-// add all files and leading directory to outgoing OO sequence
-uno::Sequence OUString seq(files.size());
-for (int i = 0; i files.size(); ++i)
-{
-OUString aFile(toOUString(files[i])), aURL;
-osl_getFileURLFromSystemPath(aFile.pData, aURL.pData );
-seq[i] = aURL;
-}
-
+KUrl::List urls = _dialog-selectedUrls();
+uno::Sequence OUString seq( urls.size());
+int i = 0;
+foreach( const KUrl url, urls )
+seq[ i++ ]= toOUString( url.url());
return seq;
}
commit f235df85447f1d159b70d8ace4d2849cf782abe6
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jun 7 11:31:05 2013 +0200
ugly workaround for external leading with symbol fonts (bnc#823626)
I'd much rather find the code using external leading in Writer's layout,
but this font rendering and layout stuff is so complicated.
Change-Id: Iaf58af387a6727eb18f5a9d1613de3ae30d7c35e
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 77ae849..4b04cc7 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -379,6 +379,23 @@ sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh,
const OutputDevice r
bSymbol = RTL_TEXTENCODING_SYMBOL == aMet.GetCharSet();
GuessLeading( *pSh, aMet );
nExtLeading = static_castsal_uInt16(aMet.GetExtLeading());
+/* HACK: There is something wrong with Writer's bullet rendering,
causing lines
+ with bullets to be higher than they should be. I think this is
because
+ Writer uses font's external leading incorrect, as the vertical
distance
+ added to every line instead of only a distance between multiple
lines,
+ which means a single bullet has external leading added even
though it
+ shouldn't, but frankly this is just an educated guess rather
than understanding
+ Writer's layout (heh).
+ Symbol font in some documents is 'StarSymbol; Arial Unicode
MS', and Windows
+ machines often do not have StarSymbol, falling back to Arial
Unicode MS, which
+ has unusually high external leading. So just reset external
leading for fonts
+ which are used to bullets, as those should not be used on
multiple lines anyway,
+ so in correct rendering external leading should be irrelevant
anyway.
+ Interestingly enough, bSymbol is false for 'StarSymbol; Arial
Unicode MS', so
+ also check explicitly.
+*/
+
[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/AutoInstall.mk scp2/InstallModule_calc.mk scp2/source
Repository.mk| 830 --- scp2/AutoInstall.mk |1 scp2/InstallModule_calc.mk |2 scp2/source/calc/file_calc.scp | 18 scp2/source/calc/module_calc.scp | 11 scp2/source/ooo/file_library_ooo.scp |2 6 files changed, 403 insertions(+), 461 deletions(-) New commits: commit cb548bc7a1c863d1716ce0f609a64f45a8d73328 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Mon Jun 10 19:20:14 2013 -0300 fdo#60924 autoinstall - gbuild/scp2: add calc module Change-Id: I89e87f2e107bdb31f19262c83f8e20be9642a4eb diff --git a/Repository.mk b/Repository.mk index 1e7bec1..c37f6d6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -157,6 +157,19 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \ dbu \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ + analysis \ + calc \ + date \ + pricing \ + sc \ + scd \ + scfilt \ + scui \ + solver \ + $(if $(DISABLE_SCRIPTING),,vbaobj) \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \ svgfilter \ flash \ @@ -341,35 +354,26 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabasui \ ado \ agg \ - analysis \ $(if $(filter $(OS),ANDROID),, \ basebmp \ ) \ communi \ - date \ oox \ ooxml \ sdbc \ AppleRemote \ avmediaQuickTime \ - calc \ filtertracer \ log \ MacOSXSpell \ mork \ mozab2 \ mozabdrv \ - pricing \ protocolhandler \ rpt \ rptui \ rptxml \ - sc \ - scd \ - scfilt \ - scui \ simplecm \ - solver \ spa \ spell \ sts \ @@ -584,7 +588,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ ucptdoc1 \ updatefeed \ vbaevents \ - vbaobj \ vbaswobj \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index a6dad3c..3dfb56a2 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -10,6 +10,7 @@ $(eval $(call gb_AutoInstall_AutoInstall)) $(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk index dba5960..acb1009 100644 --- a/scp2/InstallModule_calc.mk +++ b/scp2/InstallModule_calc.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/calc)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc)) + $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\ ENABLE_LPSOLVE \ SYSTEM_LPSOLVE \ diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 115681b..171459e 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -18,12 +18,6 @@ #include macros.inc -STD_LIB_FILE( gid_File_Lib_Solver, solver) - -STD_LIB_FILE( gid_File_Lib_Analysis, analysis) - -STD_LIB_FILE( gid_File_Lib_Pricing, pricing) - File gid_File_Share_Registry_Calc_Xcd TXT_FILE_BODY; Styles = (PACKED); @@ -31,18 +25,6 @@ File gid_File_Share_Registry_Calc_Xcd Name = calc.xcd; End -STD_LIB_FILE( gid_File_Lib_Calc, calc) - -STD_LIB_FILE( gid_File_Lib_Date, date) - -STD_LIB_FILE( gid_File_Lib_Sc, sc) - -STD_LIB_FILE( gid_File_Lib_Scui, scui) - -STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) - -STD_LIB_FILE( gid_File_Lib_Scd, scd) - STD_RES_FILE( gid_File_Res_Analysis, analysis) STD_RES_FILE( gid_File_Res_Date, date) diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index 46b4271..35aafdf 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -18,6 +18,8 @@ #include macros.inc +#include AutoInstall/calc + Module gid_Module_Prg_Calc MOD_NAME_DESC ( MODULE_PRG_CALC ); ParentID = gid_Module_Prg; @@ -33,10 +35,9 @@ Module gid_Module_Prg_Calc_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); -Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg, -gid_File_Lib_Solver,gid_File_Lib_Lpsolve, -gid_File_Lib_Vbaobj, -gid_File_Tmp_Userinstall_Calc_Inf); +Files = (auto_calc_ALL +gid_File_Share_Registry_Calc_Xcd, +gid_File_Lib_Lpsolve);
[PUSHED] fdo#60924 autoinstall - gbuild/scp2: add calc module
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4225 -- To view, visit https://gerrit.libreoffice.org/4225 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89e87f2e107bdb31f19262c83f8e20be9642a4eb Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Limit - New Database feature
Hallo Tamás, *, On Dienstag, 11. Juni 2013 16:01 Zolnai Tamás wrote: Extend help is a good idea and adding a new dialog too. But I think this characteristic of hsqldb would be hide from the user instead, because if the deafult database change in the future (as I see there are some efforts to it) well, but as it maybe would change in the future, I think, we should extend the OLH (we could remove it later, when we have a replacement for HSQL, couldn't we?) instead of getting loads of complains or bug reports about a non working Base or the like ... ;) and this database supports LIMIT without adding GROUP BY or WHERE, than these things get unneeded and the behaviour of Base change. (Here I means that Base known by normal user who use it with the default driver). This is why I prefer adding table alias to the select statement behind GUI and allow the user to make queries like select * from table limit y. Would this be easy to implement without any strange side effects? If it is easy, it would be cool to get this done before releasing 4.1 final ... ;) Thanks for your answer Thomas. TOFU removed -- We tried to close Ohio's borders and ran into a Constitutional problem. There's a provision in the Constitution that says you can't close your borders to interstate commerce, and garbage is a form of interstate commerce. -- Ohio Lt. Governor Paul Leonard ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC weekly update] iOS remote control
Hello everyone, It seems that we can simply use plist to get the decoding done...and since we don't need encoding on the remote end, the problem was solved with this one-liner: [NSPropertyListSerialization propertyListWithData:[plist dataUsingEncoding: NSASCIIStringEncoding] options:0 format:NULL error:NULL]; Not sure if that's really safe to use but I've just done some tests and it works pretty well. If anyone of you have used this method please let me know. For now I've wrapped that into NSData as a category. Will post a screenshot on my blog shortly. Now once server-end starts the slides show, we got a preview image and lecturer's notes on the remote end :P Cheers! Siqi 2013/6/11 Siqi Liu m...@siqi.fr Hello all, Thanks for your help, it's great to have many helping hands here :) I think I would write my own implementation since it doesn't seem to be really complicated... I will not create a separate utility class but instead add it to a category for NSData. I will test that today and let you know what I get there. All the best! Siqi 2013/6/10 Cedric Bosdonnat cbosdon...@suse.com On Mon, 2013-06-10 at 11:21 +0300, Tor Lillqvist wrote: I don't think we want to drag in boost in an otherwise clean Objective-C -only app. (Cédric's code at least includes a boost header, too.) Just pay attention with my code: I wanted it to work on streams when I don't have the full content to encode. The boost header used in that file is not used by the EncodedData class actually doing the base64 encode/decode work. Note that Base64 isn't that complex, you can even write one in objective-C pretty quickly. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC weekly update] iOS remote control
Actually I wonder why the thumbnails need to be Base64 encoded at all; surely the communication is not going through any 7-bit short-lines-of-text -enforcing channel;) Would it not be possible to just pass the PNG (IIRC) bytes as such as a binary blob? Prefixed by information about its length, presumably. And then instead of writing/reading base64 encoded lines, just write/read the specified number of bytes. Would of course be incompatible with existing (Android) remote control implementations, so some way to negotiate versions of the protocol at start would be needed. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Firebird Dependencies Upload
On Tue, 2013-06-11 at 10:15 +0100, Andrzej J. R. Hunt wrote: Hi everyone, Could the following 2 files please be uploaded to the TDF servers for me: done now at http://dev-www.libreoffice.org/src/ I left them as the barefile names rather than as md5sum-filename, is that ok? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#65655 : fix for Different_Odd_And_Even_Pages flag ignore...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4229
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/4229/1
fdo#65655 : fix for Different_Odd_And_Even_Pages flag ignored
Change-Id: Icf9949bb00aa905d22aedfd8f2b297dfa89dfedb
---
A sw/qa/extras/ooxmlexport/data/fdo65655.docx
M sw/qa/extras/ooxmlexport/ooxmlexport.cxx
A sw/qa/extras/ooxmlimport/data/fdo65655.docx
M sw/qa/extras/ooxmlimport/ooxmlimport.cxx
M writerfilter/source/dmapper/DomainMapper_Impl.cxx
5 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/sw/qa/extras/ooxmlexport/data/fdo65655.docx
b/sw/qa/extras/ooxmlexport/data/fdo65655.docx
new file mode 100644
index 000..5fe9451
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/fdo65655.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ca6fad6..55221c2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -72,6 +72,7 @@
void testI120928();
void testFdo64826();
void testPageBackground();
+void testFdo65655();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -121,6 +122,7 @@
{i120928.docx, Test::testI120928},
{fdo64826.docx, Test::testFdo64826},
{page-background.docx, Test::testPageBackground},
+{fdo65655.docx, Test::testFdo65655},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -688,6 +690,20 @@
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x92D050),
getPropertysal_Int32(xPageStyle, BackColor));
}
+void Test::testFdo65655()
+{
+// The problem was that the DOCX had a non-blank odd footer and a blank
even footer
+// The 'Different Odd Even Pages' was turned on
+// However - LO assumed that because the 'even' footer is blank - it
should ignore the 'Different Odd Even Pages' flag
+// So it did not import it and did not export it
+uno::Referencebeans::XPropertySet
xPropertySet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+sal_Bool bValue = false;
+xPropertySet-getPropertyValue(HeaderIsShared) = bValue;
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
+xPropertySet-getPropertyValue(FooterIsShared) = bValue;
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ooxmlimport/data/fdo65655.docx
b/sw/qa/extras/ooxmlimport/data/fdo65655.docx
new file mode 100644
index 000..5fe9451
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/fdo65655.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index c422ecc..128961f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -117,6 +117,7 @@
void testWatermark();
void testPageBorderShadow();
void testN816593();
+void testFdo65655();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -202,6 +203,7 @@
{watermark.docx, Test::testWatermark},
{page-border-shadow.docx, Test::testPageBorderShadow},
{n816593.docx, Test::testN816593},
+{fdo65655.docx, Test::testFdo65655},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1441,6 +1443,19 @@
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables-getCount());
}
+void Test::testFdo65655()
+{
+// The problem was that the DOCX had a non-blank odd footer and a blank
even footer
+// The 'Different Odd Even Pages' was turned on
+// However - LO assumed that because the 'even' footer is blank - it
should ignore the 'Different Odd Even Pages' flag
+uno::Referencebeans::XPropertySet
xPropertySet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+sal_Bool bValue = false;
+xPropertySet-getPropertyValue(HeaderIsShared) = bValue;
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
+xPropertySet-getPropertyValue(FooterIsShared) = bValue;
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index fbc633d..c822739 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1377,7 +1377,10 @@
uno::makeAny(sal_True) );
// if a left header is available then header are not shared
bool bLeft = eType == SectionPropertyMap::PAGE_LEFT;
-if( bLeft m_pSettingsTable-GetEvenAndOddHeaders())
+
+// If the 'Different Even Odd Pages' flag is turned on - do not
ignore it
+// Even if the 'Even' header is blank - the flag should be
imported (so
scp2 - modules (and fdo#60924)
Hi, Anyone knows what should be the result of processing scp2 files? Few $(OUTDIR)/bin/*.ins files but I mean the solenv/bin/modules/ thing. We could install (copy) files directly with gbuild, so what would be missing after removing scp2 ? Especially I don't understand the chaos in various modules (gid_Module_Foos) - do we need them also for Windows? e.g. scp2/source/activex/module_activex.scp For Linux it's somehow used to create packages I think. Bjoern, do you have ideas how to continue with https://bugs.freedesktop.org/show_bug.cgi?id=60924 ? Marcos is doing great work there. I'm not sure I can continue to mentor it - maybe we are doing good - but I don't know which modules do we need in gbuild. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cppcanvas/qa
cppcanvas/qa/unit/test.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 58b8211f4aa0b227151890d541efa17d04058e05 Author: Michael Meeks michael.me...@suse.com Date: Tue Jun 11 16:35:49 2013 +0100 canvas unit test - tolerate canvas non-creation: really no X server... Change-Id: Id8be7bc4ad454e7e246e412803e4d672a921c08e diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx index 03d0e73..af652a3 100644 --- a/cppcanvas/qa/unit/test.cxx +++ b/cppcanvas/qa/unit/test.cxx @@ -44,7 +44,8 @@ void CanvasTest::testComposite() CPPUNIT_ASSERT( pWin != NULL ); uno::Referencerendering::XCanvas xCanvas = pWin-GetCanvas (); -CPPUNIT_ASSERT( xCanvas.is() ); +if( !xCanvas.is() ) +return; // can't get a canvas working at all - truly headless ? // a huge canvas ... Size aSize (1, 1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC weekly update] iOS remote control
Hello Tor, In fact, I've posed the same question when I see that base64 encoding thing... I'm not sure if that change anything if we also want some bluetooth transmission. For now I think I would stick to the existing protocol and focus on getting iOS remote to work as expected and then try to improve our existing protocol. For now I've also noticed that the blank_screen_with_a_specified_color is platform dependent, which takes a color representation defined in Android. Maybe we can switch to a more standard color representation so that we can have that functionality in iOS as well. I will keep track of all potential improvements on the existing protocol and investigate into that when I got my app to work. The base64 thing is just one line of code for now, and the rest of the protocol seems ok to me except the blank_screen_with_a_specified_color command. However, if the gsoc team working on improving android app (hi there ^^) would also like to change something on the existing protocol, please let me know so that we can work on that right from the beginning. Siqi 2013/6/11 Tor Lillqvist t...@iki.fi Actually I wonder why the thumbnails need to be Base64 encoded at all; surely the communication is not going through any 7-bit short-lines-of-text -enforcing channel;) Would it not be possible to just pass the PNG (IIRC) bytes as such as a binary blob? Prefixed by information about its length, presumably. And then instead of writing/reading base64 encoded lines, just write/read the specified number of bytes. Would of course be incompatible with existing (Android) remote control implementations, so some way to negotiate versions of the protocol at start would be needed. --tml -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: String to OUString and SDIs
- Original Message - From: Stephan Bergmann sberg...@redhat.com To: libreoffice@lists.freedesktop.org Cc: Sent: Tuesday, June 11, 2013 2:20 PM Subject: Re: String to OUString and SDIs On 06/11/2013 10:32 AM, Matteo Casalin wrote: From: Stephan Bergmann sberg...@redhat.com Always do a make check instead of merely a make dev-install please. (Esp. if you have enough time and/or computing bandwidth for make clean make dev-install, the additional checks should not take too long in proportion.) Thanks for the hint. Honestly, the rebuild process takes me about 4 hours, I usually let it run at night and only after widespread changes (more than 40 files are currently involved, with many header files) and almost all because I have the odd feeling that, in the past, after some modification on the same set of files the build [DEP] phase sometimes involved different modules besides the expected ones. If you confirm that this is excessive then I will happily avoid the rebuild and just perform make check. When you just modify .hxx/.cxx files (rather than doing odd changes to .mk files, say), then our dependency tracking should really be good enough to do all required rebuilds without a need to make clean first. Great! Thanks again. Matteo Stephan ___ 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: Changes to 'feature/cairocanvas'
New branch 'feature/cairocanvas' available with the following commits: commit f16f8b29b262f455f7b587389eec843ab88e6578 Author: Michael Meeks michael.me...@suse.com Date: Mon Jun 10 17:02:06 2013 +0100 Cairo canvas fixes + Move BitmapEx construction from an XBitmapCanvas into BitmapEx where (arguably) it will be easier to re-factor later, treat a mask fetch failure as if we have no mask + Teach the cairo canvas to return a non-pre-multiplied RGB + separate Alpha BitmapEx when it can to avoid unpleasantness with the underlying X resources. + Add tentative code-path to convert 32bit color Bitmaps into 24bit color, to avoid confusing X Change-Id: Iaf6998c796aea6d73c57bed2bc03152d9636d5f5 Conflicts: vcl/source/gdi/gdimtf.cxx commit 064785c2938ef146bec2098da1b53ce4b6675d01 Author: Radek Doulik r...@novell.com Date: Mon Apr 29 00:00:00 2013 +0200 Fix bnc#795857 Use correct sizes for EMF+ bitmap rendering Fix pdf export wrong size issues for embedded EMF+ images. Change-Id: I998c9535bde32fc9f452d61d7cb7609c95f5528d (cherry picked from commit 4c676625d4016d428e9becd5512b7cfc8b0c4b24) Conflicts: vcl/inc/vcl/gdimtf.hxx vcl/source/gdi/gdimtf.cxx Conflicts: vcl/source/gdi/gdimtf.cxx commit 912f84eab5509d52b3cf8306183d953311887a00 Author: Michael Meeks michael.me...@suse.com Date: Mon Jun 10 12:34:39 2013 +0100 Revert fix canvas bitmap rendering (argb32 pixmaps) fixes color in n#780830 This reverts commit 46e53913e9dcc84ffed8fb5f1b4959c70c7e5649. Conflicts: vcl/inc/salbmp.hxx vcl/source/gdi/gdimtf.cxx vcl/unx/generic/gdi/salgdi2.cxx Change-Id: Ifa893b687c724ea71655aa4e084a44858695073e Conflicts: vcl/inc/salbmp.hxx vcl/source/gdi/gdimtf.cxx commit 896725acf9bd4ead032eacfb32400378dffd1e57 Author: Michael Meeks michael.me...@suse.com Date: Mon Jun 10 12:24:10 2013 +0100 Revert pass argb32 pixmaps from vcl to canvas, avoiding costly x11 ... This reverts commit 22f63477a3300d474c3d6832232b888f75c7290c. Conflicts: canvas/source/cairo/cairo_canvasbitmap.cxx Change-Id: Ib266050ebc6eaca4fbd36ed013ac95a1b4b9d316 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - javaunohelper/com odk/configure.pl odk/docs odk/setsdkenv_unix.sh.in odk/settings odk/source odk/util
javaunohelper/com/sun/star/comp/helper/UnoInfo.java |3
odk/configure.pl| 34 +++
odk/docs/install.html | 93 +---
odk/setsdkenv_unix.sh.in| 61 +
odk/settings/settings.mk| 44 +++--
odk/source/unoapploader/unx/unoapploader.c | 14 ++-
odk/util/makefile.pmk |2
7 files changed, 129 insertions(+), 122 deletions(-)
New commits:
commit f3b3a6daf24c4fd9ca9d5b726c64d44017bef71a
Author: Jürgen Schmidt j...@apache.org
Date: Tue Jun 11 15:07:33 2013 +
#122482# make boost optional and adapt settings
diff --git a/odk/configure.pl b/odk/configure.pl
index eee5324..9f6e2a4 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -94,6 +94,10 @@ if ( $main::operatingSystem =~ m/darwin/ )
$main::OO_SDK_JAVA_HOME_SUGGESTION = searchprog(javac);
$main::javaVersion = 1.5.0_01;
+$main::OO_SDK_BOOST_HOME_SUGGESTION = ;
+$main::boostVersion = 1.48.0;
+$main::skipBoostDir = 0;
+
$main::SDK_AUTO_DEPLOYMENT = ;
$main::SDK_AUTO_DEPLOYMENT_SUGGESTION = YES;
@@ -490,6 +494,34 @@ while ( (!$main::correctVersion)
}
}
+# prepare boost directory (optional)
+while ( (!$main::skipBoostDir)
+((! -d $main::OO_SDK_BOOST_HOME ) ||
+ ((-d $main::OO_SDK_BOOST_HOME) (! -e
$main::OO_SDK_BOOST_HOME/boost/tr1/unordered_map.hpp))) )
+{
+
+print Enter boost directory [$main::OO_SDK_BOOST_HOME_SUGGESTION]: ;
+$main::OO_SDK_BOOST_HOME = readStdIn();
+chop($main::OO_SDK_BOOST_HOME);
+if ( $main::OO_SDK_BOOST_HOME eq )
+{
+$main::OO_SDK_BOOST_HOME = $main::OO_SDK_BOOST_HOME_SUGGESTION;
+}
+if ( (! -d $main::OO_SDK_BOOST_HOME) ||
+ ((-d $main::OO_SDK_BOOST_HOME) (! -e
$main::OO_SDK_BOOST_HOME/boost/tr1/unordered_map.hpp)) )
+{
+print Error: boost couldn't be find or verified, please specify a
boost directory.\n;
+if ( skipChoice(optional output directory) == 1 )
+{
+$main::skipBoostDir = 1;
+}
+$main::OO_SDK_BOOST_HOME = ;
+} else
+{
+# the boost directory is optional
+$main::skipBoostDir = 1;
+}
+}
# prepare output directory (optional)
while ( (!$main::skipOutputDir)
@@ -744,7 +776,6 @@ sub prepareScriptFile()
$_ =~ s#\@OO_SDK_NAME\@#$main::OO_SDK_NAME#go;
$_ =~ s#\@OO_SDK_HOME\@#$main::OO_SDK_HOME#go;
$_ =~ s#\@OFFICE_HOME\@#$main::OFFICE_HOME#go;
-# $_ =~ s#\@OFFICE_BASE_HOME\@#$main::OFFICE_BASE_HOME#go;
$_ =~ s#\@OO_SDK_MAKE_HOME\@#$main::OO_SDK_MAKE_HOME#go;
$_ =~ s#\@OO_SDK_ZIP_HOME\@#$main::OO_SDK_ZIP_HOME#go;
$_ =~ s#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go;
@@ -752,6 +783,7 @@ sub prepareScriptFile()
$_ =~ s#\@OO_SDK_CPP_HOME\@#$main::OO_SDK_CPP_HOME#go;
$_ =~ s#\@OO_SDK_CC_55_OR_HIGHER\@#$main::OO_SDK_CC_55_OR_HIGHER#go;
$_ =~ s#\@OO_SDK_JAVA_HOME\@#$main::OO_SDK_JAVA_HOME#go;
+$_ =~ s#\@OO_SDK_BOOST_HOME\@#$main::OO_SDK_BOOST_HOME#go;
$_ =~ s#\@SDK_AUTO_DEPLOYMENT\@#$main::SDK_AUTO_DEPLOYMENT#go;
$_ =~ s#\@OO_SDK_OUTPUT_DIR\@#$main::OO_SDK_OUTPUT_DIR#go;
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 146d091..e3a12cb 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -150,6 +150,13 @@
tr valign=middle
td colspan=2img class=line src=images/sdk_line-1.gif/td
/tr
+ tdbBoost (bUnix only/b and optional)b/td
+ td class=content80The boost library is used today on Unix
systems as replacement for the stlport library. The stlport library is removed
and replaced by either the compiler stl (on Windows) or the boost stl on all
Unix based systems. We are planning to switch to the compiler stl completely as
soon as possible. The boost headers/library are boptional/b and for C++
development only if stl containers are used.
+ pbDownload:/b a target=_blank
href=http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download;
title=link to boost version 1.48.0
(online)http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download/a./p
+ /td
+ tr valign=middle
+td colspan=2img class=line src=images/sdk_line-1.gif/td
+ /tr
tr
tdimg class=nothing10 src=images/nada.gif/td
td align=right
@@ -188,10 +195,8 @@
tr valign=top
td class=cell20bOFFICE_HOME/b/td
td class=cell80Path to an existing Apache OpenOffice
- base installation, e.g. quot;/opt/openoffice3quot;. Be sure
- that it is not a user installation only. Exactly one of
OFFICE_HOME
- and OO_SDK_URE_HOME must be set. The other should be
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst |8
solenv/inc/minor.mk |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9e00a0fc2229d2490470cd7708c45f819d7ca48f
Author: Andras Timar ati...@suse.com
Date: Tue Jun 11 18:22:32 2013 +0200
Bump for 3.6-27
Change-Id: I6da35dda4d5e569ce9d6155248d1656b931b3850
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index bdda918..33eedd5 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 26
+WINDOWSPATCHLEVEL 27
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-526
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-527
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-526
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-527
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-526
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-527
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 5767841..c818fab 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=360
-RSCREVISION=360m1(Build:526)
-BUILD=526
+RSCREVISION=360m1(Build:527)
+BUILD=527
LAST_MINOR=m1
SOURCEVERSION=OOO360
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 62806, which changed state. Bug 62806 Summary: serious scaling issue exporting WMFs to PDF https://bugs.freedesktop.org/show_bug.cgi?id=62806 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/ole/axcontrol.cxx | 45 +++
1 file changed, 37 insertions(+), 8 deletions(-)
New commits:
commit 794352229145eeed32aca21682aef7172f0859db
Author: Noel Power noel.po...@suse.com
Date: Tue Jun 11 17:41:51 2013 +0100
squash some excel fileformat warnings ( and protected mode opening )
some attributes should not be exported for some controls, their
very presence triggers the dreaded nag dialog ( promising doom
death if you open the file )
Change-Id: I974ac94f75ee95ab54ca19bd5cd31952a66b20e5
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 23f08e3..b65d38f 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -1499,13 +1499,27 @@ void AxMorphDataModelBase::exportBinaryModel(
BinaryOutputStream rOutStrm )
aWriter.writeIntProperty sal_uInt32 ( mnFlags );
aWriter.writeIntProperty sal_uInt32 ( mnBackColor );
aWriter.writeIntProperty sal_uInt32 ( mnTextColor );
-aWriter.writeIntProperty sal_Int32 ( mnMaxLength );
-aWriter.writeIntProperty sal_uInt8 ( mnBorderStyle );
-aWriter.writeIntProperty sal_uInt8 ( mnScrollBars );
+if ( ( mnDisplayStyle == AX_DISPLAYSTYLE_LISTBOX ) || ( mnDisplayStyle ==
AX_DISPLAYSTYLE_COMBOBOX ) )
+aWriter.writeIntProperty sal_Int32 ( mnMaxLength );
+else
+aWriter.skipProperty(); //mnMaxLength
+if ( ( mnDisplayStyle == AX_DISPLAYSTYLE_LISTBOX ) || ( mnDisplayStyle ==
AX_DISPLAYSTYLE_TEXT ) )
+{
+aWriter.writeIntProperty sal_uInt8 ( mnBorderStyle );
+aWriter.writeIntProperty sal_uInt8 ( mnScrollBars );
+}
+else
+{
+aWriter.skipProperty(); //mnBorderStyle
+aWriter.skipProperty(); //mnScrollBars
+}
aWriter.writeIntProperty sal_uInt8 ( mnDisplayStyle );
aWriter.skipProperty(); // mouse pointer
aWriter.writePairProperty( maSize );
-aWriter.writeIntProperty sal_uInt16 ( mnPasswordChar );
+if ( mnDisplayStyle == AX_DISPLAYSTYLE_TEXT )
+aWriter.writeIntProperty sal_uInt16 ( mnPasswordChar );
+else
+aWriter.skipProperty(); // mnPasswordChar
aWriter.skipProperty(); // list width
aWriter.skipProperty(); // bound column
aWriter.skipProperty(); // text column
@@ -1517,18 +1531,33 @@ void AxMorphDataModelBase::exportBinaryModel(
BinaryOutputStream rOutStrm )
aWriter.skipProperty(); // mnShowDropButton );
aWriter.skipProperty();
aWriter.skipProperty(); // drop down style
-aWriter.writeIntProperty sal_uInt8 ( mnMultiSelect );
+if ( mnDisplayStyle == AX_DISPLAYSTYLE_LISTBOX )
+aWriter.writeIntProperty sal_uInt8 ( mnMultiSelect );
+// although CheckBox, ListBox, OptionButton, ToggleButton are also
supported
+// they can only have the fileformat default
+else
+aWriter.skipProperty(); //mnMultiSelect
aWriter.writeStringProperty( maValue );
-aWriter.writeStringProperty( maCaption );
+
+if ( ( mnDisplayStyle == AX_DISPLAYSTYLE_CHECKBOX ) || ( mnDisplayStyle ==
AX_DISPLAYSTYLE_OPTBUTTON ) || ( mnDisplayStyle == AX_DISPLAYSTYLE_TOGGLE ) )
+aWriter.writeStringProperty( maCaption );
+else
+aWriter.skipProperty(); // mnCaption
aWriter.skipProperty(); // mnPicturePos );
-aWriter.writeIntProperty sal_uInt32 ( mnBorderColor );
+if ( ( mnDisplayStyle == AX_DISPLAYSTYLE_COMBOBOX ) || ( mnDisplayStyle ==
AX_DISPLAYSTYLE_LISTBOX ) || ( mnDisplayStyle == AX_DISPLAYSTYLE_TEXT ) )
+aWriter.writeIntProperty sal_uInt32 ( mnBorderColor );
+else
+aWriter.skipProperty(); // mnBorderColor
aWriter.writeIntProperty sal_uInt32 ( mnSpecialEffect );
aWriter.skipProperty(); // mouse icon
aWriter.skipProperty(); // maPictureData
aWriter.skipProperty(); // accelerator
aWriter.skipProperty(); // undefined
aWriter.writeBoolProperty(true); // must be 1 for morph
-aWriter.writeStringProperty( maGroupName );
+if ( ( mnDisplayStyle == AX_DISPLAYSTYLE_CHECKBOX ) || ( mnDisplayStyle ==
AX_DISPLAYSTYLE_OPTBUTTON ) )
+aWriter.writeStringProperty( maGroupName );
+else
+aWriter.skipProperty(); //maGroupName
aWriter.finalizeExport();
AxFontDataModel::exportBinaryModel( rOutStrm );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/inc vcl/source
vcl/inc/vcl/gdimtf.hxx |2 +-
vcl/source/gdi/gdimtf.cxx | 15 +--
vcl/source/gdi/pdfwriter_impl2.cxx |2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 3553fa71b695c6c354872a77747ac4eb4bbff364
Author: Radek Doulik r...@novell.com
Date: Mon Apr 29 00:00:00 2013 +0200
Fix bnc#795857 Use correct sizes for EMF+ bitmap rendering
Fix pdf export wrong size issues for embedded EMF+ images.
(cherry picked from commit 4c676625d4016d428e9becd5512b7cfc8b0c4b24)
Conflicts:
vcl/inc/vcl/gdimtf.hxx
vcl/source/gdi/gdimtf.cxx
Signed-off-by: Michael Meeks michael.me...@suse.com
Conflicts:
vcl/source/gdi/gdimtf.cxx
Change-Id: I998c9535bde32fc9f452d61d7cb7609c95f5528d
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index ecefb90..90fce69 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -124,7 +124,7 @@ private:
const OutputDevice
rMapDev,
const PolyPolygon
rPolyPoly,
const Gradient
rGrad );
-SAL_DLLPRIVATE bool ImplPlayWithRenderer( OutputDevice* pOut,
const Point rPos, Size rDestSize );
+SAL_DLLPRIVATE bool ImplPlayWithRenderer( OutputDevice* pOut,
const Point rPos, Size rLogicDestSize );
SAL_DLLPRIVATE void ImplDelegate2PluggableRenderer( const
MetaCommentAction* pAct, OutputDevice* pOut );
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 42ed63c..172b477 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -399,7 +399,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
OSL_TRACE(GDIMetaFile::Play on device of size: %d x %d,
pOut-GetOutputSizePixel().Width(), pOut-GetOutputSizePixel().Height());
-if( !ImplPlayWithRenderer( pOut, Point(0,0),
pOut-GetOutputSizePixel() ) ) {
+if( !ImplPlayWithRenderer( pOut, Point(0,0), pOut-GetOutputSize() ) )
{
size_t i = 0;
for( size_t nCurPos = nCurrentActionElement; nCurPos nPos;
nCurPos++ )
{
@@ -428,13 +428,13 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
}
}
-//
-
-bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point rPos,
Size rDestSize )
+bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point rPos,
Size rLogicDestSize )
{
if (!bUseCanvas)
return false;
+Size rDestSize( pOut-LogicToPixel( rLogicDestSize ) );
+
const Window* win = dynamic_cast Window* ( pOut );
if (!win)
@@ -500,7 +500,10 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice*
pOut, const Point rPos, S
Bitmap aMask( pSalMask );
AlphaMask aAlphaMask( aMask );
BitmapEx aBitmapEx( aBitmap, aAlphaMask );
-pOut-DrawBitmapEx( rPos, aBitmapEx );
+if ( pOut-GetMapMode() == MAP_PIXEL )
+pOut-DrawBitmapEx( rPos, aBitmapEx );
+else
+pOut-DrawBitmapEx( rPos, rLogicDestSize,
aBitmapEx );
return true;
}
@@ -606,7 +609,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, const Point
rPos,
{
GDIMetaFile*pMtf = pOut-GetConnectMetaFile();
-if( ImplPlayWithRenderer( pOut, rPos, aDestSize ) )
+if( ImplPlayWithRenderer( pOut, rPos, rSize ) )
return;
Size aTmpPrefSize( pOut-LogicToPixel( GetPrefSize(), aDrawMap ) );
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx
b/vcl/source/gdi/pdfwriter_impl2.cxx
index beee461..8579168 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -769,7 +769,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile
i_rMtf, vcl::PDFExtOutDevDa
const MetaBmpAction* pA = (const MetaBmpAction*) pAction;
BitmapEx aBitmapEx( pA-GetBitmap() );
Size aSize( OutputDevice::LogicToLogic(
aBitmapEx.GetPrefSize(),
-aBitmapEx.GetPrefMapMode(),
pDummyVDev-GetMapMode() ) );
+
aBitmapEx.GetPrefMapMode(), pDummyVDev-GetMapMode() ) );
if( ! ( aSize.Width() aSize.Height() ) )
aSize = pDummyVDev-PixelToLogic(
aBitmapEx.GetSizePixel() );
implWriteBitmapEx( pA-GetPoint(), aSize, aBitmapEx,
pDummyVDev, i_rContext );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
Re: [GSOC weekly update] iOS remote control
On 11/06/13 16:11, Tor Lillqvist wrote: Actually I wonder why the thumbnails need to be Base64 encoded at all; surely the communication is not going through any 7-bit short-lines-of-text -enforcing channel;) Would it not be possible to just pass the PNG (IIRC) bytes as such as a binary blob? Prefixed by information about its length, presumably. And then instead of writing/reading base64 encoded lines, just write/read the specified number of bytes. Would of course be incompatible with existing (Android) remote control implementations, so some way to negotiate versions of the protocol at start would be needed. I wanted the protocol to be as simple as possible -- hence a purely text based protocol -- which turns out to be simple to work with in most languages -- but necessitated extra encoding for images. For iOS and Android it may in fact be more efficient to change to binary, but that probably won't work well for the Firefox Os version of the app I'm working on given Javascript is pretty poor at working with binary data. (A protocol version negotiation would be very useful for other things though anyway: e.g. currently the server pushes all the slide previews at the start of the presentation, ideally the remote would request them as necessary instead -- and there may be other things needing changing in the future / other features for which this would be useful.) Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 56709, which changed state. Bug 56709 Summary: UI: Cell formatting dialog shows characters as squares for some languages https://bugs.freedesktop.org/show_bug.cgi?id=56709 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e9c03d8225e79b63af6ab302e94fe08f2753a339 Author: Andras Timar ati...@suse.com Date: Tue Jun 11 20:42:34 2013 +0200 Updated core Project: translations efadc1300cf8ec70343123abc8f087bf6a1fa355 diff --git a/translations b/translations index e2402cb..efadc13 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit e2402cb148bd65ccdb910857b6efccbe537d03aa +Subproject commit efadc1300cf8ec70343123abc8f087bf6a1fa355 ___ 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 e72e1c110ad42b779afbe74b47ca35c1849e06b2 Author: Andras Timar ati...@suse.com Date: Tue Jun 11 20:42:34 2013 +0200 Updated core Project: translations 6f51f560aeead852a1add0250e068192477967e9 diff --git a/translations b/translations index 91d7065..6f51f56 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 91d7065cae5bfbcfcf243fe9dcefbca6e13c42fa +Subproject commit 6f51f560aeead852a1add0250e068192477967e9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1' - source/be
source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit efadc1300cf8ec70343123abc8f087bf6a1fa355 Author: Andras Timar ati...@suse.com Date: Tue Jun 11 20:42:34 2013 +0200 fdo#65214 missing | cause Windows installer error 2870 Change-Id: Ie6290ccc65c29eae0edb90af7bbd74b8013c2970 diff --git a/source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po b/source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po index f2a5c46..53bc4a7 100644 --- a/source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po +++ b/source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po @@ -1645,7 +1645,7 @@ msgctxt OOO_CONTROL_121\n LngText.text msgid Up One Level| -msgstr УвеÑÑ Ð½Ð° адзÑн ÑзÑÐ¾Ð²ÐµÐ½Ñ +msgstr УвеÑÑ Ð½Ð° адзÑн ÑзÑовенÑ| #: Control.ulf msgctxt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cmis' - include/sfx2 sfx2/source
include/sfx2/dinfdlg.hxx | 38 ++
sfx2/source/dialog/dinfdlg.cxx | 154 -
sfx2/source/dialog/dinfdlg.hrc | 10 +-
sfx2/source/dialog/dinfdlg.src | 80 +
sfx2/source/inc/sfxlocal.hrc |9 ++
5 files changed, 149 insertions(+), 142 deletions(-)
New commits:
commit ea9e84cf2a6ddc190ec6a8b8c00cb2b71c6b580c
Author: Cao Cuong Ngo cao.cuong@gmail.com
Date: Tue Jun 11 20:38:51 2013 +0200
CMIS properties dialog
Change property name and type to FixedText
Change-Id: I568e213efb0cd0fb0167d8dab397f67b3fa1f69e
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 397a011..3830c46 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -519,19 +519,6 @@ public:
inline CmisPropertyLine* GetLine() const { return m_pLine; }
};
-class CmisPropertiesTypeBox : public ListBox
-{
-private:
-CmisPropertyLine* m_pLine;
-
-public:
-inline CmisPropertiesTypeBox(
-Window* pParent, const ResId rResId, CmisPropertyLine* pLine ) :
-ListBox( pParent, rResId ), m_pLine( pLine ) {}
-
-inline CmisPropertyLine* GetLine() const { return m_pLine; }
-};
-
class CmisPropertiesDateField : public DateField
{
private:
@@ -588,20 +575,17 @@ public:
struct CmisPropertyLine
{
-SelectableFixedText m_aNameBox;
-CmisPropertiesTypeBox m_aTypeBox;
+FixedText m_aName;
+FixedText m_aType;
CmisPropertiesEditm_aValueEdit;
CmisPropertiesDateField m_aDateField;
CmisPropertiesTimeField m_aTimeField;
CmisPropertiesYesNoButton m_aYesNoButton;
-Point m_aDatePos;
-Point m_aTimePos;
-Sizem_aDateTimeSize;
-boolm_bTypeLostFocus;
-
+Point m_aDatePos;
+Point m_aTimePos;
+Size m_aDateTimeSize;
+bool m_bTypeLostFocus;
CmisPropertyLine( Window* pParent );
-
-voidSetRemoved();
};
// class CmisPropertiesWindow --
@@ -609,8 +593,8 @@ struct CmisPropertyLine
class CmisPropertiesWindow : public Window
{
private:
-SelectableFixedText m_aNameBox;
-ListBox m_aTypeBox;
+FixedText m_aName;
+FixedText m_aType;
Editm_aValueEdit;
DateField m_aDateField;
TimeField m_aTimeField;
@@ -625,9 +609,7 @@ private:
Timer m_aEditLoseFocusTimer;
Timer m_aBoxLoseFocusTimer;
-DECL_LINK( TypeHdl, CmisPropertiesTypeBox* );
DECL_LINK( EditLoseFocusHdl, CmisPropertiesEdit* );
-DECL_LINK( BoxLoseFocusHdl, CmisPropertiesTypeBox* );
boolIsLineValid( CmisPropertyLine* pLine ) const;
voidValidateLine( CmisPropertyLine* pLine, bool bIsFromTypeBox );
@@ -640,7 +622,7 @@ public:
~CmisPropertiesWindow();
voidInitControls( HeaderBar* pHeaderBar, const ScrollBar*
pScrollBar );
-sal_uInt16 GetVisibleLineCount() const;
+sal_uInt16 GetLineCount() const;
inline sal_Int32GetLineHeight() const { return m_nLineHeight; }
voidAddLine( const OUString sName,
com::sun::star::uno::Any rAny );
boolAreAllLinesValid() const;
@@ -691,7 +673,7 @@ private:
protected:
SfxCmisPropertiesPage( Window* pParent, const SfxItemSet );
-virtual sal_BoolFillItemSet( SfxItemSet );
+virtual sal_BoolFillItemSet( SfxItemSet );
virtual voidReset( const SfxItemSet );
virtual int DeactivatePage( SfxItemSet* pSet = NULL );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index abd66d6..8f148dc 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2173,12 +2173,12 @@ void CmisPropertiesYesNoButton::Resize()
// struct CmisPropertyLine -
CmisPropertyLine::CmisPropertyLine( Window* pParent ) :
-m_aNameBox ( pParent ),
-m_aTypeBox ( pParent, SfxResId( SFX_LB_CMIS_PROPERTY_TYPE ), this ),
-m_aValueEdit( pParent, SfxResId( SFX_ED_PROPERTY_VALUE ), this ),
-m_aDateField( pParent, SfxResId( SFX_FLD_DATE), this),
-m_aTimeField( pParent, SfxResId( SFX_FLD_TIME), this),
-m_aYesNoButton ( pParent, SfxResId( SFX_WIN_PROPERTY_YESNO ) ),
+m_aName ( pParent, SfxResId( SFX_CMIS_PROPERTY_TYPE ) ),
+m_aType ( pParent, SfxResId( SFX_CMIS_PROPERTY_TYPE ) ),
+m_aValueEdit( pParent,
[Libreoffice-commits] translations.git: source/be
source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6f51f560aeead852a1add0250e068192477967e9 Author: Andras Timar ati...@suse.com Date: Tue Jun 11 20:42:34 2013 +0200 fdo#65214 missing | cause Windows installer error 2870 Change-Id: Ie6290ccc65c29eae0edb90af7bbd74b8013c2970 diff --git a/source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po b/source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po index f2a5c46..53bc4a7 100644 --- a/source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po +++ b/source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po @@ -1645,7 +1645,7 @@ msgctxt OOO_CONTROL_121\n LngText.text msgid Up One Level| -msgstr УвеÑÑ Ð½Ð° адзÑн ÑзÑÐ¾Ð²ÐµÐ½Ñ +msgstr УвеÑÑ Ð½Ð° адзÑн ÑзÑовенÑ| #: Control.ulf msgctxt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ed/0d53f8283cd3ce579a90b599118884d0db6119
ed/0d53f8283cd3ce579a90b599118884d0db6119 |1 + 1 file changed, 1 insertion(+) New commits: commit 92999c807dfd26244e1a94f7b97473978124460d Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 20:02:53 2013 +0100 Notes added by 'git notes add' diff --git a/ed/0d53f8283cd3ce579a90b599118884d0db6119 b/ed/0d53f8283cd3ce579a90b599118884d0db6119 new file mode 100644 index 000..7ad792c --- /dev/null +++ b/ed/0d53f8283cd3ce579a90b599118884d0db6119 @@ -0,0 +1 @@ +merged as: 37aa7d81aacaae12dfe0fd2ade2779235bbf72f1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 79/03c33f31c457eb6ff506958c4233f2a5d39bcf
79/03c33f31c457eb6ff506958c4233f2a5d39bcf |1 + 1 file changed, 1 insertion(+) New commits: commit 37cb26a56a341d17d8a009b2c9e1f73dd700737f Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 20:03:35 2013 +0100 Notes added by 'git notes add' diff --git a/79/03c33f31c457eb6ff506958c4233f2a5d39bcf b/79/03c33f31c457eb6ff506958c4233f2a5d39bcf new file mode 100644 index 000..7ad792c --- /dev/null +++ b/79/03c33f31c457eb6ff506958c4233f2a5d39bcf @@ -0,0 +1 @@ +merged as: 37aa7d81aacaae12dfe0fd2ade2779235bbf72f1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d8/a724835732e8111a8798484d63202fc90f93f9
d8/a724835732e8111a8798484d63202fc90f93f9 |1 + 1 file changed, 1 insertion(+) New commits: commit a1814f36f17b3f47701f0b8ac45d6665ee8b26e5 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 20:07:06 2013 +0100 Notes added by 'git notes add' diff --git a/d8/a724835732e8111a8798484d63202fc90f93f9 b/d8/a724835732e8111a8798484d63202fc90f93f9 new file mode 100644 index 000..7b42c0b --- /dev/null +++ b/d8/a724835732e8111a8798484d63202fc90f93f9 @@ -0,0 +1 @@ +merged as: 95ada2d65f6d20f2a04599ac132fa632d66d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/comp/helper/UnoInfo.java |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 95ada2d65f6d20f2a04599ac132fa632d66d
Author: Jürgen Schmidt j...@apache.org
Date: Tue Jun 11 14:59:25 2013 +
Related: #i122483# set correct classpath, include unoil.jar
(cherry picked from commit d8a724835732e8111a8798484d63202fc90f93f9)
Change-Id: Iaf4d90a111c5adf15817c7c1360e4bfad0ee9148
diff --git a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
b/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
index c26dda1..67a3594 100644
--- a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
+++ b/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
@@ -90,7 +90,8 @@ public final class UnoInfo {
String[] jarFileNames = new String[] {
jurt.jar,
ridl.jar,
-juh.jar };
+juh.jar,
+unoil.jar };
return getURLs( jarFileNames );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7a/652a2b2ab5e0d37e32185c8c5fac3af482bb76
7a/652a2b2ab5e0d37e32185c8c5fac3af482bb76 |1 + 1 file changed, 1 insertion(+) New commits: commit 46baeee748e5b0f1a440fed12f2476f067b0fe60 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 20:02:10 2013 +0100 Notes added by 'git notes add' diff --git a/7a/652a2b2ab5e0d37e32185c8c5fac3af482bb76 b/7a/652a2b2ab5e0d37e32185c8c5fac3af482bb76 new file mode 100644 index 000..7ad792c --- /dev/null +++ b/7a/652a2b2ab5e0d37e32185c8c5fac3af482bb76 @@ -0,0 +1 @@ +merged as: 37aa7d81aacaae12dfe0fd2ade2779235bbf72f1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/source
odk/source/unoapploader/unx/unoapploader.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit c3359bd7e662e905fdb85d8f6b3455018b31cf09
Author: Jürgen Schmidt j...@apache.org
Date: Tue Jun 11 15:00:40 2013 +
Related: #i122483# correct library path
(cherry picked from commit f6c713b7e38d4de5afdf508b8d6bfc6d1d27e000)
Change-Id: I327d9946d139aaf3347c42e8b565a8de635b5ed1
diff --git a/odk/source/unoapploader/unx/unoapploader.c
b/odk/source/unoapploader/unx/unoapploader.c
index f1caf06..5dc3abe 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -179,12 +179,22 @@ int main( int argc, char *argv[] )
value = getenv( ENVVARNAME );
+// workaround for finding wrong libsqlite3.dylib in the office
installation
+// For MacOS 10.6 nss uses the system lib - unresolved symbol
_sqlite3_wal_checkpoint
+#ifdef MACOSX
+size = strlen( ENVVARNAME ) + strlen( =/usr/lib: ) + strlen( libpath
) + 1;
+#else
size = strlen( ENVVARNAME ) + strlen( = ) + strlen( libpath ) + 1;
+#endif
if ( value != NULL )
size += strlen( PATHSEPARATOR ) + strlen( value );
envstr = (char*) malloc( size );
strcpy( envstr, ENVVARNAME );
+#ifdef MACOSX
+strcat( envstr, =/usr/lib: );
+#else
strcat( envstr, = );
+#endif
strcat( envstr, libpath );
if ( freeLibpath != 0 )
{
@@ -199,7 +209,7 @@ int main( int argc, char *argv[] )
}
else
{
-fprintf( stderr, Warning: no UNO installation found!\n );
+fprintf( stderr, Warning: no office installation found!\n );
fflush( stderr );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f6/c713b7e38d4de5afdf508b8d6bfc6d1d27e000
f6/c713b7e38d4de5afdf508b8d6bfc6d1d27e000 |1 + 1 file changed, 1 insertion(+) New commits: commit 7adef97c543cd5fa688c3fb99fae619c51161cc7 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 20:12:18 2013 +0100 Notes added by 'git notes add' diff --git a/f6/c713b7e38d4de5afdf508b8d6bfc6d1d27e000 b/f6/c713b7e38d4de5afdf508b8d6bfc6d1d27e000 new file mode 100644 index 000..10271ca --- /dev/null +++ b/f6/c713b7e38d4de5afdf508b8d6bfc6d1d27e000 @@ -0,0 +1 @@ +merged as: c3359bd7e662e905fdb85d8f6b3455018b31cf09 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Firebird Dependencies Upload
On 11/06/13 16:17, Caolán McNamara wrote: On Tue, 2013-06-11 at 10:15 +0100, Andrzej J. R. Hunt wrote: Hi everyone, Could the following 2 files please be uploaded to the TDF servers for me: done now at http://dev-www.libreoffice.org/src/ I left them as the barefile names rather than as md5sum-filename, is that ok? C. Thanks! No idea what naming scheme I should be using: most libraries have their md5sum prepended to their name, but some don't. ( In Makefile.fetch, fetch_Download_item_special is used for those without the md5sum in the name, fetch_Download_item for those with the md5sum in the name. Which one should I use?) The md5sums I have are: libatomic-ops-7_2d.zip: c0b86562d5aa40761a87134f83e6adcf Firebird-2.5.2.26540-0.tar.bz2 d41d8cd98f00b204e9800998ecf8427e Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 14/9e995910a45e66aa5cb2ff8af1da822667c7e4
14/9e995910a45e66aa5cb2ff8af1da822667c7e4 |1 + 1 file changed, 1 insertion(+) New commits: commit d79a22f160b5e360de8892ce9635d5b16b7ee96b Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 20:16:37 2013 +0100 Notes added by 'git notes add' diff --git a/14/9e995910a45e66aa5cb2ff8af1da822667c7e4 b/14/9e995910a45e66aa5cb2ff8af1da822667c7e4 new file mode 100644 index 000..4291a87 --- /dev/null +++ b/14/9e995910a45e66aa5cb2ff8af1da822667c7e4 @@ -0,0 +1 @@ +prefer: 37aa7d81aacaae12dfe0fd2ade2779235bbf72f1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a4/3dc7a1b0168d6e438ec83cf4f3b226574eda0c
a4/3dc7a1b0168d6e438ec83cf4f3b226574eda0c |1 + 1 file changed, 1 insertion(+) New commits: commit 995373013a0454832005cf89536449b12b4e62cb Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 11 20:22:24 2013 +0100 Notes added by 'git notes add' diff --git a/a4/3dc7a1b0168d6e438ec83cf4f3b226574eda0c b/a4/3dc7a1b0168d6e438ec83cf4f3b226574eda0c new file mode 100644 index 000..077165c --- /dev/null +++ b/a4/3dc7a1b0168d6e438ec83cf4f3b226574eda0c @@ -0,0 +1 @@ +prefer: 391477d40ea718c46089e16484726dba085a6ad8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
