[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sw/qa sw/source
sw/qa/extras/ooxmlimport/data/n830205.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8
sw/source/core/doc/docredln.cxx|2 ++
3 files changed, 10 insertions(+)
New commits:
commit b2c54b13e347a1ffc5dc7347c531c34ebcb28b8a
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 12 13:35:56 2013 +0100
bnc#830205: Stop-gap solution to avoid crash.
This improves the situation, because previously, the document would just
crash
due to infinite recursion.
Deeper checking why do we end up with an invalid range would be good; but it
was impossible to check with the bugdoc, as it was too complex, and trying
to
cut it down was crashing MSO :-) Hopefully we'll get a better document at
some stage.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I4cd639e02aebe9027f06e8468c14969c506327b2
diff --git a/sw/qa/extras/ooxmlimport/data/n830205.docx
b/sw/qa/extras/ooxmlimport/data/n830205.docx
new file mode 100644
index 000..89cf1d8
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n830205.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 33c0ece..2629684 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -128,6 +128,7 @@ public:
void testN816593();
void testN820509();
void testN820788();
+void testN830205();
void testTableAutoColumnFixedSize();
void testFdo66474();
void testBnc780044Spacing();
@@ -215,6 +216,7 @@ void Test::run()
{n816593.docx, Test::testN816593},
{n820509.docx, Test::testN820509},
{n820788.docx, Test::testN820788},
+{n830205.docx, Test::testN830205},
{table-auto-column-fixed-size.docx,
Test::testTableAutoColumnFixedSize},
{fdo66474.docx, Test::testFdo66474},
{bnc780044_spacing.docx, Test::testBnc780044Spacing},
@@ -1293,6 +1295,12 @@ void Test::testN820788()
CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getPropertysal_Int16(xFrame,
SizeType));
}
+void Test::testN830205()
+{
+// Previously import just crashed (due to infinite recursion).
+getParagraph(1, XXX);
+}
+
void Test::testTableAutoColumnFixedSize()
{
uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index eed72a6..729d144 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2694,7 +2694,9 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRedline* p,
sal_uInt16* pInsPos )
#if OSL_DEBUG_LEVEL 0
CheckPosition( pNew-GetPoint(), pNew-GetMark() );
#endif
+
if( *pNew-GetPoint() != *pNew-GetMark()
+pNew-HasValidRange()
Insert( pNew, nInsPos ) )
{
pNew-CallDisplayFunc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - sw/qa sw/source
sw/qa/extras/ooxmlimport/data/n830205.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8
sw/source/core/doc/docredln.cxx|2 ++
3 files changed, 10 insertions(+)
New commits:
commit 238e528ea4f58c045dc3d2241f1d2c04cd7b549b
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 12 13:35:56 2013 +0100
bnc#830205: Stop-gap solution to avoid crash.
This improves the situation, because previously, the document would just
crash
due to infinite recursion.
Deeper checking why do we end up with an invalid range would be good; but it
was impossible to check with the bugdoc, as it was too complex, and trying
to
cut it down was crashing MSO :-) Hopefully we'll get a better document at
some stage.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I4cd639e02aebe9027f06e8468c14969c506327b2
diff --git a/sw/qa/extras/ooxmlimport/data/n830205.docx
b/sw/qa/extras/ooxmlimport/data/n830205.docx
new file mode 100644
index 000..89cf1d8
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n830205.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 33c0ece..2629684 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -128,6 +128,7 @@ public:
void testN816593();
void testN820509();
void testN820788();
+void testN830205();
void testTableAutoColumnFixedSize();
void testFdo66474();
void testBnc780044Spacing();
@@ -215,6 +216,7 @@ void Test::run()
{n816593.docx, Test::testN816593},
{n820509.docx, Test::testN820509},
{n820788.docx, Test::testN820788},
+{n830205.docx, Test::testN830205},
{table-auto-column-fixed-size.docx,
Test::testTableAutoColumnFixedSize},
{fdo66474.docx, Test::testFdo66474},
{bnc780044_spacing.docx, Test::testBnc780044Spacing},
@@ -1293,6 +1295,12 @@ void Test::testN820788()
CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getPropertysal_Int16(xFrame,
SizeType));
}
+void Test::testN830205()
+{
+// Previously import just crashed (due to infinite recursion).
+getParagraph(1, XXX);
+}
+
void Test::testTableAutoColumnFixedSize()
{
uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index eed72a6..729d144 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2694,7 +2694,9 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRedline* p,
sal_uInt16* pInsPos )
#if OSL_DEBUG_LEVEL 0
CheckPosition( pNew-GetPoint(), pNew-GetMark() );
#endif
+
if( *pNew-GetPoint() != *pNew-GetMark()
+pNew-HasValidRange()
Insert( pNew, nInsPos ) )
{
pNew-CallDisplayFunc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Merging files to one
The number of source code lines in a .cxx file is as such not that relevant a factor determining resources consumed when compiling a source file. After all, the number of source lines *included* from headers during the compilation can easily be much more. The complexity of the code (especially so-called template-based metaprogramming) can be a much larger factor. As such, personally I also dislike the split of source code into numbered source files. It has been done a long time ago when computers were much much less powerful. But the main thing that speaks against re-combining source code files that clearly belongs together into one source file is the loss of (easy) access to version history. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/window/salframe.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f4bda9b6ab58e9d97665ef02d5ffd896a88dca3a Author: Jan Holesovsky ke...@collabora.com Date: Wed Nov 13 09:39:53 2013 +0100 fdo#68174: Default to large icons on OSX too, regardless of the DPI. Change-Id: Id7a8ebe6642e032e370dce2832ccaa2350fdcba8 diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 5508e44..8092e9f 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -1250,7 +1250,7 @@ void AquaSalFrame::UpdateSettings( AllSettings rSettings ) getResolution( nDPIX, nDPIY ); aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont ); -aStyleSettings.SetToolbarIconSize( nDPIY 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL ); +aStyleSettings.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); // TODO: better mapping of aqua-ooo font settings aStyleSettings.SetAppFont( aAppFont ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/osl
include/osl/mutex.h |2 +-
include/osl/mutex.hxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e4b993e95dd6a3c5ef174ab72fd11d33585ddf9a
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 12 14:49:45 2013 +0200
What is a thread-local mutex?
Change-Id: Idb0ca4bcefea4c1927e8238d3371c9044103239f
Reviewed-on: https://gerrit.libreoffice.org/6651
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com
diff --git a/include/osl/mutex.h b/include/osl/mutex.h
index e500ec3..03c78b1 100644
--- a/include/osl/mutex.h
+++ b/include/osl/mutex.h
@@ -32,7 +32,7 @@ extern C {
struct _oslMutexImpl;
typedef struct _oslMutexImpl * oslMutex;
-/** Create a thread-local mutex.
+/** Create a mutex.
@return 0 if the mutex could not be created, otherwise a handle to the
mutex.
*/
SAL_DLLPUBLIC oslMutex SAL_CALL osl_createMutex(void);
diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index 55eb741..2aff64b 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -32,7 +32,7 @@ namespace osl
class SAL_WARN_UNUSED Mutex {
public:
-/** Create a thread-local mutex.
+/** Create a mutex.
@return 0 if the mutex could not be created, otherwise a handle to
the mutex.
@see ::osl_createMutex()
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/ElementsDockingWindow.hxx|1 +
starmath/source/ElementsDockingWindow.cxx |8
2 files changed, 9 insertions(+)
New commits:
commit e667062310ed327dc0a9d338a9e26dc0e2ce865f
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Nov 13 09:30:08 2013 +0100
fdo#69112 - Detaching the docking window leads to a wrong sized window
Just fix it by setting an appropriate minimum window size.
It's set to 100px because this is approx. one column/row of elements.
Now, after entering the floating mode the height of the window is 100px.
Maybe this needs some more adjustment, but it's not 0px anymore.
Change-Id: I7b14d001bbca1d1a5297f875fdf424beefaed85a
diff --git a/starmath/inc/ElementsDockingWindow.hxx
b/starmath/inc/ElementsDockingWindow.hxx
index ce17664..66b410c 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -180,6 +180,7 @@ public:
~SmElementsDockingWindow();
virtual void EndDocking( const Rectangle rReactangle, sal_Bool
bFloatMode);
+virtual void ToggleFloatingMode();
};
class SmElementsDockingWindowWrapper : public SfxChildWindow
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 196ee26..cda53ef 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -605,6 +605,14 @@ SmElementsDockingWindow::~SmElementsDockingWindow ()
{
}
+void SmElementsDockingWindow::ToggleFloatingMode()
+{
+SfxDockingWindow::ToggleFloatingMode();
+
+if (GetFloatingWindow())
+GetFloatingWindow()-SetMinOutputSizePixel( Size(100, 100) );
+}
+
void SmElementsDockingWindow::EndDocking( const Rectangle rReactangle,
sal_Bool bFloatMode)
{
SfxDockingWindow::EndDocking(rReactangle, bFloatMode);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 68871] Disable View -- Elements by default
https://bugs.freedesktop.org/show_bug.cgi?id=68871 Bug 68871 depends on bug 69112, which changed state. Bug 69112 Summary: Detaching the docking window leads to a wrong sized window https://bugs.freedesktop.org/show_bug.cgi?id=69112 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 'distro/collabora/cp-4.1' - sw/qa sw/source
sw/qa/extras/ooxmlimport/data/n830205.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8
sw/source/core/doc/docredln.cxx|2 ++
3 files changed, 10 insertions(+)
New commits:
commit efc58a791d9df1aa9787aa7f8da957551ef7329c
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 12 13:35:56 2013 +0100
bnc#830205: Stop-gap solution to avoid crash.
This improves the situation, because previously, the document would just
crash
due to infinite recursion.
Deeper checking why do we end up with an invalid range would be good; but it
was impossible to check with the bugdoc, as it was too complex, and trying
to
cut it down was crashing MSO :-) Hopefully we'll get a better document at
some stage.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I4cd639e02aebe9027f06e8468c14969c506327b2
diff --git a/sw/qa/extras/ooxmlimport/data/n830205.docx
b/sw/qa/extras/ooxmlimport/data/n830205.docx
new file mode 100644
index 000..89cf1d8
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n830205.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 709431d..2eaa994 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -123,6 +123,7 @@ public:
void testN820509();
void testN820788();
void testN820504();
+void testN830205();
void testFdo43641();
void testFdo46361();
void testFdo65632();
@@ -226,6 +227,7 @@ void Test::run()
{n820509.docx, Test::testN820509},
{n820788.docx, Test::testN820788},
{n820504.docx, Test::testN820504},
+{n830205.docx, Test::testN830205},
{fdo43641.docx, Test::testFdo43641},
{fdo46361.docx, Test::testFdo46361},
{fdo65632.docx, Test::testFdo65632},
@@ -1514,6 +1516,12 @@ void Test::testN820504()
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
getPropertytext::TextContentAnchorType(xDraws-getByIndex(0), AnchorType));
}
+void Test::testN830205()
+{
+// Previously import just crashed (due to infinite recursion).
+getParagraph(1, XXX);
+}
+
void Test::testFdo43641()
{
uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index a6a92a1..7a1fcf9 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2690,7 +2690,9 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRedline* p,
sal_uInt16* pInsPos )
#if OSL_DEBUG_LEVEL 0
CheckPosition( pNew-GetPoint(), pNew-GetMark() );
#endif
+
if( *pNew-GetPoint() != *pNew-GetMark()
+pNew-HasValidRange()
Insert( pNew, nInsPos ) )
{
pNew-CallDisplayFunc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/worker.pm |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 85d584416fd7d51a397807597b5f36e39820a317
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 13 10:02:22 2013 +0100
installer: use 'mkdir -p' before 'ln -sf'
Fixes the ln: failed to create symbolic link
'.../usr/lib/libreoffice/sdk/classes/win/unowinreg.dll': No such file or
directory problem, reported at
http://lists.freedesktop.org/archives/libreoffice/2013-November/057443.html
Change-Id: Ibe7dbbecc670921ca3c372cc9b8655cf2f50aefa
diff --git a/solenv/bin/modules/installer/worker.pm
b/solenv/bin/modules/installer/worker.pm
index 917066f..aab676f 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -23,6 +23,7 @@ use File::Copy;
use File::stat;
use File::Temp qw(tmpnam);
use File::Path;
+use File::Basename;
use installer::control;
use installer::converter;
use installer::exiter;
@@ -369,7 +370,9 @@ sub install_simple ($$)
my $onelink = ${$unixlinksarray}[$i];
my $target = $onelink-{'Target'};
my $destination = $onelink-{'destination'};
-my $cmd = ln -sf '$target' '$destdir$destination';
+my $cmd = mkdir -p ' . dirname($destdir . $destination) . ';
+system($cmd) die Failed to execute \$cmd\;
+$cmd = ln -sf '$target' '$destdir$destination';
system($cmd) die Failed \$cmd\;
push @lines, $destination\n;
___
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 ape os...@yandex.ru changed: What|Removed |Added Depends on||62461 --- Comment #112 from ape os...@yandex.ru --- Bug 62461 added because the API does not use a PNG image that is embedded in the ODF file in addition to SVG drawing. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 4.2.0.0.alpha1 build error
On Tue, Nov 12, 2013 at 09:14:30PM +0100, Andreas Radke a.ra...@arcor.de wrote: Thanks for the hint. Replacing dejavu-fonts with liberation fonts made the build finish. Great to hear that. :) Now it fails in a different way: ... installing module gid_Module_Root_SDK ... DestDir: /build/libreoffice/src/fakeinstall Rootpath: /usr/lib/libreoffice ln: failed to create symbolic link '/build/libreoffice/src/fakeinstall/usr/lib/libreoffice/sdk/classes/win/unowinreg.dll': No such file or directory ERROR: Failure in installer.pm ERROR: Failed ln -sf '/build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll' '/build/libreoffice/src/fakeinstall/usr/lib/libreoffice/sdk/classes/win/unowinreg.dll' at /build/libreoffice/src/libreoffice-4.2.0.0.alpha1/solenv/bin/modules/installer/worker.pm line 374. I can see that happening when 'make DESTDIR=something install' is used. The TDF binaries don't use that feature, so such issues are detected when the first Linux distro tries to package the source. ;) This fixed the problem for me: http://cgit.freedesktop.org/libreoffice/core/commit/?id=85d584416fd7d51a397807597b5f36e39820a317 I haven't changed anything related to 185d60944ea767075d27247c3162b3bc-unowinreg.dll The file is linked into the main source directory and this worked so far. Or need to be linked/copied now into the external directory? find /home/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/ | grep unowinreg.dll /home/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/src/libreoffice-4.2.0.0.alpha1/instdir/unxlngx6.pro/sdk/classes/win/unowinreg.dll /home/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/src/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll /home/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll Make sure to check the result after make install, if the symlink still points to '/build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll', you probably want to replace that symlink with a real copy, as users won't have access to '/build/libreoffice/src/' when they install your package. :) Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Merging files to one
On 11/13/2013 09:34 AM, Tor Lillqvist wrote: But the main thing that speaks against re-combining source code files that clearly belongs together into one source file is the loss of (easy) access to version history. git-blame -C can make that a little less painful. And it's always debatable how much the past should dictate the future, so to say. However, a class whose implementation requires multiple thousand lines of code is likely asking for some refactoring into more manageable pieces anyway. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/options/optgdlg.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 97747499b26314bb308b12cd331bf0d99f21c96c
Author: Andras Timar andras.ti...@collabora.com
Date: Wed Nov 13 10:23:59 2013 +0100
fdo#59256 hide this option when experimental features are disabled
GTK print dialog is experimental, the checkbox has no effect, if
experimental features are disabled.
Change-Id: I664a5520ed8fd0740c381af3d38fc5252c020548
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 08873a5..f33d7b8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -190,6 +190,11 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const
SfxItemSet rSet)
getVclContainer(filedlgframe)-Hide();
#if !defined(MACOSX) ! ENABLE_GTK
getVclContainer(printdlgframe)-Hide();
+#else
+if (!SvtMiscOptions().IsExperimentalMode())
+{
+getVclContainer(printdlgframe)-Hide();
+}
#endif
get(m_pFileDlgCB, filedlg);
get(m_pPrintDlgCB, printdlg);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/inc writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|9 +-
sw/source/filter/ww8/docxexport.cxx | 35 +-
sw/source/filter/ww8/docxexport.hxx |2
writerfilter/inc/ooxml/OOXMLDocument.hxx|3
writerfilter/source/filter/ImportFilter.cxx |7 +-
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 77 ++--
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |5 +
writerfilter/source/ooxml/OOXMLStreamImpl.cxx |4 +
8 files changed, 127 insertions(+), 15 deletions(-)
New commits:
commit 52ee03760e26e2ac7eb2561e96ab557ad287de58
Author: sushil_shinde sushil.shi...@synerzip.com
Date: Thu Nov 7 10:45:03 2013 +0530
[docx] CustomXml relationship files saved in InteropGrabBag and exported.
The XDocuments representing the DOM of an OOXML's customxml property
document is stored as the PropertyValue OOXCustomXmlProps into the
InteropGraBag.
Added mxCustomXmlDomPropList object which holds xDocument for each
itemProps.xml from relationship of item.xml.
Exporting all itemprops files from customxml.
Reviewed on:
https://gerrit.libreoffice.org/6603
Change-Id: I3973e6ce40382bbc4da247b5b27d99b03e851744
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e3f60a9..5c44dc8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1534,7 +1534,8 @@ DECLARE_OOXML_TEST(testCharHighlight,
char_highlight.docx)
DECLARE_OOXML_TEST(testCustomXmlGrabBag, customxml.docx)
{
- // The problem was that CustomXml/item[n].xml files were missing from docx
file after saving file.
+ // The problem was that item[n].xml and itemProps[n].xml and .rels files
for item[n].xml
+ // files were missing from docx file after saving file.
// This test case tests whether customxml files grabbagged properly in
correct object.
uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
@@ -1545,15 +1546,15 @@ DECLARE_OOXML_TEST(testCustomXmlGrabBag,
customxml.docx)
sal_Bool CustomXml = sal_False;
for(int i = 0; i aGrabBag.getLength(); ++i)
{
- if (aGrabBag[i].Name == OUString(OOXCustomXml))
+ if (aGrabBag[i].Name == OOXCustomXml || aGrabBag[i].Name ==
OOXCustomXmlProps)
{
CustomXml = sal_True;
uno::Referencexml::dom::XDocument aCustomXmlDom;
uno::Sequenceuno::Referencexml::dom::XDocument
aCustomXmlDomList;
CPPUNIT_ASSERT(aGrabBag[i].Value = aCustomXmlDomList); //
PropertyValue of proper type
sal_Int32 length = aCustomXmlDomList.getLength();
- CPPUNIT_ASSERT_EQUAL(sal_Int32(3), length);
- aCustomXmlDom = aCustomXmlDomList[1];
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), length);
+ aCustomXmlDom = aCustomXmlDomList[0];
CPPUNIT_ASSERT(aCustomXmlDom.get()); // Reference not empty
}
}
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index fffa8e3..126e3ef 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -794,6 +794,7 @@ void DocxExport::WriteCustomXml()
return;
uno::Sequenceuno::Referencexml::dom::XDocument customXmlDomlist;
+uno::Sequenceuno::Referencexml::dom::XDocument customXmlDomPropslist;
uno::Sequence beans::PropertyValue propList;
xPropSet-getPropertyValue( pName ) = propList;
for ( sal_Int32 nProp=0; nProp propList.getLength(); ++nProp )
@@ -806,23 +807,51 @@ void DocxExport::WriteCustomXml()
}
}
-for (sal_Int32 j = 1; j customXmlDomlist.getLength(); j++)
+for ( sal_Int32 nProp=0; nProp propList.getLength(); ++nProp )
{
+OUString propName = propList[nProp].Name;
+if ( propName == OOXCustomXmlProps )
+{
+ propList[nProp].Value = customXmlDomPropslist;
+ break;
+}
+}
+
+for (sal_Int32 j = 0; j customXmlDomlist.getLength(); j++) {
uno::Referencexml::dom::XDocument customXmlDom = customXmlDomlist[j];
+uno::Referencexml::dom::XDocument customXmlDomProps =
customXmlDomPropslist[j];
if ( customXmlDom.is() )
{
m_pFilter-addRelation( m_pDocumentFS-getOutputStream(),
http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml;,
-../customXml/item+OUString::number(j)+.xml );
+../customXml/item+OUString::number((j+1))+.xml );
uno::Reference xml::sax::XSAXSerializable serializer(
customXmlDom, uno::UNO_QUERY );
uno::Reference xml::sax::XWriter writer =
xml::sax::Writer::create( comphelper::getProcessComponentContext() );
-writer-setOutputStream( GetFilter().openFragmentStream(
customXml/item+OUString::number(j)+.xml,
+
[Bug 68871] Disable View -- Elements by default
https://bugs.freedesktop.org/show_bug.cgi?id=68871 --- Comment #2 from Jan Holesovsky ke...@collabora.com --- Can you please provide a screenshot what is this bug about? Thank you! -- 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: cui/source
cui/source/options/optgdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 856d22cab35e8107a6f37ce919c83b90cc2660d9 Author: Andras Timar andras.ti...@collabora.com Date: Wed Nov 13 10:54:44 2013 +0100 On Mac OS X LibreOffice cannot use native print dialog at all Change-Id: I37d36ba175362dedffbbabb561a11033a0454110 diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index f33d7b8..e2129cd 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -188,7 +188,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet rSet) get(m_pExtHelpCB, exthelp); if (!lcl_HasSystemFilePicker()) getVclContainer(filedlgframe)-Hide(); -#if !defined(MACOSX) ! ENABLE_GTK +#if ! ENABLE_GTK getVclContainer(printdlgframe)-Hide(); #else if (!SvtMiscOptions().IsExperimentalMode()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Mac OSX Mavericks, XCode 5.01 and aclocal failure
Hi all,
On a clean installation of OSX Mavericks with XCode 5.01, command line
tools version 5A2053 in /Applications/XCode.app, I get the following
build failure when attempting to build from master :
Failed to run aclocal at /Users/Shared/Repos/LO/core/autogen.sh line 176
The incriminated line reads as follows :
system ($aclocal $aclocal_flags) die Failed to run aclocal;
where $aclocal is defined at line 156 as :
$aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal'
My ENV shows the following PATH :
PATH=/usr/bin:/bin:/usr/sbin:/usr/local/bin
Not quite sure where to go from here though.
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Mac OSX Mavericks, XCode 5.01 and aclocal failure
You need to download and install automake and autoconf, just like documented: https://wiki.documentfoundation.org/Development/BuildingOnMac . aclocal is part of automake. Do it as described there, do *not* try to use some pre-built collection of useful open source packages that might do more than you want, and confuse the build. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - chart2/uiconfig sd/AllLangResTarget_sd.mk sd/source sd/uiconfig sd/UIConfig_sdraw.mk
chart2/uiconfig/ui/attributedialog.ui |1
sd/AllLangResTarget_sd.mk |1
sd/UIConfig_sdraw.mk |1
sd/source/ui/dlg/brkdlg.cxx | 42 -
sd/source/ui/dlg/brkdlg.src | 71
sd/source/ui/inc/BreakDlg.hxx | 12 --
sd/source/ui/inc/brkdlg.hrc | 28 --
sd/source/ui/view/drviewsc.cxx|1
sd/uiconfig/sdraw/ui/breakdialog.ui | 143 ++
9 files changed, 165 insertions(+), 135 deletions(-)
New commits:
commit a4451e6e1ff41edfed8eff16b433ae8dab952945
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 13 09:53:51 2013 +
convert break dialog to .ui
Change-Id: Ic0cee9c164eb077f76403a154461f1d1f3b52921
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 2e311ef..b988697 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/app/strings.src \
sd/source/ui/app/toolbox.src \
sd/source/ui/dlg/animobjs.src \
-sd/source/ui/dlg/brkdlg.src \
sd/source/ui/dlg/dlgass.src \
sd/source/ui/dlg/dlgfield.src \
sd/source/ui/dlg/dlgolbul.src \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 6ff0334..c6851e2 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
))
$(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
+ sd/uiconfig/sdraw/ui/breakdialog \
sd/uiconfig/sdraw/ui/dlgsnap \
sd/uiconfig/sdraw/ui/copydlg \
sd/uiconfig/sdraw/ui/drawchardialog \
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 676de78..8ec335b 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -26,7 +26,6 @@
#include vcl/msgbox.hxx
#include sdattr.hxx
-#include brkdlg.hrc
#include sdresid.hxx
#include View.hxx
#include drawview.hxx
@@ -45,18 +44,16 @@ BreakDlg::BreakDlg(
DrawDocShell* pShell,
sal_uLong nSumActionCount,
sal_uLong nObjCount )
-: SfxModalDialog ( pWindow, SdResId( DLG_BREAK ) ),
- aFtObjInfo( this, SdResId( FT_OBJ_INFO ) ),
- aFtActInfo( this, SdResId( FT_ACT_INFO ) ),
- aFtInsInfo( this, SdResId( FT_INS_INFO ) ),
- aFiObjInfo( this, SdResId( FI_OBJ_INFO ) ),
- aFiActInfo( this, SdResId( FI_ACT_INFO ) ),
- aFiInsInfo( this, SdResId( FI_INS_INFO ) ),
- aBtnCancel( this, SdResId( BTN_CANCEL ) ),
- aLink ( LINK( this, BreakDlg, UpDate)),
- mpProgress( NULL )
+: SfxModalDialog(pWindow, BreakDialog, modules/sdraw/ui/breakdialog.ui)
+, aLink( LINK(this, BreakDlg, UpDate))
+, mpProgress( NULL )
{
-aBtnCancel.SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl));
+get(m_pFiObjInfo, metafiles);
+get(m_pFiActInfo, metaobjects);
+get(m_pFiInsInfo, drawingobjects);
+get(m_pBtnCancel, cancel);
+
+m_pBtnCancel-SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl));
mpProgress = new SfxProgress( pShell, SD_RESSTR(STR_BREAK_METAFILE),
nSumActionCount*3 );
@@ -66,24 +63,19 @@ BreakDlg::BreakDlg(
pDrView = _pDrView;
bCancel = sal_False;
-
-FreeResource();
}
BreakDlg::~BreakDlg()
{
-if( mpProgress )
-delete mpProgress;
-
-if( pProgrInfo )
-delete pProgrInfo;
+delete mpProgress;
+delete pProgrInfo;
}
// Control-Handler for cancel button
IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl)
{
bCancel = sal_True;
- aBtnCancel.Disable();
+ m_pBtnCancel-Disable();
return( 0L );
}
@@ -114,32 +106,32 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
OUString info = OUString::number( pProgrInfo-GetCurObj() )
+ /
+ OUString::number( pProgrInfo-GetObjCount() );
-aFiObjInfo.SetText(info);
+m_pFiObjInfo-SetText(info);
// how many actions are started?
if(pProgrInfo-GetActionCount() == 0)
{
-aFiActInfo.SetText( OUString() );
+m_pFiActInfo-SetText( OUString() );
}
else
{
info = OUString::number( pProgrInfo-GetCurAction() )
+ /
+ OUString::number( pProgrInfo-GetActionCount() );
-aFiActInfo.SetText(info);
+m_pFiActInfo-SetText(info);
}
// and inserted
if(pProgrInfo-GetInsertCount() == 0)
{
-aFiInsInfo.SetText( OUString() );
+m_pFiInsInfo-SetText( OUString() );
}
else
{
info = OUString::number( pProgrInfo-GetCurInsert() )
+ /
+ OUString::number( pProgrInfo-GetInsertCount() );
-aFiInsInfo.SetText(info);
+m_pFiInsInfo-SetText(info);
}
Application::Reschedule();
diff --git a/sd/source/ui/dlg/brkdlg.src b/sd/source/ui/dlg/brkdlg.src
deleted file
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1c/a60f6c41626868aaf17a52b997f26fd94053a5
1c/a60f6c41626868aaf17a52b997f26fd94053a5 |1 + 1 file changed, 1 insertion(+) New commits: commit 5abac6c4a7be5709081fd98da6dc9b0c02f9f02e Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 09:56:55 2013 + Notes added by 'git notes add' diff --git a/1c/a60f6c41626868aaf17a52b997f26fd94053a5 b/1c/a60f6c41626868aaf17a52b997f26fd94053a5 new file mode 100644 index 000..17d6347 --- /dev/null +++ b/1c/a60f6c41626868aaf17a52b997f26fd94053a5 @@ -0,0 +1 @@ +prefer: 272e59094ac1390d5fde34947c724f36d2809ce4 ___ 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/9426147a9700d3fbfcf6ad84dab3252af09c06 a0/e2aa57219a86c722bca890de349897cc479725
41/9426147a9700d3fbfcf6ad84dab3252af09c06 |1 + a0/e2aa57219a86c722bca890de349897cc479725 |1 + 2 files changed, 2 insertions(+) New commits: commit 2987ff018e1231417ef99b80a18160c1e9beb9a8 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 09:57:34 2013 + Notes added by 'git notes add' diff --git a/a0/e2aa57219a86c722bca890de349897cc479725 b/a0/e2aa57219a86c722bca890de349897cc479725 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/a0/e2aa57219a86c722bca890de349897cc479725 @@ -0,0 +1 @@ +ignore: obsolete commit 3f738d5548928a9a6faf5ea7c4e00981a94a37ca Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 09:57:25 2013 + Notes added by 'git notes add' diff --git a/41/9426147a9700d3fbfcf6ad84dab3252af09c06 b/41/9426147a9700d3fbfcf6ad84dab3252af09c06 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/41/9426147a9700d3fbfcf6ad84dab3252af09c06 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source
scp2/source/ooo/ure.scp | 71 1 file changed, 71 deletions(-) New commits: commit 01a71171575c3d616ea0d2d30992a350f22f21af Author: Andre Fischer a...@apache.org Date: Wed Nov 13 08:29:37 2013 + 123531: Removed CompID lines (already commented out). diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 5545ab8..c5f9b9d 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -66,7 +66,6 @@ File gid_File_Exe_Uno //Dir = gid_Dir_Ure_Bin; Name = EXENAME(uno); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = C66A9E2B-B16D-46A9-B9EC-772D9D3837F5; End #endif @@ -91,7 +90,6 @@ File gid_File_Exe_Regcomp //Dir = gid_Dir_Ure_Bin; Name = EXENAME(regcomp); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = D51FA672-7C24-4E24-A282-872C4BF690A1; End #endif @@ -119,7 +117,6 @@ File gid_File_Exe_Regmerge //Dir = gid_Dir_Ure_Bin; Name = EXENAME(regmerge); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = 881BCC1D-BA4A-4527-9C7D-D89157C2D03B; End File gid_File_Exe_Regview @@ -132,7 +129,6 @@ File gid_File_Exe_Regview //Dir = gid_Dir_Ure_Bin; Name = EXENAME(regview); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = DAB09DCD-8491-4DC8-B153-2BA81A830AC2; End #if !defined MACOSX !defined WNT defined SOLAR_JAVA !defined OS2 @@ -142,7 +138,6 @@ File gid_File_Exe_Javaldx //Dir = gid_Dir_Ure_Bin; Name = EXENAME(javaldx); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = 291B5981-3E41-40E2-9C3F-115A7DF1C6A1; End #endif @@ -159,7 +154,6 @@ File gid_File_Exe_StartupSh //Dir = gid_Dir_Ure_Bin; Name = /ure/startup.sh; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = C86E816A-4EAE-47E9-BD1F-3E23C80F4EAE; End #endif @@ -174,7 +168,6 @@ File gid_File_Exe_UnoBin //Dir = gid_Dir_Ure_Bin; Name = uno.bin; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = 4AE33B3E-B33E-4BA4-AADC-8D7ED303FDE9; End #endif @@ -189,7 +182,6 @@ File gid_File_Exe_RegcompBin //Dir = gid_Dir_Ure_Bin; Name = regcomp.bin; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = 70FBE546-A228-455F-BCBB-716BF03AD5C6; End #endif @@ -200,7 +192,6 @@ File gid_File_Dl_Cppu Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_UNO_VER(cppu, 3); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = 36C01AC6-BB0A-4181-A8B8-50B793ADEDB7; End File gid_File_Dl_Cppuhelper @@ -212,7 +203,6 @@ File gid_File_Dl_Cppuhelper Name = SCP2_URE_DL_UNO_COMID_VER(cppuhelper, 3); #endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = D2A191E6-2023-41F5-9032-B98C50C37964; End File gid_File_Dl_PurpEnvHelper @@ -224,7 +214,6 @@ File gid_File_Dl_PurpEnvHelper Name = SCP2_URE_DL_UNO_COMID_VER(purpenvhelper, 3); #endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = C80146A8-A14C-44D1-AB9F-D9D8BF22277E; End File gid_File_Dl_Sal @@ -232,7 +221,6 @@ File gid_File_Dl_Sal Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_UNO_VER(sal, 3); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = B1EF3AB6-611E-4027-958A-736583EB82E6; End File gid_File_Dl_Salhelper @@ -244,25 +232,15 @@ File gid_File_Dl_Salhelper Name = SCP2_URE_DL_UNO_COMID_VER(salhelper, 3); #endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = 879B80E0-F6E1-4931-8EE6-7CF867CB6AA5; End // Private Dynamic Libraries: -//File gid_File_Dl_Profile_Uno -//TXT_FILE_BODY; -//Dir = SCP2_URE_DL_DIR; -//Name = PROFILENAME(/ure/uno); -//Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -//// CompID = 4681F5C1-8F64-486F-B804-03B4D8CEB41F; -//End - File gid_File_Dl_Reg TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_VER(reg, 3); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = D5313B1F-D09F-401F-B180-891F70D489ED; End File gid_File_Dl_Store @@ -270,7 +248,6 @@ File gid_File_Dl_Store Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_VER(store, 3); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = A5477BD7-89A3-44AF-8B42-9E28D55C8066; End File gid_File_Dl_Xmlreader @@ -293,7 +270,6 @@ File gid_File_Dl_Jvmaccess Name = SCP2_URE_DL_COMID_VER(jvmaccess, 3); #endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = F3D6F794-DA6F-4522-B3A7-C15593C1A577; End File gid_File_Dl_Jvmfwk @@ -301,7 +277,6 @@ File gid_File_Dl_Jvmfwk Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_VER(jvmfwk, 3); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = 4E128F82-FA30-4077-88DC-F745C3330093; End #if defined SOLAR_JAVA @@ -314,7 +289,6 @@ File gid_File_Dl_Sunjavaplugin Name = SCP2_URE_DL_BARE(sunjavaplugin); #endif Styles = (PACKED,
Re: Mac OSX Mavericks, XCode 5.01 and aclocal failure
On 13/11/2013 10:53, Tor Lillqvist wrote: Hi Tor, You need to download and install automake and autoconf, just like documented: https://wiki.documentfoundation.org/Development/BuildingOnMac . aclocal is part of automake. Do it as described there, do *not* try to use some pre-built collection of useful open source packages that might do more than you want, and confuse the build. Ah, OK thanks, I will look at that. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/refreshtimer.hxx |5 +++--
sc/source/ui/inc/datastreams.hxx | 27 ---
2 files changed, 15 insertions(+), 17 deletions(-)
New commits:
commit 5ad65cf4d8afb66c3da8034046d08b7399c1016c
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Nov 13 11:19:33 2013 +0100
remove broken friend declaration and make methods public instead
Change-Id: I59b1a89cdd1269e6245bad9491916dfd1bcecea7
diff --git a/sc/source/ui/inc/datastreams.hxx b/sc/source/ui/inc/datastreams.hxx
index 124ebef..8233be1 100644
--- a/sc/source/ui/inc/datastreams.hxx
+++ b/sc/source/ui/inc/datastreams.hxx
@@ -16,7 +16,6 @@
#include boost/scoped_ptr.hpp
namespace datastreams { class CallerThread; }
-namespace { class DataStreamsDlg; }
class ScDocShell;
class ScDocument;
class ScRange;
@@ -25,8 +24,19 @@ class Window;
class DataStreams : boost::noncopyable
{
-friend DataStreamsDlg;
+public:
enum MoveEnum { NO_MOVE, RANGE_DOWN, MOVE_DOWN, MOVE_UP };
+DataStreams(ScDocShell *pScDocShell);
+~DataStreams();
+bool ImportData();
+void MoveData();
+void Set(const OUString rUrl, bool bIsScript, const OUString rRange,
+sal_Int32 nLimit, MoveEnum eMove);
+void ShowDialog(Window *pParent);
+void Start();
+void Stop();
+
+private:
ScDocShell *mpScDocShell;
ScDocument *mpScDocument;
MoveEnum meMove;
@@ -37,19 +47,6 @@ class DataStreams : boost::noncopyable
boost::scoped_ptrScRange mpEndRange;
boost::scoped_ptrSvStream mpStream;
rtl::Referencedatastreams::CallerThread mxThread;
-
-public:
-DataStreams(ScDocShell *pScDocShell);
-~DataStreams();
-bool ImportData();
-void ShowDialog(Window *pParent);
-void Start();
-void Stop();
-
-private:
-void MoveData();
-void Set(const OUString rUrl, bool bIsScript, const OUString rRange,
-sal_Int32 nLimit, MoveEnum eMove);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 22a7c9c0a6301ab497d91e0370164c3c9e3cf988
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Nov 13 11:14:06 2013 +0100
ScRefreshTimer: export virtual methods and if possible mark SAL_OVERRIDE
Change-Id: I7a14121d1e50bcf87810316db9b51a548d55a47a
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index ff8fb12..fc1eaec 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -22,6 +22,7 @@
#include vcl/timer.hxx
#include osl/mutex.hxx
+#include scdllapi.h
class ScRefreshTimerControl
{
@@ -55,8 +56,8 @@ public:
sal_uLong GetRefreshDelay() const;
void StopRefreshTimer();
-virtual void SetRefreshDelay( sal_uLong nSeconds );
-virtual void Timeout();
+SC_DLLPUBLIC virtual void SetRefreshDelay( sal_uLong nSeconds );
+SC_DLLPUBLIC virtual void Timeout() SAL_OVERRIDE;
private:
void Start();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/matus/sc-hacks' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: WRITER : Extend support for RDF Metadata
Hi, arkarell píše v Čt 31. 10. 2013 v 14:37 +0100: I would like to extend support for RDF metadata in LibreOffice Writer in order to be able to set metadata on a lot of elements unsupported today like tables. Is there anybody that could help me to find what source code are involved ? For information, I use the API of LibreOffice/OpenOffice for many years now but it would be my first contribution at the LO code. Is https://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/RDF_metadata what you are searching for? This applies to LibreOffice too if I am not mistaken. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype
bin/get-bugzilla-attachments-by-mimetype |1 +
1 file changed, 1 insertion(+)
New commits:
commit bd7a4db1dc4e4785956e81f0f997257063669709
Author: David Tardon dtar...@redhat.com
Date: Wed Nov 13 11:10:50 2013 +0100
add cmx
Change-Id: I8c0b422dc40188936b2473fed2e7a24ed36977e9
diff --git a/bin/get-bugzilla-attachments-by-mimetype
b/bin/get-bugzilla-attachments-by-mimetype
index fc7c14b..b09261e 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -347,6 +347,7 @@ mimetypes = {
'image/x-svm': 'svm',
'image/x-wmf': 'wmf',
'image/x-pict': 'pict',
+'image/x-cmx': 'cmx',
}
# disabled for now, this would download gigs of pngs/jpegs...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/templates/layout/LushGreen.otp |binary 1 file changed New commits: commit 1eefdd83c153a312c2af7fb66af3430cd269284c Author: Andras Timar andras.ti...@collabora.com Date: Wed Nov 13 11:26:47 2013 +0100 fdo#69046 fix discolored thumbnail and background image of LushGreen template Change-Id: I71307b9f5d973b8282b793df1d71816fe002b541 diff --git a/extras/source/templates/layout/LushGreen.otp b/extras/source/templates/layout/LushGreen.otp index 991bad9..936ae04 100644 Binary files a/extras/source/templates/layout/LushGreen.otp and b/extras/source/templates/layout/LushGreen.otp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Problems in importing .docx or .pptx file with too many pages(or slides)
Hey! I have been recently facing a problem when I open a .doc/.docx file with more than 150 pages or a .ppt/.pptx file with more than 150 slides.The main error is that just 3 pages/slides of all of them open up. Being a developer I am sure I can fix it.It would be of great help if someone can please provide me the codepointer so I can correct this problem if it does exist seriously. Hope to receive a positive and prompt reply from your end. Regards, Janit ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Compiling LibreOffice 4.1.2.3 on Solaris
Hi Eric, Eric Bautsch píše v Pá 01. 11. 2013 v 19:57 +: Yes, the command is pvs: http://docs.oracle.com/cd/E19253-01/816-5165/pvs-1/ Did you get anywhere, or still stuck, please? :-) And the output suggests that the versions are OK: bautsche@cressida $ pvs solver/unxsogi.pro/bin/idlc libm.so.2 (SUNW_1.1); libgcc_s.so.1 (GCC_3.0); libc.so.1 (SUNWprivate_1.1, SUNW_1.1, SUNW_0.9, SUNW_0.7, SYSVABI_1.3); libuno_sal.so.3 (LIBO_UDK_4.1, UDK_3.6, LIBO_UDK_4.0, PRIVATE_1.1, UDK_3 _0_0); bautsche@cressida $ pvs solver/unxsogi.pro/lib/libuno_sal.so.3 libgcc_s.so.1 (GCC_3.0); libsocket.so.1 (SUNW_1.1, SUNW_0.7); libnsl.so.1 (SUNW_0.7); libm.so.2 (SUNW_1.1); libpthread.so.1 (SUNW_1.1, SUNW_1.2, SUNW_0.9); libuno_sal.so.3; UDK_3_0_0; [...] Knowing nothing about Solaris - I wonder why the other libs have eg. (SUNW_1.1) or (GCC_3.0), but libuno_sal.so.3 has nothing like that, instead the UDK_3_0_0 etc. are each on a separate line as if it was a library itself, or what? Could that be the problem? Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/PlacesListBox.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 28daf1af06b8c596bf7a88864456a0181f9cee19 Author: Andras Timar andras.ti...@collabora.com Date: Wed Nov 13 12:58:09 2013 +0100 fdo#59542 smaller +/- buttons will not be truncated at the bottom Change-Id: If937d72e5b10bfbf055cf5b9909d50bbf5ddac81 diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 99bb9e1..c3b3818 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -71,12 +71,12 @@ PlacesListBox::PlacesListBox( SvtFileDialog* pFileDlg, const OUString rTitle, c mpAddBtn = new ImageButton( this, 0 ); mpAddBtn-SetText( OUString( + ) ); -mpAddBtn-SetPosSizePixel( Point( 0, 0 ), Size( 24, 24 ) ); +mpAddBtn-SetPosSizePixel( Point( 0, 0 ), Size( 22, 22 ) ); mpAddBtn-Show(); mpDelBtn = new ImageButton( this, 0 ); mpDelBtn-SetText( OUString( - ) ); -mpDelBtn-SetPosSizePixel( Point( 0, 0 ), Size( 24, 24 ) ); +mpDelBtn-SetPosSizePixel( Point( 0, 0 ), Size( 22, 22 ) ); mpDelBtn-Show(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Need for starmath expert
On Mon, 2013-11-11 at 01:11 -0800, abdulaziz wrote: Hi all ; we have an idea for RTL (arabic) support in Math and we want someone who expert in starmath to answering the following questions : 1- is it possible to add an arabic mathematical unicode (*nowadays , there is no full mathematical unicode for arabic* )to the module /starmath ? For adding symbols to OpenSymbol, there's a README as extras/source/truetype/symbol/README on that. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/galaxy
icon-themes/galaxy/links.txt |4 1 file changed, 4 insertions(+) New commits: commit ff5448b6c7be7a4ea60787aa1e64362d7f8f8077 Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Nov 13 13:05:50 2013 +0100 Add icons for datastreams toolbar items as links to existing icons for now. Change-Id: I8ae2df5a1691f48b29a98d34417f6271a8f2e0a9 diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt new file mode 100644 index 000..e55b9db --- /dev/null +++ b/icon-themes/galaxy/links.txt @@ -0,0 +1,4 @@ +cmd/lc_datastreamsplay.png cmd/lc_runbasic.png +cmd/sc_datastreamsplay.png cmd/sc_runbasic.png +cmd/lc_datastreamsstop.png cmd/lc_basicstop.png +cmd/sc_datastreamsstop.png cmd/sc_basicstop.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Robert M Campbell license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Respectfully, *Robert M Campbell* IT Specialist for ADRA Laos Open Source Advocate Lao Cell: +856 207 616 7299 US Phone: +1 270 681 0399 robert.rcampb...@gmail.com rcampb...@adralaos.org Visit ADRA Lao's Facebook Page at facebook.com/ADRALaos www.facebook.com/ADRALaos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Vinaya Mandke - license statement
Hi all, All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Regards, Vinaya Mandke -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Libreoffice License statement: Vinaya Mandke
Hi, All of my past and future contributions to the LibreOffice project are under LGPLv3+/GPLv3+/MPL until further notice. Regards, Vinaya Mandke -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Replacing one DLL from official build
Hi, I had a plan to take an official Win32 build and after installation replace swlo.dll with modified library I built myself. I used this approach successfully once in past. However this time Writer crashes (SwDocShell::SwDocShell() calls something in sfxlo.dll and a null pointer is referenced). One thing I can think of that might cause it is probably different compiler versions used. Is there some more or less safe way to achieve my goal or should not this approach be used at all? -- Regards Pavel Laštovička blue.point Solutions spol. s r. o. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Replacing one DLL from official build
Hi Pavel, Pavel Laštovička píše v St 13. 11. 2013 v 13:29 +0100: I had a plan to take an official Win32 build and after installation replace swlo.dll with modified library I built myself. I used this approach successfully once in past. However this time Writer crashes (SwDocShell::SwDocShell() calls something in sfxlo.dll and a null pointer is referenced). One thing I can think of that might cause it is probably different compiler versions used. Is there some more or less safe way to achieve my goal or should not this approach be used at all? I wouldn't use it - as you can see, anything can go wrong there... But I am more curious why do you need to do an own swlo.dll in the first place? Cannot you just up-stream the functionality you need there? All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Doubt regarding expected failures in Make check for cppunit package
Hi, This is regarding the package cppunit. I am working on a new architecture - ppc64le (powerpc 64-bit Little Endian) and I was looking at building cppunit. I picked up the latest release tarball ( cppunit-1.13.2) and built on our ppc64le environment. While building, the make check fails with the following errors. make[3]: Entering directory `/home/rajesh/work/pkgs/cppunit/rel-tar/cppunit-1.13.2/examples/hierarchy' ..The following test fails, this is intended: F..The following test fails, this is intended: F. !!!FAILURES!!! Test Results: Run: 5 Failures: 2 Errors: 0 1) test: BoardGameTestBoardGame::testResetShouldFail (F) line: 45 BoardGameTest.h assertion failed - Expression: !this-m_game-reset() 2) test: ChessTestChess::testResetShouldFail (F) line: 45 BoardGameTest.h assertion failed - Expression: !this-m_game-reset() I am not able to figure out if the error I am seeing above is an expected failure or not. The test says that it is intended, but still reported as !!!FAILURES!!! Could you please confirm if this is an expected failure or not? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Compiling LibreOffice 4.1.2.3 on Solaris
No, I haven't played with this any further. I'm intending to, but I was going to move the compile over to Solaris 11.1, that being obviously a more stable platform. I have no idea if the lack of brackets or UDK_3_0_0 on its own is significant, but doing a quick pvs on other files (/opt/openoffice.org3/program/*, /usr/bin/* and /usr/lib/*.so) it seems that this behaviour is OK for libraries but not binaries: rpcsec.so: libgss.so.1 (SUNW_1.2, SUNWprivate_1.1); libnsl.so.1 (SUNW_0.7, SUNWprivate_1.1); libc.so.1 (SUNW_1.23); rpcsec.so.1; SUNW_1.2; SUNW_1.1; SUNWprivate_1.1; straddr.so: libnsl.so.1 (SUNWprivate_1.1, SYSVABI_1.3); libc.so.1 (SUNW_1.19); straddr.so.2; SUNWprivate_2.1; I'll let you know how I get on though and thanks for your help. Any and all pointers always welcome... Eric On 13/11/2013 11:32, Jan Holesovsky wrote: Hi Eric, Eric Bautsch píše v Pá 01. 11. 2013 v 19:57 +: Yes, the command is pvs: http://docs.oracle.com/cd/E19253-01/816-5165/pvs-1/ Did you get anywhere, or still stuck, please? :-) And the output suggests that the versions are OK: bautsche@cressida $ pvs solver/unxsogi.pro/bin/idlc libm.so.2 (SUNW_1.1); libgcc_s.so.1 (GCC_3.0); libc.so.1 (SUNWprivate_1.1, SUNW_1.1, SUNW_0.9, SUNW_0.7, SYSVABI_1.3); libuno_sal.so.3 (LIBO_UDK_4.1, UDK_3.6, LIBO_UDK_4.0, PRIVATE_1.1, UDK_3 _0_0); bautsche@cressida $ pvs solver/unxsogi.pro/lib/libuno_sal.so.3 libgcc_s.so.1 (GCC_3.0); libsocket.so.1 (SUNW_1.1, SUNW_0.7); libnsl.so.1 (SUNW_0.7); libm.so.2 (SUNW_1.1); libpthread.so.1 (SUNW_1.1, SUNW_1.2, SUNW_0.9); libuno_sal.so.3; UDK_3_0_0; [...] Knowing nothing about Solaris - I wonder why the other libs have eg. (SUNW_1.1) or (GCC_3.0), but libuno_sal.so.3 has nothing like that, instead the UDK_3_0_0 etc. are each on a separate line as if it was a library itself, or what? Could that be the problem? Regards, Kendy -- / . Eric A. Bautsch /-- __ _____ / // / / (_/(___(__/ email: eric.baut...@pobox.com smime.p7s Description: S/MIME Cryptographic Signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Compiling LibreOffice 4.1.2.3 on Solaris
On 13/11/13 12:32, Jan Holesovsky wrote: Eric Bautsch píše v Pá 01. 11. 2013 v 19:57 +: And the output suggests that the versions are OK: bautsche@cressida $ pvs solver/unxsogi.pro/bin/idlc libm.so.2 (SUNW_1.1); libgcc_s.so.1 (GCC_3.0); libc.so.1 (SUNWprivate_1.1, SUNW_1.1, SUNW_0.9, SUNW_0.7, SYSVABI_1.3); libuno_sal.so.3 (LIBO_UDK_4.1, UDK_3.6, LIBO_UDK_4.0, PRIVATE_1.1, UDK_3 _0_0); bautsche@cressida $ pvs solver/unxsogi.pro/lib/libuno_sal.so.3 libgcc_s.so.1 (GCC_3.0); libsocket.so.1 (SUNW_1.1, SUNW_0.7); libnsl.so.1 (SUNW_0.7); libm.so.2 (SUNW_1.1); libpthread.so.1 (SUNW_1.1, SUNW_1.2, SUNW_0.9); libuno_sal.so.3; UDK_3_0_0; [...] Knowing nothing about Solaris - I wonder why the other libs have eg. (SUNW_1.1) or (GCC_3.0), but libuno_sal.so.3 has nothing like that, instead the UDK_3_0_0 etc. are each on a separate line as if it was a library itself, or what? Could that be the problem? iirc the UDK_3_0_0 above is a version that libuno_sal.so.3 itself exports whereas the things in brackets are versions that libuno_sal.so.3 requires from other (system, hence SUNW_*) libraries, hence the difference. not obivous to me why it's failing to run anyway. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/tml/opencl-background-compilation'
New branch 'private/tml/opencl-background-compilation' available with the following commits: commit e0bf8fe2bfd2c240b578fe27ef1291cc673884c6 Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 13 15:37:34 2013 +0200 Avoid crash in unit test Change-Id: Ic452c1a2a8a7099a22584130e6a161c25bccabae commit d864eef08f7c6b4e6040726a481eff6d0938b6fc Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 13 14:26:47 2013 +0200 WaE: unused parameters Change-Id: Ic7c0b5273bc585757abb070ed71ab0cc04bd0304 commit 5b937086358bfe7b65472ffdf9eeca8234f6d2e3 Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 13 11:06:49 2013 +0200 Fixup after merge of Kohei's work on same stuff Change-Id: I32266a1a87f56dc09ba71c505e01deca96c65283 commit 2d2522a612c09192607908ead499f47ba5ffb3af Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 13 10:50:12 2013 +0200 WIP commit of threaded OpenCL compilation work Change-Id: I210d0ded9cb38569b0831355522d8309cee05f56 commit e92aa1c46d6e478899e9041c01c34108aca6d8ab Author: Tor Lillqvist t...@collabora.com Date: Mon Nov 11 12:31:58 2013 +0200 Use the more generic CompiledFormula type Change-Id: I91d2e956b76919c56d14712789198c3c10470742 commit ae81a3e4f3f7ab10572ba34d49365a9259a9befa Author: Tor Lillqvist t...@collabora.com Date: Fri Nov 8 17:25:42 2013 +0200 Point to the group's top cell in ScFormulaCellGroup instead of the top row It will make implementing the background compilation of OpenCL kernels easier, I hope. That needs data accessible through the ScFormulaCell. Change-Id: I77ad5a94eb13551e6238d5f5285f1c916d7cb992 commit a0c7ffc4ea44e9545a81ff2bc1bed7ce22d637a3 Author: Tor Lillqvist t...@collabora.com Date: Fri Nov 8 13:41:11 2013 +0200 Add sc.opencl logging area Change-Id: Icd851c17bab1f55cd16d5a48cc71ff2ac91daa2c commit fd51c122ab4e47257c9e53bb9701f1b4ba0ed330 Author: Tor Lillqvist t...@collabora.com Date: Fri Nov 8 12:36:47 2013 +0200 Bin if-zeroed-out obsolete code Change-Id: Idddbbee67abe45c0c66ef4385286e98bd6212e42 commit b014f6bb16331c2c381d2d2514f7f9f5c5f98653 Author: Tor Lillqvist t...@collabora.com Date: Fri Nov 8 10:16:39 2013 +0200 WIP: Do OpenCL compilation in advance in a worker thread Change-Id: I9fbf848bd487e5ea49a383461f04e3c1678af607 commit fc50c3c824a66192c9bbcd458b8744f98e5f77de Author: Tor Lillqvist t...@collabora.com Date: Thu Nov 7 18:44:29 2013 +0200 Make it clear in comments what kind of code generation they mean Change-Id: I1a21ba33dd5c5c87938efaa9a779e2eab4f2778c commit c6b671f265cb81fa963d86079c1b2ff7509280f7 Author: Tor Lillqvist t...@collabora.com Date: Thu Nov 7 18:09:58 2013 +0200 Refactoring in preparation for threaded OpenCL kernel compilation Introduce a new abstract class CompiledFormula, of which the (existing) class BinaryKernel, that represents one OpenCL kernel, is a concrete subclass. Change-Id: Iab5f2c2777d32df3db98e1810039bf7880c27103 commit 72f48eb0c8412ecd615c53e9676bf8b62c54f5b5 Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 6 21:21:56 2013 +0200 We don't use the static OpenCL kernels any more So remove them and code related only to them. Change-Id: Ibd09e7a801b9757443b6f87018570ec007e201d5 commit 3ce8cf7f675a64aad91010d255f7a90d1135945f Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 6 17:12:53 2013 +0200 A bit more informative logging (temporary) Change-Id: I2b8bfad0d39e7c7ab059d58db54bcc2136bd9ce2 commit bc72fcf98316438907a627d02e60f5bad09176b0 Author: Tor Lillqvist t...@collabora.com Date: Tue Nov 5 19:42:34 2013 +0200 Don't compile the static OpenCL kernels while loading a spreadsheet It has the potential to slow down the loading as we wait for the compilation thread to finish when loading has otherwise finished. Besides, the static kernels are not even used any more. Keep the static kernel source code and the code that handles it for now, for reference. Also keep the compilation thread source for future modifications and re-use. Change-Id: I7ae6ad08b0ac00a15cc4ce5bc9906972e7e23850 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 4.2.0.0.alpha1 build error
On 13/11/13 10:12, Miklos Vajna wrote: On Tue, Nov 12, 2013 at 09:14:30PM +0100, Andreas Radke a.ra...@arcor.de wrote: Thanks for the hint. Replacing dejavu-fonts with liberation fonts made the build finish. Great to hear that. :) Now it fails in a different way: ... installing module gid_Module_Root_SDK ... DestDir: /build/libreoffice/src/fakeinstall Rootpath: /usr/lib/libreoffice ln: failed to create symbolic link '/build/libreoffice/src/fakeinstall/usr/lib/libreoffice/sdk/classes/win/unowinreg.dll': No such file or directory ERROR: Failure in installer.pm ERROR: Failed ln -sf '/build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll' '/build/libreoffice/src/fakeinstall/usr/lib/libreoffice/sdk/classes/win/unowinreg.dll' at /build/libreoffice/src/libreoffice-4.2.0.0.alpha1/solenv/bin/modules/installer/worker.pm line 374. Make sure to check the result after make install, if the symlink still points to '/build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll', you probably want to replace that symlink with a real copy, as users won't have access to '/build/libreoffice/src/' when they install your package. :) the unowinreg.dll must not be a symlink since the installer now checks for filelists if the listed file is a symlink and in that case assumes that a symlink needs to be created in the installation that points to the same target, which avoids having to maintain special entries for symlinks in scp2; no file is actually copied in that case. if anybody symlinks random files and expects the installer to convert them to real files like it did in previous versions they may be disappointed :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 9 commits - connectivity/source filter/source fpicker/source sd/inc sd/source sd/uiconfig sd/UIConfig_sdraw.mk svtools/source sw/source tools/inc tools/source
connectivity/source/drivers/file/FStatement.cxx |8 +-
connectivity/source/drivers/flat/ETable.cxx |8 +-
connectivity/source/drivers/mork/MResultSet.hxx |1
connectivity/source/drivers/mozab/MResultSet.hxx |1
connectivity/source/inc/file/FStatement.hxx |2
filter/source/msfilter/escherex.cxx |3
filter/source/msfilter/svdfppt.cxx |7 -
fpicker/source/office/iodlg.hxx |4 -
sd/UIConfig_sdraw.mk |1
sd/inc/helpids.h |2
sd/source/filter/html/pubdlg.cxx | 25 ++
sd/source/filter/html/pubdlg.src | 38 -
sd/source/ui/inc/pubdlg.hrc |7 -
sd/uiconfig/sdraw/ui/namedesign.ui | 89 +++
svtools/source/control/scriptedtext.cxx | 12 +--
svtools/source/svhtml/parhtml.cxx| 14 +--
sw/source/ui/lingu/hhcwrp.cxx| 30 +++
tools/inc/impstrg.hxx| 31
tools/source/inet/inetmime.cxx |7 -
19 files changed, 147 insertions(+), 143 deletions(-)
New commits:
commit 4d585e6fcd379dc699ec9bcd6d96291453ecbf34
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 13 11:31:33 2013 +
longparas: STRING_NOTFOUND--1
Change-Id: I596b0bbe32b9f4017e58cedb6802d82b55454d16
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 28e159a..7a0c070 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -238,18 +238,18 @@ void SwHHCWrapper::ChangeText( const OUString rNewText,
{
// remember cursor start position for later setting of the cursor
const SwPosition *pStart = pCrsr-Start();
-const xub_StrLen nStartIndex = pStart-nContent.GetIndex();
+const sal_Int32 nStartIndex = pStart-nContent.GetIndex();
const SwNodeIndex aStartNodeIndex = pStart-nNode;
SwTxtNode *pStartTxtNode = aStartNodeIndex.GetNode().GetTxtNode();
const sal_Int32 nIndices = pOffsets-getLength();
const sal_Int32 *pIndices = pOffsets-getConstArray();
sal_Int32 nConvTextLen = rNewText.getLength();
-xub_StrLen nPos = 0;
-xub_StrLen nChgPos = STRING_NOTFOUND;
-xub_StrLen nChgLen = 0;
-xub_StrLen nConvChgPos = STRING_NOTFOUND;
-xub_StrLen nConvChgLen = 0;
+sal_Int32 nPos = 0;
+sal_Int32 nChgPos = -1;
+sal_Int32 nChgLen = 0;
+sal_Int32 nConvChgPos = -1;
+sal_Int32 nConvChgLen = 0;
// offset to calculate the position in the text taking into
// account that text may have been replaced with new text of
@@ -263,20 +263,20 @@ void SwHHCWrapper::ChangeText( const OUString rNewText,
while (true)
{
// get index in original text that matches nPos in new text
-xub_StrLen nIndex;
+sal_Int32 nIndex;
if (nPos nConvTextLen)
-nIndex = (sal_Int32) nPos nIndices ? (xub_StrLen)
pIndices[nPos] : nPos;
+nIndex = nPos nIndices ? pIndices[nPos] : nPos;
else
{
nPos = nConvTextLen;
-nIndex = static_cast xub_StrLen ( rOrigText.getLength() );
+nIndex = rOrigText.getLength();
}
if (rOrigText[nIndex] == rNewText[nPos] ||
nPos == nConvTextLen /* end of string also terminates
non-matching char sequence */)
{
// substring that needs to be replaced found?
-if (nChgPos != STRING_NOTFOUND nConvChgPos !=
STRING_NOTFOUND)
+if (nChgPos != -1 nConvChgPos != -1)
{
nChgLen = nIndex - nChgPos;
nConvChgLen = nPos - nConvChgPos;
@@ -286,7 +286,7 @@ void SwHHCWrapper::ChangeText( const OUString rNewText,
OUString aInNew( rNewText.copy( nConvChgPos, nConvChgLen )
);
// set selection to sub string to be replaced in original
text
-xub_StrLen nChgInNodeStartIndex = static_cast xub_StrLen
( nStartIndex + nCorrectionOffset + nChgPos );
+sal_Int32 nChgInNodeStartIndex = nStartIndex +
nCorrectionOffset + nChgPos;
OSL_ENSURE( m_rWrtShell.GetCrsr()-HasMark(), cursor
misplaced (nothing selected) );
m_rWrtShell.GetCrsr()-GetMark()-nContent.Assign(
pStartTxtNode, nChgInNodeStartIndex );
m_rWrtShell.GetCrsr()-GetPoint()-nContent.Assign(
pStartTxtNode, nChgInNodeStartIndex + nChgLen );
@@ -301,14 +301,14 @@ void SwHHCWrapper::ChangeText( const OUString rNewText,
nCorrectionOffset += nConvChgLen - nChgLen;
-nChgPos = STRING_NOTFOUND;
-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 01/a71171575c3d616ea0d2d30992a350f22f21af
01/a71171575c3d616ea0d2d30992a350f22f21af |1 + 1 file changed, 1 insertion(+) New commits: commit 8d4f0208a7aedb0100c73374468c86eaa0eade72 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 13:51:05 2013 + Notes added by 'git notes add' diff --git a/01/a71171575c3d616ea0d2d30992a350f22f21af b/01/a71171575c3d616ea0d2d30992a350f22f21af new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/01/a71171575c3d616ea0d2d30992a350f22f21af @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |2 -- 1 file changed, 2 deletions(-) New commits: commit 26d5b0661751122abfb739e8f7deb2de72f9ea28 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 11:10:33 2013 + drop unused helpids Change-Id: Ic2eff44075534a7a7df9296ccebb2d5ff0630c76 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 578b536..bd0b478 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3242,7 +3242,6 @@ HID_SD_CUSTOM_ANIMATIONS,59910, HID_SD_DRAW_OBJ_TOOLBOX,59813, HID_SD_DRAW_OPTIONS_TOOLBOX,59814, HID_SD_DRAW_TOOLBOX,59810, -HID_SD_HTMLEXPORT_DLG_DNAME,59883, HID_SD_HTMLEXPORT_PAGE1,59873, HID_SD_HTMLEXPORT_PAGE2,59874, HID_SD_HTMLEXPORT_PAGE3,59875, @@ -6336,7 +6335,6 @@ sd_DockingWindow_FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW,3234201600, sd_DockingWindow_FLT_RIGHT_PANE_DOCKING_WINDOW,3234234368, sd_Edit_DLG_ASS_EDT_PAGE4_ASKNAME,1088489495, sd_Edit_DLG_ASS_EDT_PAGE4_ASKTOPIC,1088489497, -sd_Edit_DLG_DESIGNNAME_EDT_NAME,1085868035, sd_Edit_DLG_PUBLISHING_PAGE2_CGI,1085851696, sd_Edit_DLG_PUBLISHING_PAGE2_INDEX,1085851692, sd_Edit_DLG_PUBLISHING_PAGE2_URL,1085851694, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/AllLangResTarget_flash.mk filter/Module_filter.mk filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk
filter/AllLangResTarget_flash.mk | 31 --- filter/Module_filter.mk |1 filter/UIConfig_xsltdlg.mk |1 filter/source/flash/impswfdialog.cxx | 82 +++-- filter/source/flash/impswfdialog.hrc | 42 - filter/source/flash/impswfdialog.hxx | 30 +-- filter/source/flash/impswfdialog.src | 167 filter/source/flash/swfdialog.cxx|2 filter/uiconfig/ui/impswfdialog.ui | 292 +++ 9 files changed, 336 insertions(+), 312 deletions(-) New commits: commit 191dc43f97ed8bec78ee540676a91815cad71104 Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net Date: Tue Nov 5 19:39:26 2013 +0100 Convert ImpSWFDialog.src to ui add ui file Change-Id: I42af9b8969a07b4d738c1fd30fc8917f24f784c6 Reviewed-on: https://gerrit.libreoffice.org/6592 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/filter/AllLangResTarget_flash.mk b/filter/AllLangResTarget_flash.mk deleted file mode 100644 index 841d626..000 --- a/filter/AllLangResTarget_flash.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# 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/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the License); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,flash)) - -$(eval $(call gb_AllLangResTarget_add_srs,flash,\ - filter/flash \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,filter/flash)) - -$(eval $(call gb_SrsTarget_add_files,filter/flash,\ - filter/source/flash/impswfdialog.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 559fb65..a2d09f3 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Module_Module,filter)) $(eval $(call gb_Module_add_targets,filter,\ AllLangResTarget_eps \ - AllLangResTarget_flash \ AllLangResTarget_pdffilter \ AllLangResTarget_t602filter \ AllLangResTarget_xsltdlg \ diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk index 6b7b48f..abef4d3 100644 --- a/filter/UIConfig_xsltdlg.mk +++ b/filter/UIConfig_xsltdlg.mk @@ -10,6 +10,7 @@ $(eval $(call gb_UIConfig_UIConfig,filter)) $(eval $(call gb_UIConfig_add_uifiles,filter,\ +filter/uiconfig/ui/impswfdialog \ filter/uiconfig/ui/pdfgeneralpage \ filter/uiconfig/ui/pdflinkspage \ filter/uiconfig/ui/pdfoptionsdialog \ diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index 5a4ab63..0bb6239 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -19,7 +19,6 @@ #include impswfdialog.hxx -#include impswfdialog.hrc using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -29,48 +28,36 @@ using namespace com::sun::star::beans; // - ImpPDFDialog - // -ImpSWFDialog::ImpSWFDialog( Window* pParent, ResMgr rResMgr, Sequence PropertyValue rFilterData ) : -ModalDialog( pParent, ResId( DLG_OPTIONS, rResMgr ) ), -maFiDescr( this, ResId( FI_DESCR, rResMgr ) ), -maNumFldQuality( this, ResId( NUM_FLD_QUALITY, rResMgr ) ), -maFiExportAllDescr( this, ResId( FI_EXPORT_ALL_DESCR, rResMgr ) ), -maCheckExportAll( this, ResId( BOOL_EXPORT_ALL, rResMgr ) ), -maFiExportBackgroundsDescr( this, ResId( FI_EXPORT_BACKGROUNDS_DESCR, rResMgr ) ), -maCheckExportBackgrounds( this, ResId( BOOL_EXPORT_BACKGROUNDS, rResMgr ) ), -maFiExportBackgroundObjectsDescr( this, ResId( FI_EXPORT_BACKGROUND_OBJECTS_DESCR, rResMgr ) ), -maCheckExportBackgroundObjects( this, ResId( BOOL_EXPORT_BACKGROUND_OBJECTS, rResMgr ) ), -maFiExportSlideContentsDescr( this, ResId( FI_EXPORT_SLIDE_CONTENTS_DESCR, rResMgr ) ), -maCheckExportSlideContents( this, ResId( BOOL_EXPORT_SLIDE_CONTENTS, rResMgr ) ), -maFiExportSoundDescr( this, ResId( FI_EXPORT_SOUND_DESCR, rResMgr ) ), -maCheckExportSound( this, ResId( BOOL_EXPORT_SOUND, rResMgr ) ), -maFiExportOLEAsJPEGDescr( this, ResId( FI_EXPORT_OLE_AS_JPEG_DESCR, rResMgr ) ), -maCheckExportOLEAsJPEG( this, ResId( BOOL_EXPORT_OLE_AS_JPEG, rResMgr ) ), -maFiExportMultipleFilesDescr( this,
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4281f845148f1cf3c22507ec5d57637c490f2834 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 11:10:33 2013 + Updated core Project: help 26d5b0661751122abfb739e8f7deb2de72f9ea28 diff --git a/helpcontent2 b/helpcontent2 index 54e2721..26d5b06 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 54e2721b1e11389aedb06a3e8960a6cbcb290428 +Subproject commit 26d5b0661751122abfb739e8f7deb2de72f9ea28 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/uiconfig
filter/uiconfig/ui/impswfdialog.ui |2 ++ 1 file changed, 2 insertions(+) New commits: commit 4f1e4c05a9b67fbc67ea4279793a61af46444dad Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 14:02:06 2013 + set mnemonic widget Change-Id: Iefdaf7d7e7b1156e9f1d20e2552ca0bb84c2a357 diff --git a/filter/uiconfig/ui/impswfdialog.ui b/filter/uiconfig/ui/impswfdialog.ui index 436012f..74fe7ca 100644 --- a/filter/uiconfig/ui/impswfdialog.ui +++ b/filter/uiconfig/ui/impswfdialog.ui @@ -91,7 +91,9 @@ property name=xalign0/property property name=label translatable=yes1: min. quality 100: max. quality/property +property name=use_underlineTrue/property property name=justifyfill/property +property name=mnemonic_widgetquality/property /object packing property name=left_attach0/property ___ 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' - extras/source
extras/source/templates/layout/LushGreen.otp |binary 1 file changed New commits: commit ed826bb4ad658a1ce1704f60c474d367945bc033 Author: Andras Timar andras.ti...@collabora.com Date: Wed Nov 13 11:26:47 2013 +0100 fdo#69046 fix discolored thumbnail and background image of LushGreen template Change-Id: I71307b9f5d973b8282b793df1d71816fe002b541 Reviewed-on: https://gerrit.libreoffice.org/6667 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extras/source/templates/layout/LushGreen.otp b/extras/source/templates/layout/LushGreen.otp index 991bad9..936ae04 100644 Binary files a/extras/source/templates/layout/LushGreen.otp and b/extras/source/templates/layout/LushGreen.otp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - fpicker/source
fpicker/source/office/PlacesListBox.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 224820c0786f64153c9018456dd5b5469bddfd3f Author: Andras Timar andras.ti...@collabora.com Date: Wed Nov 13 12:58:09 2013 +0100 fdo#59542 smaller +/- buttons will not be truncated at the bottom Change-Id: If937d72e5b10bfbf055cf5b9909d50bbf5ddac81 Reviewed-on: https://gerrit.libreoffice.org/6668 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 99bb9e1..c3b3818 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -71,12 +71,12 @@ PlacesListBox::PlacesListBox( SvtFileDialog* pFileDlg, const OUString rTitle, c mpAddBtn = new ImageButton( this, 0 ); mpAddBtn-SetText( OUString( + ) ); -mpAddBtn-SetPosSizePixel( Point( 0, 0 ), Size( 24, 24 ) ); +mpAddBtn-SetPosSizePixel( Point( 0, 0 ), Size( 22, 22 ) ); mpAddBtn-Show(); mpDelBtn = new ImageButton( this, 0 ); mpDelBtn-SetText( OUString( - ) ); -mpDelBtn-SetPosSizePixel( Point( 0, 0 ), Size( 24, 24 ) ); +mpDelBtn-SetPosSizePixel( Point( 0, 0 ), Size( 22, 22 ) ); mpDelBtn-Show(); } ___ 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/source/options/optgdlg.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 310396aaa9c8b0e25053decbb673af339eebdec3
Author: Andras Timar andras.ti...@collabora.com
Date: Wed Nov 13 10:23:59 2013 +0100
fdo#59256 hide this option when experimental features are disabled
GTK print dialog is experimental, the checkbox has no effect, if
experimental features are disabled.
On Mac OS X LibreOffice cannot use native print dialog at all.
Change-Id: I7497f1da0ec74b9067675e34eb4314b7a4616f06
Reviewed-on: https://gerrit.libreoffice.org/6664
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 1ae32e1..fbb1cf7 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -187,8 +187,13 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const
SfxItemSet rSet)
get(m_pExtHelpCB, exthelp);
if (!lcl_HasSystemFilePicker())
getVclContainer(filedlgframe)-Hide();
-#if !defined(MACOSX) ! ENABLE_GTK
+#if ! ENABLE_GTK
getVclContainer(printdlgframe)-Hide();
+#else
+if (!SvtMiscOptions().IsExperimentalMode())
+{
+getVclContainer(printdlgframe)-Hide();
+}
#endif
get(m_pFileDlgCB, filedlg);
get(m_pPrintDlgCB, printdlg);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmlhelp/util
xmlhelp/util/main_transform.xsl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a2afc19e04f8bb3089cbfef34960ad8f0a3b99bf
Author: Ariel Constenla-Haile arie...@apache.org
Date: Wed Nov 13 12:33:51 2013 +
i123670 - Add support for https links
diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl
index 5d84746..4c6acf2 100644
--- a/xmlhelp/util/main_transform.xsl
+++ b/xmlhelp/util/main_transform.xsl
@@ -613,7 +613,7 @@
xsl:variable name=archivexsl:value-of
select=concat(substring-before(substring-after(@href,'text/'),'/'),'/')//xsl:variable
xsl:variable name=dbpostfixxsl:call-template
name=createDBpostfixxsl:with-param name=archive
select=$archive//xsl:call-template/xsl:variable
xsl:choose
- xsl:when test=starts-with(@href,'http://') !-- web links
--
+ xsl:when test=starts-with(@href,'http://') or
starts-with(@href,'https://') !-- web links --
a href={@href}xsl:apply-templates //a
/xsl:when
xsl:when test=contains(@href,'#')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 68871] Disable View -- Elements by default
https://bugs.freedesktop.org/show_bug.cgi?id=68871 --- Comment #4 from Thomas Arnhold thomas-l...@arnhold.org --- Created attachment 89145 -- https://bugs.freedesktop.org/attachment.cgi?id=89145action=edit Elements window -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl include/xmloff vcl/Library_vcl.mk vcl/source xmloff/source
include/vcl/embeddedfontshelper.hxx |5 -
include/xmloff/xmltoken.hxx |1
vcl/Library_vcl.mk|1
vcl/source/gdi/embeddedfontshelper.cxx| 63 ++--
vcl/source/gdi/pdfwriter_impl.cxx |6 +
xmloff/source/core/xmltoken.cxx |1
xmloff/source/style/XMLFontStylesContext.cxx | 67 +-
xmloff/source/style/XMLFontStylesContext_impl.hxx | 33 ++
8 files changed, 165 insertions(+), 12 deletions(-)
New commits:
commit 5ce50b8d171c9d86d2175dd35b1e7ef23255e895
Author: Brennan Vincent brenn...@email.arizona.edu
Date: Sat Oct 5 16:50:24 2013 -0700
Respect svg:font-face-format element.
Call libeot to parse font if value embedded-opentype is found.
Change-Id: I03a072fd4db47d151a3934e959ad17c1e24fcf09
Reviewed-on: https://gerrit.libreoffice.org/6144
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/embeddedfontshelper.hxx
b/include/vcl/embeddedfontshelper.hxx
index 2250aa3..b02431e 100644
--- a/include/vcl/embeddedfontshelper.hxx
+++ b/include/vcl/embeddedfontshelper.hxx
@@ -44,10 +44,11 @@ public:
@param fontName name of the font (e.g. 'Times New Roman')
@param extra additional text to use for name (e.g. to distinguish
regular from bold, italic,...), ? for unique
@param key key to xor the data with, from the start until the key's
length (not repeated)
+ @param eot whether the data is compressed in Embedded OpenType format
*/
static bool addEmbeddedFont( com::sun::star::uno::Reference
com::sun::star::io::XInputStream stream,
const OUString fontName, const char* extra,
-std::vector unsigned char key = std::vector unsigned char ());
+std::vector unsigned char key = std::vector unsigned char (),
bool eot = false);
/**
Returns an URL for a file where to store contents of a given temporary
font.
@@ -75,7 +76,7 @@ public:
@param size size of the font data
@param rights type of operation to be allowed for the font
*/
-static bool sufficientFontRights( const void* data, long size, FontRights
rights );
+static bool sufficientTTFRights( const void* data, long size, FontRights
rights );
/**
Removes all temporary fonts in the path used by
fileUrlForTemporaryFont().
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 33f2bee..bb585c6 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2482,6 +2482,7 @@ namespace xmloff { namespace token {
XML_FONT_FACE,
XML_FONT_FACE_SRC,
XML_FONT_FACE_URI,
+XML_FONT_FACE_FORMAT,
XML_FONT_ADORNMENTS,
XML_INCH,
XML_SPACE_AFTER,
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index fd24589..38cf55a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_custom_headers,vcl,\
$(eval $(call gb_Library_use_externals,vcl,\
jpeg \
nss3 \
+ libeot \
))
$(eval $(call gb_Library_use_libraries,vcl,\
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx
b/vcl/source/gdi/embeddedfontshelper.cxx
index 3460f78..c3101df 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -18,16 +18,29 @@
#include vcl/svapp.hxx
#include boost/scoped_ptr.hpp
+#include boost/shared_ptr.hpp
#include fontsubset.hxx
#include outdev.h
#include outfont.hxx
#include salgdi.hxx
+#include config_eot.h
+
+#if ENABLE_EOT
+extern C
+{
+namespace libeot
+{
+#include libeot.h
+} // namespace libeot
+} // extern C
+#endif
+
using namespace com::sun::star;
using namespace vcl;
static void clearDir( const OUString path )
-{
+{
osl::Directory dir( path );
if( dir.reset() == osl::Directory::E_None )
{
@@ -53,7 +66,7 @@ void EmbeddedFontsHelper::clearTemporaryFontFiles()
}
bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference io::XInputStream
stream, const OUString fontName,
-const char* extra, std::vector unsigned char key )
+const char* extra, std::vector unsigned char key, bool eot )
{
OUString fileUrl = EmbeddedFontsHelper::fileUrlForTemporaryFont( fontName,
extra );
osl::File file( fileUrl );
@@ -78,7 +91,8 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference
io::XInputStream st
pos read keyPos key.size();
++pos )
buffer[ pos ] ^= key[ keyPos++ ];
-if( read 0 )
+// if eot, don't write the file out yet, since we need to unpack it
first.
+if( !eot read 0 )
{
sal_uInt64 writtenTotal = 0;
while( writtenTotal read )
@@ -92,13 +106,50 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference
io::XInputStream st
[Libreoffice-commits] core.git: xmlhelp/util
xmlhelp/util/main_transform.xsl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b5026aaabf49b9c6e23bf9329674de2c24272c4e
Author: Ariel Constenla-Haile arie...@apache.org
Date: Wed Nov 13 12:33:51 2013 +
i123670 - Add support for https links
(cherry picked from commit a2afc19e04f8bb3089cbfef34960ad8f0a3b99bf)
diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl
index 2834668..b6b9c2e 100644
--- a/xmlhelp/util/main_transform.xsl
+++ b/xmlhelp/util/main_transform.xsl
@@ -628,7 +628,7 @@
xsl:variable name=archivexsl:value-of
select=concat(substring-before(substring-after(@href,'text/'),'/'),'/')//xsl:variable
xsl:variable name=dbpostfixxsl:call-template
name=createDBpostfixxsl:with-param name=archive
select=$archive//xsl:call-template/xsl:variable
xsl:choose
- xsl:when test=starts-with(@href,'http://') !-- web links
--
+ xsl:when test=starts-with(@href,'http://') or
starts-with(@href,'https://') !-- web links --
a href={@href}xsl:apply-templates //a
/xsl:when
xsl:when test=contains(@href,'#')
___
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' - a2/afc19e04f8bb3089cbfef34960ad8f0a3b99bf
a2/afc19e04f8bb3089cbfef34960ad8f0a3b99bf |1 + 1 file changed, 1 insertion(+) New commits: commit 490b0df38861f14a4d65ba2f50491de9d380318e Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 14:39:08 2013 + Notes added by 'git notes add' diff --git a/a2/afc19e04f8bb3089cbfef34960ad8f0a3b99bf b/a2/afc19e04f8bb3089cbfef34960ad8f0a3b99bf new file mode 100644 index 000..0431045 --- /dev/null +++ b/a2/afc19e04f8bb3089cbfef34960ad8f0a3b99bf @@ -0,0 +1 @@ +merged as: b5026aaabf49b9c6e23bf9329674de2c24272c4e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - oox/Library_oox.mk oox/source sw/qa writerfilter/source
oox/Library_oox.mk|1
oox/source/shape/ShapeContextHandler.cxx | 37
oox/source/shape/ShapeContextHandler.hxx |2
oox/source/shape/WpsContext.cxx | 58 ++
oox/source/shape/WpsContext.hxx | 38 +
oox/source/token/namespaces.hxx.tail |1
oox/source/token/namespaces.txt |1
oox/source/token/tokens.txt |1
sw/qa/extras/ooxmlimport/data/wps-only.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |7 +++
writerfilter/source/dmapper/GraphicImport.cxx | 11
writerfilter/source/ooxml/model.xml | 23 ++
12 files changed, 179 insertions(+), 1 deletion(-)
New commits:
commit 903bbf3865809ddd03e181eee1c6297c91021743
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 13 13:41:17 2013 +0100
writerfilter: fix anchoring of anchored wps (drawingML) shapes
Previous code assumed that either we're dealing with VML shapes (where
the shape knows its position, anchoring, etc.) or with Wrtier pictures.
drawingML shapes are a third category: they don't know their anchoring
(and similar properties), still they are not Writer pictures.
For now just fix the anchoring, other properties should be handled in a
later follow-up commit.
Change-Id: I2fede3b11cfbd423cd50cfc0c032d424c81c6c4a
diff --git a/sw/qa/extras/ooxmlimport/data/wps-only.docx
b/sw/qa/extras/ooxmlimport/data/wps-only.docx
new file mode 100644
index 000..5b563b0
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/wps-only.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f2c3b70..91f49c0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1505,6 +1505,13 @@ DECLARE_OOXMLIMPORT_TEST(testFdo69548, fdo69548.docx)
CPPUNIT_ASSERT_EQUAL(OUString(#this is a bookmark),
getPropertyOUString(getRun(getParagraph(1), 1), HyperLinkURL));
}
+DECLARE_OOXMLIMPORT_TEST(testWpsOnly, wps-only.docx)
+{
+// Document has wp:anchor, not wp:inline, so handle it accordingly.
+text::TextContentAnchorType eValue =
getPropertytext::TextContentAnchorType(getShape(1), AnchorType);
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, eValue);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index ba8aab2..ff3409c 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -986,6 +986,16 @@ void GraphicImport::lcl_attribute(Id nName, Value val)
m_pImpl-bIsGraphic = true;
}
+
+if (bUseShape m_pImpl-eGraphicImportType ==
IMPORT_AS_DETECTED_ANCHOR)
+{
+// If we are here, this is a drawingML shape. For
those, only dmapper (and not oox) knows the anchoring infos (just like for
Writer pictures).
+// But they aren't Writer pictures, either (which are
already handled above).
+uno::Reference beans::XPropertySet
xShapeProps(m_xShape, uno::UNO_QUERY_THROW);
+xShapeProps-setPropertyValue(AnchorType,
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+
+// TODO handle more properties here like
HoriOrientPosition, etc.
+}
}
}
break;
commit 400d5d8a90f1f2737f87b7011294cddb8071768f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 13 10:35:36 2013 +0100
oox: initial import of wps:wsp
We import something that's visible, but the shape is always inline, even
when it has to be anchored.
Change-Id: I6e20aa1a208f06731098ad21bb51c1ca840213d0
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index dd30e70..7bd3710 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -277,6 +277,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/shape/ShapeContextHandler \
oox/source/shape/ShapeDrawingFragmentHandler \
oox/source/shape/ShapeFilterBase \
+oox/source/shape/WpsContext \
oox/source/token/namespacemap \
oox/source/token/propertynames \
oox/source/token/tokenmap \
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index dbbd41d..8286def 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -22,6 +22,7 @@
#include ShapeContextHandler.hxx
#include ShapeDrawingFragmentHandler.hxx
#include LockedCanvasContext.hxx
+#include WpsContext.hxx
#include oox/vml/vmldrawingfragment.hxx
#include oox/vml/vmlshape.hxx
#include oox/drawingml/themefragmenthandler.hxx
[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype
bin/get-bugzilla-attachments-by-mimetype | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit d634d1a18a33fbef272a4cfdf094ce1ea1bc5d6c
Author: David Tardon dtar...@redhat.com
Date: Wed Nov 13 15:50:24 2013 +0100
enable more useful formats
Change-Id: I790f0678a0fb06b3fd1babf499803b5250f23c1b
diff --git a/bin/get-bugzilla-attachments-by-mimetype
b/bin/get-bugzilla-attachments-by-mimetype
index b09261e..a45281d 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -348,11 +348,6 @@ mimetypes = {
'image/x-wmf': 'wmf',
'image/x-pict': 'pict',
'image/x-cmx': 'cmx',
-}
-
-# disabled for now, this would download gigs of pngs/jpegs...
-common_noncore_mimetypes = {
-# graphics
'image/svg+xml': 'svg',
'image/x-MS-bmp': 'bmp',
'image/x-wpg': 'wpg',
@@ -367,6 +362,11 @@ common_noncore_mimetypes = {
'image/x-cmu-raster': 'ras',
'image/x-xbitmap': 'xbm',
'image/x-xpixmap': 'xpm',
+}
+
+# disabled for now, this would download gigs of pngs/jpegs...
+common_noncore_mimetypes = {
+# graphics
'image/gif': 'gif',
'image/jpeg': 'jpeg',
'image/png': 'png',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source dbaccess/source sw/qa
connectivity/source/drivers/firebird/Connection.cxx | 54
++
connectivity/source/drivers/firebird/Connection.hxx | 18 ++-
dbaccess/source/core/dataaccess/datasource.cxx |7 +
sw/qa/extras/ooxmlexport/data/multi-column-line-separator-SAVED.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |7 +
5 files changed, 38 insertions(+), 48 deletions(-)
New commits:
commit 0fe680b266f272fb82edc357fd036be85d4124cd
Author: YogeshBharate yogesh.bhar...@synerzip.com
Date: Fri Oct 18 17:45:36 2013 +0530
Added unit test for multicolumn section separator line
Unit test case to verify the multicolumn separator value.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: Ifd5b060a4981dda20df2f2ee5cbb2879f9ba0cdb
Reviewed-on: https://gerrit.libreoffice.org/6318
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git
a/sw/qa/extras/ooxmlexport/data/multi-column-line-separator-SAVED.docx
b/sw/qa/extras/ooxmlexport/data/multi-column-line-separator-SAVED.docx
new file mode 100644
index 000..9645883
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/multi-column-line-separator-SAVED.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5c44dc8..69c3b58 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1532,6 +1532,13 @@ DECLARE_OOXML_TEST(testCharHighlight,
char_highlight.docx)
}
}
+DECLARE_OOXML_TEST(testMultiColumnLineSeparator,
multi-column-line-separator-SAVED.docx)
+{
+// Check for the Column Separator value.It should be FALSE as the document
doesnt contains separator line.
+xmlDocPtr pXmlDoc = parseExport();
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[3]/w:pPr/w:sectPr/w:cols,sep,false);
+}
+
DECLARE_OOXML_TEST(testCustomXmlGrabBag, customxml.docx)
{
// The problem was that item[n].xml and itemProps[n].xml and .rels files
for item[n].xml
commit a3eece5a885395888e3b8e779e1fa46f9538d7af
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Sun Nov 10 08:34:27 2013 +
Pass Document directly to Driver for embedded databases.
Change-Id: I346a8ef07c5d695b3aa879f5c25cc4af97e25b99
Reviewed-on: https://gerrit.libreoffice.org/6627
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
diff --git a/connectivity/source/drivers/firebird/Connection.cxx
b/connectivity/source/drivers/firebird/Connection.cxx
index 728e54f..d00478a 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -124,6 +124,7 @@ void Connection::construct(const ::rtl::OUString url,
const Sequence PropertyV
if (url.equals(sdbc:embedded:firebird))
{
m_bIsEmbedded = true;
+
const PropertyValue* pIter = info.getConstArray();
const PropertyValue* pEnd = pIter + info.getLength();
@@ -137,6 +138,10 @@ void Connection::construct(const ::rtl::OUString url,
const Sequence PropertyV
{
pIter-Value = aStorageURL;
}
+else if ( pIter-Name == Document )
+{
+pIter-Value = m_xParentDocument;
+}
}
if ( !m_xEmbeddedStorage.is() )
@@ -284,52 +289,19 @@ void Connection::construct(const ::rtl::OUString url,
const Sequence PropertyV
// it in the .odb.
rebuildIndexes();
-attachAsDocumentListener(aStorageURL);
+// We need to attach as a document listener in order to be able to
store
+// the temporary db back into the .odb when saving
+uno::ReferenceXDocumentEventBroadcaster
xBroadcaster(m_xParentDocument, UNO_QUERY);
+
+if (xBroadcaster.is())
+xBroadcaster-addDocumentEventListener(this);
+else
+assert(false);
}
osl_atomic_decrement( m_refCount );
}
-void Connection::attachAsDocumentListener(const OUString rStorageURL)
-{
-// We can't directly access the Document that is using this connection
-// (since a Connection can in fact be used independently of a DB document)
-// hence we need to iterate through all Frames to find our Document.
-uno::Reference frame::XDesktop2 xFramesSupplier =
-frame::Desktop::create(::comphelper::getProcessComponentContext());
-uno::Reference frame::XFrames xFrames(xFramesSupplier-getFrames(),
- uno::UNO_QUERY);
-if (!xFrames.is())
-return;
-
-uno::Sequence uno::Referenceframe::XFrame xFrameList =
-xFrames-queryFrames( frame::FrameSearchFlag::ALL );
-
-for (sal_Int32 i = 0; i xFrameList.getLength(); i++)
-{
-uno::Reference frame::XFrame xf = xFrameList[i];
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sd/source
sd/source/ui/inc/slideshow.hxx |5 ++
sd/source/ui/slideshow/slideshowimpl.cxx |6 +-
sd/source/ui/slideshow/slideshowimpl.hxx |2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 29
sd/source/ui/view/drviewse.cxx | 40 +++--
sd/source/ui/view/outlnvs2.cxx | 30
6 files changed, 39 insertions(+), 73 deletions(-)
New commits:
commit 393c38129284fe3b9b9fc0b927f8cd128f016a86
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 12:20:16 2013 +0100
Resolves: fdo#69975 honour custom show settings
if a custom show is set, then don't override it with
current/first page, just accept it
Change-Id: Icd04711028b3e11a576df6cd325ddb0db8974111
(cherry picked from commit 438f5cf4229dafe2100e36d818b05535091054d7)
merge all three ShowSlideShow impls together
Change-Id: If82f6313b258a79d59fbe34ab7846db5f9f45f76
(cherry picked from commit 368e94ce33bb4de1d2c0348082a349331a17f332)
bStartWithActualSlide is always false
(cherry picked from commit a1b0b68c0f1fe2467cddf021e09123085d043de2)
Conflicts:
sd/source/ui/slideshow/slideshowimpl.cxx
sd/source/ui/slideshow/slideshowimpl.hxx
Change-Id: Icf61858730e2576439fdc7bdd1c8a911f2b34bd7
Reviewed-on: https://gerrit.libreoffice.org/6374
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index a309c82..be44a51 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -214,6 +214,11 @@ private:
sal_Int32 mnInPlaceConfigEvent;
};
+namespace slideshowhelp
+{
+void ShowSlideShow(SfxRequest rReq, SdDrawDocument rDoc);
+}
+
}
#endif /* _SD_SLIDESHOW_HXX */
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index b096dc4..6fbd862 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -974,7 +974,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx*
pPresSettings )
}
// build page list
-createSlideList( maPresSettings.mbAll, false, aPresSlide );
+createSlideList( maPresSettings.mbAll, aPresSlide );
// remember Slide number from where the show was started
if( pStartPage )
@@ -2449,7 +2449,7 @@ Reference XSlideShow SlideshowImpl::createSlideShow()
const
// -
-void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide,
const String rPresSlide )
+void SlideshowImpl::createSlideList( bool bAll, const String rPresSlide )
{
const long nSlideCount = mpDoc-GetSdPageCount( PK_STANDARD );
@@ -2457,7 +2457,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool
bStartWithActualSlide, cons
{
SdCustomShow* pCustomShow;
-if( !bStartWithActualSlide mpDoc-GetCustomShowList()
maPresSettings.mbCustomShow )
+if( mpDoc-GetCustomShowList() maPresSettings.mbCustomShow )
pCustomShow = mpDoc-GetCustomShowList()-GetCurObject();
else
pCustomShow = NULL;
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx
b/sd/source/ui/slideshow/slideshowimpl.hxx
index 8be006b..89db0b2 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -265,7 +265,7 @@ private:
double update();
-void createSlideList( bool bAll, bool bStartWithActualSlide, const String
rPresSlide );
+void createSlideList( bool bAll, const String rPresSlide );
void displayCurrentSlide (const bool bSkipAllMainSequenceEffects = false);
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 6b9c690..ecb7761 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -883,34 +883,7 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet)
void SlotManager::ShowSlideShow( SfxRequest rReq)
{
-Reference XPresentation2 xPresentation(
mrSlideSorter.GetModel().GetDocument()-getPresentation() );
-if( xPresentation.is() )
-{
-if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) )
-{
-if( (SID_PRESENTATION == rReq.GetSlot() ) )
-{
-Sequence PropertyValue aArguments(1);
-PropertyValue aPage;
-OUString sValue(0);
-
-aPage.Name = FirstPage;
-aPage.Value = sValue;
-
-aArguments[0] = aPage;
-
-xPresentation-startWithArguments( aArguments );
-}
-else
-{
-xPresentation-start();
-
[Libreoffice-commits] core.git: 3 commits - oox/source sd/qa
oox/source/export/drawingml.cxx | 13 +
sd/qa/unit/import-tests.cxx | 21 -
sd/qa/unit/sdmodeltestbase.hxx | 32
3 files changed, 57 insertions(+), 9 deletions(-)
New commits:
commit 08a52b17cb2e8c4c2a8c1ad7b95d2cfc5a9e844e
Author: Muthu Subramanian sumu...@collabora.com
Date: Wed Nov 13 20:54:46 2013 +0530
n#828390: Export subscript text.
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 7a75d88..3f5731b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -697,6 +697,7 @@ void DrawingML::WriteRunProperties( Reference XPropertySet
rRun, sal_Bool bIs
const char* italic = NULL;
const char* underline = NULL;
sal_Int32 nSize = 1800;
+sal_Int32 nCharEscapement = 0;
if( GETAD( CharHeight ) )
nSize = (sal_Int32) (100*(*((float*) mAny.getValue(;
@@ -777,12 +778,24 @@ void DrawingML::WriteRunProperties( Reference
XPropertySet rRun, sal_Bool bIs
usLanguage = aLanguageTag.getBcp47();
}
+if( GETAD( CharEscapement ) )
+mAny = nCharEscapement;
+
+if( nCharEscapement GETAD( CharEscapementHeight ) ) {
+sal_uInt32 nCharEscapementHeight;
+mAny = nCharEscapementHeight;
+nSize = (nSize * nCharEscapementHeight) / 100;
+// MSO uses default ~58% size
+nSize = (nSize / 0.58);
+}
+
mpFS-startElementNS( XML_a, XML_rPr,
XML_b, bold,
XML_i, italic,
XML_lang, usLanguage.isEmpty() ? NULL : USS(
usLanguage ),
XML_sz, nSize == 1800 ? NULL : IS( nSize ),
XML_u, underline,
+ XML_baseline, nCharEscapement == 0 ? NULL : IS(
nCharEscapement*1000 ),
FSEND );
// mso doesn't like text color to be placed after typeface
commit 5656393f02ddd501d60673b0686688156336f0ee
Author: Muthu Subramanian sumu...@collabora.com
Date: Wed Nov 13 20:45:18 2013 +0530
Add export unit test helper to testDocumentLayout.
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 2a7de2d..6862815 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -88,16 +88,17 @@ the test, and re-running; it should break.
*/
void SdFiltersTest::testDocumentLayout()
{
-struct { const char *pInput, *pDump; } aFilesToCompare[] =
+struct { const char *pInput, *pDump; sal_Int32 nExportType; }
aFilesToCompare[] =
{
-{ odp/shapes-test.odp, xml/shapes-test_page },
-{ pptx/fdo47434-all.pptx, pptx/xml/fdo47434_page },
-{ n758621.ppt, xml/n758621_ },
-{ fdo64586.ppt, xml/fdo64586_ },
-{ n819614.pptx, xml/n819614_ },
-{ n820786.pptx, xml/n820786_ },
-{ n762695.pptx, xml/n762695_ },
-{ n593612.pptx, xml/n593612_ },
+{ odp/shapes-test.odp, xml/shapes-test_page, -1 },
+{ pptx/fdo47434-all.pptx, pptx/xml/fdo47434_page, -1 },
+{ n758621.ppt, xml/n758621_, -1 },
+{ fdo64586.ppt, xml/fdo64586_, -1 },
+{ n819614.pptx, xml/n819614_, -1 },
+{ n820786.pptx, xml/n820786_, -1 },
+{ n762695.pptx, xml/n762695_, -1 },
+{ n593612.pptx, xml/n593612_, -1 },
+// { pptx/n828390.pptx, pptx/xml/n828390_, PPTX }, // Example
};
for ( int i = 0; i static_cast int ( SAL_N_ELEMENTS( aFilesToCompare )
); ++i )
@@ -105,6 +106,8 @@ void SdFiltersTest::testDocumentLayout()
int nUpdateMe = -1; // index of test we want to update; supposedly
only when the test is created
::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc(
/sd/qa/unit/data/ ) + OUString::createFromAscii( aFilesToCompare[i].pInput )
);
+if( aFilesToCompare[i].nExportType = 0 )
+xDocShRef = saveAndReload( xDocShRef,
aFilesToCompare[i].nExportType );
compareWithShapesDump( xDocShRef,
getPathFromSrc( /sd/qa/unit/data/ ) +
OUString::createFromAscii( aFilesToCompare[i].pDump ),
i == nUpdateMe );
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 6c05ffa..00b5892 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -120,10 +120,10 @@ protected:
return xDocShRef;
}
-::sd::DrawDocShellRef saveAndReload( ::sd::DrawDocShell *pShell, sal_uLong
nExportType )
+::sd::DrawDocShellRef saveAndReload( ::sd::DrawDocShell *pShell, sal_Int32
nExportType )
{
FileFormat *pFmt = aFileFormats[0];
-if( nExportType SAL_N_ELEMENTS( aFileFormats ) )
+if( ( (sal_uInt32) nExportType ) SAL_N_ELEMENTS( aFileFormats ) )
pFmt = aFileFormats[ nExportType ];
OUString aExt = OUString( . ) + OUString::createFromAscii(
pFmt-pName );
utl::TempFile aTempFile( OUString(), aExt );
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/export/drawingml.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 884070670824a210832739c9235693cd3fd6cca8
Author: Muthu Subramanian sumu...@collabora.com
Date: Wed Nov 13 20:54:46 2013 +0530
n#828390: Export subscript text.
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index afb9e02..bfe3ed9 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -665,6 +665,7 @@ void DrawingML::WriteRunProperties( Reference XPropertySet
rRun, sal_Bool bIs
const char* italic = NULL;
const char* underline = NULL;
sal_Int32 nSize = 1800;
+sal_Int32 nCharEscapement = 0;
if( GETAD( CharHeight ) )
nSize = (sal_Int32) (100*(*((float*) mAny.getValue(;
@@ -751,12 +752,24 @@ void DrawingML::WriteRunProperties( Reference
XPropertySet rRun, sal_Bool bIs
usLanguage = usLanguageBuffer.makeStringAndClear();
}
+if( GETAD( CharEscapement ) )
+mAny = nCharEscapement;
+
+if( nCharEscapement GETAD( CharEscapementHeight ) ) {
+sal_uInt32 nCharEscapementHeight;
+mAny = nCharEscapementHeight;
+nSize = (nSize * nCharEscapementHeight) / 100;
+// MSO uses default ~58% size
+nSize = (nSize / 0.58);
+}
+
mpFS-startElementNS( XML_a, XML_rPr,
XML_b, bold,
XML_i, italic,
XML_lang, usLanguage.isEmpty() ? NULL : USS(
usLanguage ),
XML_sz, nSize == 1800 ? NULL : IS( nSize ),
XML_u, underline,
+ XML_baseline, nCharEscapement == 0 ? NULL : IS(
nCharEscapement*1000 ),
FSEND );
// mso doesn't like text color to be placed after typeface
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/edit/edattr.cxx |2 +-
sw/source/core/fields/expfld.cxx |2 +-
sw/source/core/inc/txmsrt.hxx|8
sw/source/core/tox/txmsrt.cxx|6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b17601a4cbedb5e05e22443459366e604194bb77
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 13 15:20:38 2013 +
longparas: these USHRT_MAX are really STRING_LEN
Change-Id: I5b55204c262e9fd0c14a9562351a9a1f8b080cec
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 50b6364..2920919 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -357,7 +357,7 @@ sal_uInt16 SwEditShell::GetSeqFtnList( SwSeqFldList rList,
bool bEndNotes )
OUString sTxt( rFtn.GetViewNumStr( *mpDoc ));
if( !sTxt.isEmpty() )
sTxt += ;
-sTxt += pTxtNd-GetExpandTxt( 0, USHRT_MAX );
+sTxt += pTxtNd-GetExpandTxt( 0, STRING_LEN );
_SeqFldLstElem* pNew = new _SeqFldLstElem( sTxt,
pTxtFtn-GetSeqRefNo() );
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 21dc62a..a35d96b 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -586,7 +586,7 @@ sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList
rList )
pNd-GetNodes().IsDocNodes() )
{
_SeqFldLstElem* pNew = new _SeqFldLstElem(
-pNd-GetExpandTxt( 0, USHRT_MAX ),
+pNd-GetExpandTxt( 0, STRING_LEN ),
((SwSetExpField*)pF-GetField())-GetSeqNumber() );
rList.InsertSort( pNew );
}
commit fbe0a4a12c44901a203a011c9498a67ee6eda411
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 13 15:17:43 2013 +
longparas: safe STRING_NOTFOUND - -1
Change-Id: Ib8e2dea41293822cb49ebfc7b398acc20b6c37be
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 5d0b3d9..53d90bd 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -240,8 +240,8 @@ struct SwTOXPara : public SwTOXSortTabBase
SwTOXPara( const SwCntntNode, SwTOXElement, sal_uInt16 nLevel =
FORM_ALPHA_DELIMITTER, OUString sSeqName = OUString() );
virtual ~SwTOXPara() {}
-voidSetStartIndex( xub_StrLen nSet) { nStartIndex = nSet;}
-voidSetEndIndex( xub_StrLen nSet ) { nEndIndex = nSet;}
+voidSetStartIndex(sal_Int32 nSet){ nStartIndex = nSet; }
+voidSetEndIndex(sal_Int32 nSet) { nEndIndex = nSet; }
virtual voidFillText( SwTxtNode rNd, const SwIndex rInsPos,
sal_uInt16 nAuthField = 0 ) const;
virtual sal_uInt16 GetLevel() const;
@@ -252,8 +252,8 @@ private:
SwTOXElement eType;
sal_uInt16 m_nLevel;
-xub_StrLen nStartIndex;
-xub_StrLen nEndIndex;
+sal_Int32 nStartIndex;
+sal_Int32 nEndIndex;
OUString m_sSequenceName;
};
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 37d239f..7e08f1d 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -525,7 +525,7 @@ SwTOXPara::SwTOXPara( const SwCntntNode rNd, SwTOXElement
eT, sal_uInt16 nLevel
eType( eT ),
m_nLevel(nLevel),
nStartIndex(0),
-nEndIndex(STRING_LEN),
+nEndIndex(-1),
m_sSequenceName( sSeqName )
{
}
@@ -543,7 +543,7 @@ TextAndReading SwTOXPara::GetText_Impl() const
xub_StrLen nStt = nStartIndex;
return TextAndReading(((SwTxtNode*)pNd)-GetExpandTxt(
nStt,
-STRING_NOTFOUND == nEndIndex ? STRING_LEN : nEndIndex -
nStt),
+nEndIndex == -1 ? STRING_LEN : nEndIndex - nStt),
OUString());
}
break;
@@ -578,7 +578,7 @@ void SwTOXPara::FillText( SwTxtNode rNd, const SwIndex
rInsPos, sal_uInt16 ) c
SwTxtNode* pSrc = (SwTxtNode*)aTOXSources[0].pNd;
xub_StrLen nStt = nStartIndex;
pSrc-GetExpandTxt( rNd, rInsPos, nStt,
-nEndIndex == STRING_LEN ? STRING_LEN : nEndIndex - nStt,
+nEndIndex == -1 ? STRING_LEN : nEndIndex - nStt,
sal_False, sal_False, sal_True );
}
else
___
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/embeddedfontshelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b7b4ce70d84591d4d17428e0f237737208f2d0f2
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 13 15:32:41 2013 +
initialize sufficientFontRights
Change-Id: I14d7d38c5e6e34e81e648872155a1aef9b9578d4
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx
b/vcl/source/gdi/embeddedfontshelper.cxx
index c3101df..d32f9a3 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -106,7 +106,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference
io::XInputStream st
if( read = 0 )
break;
}
-bool sufficientFontRights;
+bool sufficientFontRights(false);
#if ENABLE_EOT
if( eot )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac download.lst external/icu
configure.ac |2 download.lst |3 external/icu/UnpackedTarball_icu.mk |8 -- external/icu/icu4c-aix.patch | 39 +++ external/icu/icu4c-android.patch | 38 +- external/icu/icu4c-buffer-overflow.patch |3 external/icu/icu4c-build.patch | 35 ++--- external/icu/icu4c-macosx.patch |3 external/icu/icu4c-mkdir.patch |3 external/icu/icu4c-rpath.patch |1 external/icu/icu4c-solarisgcc.patch |6 - external/icu/icu4c-warnings.patch|5 - external/icu/icu4c-wchar_t.patch |5 - external/icu/icu4c.10129.wintz.patch | 24 -- external/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch | 36 -- 15 files changed, 60 insertions(+), 151 deletions(-) New commits: commit 8ab4752820331ab80410877836093630198812d8 Author: Robert M Campbell robert.rcampb...@gmail.com Date: Wed Nov 13 17:23:40 2013 +0700 upgrade to ICU 52.1, fdo#70995 Change-Id: I25e4b630c9029749cc459c0b65da287d6f0ba95e Reviewed-on: https://gerrit.libreoffice.org/ Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Eike Rathke er...@redhat.com diff --git a/configure.ac b/configure.ac index 6d7dcf9..657e4b3 100644 --- a/configure.ac +++ b/configure.ac @@ -8911,7 +8911,7 @@ SYSTEM_GENBRK= SYSTEM_GENCCODE= SYSTEM_GENCMN= -ICU_MAJOR=51 +ICU_MAJOR=52 ICU_MINOR=1 ICU_RECLASSIFIED_CLOSE_PARENTHESIS=YES ICU_RECLASSIFIED_PREPEND_SET_EMPTY=YES diff --git a/download.lst b/download.lst index a34b6c2..238407c 100644 --- a/download.lst +++ b/download.lst @@ -58,8 +58,7 @@ export GRAPHITE_TARBALL := 7042305e4208af4c2d5249d814ccce58-graphite2-1.2.3.tgz export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz -export ICU_TARBALL := 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz -export ICU_51_LAYOUT_FIX_TARBALL := 7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz +export ICU_TARBALL := 9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip export JFREEREPORT_LIBBASE_TARBALL := eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 2fdc9ee..77cd38a 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -11,15 +11,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu)) $(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL))) -# *ONLY* for ICU 51(.1)! -# http://site.icu-project.org/download/51#TOC-Known-Issues -$(eval $(call gb_UnpackedTarball_set_pre_action,icu,\ - $(GNUTAR) -x -z -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(ICU_51_LAYOUT_FIX_TARBALL) \ -)) - $(eval $(call gb_UnpackedTarball_add_patches,icu,\ - external/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch \ - external/icu/icu4c.10129.wintz.patch \ external/icu/icu4c-build.patch \ external/icu/icu4c-aix.patch \ external/icu/icu4c-wchar_t.patch \ diff --git a/external/icu/icu4c-aix.patch b/external/icu/icu4c-aix.patch index 48659ca..580a8fc 100644 --- a/external/icu/icu4c-aix.patch +++ b/external/icu/icu4c-aix.patch @@ -1,20 +1,6 @@ misc/icu/source/config/mh-aix-gcc 2009-01-15 01:46:10.0 -0600 -+++ misc/build/icu/source/config/mh-aix-gcc2010-06-24 20:58:16.0 -0500 -@@ -1,10 +1,7 @@ - ## -*-makefile-*- --## Copyright (c) 2003-2009 IBM, Ken Foskey, and others. All rights reserved. --## --## Aix-specific setup (for gcc) --## --## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability). --## So, we are using 'windows' style library names, that is, libicuuc20.1.so instead of libicuuc.so.20.1 -+## Linux-specific setup -+## Copyright (c) 1999-2006, International Business Machines Corporation and -+## others. All Rights Reserved. - - # Certain files don't compile in -ansi mode (e.g. umutex.c, toolutil.c, and cdatatst.c) - CFLAGS += -D_ALL_SOURCE -@@ -13,84 +10,30 @@ +--- misc/icu/source/config/mh-aix-gcc 2010-06-24 20:58:16.0 -0500 misc/build/icu/source/config/mh-aix-gcc2013-10-31 20:34:16.607982310 +0700 +@@ -13,84 +13,29 @@ GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX) -E -MM $(DEFS)
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/embeddedfontshelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a88ea0092c8c5176cfa6ecf3e781375633b6c665
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 13 15:40:10 2013 +
sufficientFontRights usage appears to have reversed logic
Change-Id: Icbadfc2f2279f1814f7269110c61bb877c59cb0b
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx
b/vcl/source/gdi/embeddedfontshelper.cxx
index d32f9a3..b69be4e 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -149,7 +149,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference
io::XInputStream st
{
sufficientFontRights = sufficientTTFRights( fontData.front(),
fontData.size(), EditingAllowed );
}
-if( sufficientFontRights )
+if( !sufficientFontRights )
{
// It would be actually better to open the document in read-only mode
in this case,
// warn the user about this, and provide a button to drop the font(s)
in order
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 55786] FILEOPEN: read error for unsupported Lotus123 .wk3, .wk4
https://bugs.freedesktop.org/show_bug.cgi?id=55786 Michael Stahl mst...@redhat.com changed: What|Removed |Added Attachment #68305|application/octet-stream|application/vnd.lotus-1-2-3 mime type|| -- 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 55786] FILEOPEN: read error for unsupported Lotus123 .wk3, .wk4
https://bugs.freedesktop.org/show_bug.cgi?id=55786 Michael Stahl mst...@redhat.com changed: What|Removed |Added Attachment #68303|text/plain |application/vnd.lotus-1-2-3 mime type|| -- 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: xmloff/source
xmloff/source/style/XMLFontStylesContext.cxx |7 +++
xmloff/source/style/XMLFontStylesContext_impl.hxx |6 --
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 46b934679a476207d78e1284b308c792dd79c05e
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 13 15:48:04 2013 +
clear c++11ish
Change-Id: I4eea774206a5bd1de1c10a69aceb6476c5feecbf
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx
b/xmloff/source/style/XMLFontStylesContext.cxx
index 29f4808..f6006aa 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -267,6 +267,13 @@ void XMLFontStyleContextFontFaceUri::SetFormat( const
OUString rFormat )
{
format = rFormat;
}
+
+// the CSS2 standard (
http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#referencing )
+// defines these format strings.
+const char* OPENTYPE_FORMAT = opentype;
+const char* TRUETYPE_FORMAT = truetype;
+const char* EOT_FORMAT = embedded-opentype;
+
void XMLFontStyleContextFontFaceUri::EndElement()
{
if( linkPath.getLength() == 0 )
diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx
b/xmloff/source/style/XMLFontStylesContext_impl.hxx
index 6ad621f..3bcbdde 100644
--- a/xmloff/source/style/XMLFontStylesContext_impl.hxx
+++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx
@@ -88,12 +88,6 @@ public:
/// Handles style:font-face-uri
class XMLFontStyleContextFontFaceUri : public SvXMLStyleContext
{
-// the CSS2 standard (
http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#referencing )
-// defines these format strings.
-const char* OPENTYPE_FORMAT = opentype;
-const char* TRUETYPE_FORMAT = truetype;
-const char* EOT_FORMAT = embedded-opentype;
-
const XMLFontStyleContextFontFace font;
OUString format;
OUString linkPath;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 55786] FILEOPEN: read error for unsupported Lotus123 .wk3, .wk4
https://bugs.freedesktop.org/show_bug.cgi?id=55786 Michael Stahl mst...@redhat.com changed: What|Removed |Added Attachment #68307|application/octet-stream|application/vnd.lotus-1-2-3 mime type|| -- 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 55786] FILEOPEN: read error for unsupported Lotus123 .wk3, .wk4
https://bugs.freedesktop.org/show_bug.cgi?id=55786 Michael Stahl mst...@redhat.com changed: What|Removed |Added Attachment #68306|application/octet-stream|application/vnd.lotus-1-2-3 mime type|| -- 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' - vcl/qa vcl/source
vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf |binary
vcl/source/filter/wmf/enhwmf.cxx |5 +
2 files changed, 5 insertions(+)
New commits:
commit 071b6681564242d418d086e5991e1dbacc3b897c
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 12 14:56:43 2013 +
Resolves: fdo#71307 out polygons are limited to 16bit point count
Change-Id: I4dbe9145466d6d93ebd3dea7f4fe434c9ee3de19
(cherry picked from commit cdd351b1487a8a97f481a9165d9cd361aaee2ca4)
Reviewed-on: https://gerrit.libreoffice.org/6655
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf
new file mode 100644
index 000..b89db21
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index ad2a3a6..de8b780 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -344,6 +344,11 @@ void EnhWMFReader::ReadAndDrawPolygon(Drawer drawer, const
sal_Bool skipFirst)
template class T
Polygon EnhWMFReader::ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 nPoints)
{
+bool bRecordOk = nPoints = SAL_MAX_UINT16;
+SAL_WARN_IF(!bRecordOk, svtools.filter, polygon record has more
polygons than we can handle);
+if (!bRecordOk)
+return Polygon();
+
Polygon aPolygon(nPoints);
for (sal_uInt16 i = nStartIndex ; i nPoints pWMF-good(); i++ )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 68871] Disable View -- Elements by default
https://bugs.freedesktop.org/show_bug.cgi?id=68871 Thomas Arnhold thomas-l...@arnhold.org changed: What|Removed |Added Depends on||71580 -- 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 'private/tml/opencl-background-compilation' - sc/inc sc/source
sc/inc/formulacell.hxx | 15 ++-
sc/inc/types.hxx |1 +
sc/source/core/data/formulacell.cxx |3 +++
sc/source/core/opencl/formulagroupcl.cxx | 18 --
sc/source/core/tool/clkernelthread.cxx |9 +
5 files changed, 39 insertions(+), 7 deletions(-)
New commits:
commit bec94973e236a464dbeef853ba157aead8637799
Author: Tor Lillqvist t...@collabora.com
Date: Wed Nov 13 18:06:32 2013 +0200
WIP: Background ahead-of-time OpenCL compilation
Change-Id: I6e9906fb68a22eb0adab753726ec0d62dd05fe9b
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 68648fc..656eebb 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -20,15 +20,19 @@
#ifndef SC_FORMULACELL_HXX
#define SC_FORMULACELL_HXX
-#include formularesult.hxx
+#include set
+
+#include boost/noncopyable.hpp
-#include formula/tokenarray.hxx
+#include formula/tokenarray.hxx
+#include osl/conditn.hxx
+#include osl/mutex.hxx
#include rtl/ref.hxx
-#include svl/listener.hxx
+#include svl/listener.hxx
+
#include types.hxx
-#include set
-#include boost/noncopyable.hpp
+#include formularesult.hxx
namespace sc {
@@ -54,6 +58,7 @@ struct SC_DLLPUBLIC ScFormulaCellGroup : boost::noncopyable
ScTokenArray* mpCode;
osl::Mutex maMutex;
+osl::Condition maCompilationDone;
sc::CompiledFormula* mpCompiledFormula;
ScFormulaCell *mpTopCell;
SCROW mnLength; // How many of these do we have ?
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index 1704341..fc0e0e8 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -59,6 +59,7 @@ const sal_uInt16 MatrixEdgeOpen= 32;
enum GroupCalcState
{
GroupCalcEnabled,
+GroupCalcOpenCLKernelCompilationScheduled,
GroupCalcOpenCLKernelBinaryCreated,
GroupCalcRunning,
GroupCalcDisabled
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index f1ed90b..724922b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -445,9 +445,12 @@ ScFormulaCellGroup::~ScFormulaCellGroup()
void ScFormulaCellGroup::scheduleCompilation()
{
+osl::ResettableMutexGuard aGuard(maMutex);
+meCalcState = sc::GroupCalcOpenCLKernelCompilationScheduled;
sc::CLBuildKernelWorkItem aWorkItem;
aWorkItem.meWhatToDo = sc::CLBuildKernelWorkItem::COMPILE;
aWorkItem.mxGroup = this;
+aGuard.clear();
mxCLKernelThread-push(aWorkItem);
}
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 895bdc4..a1b902e 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1540,8 +1540,22 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
const ScAddress rTopPos, const ScFormulaCellGroupRef xGroup,
ScTokenArray rCode )
{
-// printf(Vector width = %d\n, xGroup-mnLength);
-DynamicKernel *pKernel = DynamicKernel::create(rDoc, rTopPos, rCode);
+DynamicKernel *pKernel;
+
+osl::ResettableMutexGuard aGuard(xGroup-maMutex);
+if (xGroup-meCalcState == sc::GroupCalcOpenCLKernelCompilationScheduled)
+{
+aGuard.clear();
+xGroup-maCompilationDone.wait();
+xGroup-maCompilationDone.reset();
+pKernel = static_castDynamicKernel*(xGroup-mpCompiledFormula);
+}
+else
+{
+aGuard.clear();
+pKernel = DynamicKernel::create(rDoc, rTopPos, rCode);
+}
+
if (!pKernel)
return false;
diff --git a/sc/source/core/tool/clkernelthread.cxx
b/sc/source/core/tool/clkernelthread.cxx
index b89312b..7404a80 100644
--- a/sc/source/core/tool/clkernelthread.cxx
+++ b/sc/source/core/tool/clkernelthread.cxx
@@ -9,6 +9,8 @@
#include sal/log.hxx
+#include formulagroupinterpreter.hxx
+
#include clkernelthread.hxx
using namespace std;
@@ -46,6 +48,13 @@ void CLBuildKernelThread::execute()
{
case CLBuildKernelWorkItem::COMPILE:
SAL_INFO(sc.opencl.thread, told to compile group
aWorkItem.mxGroup to binary);
+assert(aWorkItem.mxGroup-meCalcState ==
sc::GroupCalcOpenCLKernelCompilationScheduled);
+aWorkItem.mxGroup-mpCompiledFormula =
+
sc::FormulaGroupInterpreter::getStatic()-createCompiledFormula(*aWorkItem.mxGroup-mpTopCell-GetDocument(),
+
aWorkItem.mxGroup-mpTopCell-aPos,
+
*aWorkItem.mxGroup-mpCode);
+aWorkItem.mxGroup-meCalcState =
sc::GroupCalcOpenCLKernelBinaryCreated;
+aWorkItem.mxGroup-maCompilationDone.set();
break;
case CLBuildKernelWorkItem::FINISH:
SAL_INFO(sc.opencl.thread, told to finish);
Re: Doubt regarding expected failures in Make check for cppunit package
Hey Rajesh, 2013/11/13 Rajesh raj...@linux.vnet.ibm.com Hi, This is regarding the package cppunit. I am working on a new architecture - ppc64le (powerpc 64-bit Little Endian) and I was looking at building cppunit. I picked up the latest release tarball ( cppunit-1.13.2) and built on our ppc64le environment. While building, the make check fails with the following errors. make[3]: Entering directory `/home/rajesh/work/pkgs/ cppunit/rel-tar/cppunit-1.13.2/examples/hierarchy' ..The following test fails, this is intended: F..The following test fails, this is intended: F. !!!FAILURES!!! Test Results: Run: 5 Failures: 2 Errors: 0 1) test: BoardGameTestBoardGame::testResetShouldFail (F) line: 45 BoardGameTest.h assertion failed - Expression: !this-m_game-reset() 2) test: ChessTestChess::testResetShouldFail (F) line: 45 BoardGameTest.h assertion failed - Expression: !this-m_game-reset() I am not able to figure out if the error I am seeing above is an expected failure or not. The test says that it is intended, but still reported as !!!FAILURES!!! Could you please confirm if this is an expected failure or not? This one should not result in a build failure. These are expected failures. If make check fails can you maybe send the full console output of make check? Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/icu
external/icu/ExternalProject_icu.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a500ab2ee19a5221817c13fc8975c27fe4e92246 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 13 17:03:06 2013 +0100 Tunnel CXXFLAGS_CXX11 into ICU for our -D__float128=void hack for Clang against libstdc++; it is OK that that explicitly enables C++11 for ICU, as ICU's configure.ac would set -std=c++0x if no -std= is passed in. Change-Id: I0e5044773c3d6923e3b100e19b5b54ab9edf7a1b diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 26d90b5..bc56ce8 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -56,7 +56,7 @@ icu_CFLAGS:= \ $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \ $(if $(filter $(true),$(gb_SYMBOL)),-g) \ $(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer) -icu_CXXFLAGS:= \ +icu_CXXFLAGS:=$(CXXFLAGS_CXX11) \ $(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ $(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) \ $(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula offapi/com sc/source
formula/source/core/api/FormulaCompiler.cxx | 37 ++
include/formula/FormulaCompiler.hxx | 12
include/formula/grammar.hxx |6
offapi/com/sun/star/sheet/FormulaLanguage.idl |7 +++-
sc/source/filter/oox/formulabuffer.cxx| 10 +++
sc/source/filter/orcus/interface.cxx |2 -
6 files changed, 51 insertions(+), 23 deletions(-)
New commits:
commit debe0835cad25931a934eb3e1f205d508e6498cd
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 13 16:55:48 2013 +0100
introduced FormulaGrammar::GRAM_OOXML with FormulaLanguage::OOXML
FormulaLanguage::XL_ENGLISH is not OOXML, unconditionally using
SymbolsEnglishXL with RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML spoils
the grammars of FormulaLanguage::XL_ENGLISH that are not OOXML.
Change-Id: Id885d1c033cd15dc7b11c6490be3a98500027d37
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 1d84757..6499aa4 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -144,25 +144,25 @@ void lclPushOpCodeMapEntries( ::std::vector
sheet::FormulaOpCodeMapEntry rVe
class OpCodeList : public Resource// temp object for resource
{
public:
+enum SeparatorType
+{
+SEMICOLON_BASE,
+COMMA_BASE
+};
-OpCodeList( sal_uInt16, FormulaCompiler::NonConstOpCodeMapPtr );
+OpCodeList( sal_uInt16, FormulaCompiler::NonConstOpCodeMapPtr,
SeparatorType = SEMICOLON_BASE );
private:
bool getOpCodeString( OUString rStr, sal_uInt16 nOp );
void putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap,
sal_uInt16 nOp );
private:
-enum SeparatorType
-{
-SEMICOLON_BASE,
-COMMA_BASE
-};
SeparatorType meSepType;
};
-OpCodeList::OpCodeList( sal_uInt16 nRID, FormulaCompiler::NonConstOpCodeMapPtr
xMap ) :
+OpCodeList::OpCodeList( sal_uInt16 nRID, FormulaCompiler::NonConstOpCodeMapPtr
xMap, SeparatorType eSepType ) :
Resource( ResId( nRID, *ResourceManager::getResManager()))
-, meSepType( SEMICOLON_BASE)
+, meSepType( eSepType)
{
for (sal_uInt16 i = 0; i = SC_OPCODE_LAST_OPCODE_ID; ++i)
{
@@ -589,6 +589,11 @@ FormulaCompiler::OpCodeMapPtr
FormulaCompiler::GetOpCodeMap( const sal_Int32 nLa
InitSymbolsEnglishXL();
xMap = mxSymbolsEnglishXL;
break;
+case FormulaLanguage::OOXML:
+if (!mxSymbolsOOXML)
+InitSymbolsOOXML();
+xMap = mxSymbolsOOXML;
+break;
default:
; // nothing, NULL map returned
}
@@ -703,7 +708,7 @@ void FormulaCompiler::InitSymbolsEnglishXL() const
static OpCodeMapData aMap;
osl::MutexGuard aGuard(aMap.maMtx);
if (!aMap.mxSymbolMap)
-loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML,
FormulaGrammar::GRAM_ENGLISH, aMap.mxSymbolMap);
+loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH,
FormulaGrammar::GRAM_ENGLISH, aMap.mxSymbolMap);
mxSymbolsEnglishXL = aMap.mxSymbolMap;
// TODO: For now, just replace the separators to the Excel English
@@ -714,6 +719,15 @@ void FormulaCompiler::InitSymbolsEnglishXL() const
mxSymbolsEnglishXL-putOpCode( OUString(';'), ocArrayRowSep);
}
+void FormulaCompiler::InitSymbolsOOXML() const
+{
+static OpCodeMapData aMap;
+osl::MutexGuard aGuard(aMap.maMtx);
+if (!aMap.mxSymbolMap)
+loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML,
FormulaGrammar::GRAM_OOXML, aMap.mxSymbolMap);
+mxSymbolsOOXML = aMap.mxSymbolMap;
+}
+
void FormulaCompiler::loadSymbols( sal_uInt16 nSymbols,
FormulaGrammar::Grammar eGrammar,
NonConstOpCodeMapPtr rxMap) const
@@ -723,7 +737,10 @@ void FormulaCompiler::loadSymbols( sal_uInt16 nSymbols,
FormulaGrammar::Grammar
// not Core
rxMap.reset( new OpCodeMap( SC_OPCODE_LAST_OPCODE_ID + 1, eGrammar !=
FormulaGrammar::GRAM_ODFF, eGrammar ));
OModuleClient aModuleClient;
-OpCodeList aOpCodeList( nSymbols, rxMap );
+OpCodeList aOpCodeList( nSymbols, rxMap,
+((eGrammar == FormulaGrammar::GRAM_OOXML) ?
+ OpCodeList::SeparatorType::COMMA_BASE :
+ OpCodeList::SeparatorType::SEMICOLON_BASE));
fillFromAddInMap( rxMap, eGrammar);
// Fill from collection for AddIns not already present.
diff --git a/include/formula/FormulaCompiler.hxx
b/include/formula/FormulaCompiler.hxx
index e7ce920..5ce3c2d 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -333,6 +333,7 @@ private:
void InitSymbolsPODF() const; /// only SymbolsPODF, on demand
void InitSymbolsODFF() const; /// only SymbolsODFF, on demand
void InitSymbolsEnglishXL() const; /// only SymbolsEnglishXL, on demand
+void InitSymbolsOOXML() const;
[Libreoffice-commits] core.git: i18npool/qa i18npool/source
i18npool/qa/cppunit/test_breakiterator.cxx | 25
i18npool/source/breakiterator/breakiterator_unicode.cxx |2 -
2 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit f24fa8efad247bdc296e4724b914f73f01ef2d0b
Author: Robert M Campbell robert.rcampb...@gmail.com
Date: Wed Nov 13 23:15:13 2013 +0700
Add Lao breakiterator support for selecting and counting Lao words.
Change-Id: I6da721dc25394dfee12e3028aefbf0546d1be984
Reviewed-on: https://gerrit.libreoffice.org/6669
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 8d70250..a81475b 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -39,6 +39,7 @@ public:
void testWeak();
void testAsian();
void testThai();
+void testLao();
#ifdef TODO
void testNorthernThai();
#endif
@@ -59,6 +60,9 @@ public:
#if (U_ICU_VERSION_MAJOR_NUM 4)
CPPUNIT_TEST(testKhmer);
#endif
+#if (U_ICU_VERSION_MAJOR_NUM 51)
+CPPUNIT_TEST(testLao);
+#endif
CPPUNIT_TEST(testJapanese);
CPPUNIT_TEST_SUITE_END();
private:
@@ -784,6 +788,27 @@ void TestBreakIterator::testAsian()
}
}
+//A test to ensure that our Lao word boundary detection is useful
+void TestBreakIterator::testLao()
+{
+lang::Locale aLocale;
+aLocale.Language = OUString(lo);
+aLocale.Country = OUString(LA);
+//àºàº´àºàºàºµàºà»àºàºàº®àº±àº
+const sal_Unicode LAO[] = { 0x0e8d, 0x0eb4, 0x0e99, 0x0e94, 0x0eb5,
0x0e95, 0x0ec9, 0x0ead, 0x0e99, 0x0eae, 0x0eb1, 0x0e9a };
+OUString aTest(LAO, SAL_N_ELEMENTS(LAO));
+i18n::Boundary aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+
+CPPUNIT_ASSERT(aBounds.startPos == 0 aBounds.endPos == 5);
+
+aBounds = m_xBreak-getWordBoundary(aTest, aBounds.endPos, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+
+CPPUNIT_ASSERT(aBounds.startPos == 5 aBounds.endPos == 9);
+
+}
+
//A test to ensure that our thai word boundary detection is useful
void TestBreakIterator::testThai()
{
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index f85c109..3bb2e3e 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -121,7 +121,7 @@ void SAL_CALL
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
OUStringToOString(breakRules[breakType],
RTL_TEXTENCODING_ASCII_US).getStr(), status), status);
}
//use icu's breakiterator for Thai, Khmer, Tibetan and Dzongkha
-else if (rLocale.Language != th rLocale.Language != km
rLocale.Language != bo rLocale.Language != dz)
+else if (rLocale.Language != th rLocale.Language != lo
rLocale.Language != km rLocale.Language != bo rLocale.Language !=
dz)
{
status = U_ZERO_ERROR;
OStringBuffer aUDName(64);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/graphicfilter/file_graphicfilter.scp |2 -- scp2/source/ooo/module_lang_template.scp |1 - 2 files changed, 3 deletions(-) New commits: commit fb38a4f71f615e786ad11fe03f15419f9a389752 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 16:28:22 2013 + there is no flash related .res anymore Change-Id: I191642fd7f490a88bb75fb0943ba978582f20808 diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index 4d276d6..501d2fe 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -24,5 +24,3 @@ File gid_File_Share_Registry_Graphicfilter_Xcd Dir = gid_Brand_Dir_Share_Registry; Name = graphicfilter.xcd; End - -STD_RES_FILE( gid_File_Res_Flash, flash ) diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 63f4169..a694d14 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -72,7 +72,6 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Dkt, gid_File_Res_Editeng, gid_File_Res_Eur, - gid_File_Res_Flash, gid_File_Res_For, gid_File_Res_Forui, gid_File_Res_Fps_Office, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source
formula/source/core/api/FormulaCompiler.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e59cc6448c525561cfef8ceb3f9c335b2a7611c0 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 13 16:48:01 2013 + c++11 we love you Change-Id: I6ff8610f6b31481334d609a0e150285e6eef6096 diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 6499aa4..b5f1267 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -739,8 +739,8 @@ void FormulaCompiler::loadSymbols( sal_uInt16 nSymbols, FormulaGrammar::Grammar OModuleClient aModuleClient; OpCodeList aOpCodeList( nSymbols, rxMap, ((eGrammar == FormulaGrammar::GRAM_OOXML) ? - OpCodeList::SeparatorType::COMMA_BASE : - OpCodeList::SeparatorType::SEMICOLON_BASE)); + OpCodeList::COMMA_BASE : + OpCodeList::SEMICOLON_BASE)); fillFromAddInMap( rxMap, eGrammar); // Fill from collection for AddIns not already present. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac external/nss
config_host.mk.in |3 --- configure.ac |7 --- external/nss/nss.patch | 21 - 3 files changed, 31 deletions(-) New commits: commit a2a7a6411f7754b537d0ba2ad28a9823dd52ef74 Author: Michael Stahl mst...@redhat.com Date: Wed Nov 13 16:14:22 2013 +0100 configure: NSS_MAJOR etc. unused since cffad630 Change-Id: I5182e538219e85e8c2b0ae615d02d9aaaff75ca5 diff --git a/config_host.mk.in b/config_host.mk.in index 0da03be..42bc002 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -402,9 +402,6 @@ export NM=@NM@ export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@ export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@ export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@ -export NSS_MAJOR=@NSS_MAJOR@ -export NSS_MINOR=@NSS_MINOR@ -export NSS_PATCH=@NSS_PATCH@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ export nodep=@nodep@ @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@ diff --git a/configure.ac b/configure.ac index 657e4b3..7218fb8 100644 --- a/configure.ac +++ b/configure.ac @@ -8831,14 +8831,7 @@ if test $with_system_nss = yes; then libo_MINGW_CHECK_DLL([nssutil3]) libo_MINGW_CHECK_DLL([smime3]) libo_MINGW_CHECK_DLL([ssl3]) -else -NSS_MAJOR=3 -NSS_MINOR=13 -NSS_PATCH=5 fi -AC_SUBST(NSS_MAJOR) -AC_SUBST(NSS_MINOR) -AC_SUBST(NSS_PATCH) dnl === dnl Check for system mozilla headers commit d1299fd4c539a582e34c19e05ec635ee6ff6e0fa Author: Michael Stahl mst...@redhat.com Date: Tue Nov 12 19:26:21 2013 +0100 nss: remove obsolete signing-disabling patch Obsolete since the Mac build uses NSS_USE_SYSTEM_SQLITE=1 now. Change-Id: Ic02756c06a992d0f19849a4edf1e6305eafb8660 diff --git a/external/nss/nss.patch b/external/nss/nss.patch index e2d7d76..841685b 100644 --- a/external/nss/nss.patch +++ b/external/nss/nss.patch @@ -199,27 +199,6 @@ endif endif endif misc/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.0 +0200 -+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 -@@ -78,10 +78,15 @@ - - # sign any and all shared libraries that contain the word freebl - --CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) --CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) -+# Signing causes loading of some system library which in turn loads -+# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper -+# version. Therefore signing fails. -+# We cannot build with the system sqlite3, because it is too old (SDK -+# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib. -+#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) -+#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) - ifndef NSS_DISABLE_DBM --CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) -+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) - endif - CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) - --- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk +++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk @@ -64,12 +64,16 @@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula
formula/source/core/api/FormulaCompiler.cxx | 58 ++--
include/formula/FormulaCompiler.hxx | 16 +++
2 files changed, 46 insertions(+), 28 deletions(-)
New commits:
commit 10515c6c6f2d7257b1e9f17b16f18a637dcbf5c8
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 13 18:35:05 2013 +0100
fixed file format mappings always have RESOURCE_BASE separators
Change-Id: I7ac93f742b469156cd8eb3f8171c7e05a98598ad
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index b5f1267..d099042 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -144,33 +144,40 @@ void lclPushOpCodeMapEntries( ::std::vector
sheet::FormulaOpCodeMapEntry rVe
class OpCodeList : public Resource// temp object for resource
{
public:
-enum SeparatorType
-{
-SEMICOLON_BASE,
-COMMA_BASE
-};
-OpCodeList( sal_uInt16, FormulaCompiler::NonConstOpCodeMapPtr,
SeparatorType = SEMICOLON_BASE );
+OpCodeList( sal_uInt16, FormulaCompiler::NonConstOpCodeMapPtr,
+FormulaCompiler::SeparatorType = FormulaCompiler::SEMICOLON_BASE );
private:
bool getOpCodeString( OUString rStr, sal_uInt16 nOp );
void putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap,
sal_uInt16 nOp );
private:
-SeparatorType meSepType;
+FormulaCompiler::SeparatorType meSepType;
};
-OpCodeList::OpCodeList( sal_uInt16 nRID, FormulaCompiler::NonConstOpCodeMapPtr
xMap, SeparatorType eSepType ) :
+OpCodeList::OpCodeList( sal_uInt16 nRID, FormulaCompiler::NonConstOpCodeMapPtr
xMap,
+FormulaCompiler::SeparatorType eSepType ) :
Resource( ResId( nRID, *ResourceManager::getResManager()))
, meSepType( eSepType)
{
-for (sal_uInt16 i = 0; i = SC_OPCODE_LAST_OPCODE_ID; ++i)
+if (meSepType == FormulaCompiler::RESOURCE_BASE)
{
-OUString aOpStr;
-if ( getOpCodeString( aOpStr, i) )
-xMap-putOpCode( aOpStr, OpCode(i));
-else
+for (sal_uInt16 i = 0; i = SC_OPCODE_LAST_OPCODE_ID; ++i)
+{
putDefaultOpCode( xMap, i);
+}
+}
+else
+{
+for (sal_uInt16 i = 0; i = SC_OPCODE_LAST_OPCODE_ID; ++i)
+{
+OUString aOpStr;
+if ( getOpCodeString( aOpStr, i) )
+xMap-putOpCode( aOpStr, OpCode(i));
+else
+putDefaultOpCode( xMap, i);
+}
}
FreeResource();
@@ -182,12 +189,12 @@ bool OpCodeList::getOpCodeString( OUString rStr,
sal_uInt16 nOp )
{
case SC_OPCODE_SEP:
{
-if (meSepType == COMMA_BASE)
+if (meSepType == FormulaCompiler::COMMA_BASE)
{
rStr = ,;
return true;
}
-else if (meSepType == SEMICOLON_BASE)
+else if (meSepType == FormulaCompiler::SEMICOLON_BASE)
{
rStr = ;;
return true;
@@ -196,12 +203,12 @@ bool OpCodeList::getOpCodeString( OUString rStr,
sal_uInt16 nOp )
break;
case SC_OPCODE_ARRAY_COL_SEP:
{
-if (meSepType == COMMA_BASE)
+if (meSepType == FormulaCompiler::COMMA_BASE)
{
rStr = ,;
return true;
}
-else if (meSepType == SEMICOLON_BASE)
+else if (meSepType == FormulaCompiler::SEMICOLON_BASE)
{
rStr = ;;
return true;
@@ -210,12 +217,12 @@ bool OpCodeList::getOpCodeString( OUString rStr,
sal_uInt16 nOp )
break;
case SC_OPCODE_ARRAY_ROW_SEP:
{
-if (meSepType == COMMA_BASE)
+if (meSepType == FormulaCompiler::COMMA_BASE)
{
rStr = ;;
return true;
}
-else if (meSepType == SEMICOLON_BASE)
+else if (meSepType == FormulaCompiler::SEMICOLON_BASE)
{
rStr = |;
return true;
@@ -690,7 +697,7 @@ void FormulaCompiler::InitSymbolsPODF() const
static OpCodeMapData aMap;
osl::MutexGuard aGuard(aMap.maMtx);
if (!aMap.mxSymbolMap)
-loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH,
FormulaGrammar::GRAM_PODF, aMap.mxSymbolMap);
+loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH,
FormulaGrammar::GRAM_PODF, aMap.mxSymbolMap, RESOURCE_BASE);
mxSymbolsPODF = aMap.mxSymbolMap;
}
@@ -699,7 +706,7 @@ void FormulaCompiler::InitSymbolsODFF() const
static OpCodeMapData aMap;
osl::MutexGuard aGuard(aMap.maMtx);
if (!aMap.mxSymbolMap)
-loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF,
FormulaGrammar::GRAM_ODFF, aMap.mxSymbolMap);
+loadSymbols(RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF,
FormulaGrammar::GRAM_ODFF, aMap.mxSymbolMap, RESOURCE_BASE);
mxSymbolsODFF =
[Libreoffice-commits] core.git: autogen.sh
autogen.sh | 52 ++--
1 file changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 6b114c2dbce8bbb5aa9ffd7fac581d942cfc2819
Author: Arnaud Versini arnaud.vers...@libreoffice.org
Date: Thu Oct 17 15:01:45 2013 +0200
Generate configure before calling ./configure --help
Change-Id: I21a88802b6ca617a44def3bc96789eb97969c918
Reviewed-on: https://gerrit.libreoffice.org/6291
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/autogen.sh b/autogen.sh
index dc3a58d..a2a9675 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -101,6 +101,32 @@ sub invalid_distro($$)
closedir ($dirh);
}
+# Alloc $ACLOCAL to specify which aclocal to use
+$aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
+
+my $system = `uname -s`;
+chomp $system;
+
+sanity_checks ($system) unless($system eq 'Darwin');
+
+my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
+
+$aclocal_flags .= -I $src_path/m4;
+$aclocal_flags .= -I $src_path/m4/mac if ($system eq 'Darwin');
+$aclocal_flags .= -I /opt/freeware/share/aclocal if ($system eq 'AIX');
+
+$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq
'Darwin'));
+
+if ($src_path ne $build_path)
+{
+system (ln -sf $src_path/configure.ac configure.ac);
+system (ln -sf $src_path/g g);
+}
+system ($aclocal $aclocal_flags) die Failed to run aclocal;
+unlink (configure);
+system (autoconf -I ${src_path}) die Failed to run autoconf;
+die Failed to generate the configure script if (! -f configure);
+
# Handle help arguments first, so we don't clobber autogen.lastrun
for my $arg (@ARGV) {
if ($arg =~ /^(--help|-h|-\?)$/) {
@@ -152,32 +178,6 @@ for my $arg (@args) {
}
}
-# Alloc $ACLOCAL to specify which aclocal to use
-$aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
-
-my $system = `uname -s`;
-chomp $system;
-
-sanity_checks ($system) unless($system eq 'Darwin');
-
-my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
-
-$aclocal_flags .= -I $src_path/m4;
-$aclocal_flags .= -I $src_path/m4/mac if ($system eq 'Darwin');
-$aclocal_flags .= -I /opt/freeware/share/aclocal if ($system eq 'AIX');
-
-$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq
'Darwin'));
-
-if ($src_path ne $build_path)
-{
-system (ln -sf $src_path/configure.ac configure.ac);
-system (ln -sf $src_path/g g);
-}
-system ($aclocal $aclocal_flags) die Failed to run aclocal;
-unlink (configure);
-system (autoconf -I ${src_path}) die Failed to run autoconf;
-die Failed to generate the configure script if (! -f configure);
-
if (defined $ENV{NOCONFIGURE}) {
print Skipping configure process.;
} else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/tml/opencl-background-compilation' - sc/source
sc/source/core/opencl/openclwrapper.cxx | 24 +++-
1 file changed, 7 insertions(+), 17 deletions(-)
New commits:
commit 32c233292866084d8c0c3f64b386de868fc54dec
Author: Tor Lillqvist t...@collabora.com
Date: Wed Nov 13 20:42:19 2013 +0200
s/printf/SAL_INFO
Change-Id: I2bced1740811d236e724eaf172249a9828575d7a
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index aa41112..70a9e00 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -207,11 +207,11 @@ std::vectorboost::shared_ptrosl::File
OpenclDevice::binaryGenerated( const
if(pNewFile-open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
{
aGeneratedFiles.push_back(boost::shared_ptrosl::File(pNewFile));
-printf(opencl-wrapper: opening binary for reading [%s]
success\n, fileName.getStr());
+SAL_INFO(sc.opencl, Opening binary file ' fileName
' for reading: success);
}
else
{
-printf(opencl-wrapper: opening binary for reading [%s]
fail\n, fileName.getStr());
+SAL_INFO(sc.opencl, Opening binary file ' fileName
' for reading: FAIL);
delete pNewFile;
break;
}
@@ -288,11 +288,9 @@ int OpenclDevice::generatBinFromKernelSource( cl_program
program, const char * c
OString fileName = createFileName(mpArryDevsID[i], clFileName);
if ( !writeBinaryToFile( fileName,
binaries[i], binarySizes[i] ) )
-{
-printf(opencl-wrapper: write binary [%s] fail\n,
fileName.getStr());
-}
+SAL_INFO(sc.opencl, Writing binary file ' fileName
': FAIL);
else
-printf(opencl-wrapper: write binary [%s] success\n,
fileName.getStr());
+SAL_INFO(sc.opencl, Writing binary file ' fileName
': success);
}
}
@@ -351,7 +349,6 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo,
int idx)
cl_int clStatus;
//char options[512];
// create a cl program executable for all the devices specified
-printf(BuildProgram.\n);
if (!gpuInfo-mnIsUserCreated)
{
clStatus = clBuildProgram(gpuInfo-mpArryPrograms[idx], 1,
gpuInfo-mpArryDevsID,
@@ -366,7 +363,6 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo,
int idx)
if ( clStatus != CL_SUCCESS )
{
size_t length;
-printf (BuildProgram error!\n);
if ( !gpuInfo-mnIsUserCreated )
{
clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx],
gpuInfo-mpArryDevsID[0],
@@ -379,7 +375,6 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo,
int idx)
}
if ( clStatus != CL_SUCCESS )
{
-printf(opencl create build log fail\n);
return 0;
}
@@ -396,7 +391,6 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo,
int idx)
}
if ( clStatus != CL_SUCCESS )
{
-printf(opencl program build info fail\n);
return false;
}
@@ -465,7 +459,6 @@ bool OpenclDevice::buildProgramFromBinary(const char*
buildOption, GPUEnv* gpuIn
cl_int binary_status;
-fprintf(stderr, Create kernel from binary\n);
gpuInfo-mpArryPrograms[idx] = clCreateProgramWithBinary(
gpuInfo-mpContext,numDevices,
mpArryDevsID.get(), length.get(),
(const unsigned char**) pBinary.get(),
binary_status, clStatus );
@@ -503,10 +496,8 @@ int OpenclDevice::initOpenclRunEnv( int argc )
int status = initOpenclRunEnv( gpuEnv );
if ( status )
{
-printf(init_opencl_env failed.\n);
return 1;
}
-printf(init_opencl_env successed.\n);
//initialize program, kernelName, kernelCount
if( getenv( SC_FLOAT ) )
{
@@ -515,15 +506,15 @@ int OpenclDevice::initOpenclRunEnv( int argc )
}
if( gpuEnv.mnKhrFp64Flag )
{
-printf(use khr double type in kernel\n);
+SAL_INFO(sc.opencl, Use Khr double);
}
else if( gpuEnv.mnAmdFp64Flag )
{
-printf(use amd double type in kernel\n);
+SAL_INFO(sc.opencl, Use AMD double type);
}
else
{
-printf(use float type in kernel\n);
+SAL_INFO(sc.opencl, USE float type);
}
isInited = 1;
}
@@ -710,7 +701,6 @@ int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
void OpenclDevice::setOpenclState( int state )
{
-//printf(OpenclDevice::setOpenclState...\n);
isInited = state;
}
___
Libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/openclwrapper.cxx | 24 +++-
1 file changed, 7 insertions(+), 17 deletions(-)
New commits:
commit e51ae1c2c69597d751cf184f69192cdcb57ebf48
Author: Tor Lillqvist t...@collabora.com
Date: Wed Nov 13 20:42:19 2013 +0200
s/printf/SAL_INFO
Change-Id: I2bced1740811d236e724eaf172249a9828575d7a
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index aa41112..70a9e00 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -207,11 +207,11 @@ std::vectorboost::shared_ptrosl::File
OpenclDevice::binaryGenerated( const
if(pNewFile-open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
{
aGeneratedFiles.push_back(boost::shared_ptrosl::File(pNewFile));
-printf(opencl-wrapper: opening binary for reading [%s]
success\n, fileName.getStr());
+SAL_INFO(sc.opencl, Opening binary file ' fileName
' for reading: success);
}
else
{
-printf(opencl-wrapper: opening binary for reading [%s]
fail\n, fileName.getStr());
+SAL_INFO(sc.opencl, Opening binary file ' fileName
' for reading: FAIL);
delete pNewFile;
break;
}
@@ -288,11 +288,9 @@ int OpenclDevice::generatBinFromKernelSource( cl_program
program, const char * c
OString fileName = createFileName(mpArryDevsID[i], clFileName);
if ( !writeBinaryToFile( fileName,
binaries[i], binarySizes[i] ) )
-{
-printf(opencl-wrapper: write binary [%s] fail\n,
fileName.getStr());
-}
+SAL_INFO(sc.opencl, Writing binary file ' fileName
': FAIL);
else
-printf(opencl-wrapper: write binary [%s] success\n,
fileName.getStr());
+SAL_INFO(sc.opencl, Writing binary file ' fileName
': success);
}
}
@@ -351,7 +349,6 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo,
int idx)
cl_int clStatus;
//char options[512];
// create a cl program executable for all the devices specified
-printf(BuildProgram.\n);
if (!gpuInfo-mnIsUserCreated)
{
clStatus = clBuildProgram(gpuInfo-mpArryPrograms[idx], 1,
gpuInfo-mpArryDevsID,
@@ -366,7 +363,6 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo,
int idx)
if ( clStatus != CL_SUCCESS )
{
size_t length;
-printf (BuildProgram error!\n);
if ( !gpuInfo-mnIsUserCreated )
{
clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx],
gpuInfo-mpArryDevsID[0],
@@ -379,7 +375,6 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo,
int idx)
}
if ( clStatus != CL_SUCCESS )
{
-printf(opencl create build log fail\n);
return 0;
}
@@ -396,7 +391,6 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo,
int idx)
}
if ( clStatus != CL_SUCCESS )
{
-printf(opencl program build info fail\n);
return false;
}
@@ -465,7 +459,6 @@ bool OpenclDevice::buildProgramFromBinary(const char*
buildOption, GPUEnv* gpuIn
cl_int binary_status;
-fprintf(stderr, Create kernel from binary\n);
gpuInfo-mpArryPrograms[idx] = clCreateProgramWithBinary(
gpuInfo-mpContext,numDevices,
mpArryDevsID.get(), length.get(),
(const unsigned char**) pBinary.get(),
binary_status, clStatus );
@@ -503,10 +496,8 @@ int OpenclDevice::initOpenclRunEnv( int argc )
int status = initOpenclRunEnv( gpuEnv );
if ( status )
{
-printf(init_opencl_env failed.\n);
return 1;
}
-printf(init_opencl_env successed.\n);
//initialize program, kernelName, kernelCount
if( getenv( SC_FLOAT ) )
{
@@ -515,15 +506,15 @@ int OpenclDevice::initOpenclRunEnv( int argc )
}
if( gpuEnv.mnKhrFp64Flag )
{
-printf(use khr double type in kernel\n);
+SAL_INFO(sc.opencl, Use Khr double);
}
else if( gpuEnv.mnAmdFp64Flag )
{
-printf(use amd double type in kernel\n);
+SAL_INFO(sc.opencl, Use AMD double type);
}
else
{
-printf(use float type in kernel\n);
+SAL_INFO(sc.opencl, USE float type);
}
isInited = 1;
}
@@ -710,7 +701,6 @@ int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
void OpenclDevice::setOpenclState( int state )
{
-//printf(OpenclDevice::setOpenclState...\n);
isInited = state;
}
___
Libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 3f9e7e72c53ecbe8ee1ab060f811cb41eadfc7e1 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Wed Nov 13 22:23:05 2013 +0300 DOCX: fdo#43093 set alignment if not already set Change-Id: I34d2c6c1fc9338cea025ac510621d370f23805a2 diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 2a672f7..329cc63 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -1062,6 +1062,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) // Left-to-right direction if not already set pEntry-pProperties-Insert(PROP_WRITING_MODE, uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false); +// Left aligment if not already set +pEntry-pProperties-Insert(PROP_PARA_ADJUST, uno::makeAny( sal_Int16(style::ParagraphAdjust_LEFT) ), false); } uno::Sequence beans::PropertyValue aPropValues = pEntry-pProperties-GetPropertyValues(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal
include/sal/log-areas.dox |1 + 1 file changed, 1 insertion(+) New commits: commit f15efcb0f53ea45bf4d44a83e60706d4899c42cd Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 13 23:13:43 2013 +0200 Add sc.opencl Change-Id: I1a6544701afa7658464334d454451284a34530cb diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 73f88094a..ca635c4 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -83,6 +83,7 @@ certain functionality. @section Calc @li @c sc +@li @c sc.opencl @li @c sc.core @li @c sc.filter - Calc filter @li @c sc.ui - Calc UI ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Handling of worksheet functions from Excel 2010 and newer
On Wed, 2013-11-13 at 07:59 +0100, Winfried Donkers wrote: as I seem to read that you offer help in creating the test file, that may not be a problem after all.:) So... Our hope was to raise awareness of the importance of increasing test cases (which includes creating test files) and attract more people to write more tests because there are only so much test cases Markus and myself can write. I can tell you upfront that I cannot to offer help any more simply because I physically can't. But, thanks for the discussion. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/htmlexport/htmlexport.cxx | 68 -
sw/qa/extras/inc/swmodeltestbase.hxx | 21 +++---
2 files changed, 51 insertions(+), 38 deletions(-)
New commits:
commit 70ad8ec6d5bd9b2b146d7409ec06d3414cd8551c
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 13 22:04:41 2013 +0100
Make CppunitTest_sw_htmlexport use DECLARE_SW_ROUNDTRIP_TEST()
Change-Id: Idc524ce084e117a9cfe816e5012ef33ea774fef6
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index b200cda..c86b2f4 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -8,6 +8,9 @@
*/
#include swmodeltestbase.hxx
+
+#if !defined(MACOSX) !defined(WNT)
+
#include com/sun/star/awt/Gradient.hpp
#include com/sun/star/drawing/FillStyle.hpp
#include swmodule.hxx
@@ -16,56 +19,55 @@
class Test : public SwModelTestBase
{
public:
-void testFdo62336();
-void testCharacterBorder();
-
-CPPUNIT_TEST_SUITE(Test);
-#if !defined(MACOSX) !defined(WNT)
-CPPUNIT_TEST(run);
-#endif
-CPPUNIT_TEST_SUITE_END();
+Test()
+: SwModelTestBase(/sw/qa/extras/htmlexport/data/, HTML
(StarWriter)),
+m_eUnit(FUNIT_NONE)
+{
+}
private:
-void run();
-};
+bool mustCalcLayoutOf(const char* filename) SAL_OVERRIDE
+{
+return OString(filename) != fdo62336.docx;
+}
-void Test::run()
-{
-MethodEntryTest aMethods[] = {
-{fdo62336.docx, Test::testFdo62336},
-{charborder.odt, Test::testCharacterBorder},
-};
-header();
-for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
+bool mustTestImportOf(const char* filename) const SAL_OVERRIDE
{
-MethodEntryTest rEntry = aMethods[i];
-FieldUnit eUnit = FUNIT_NONE;
-if (OString(rEntry.pName) == charborder.odt)
+return OString(filename) != fdo62336.docx;
+}
+
+void preTest(const char* filename) SAL_OVERRIDE
+{
+if (OString(filename) == charborder.odt)
{
// FIXME if padding-top gets exported as inches, not cms, we get
rounding errors.
SwMasterUsrPref* pPref =
const_castSwMasterUsrPref*(SW_MOD()-GetUsrPref(false));
-eUnit = pPref-GetMetric();
+m_eUnit = pPref-GetMetric();
pPref-SetMetric(FUNIT_CM);
}
-load(/sw/qa/extras/htmlexport/data/, rEntry.pName,
- false /* not doing layout is required for this test */);
-reload(HTML (StarWriter));
-if (OString(rEntry.pName) == charborder.odt)
+}
+
+void postTest(const char* filename) SAL_OVERRIDE
+{
+if (OString(filename) == charborder.odt)
{
SwMasterUsrPref* pPref =
const_castSwMasterUsrPref*(SW_MOD()-GetUsrPref(false));
-pPref-SetMetric(eUnit);
+pPref-SetMetric(m_eUnit);
}
-(this-*rEntry.pMethod)();
-finish();
}
-}
-void Test::testFdo62336()
+FieldUnit m_eUnit;
+};
+
+#define DECLARE_HTMLEXPORT_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
+
+DECLARE_HTMLEXPORT_TEST(testFdo62336, fdo62336.docx)
{
// The problem was essentially a crash during table export as docx/rtf/html
+// If either of no-calc-layout or no-test-import is enabled, the crash
does not occur
}
-void Test::testCharacterBorder()
+DECLARE_HTMLEXPORT_TEST(testCharacterBorder, charborder.odt)
{
uno::Referencebeans::XPropertySet xRun(getRun(getParagraph(1),1),
uno::UNO_QUERY);
@@ -88,7 +90,7 @@ void Test::testCharacterBorder()
// No shadow
}
-CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 27cacf2..79eb8af 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -139,8 +139,10 @@ protected:
void executeImportExportImportTest(const char* filename)
{
header();
+preTest(filename);
load(mpTestDocumentPath, filename);
-reload(mpFilter);
+reload(mpFilter, filename);
+postTest(filename);
verify();
finish();
}
@@ -174,6 +176,14 @@ protected:
{
}
+/**
+ * Override this function if not calcing layout is needed
+ */
+virtual bool mustCalcLayoutOf(const char* /*filename*/)
+{
+return true;
+}
+
private:
void dumpLayout()
{
@@ -391,7 +401,7 @@ protected:
std::cerr File tested,Execution Time (ms) std::endl;
}
-void load(const char* pDir, const char* pName, bool bCalcLayout = true)
+void load(const char* pDir, const char* pName)
{
if (mxComponent.is())
mxComponent-dispose();
@@ -399,11 +409,11 @@ protected:
std::cerr pName ,;
m_nStartTime = osl_getGlobalTimer();
mxComponent =
[Libreoffice-commits] core.git: sc/Module_sc.mk
sc/Module_sc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 17cf61482a5560b82730b65552ebc770c0a2fd81 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Nov 13 18:01:31 2013 -0500 Let's not comment out the whole unit test target. Change-Id: I1629e75bfc6a528a4cbeaf296e73937b0c18a81c diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index c4a38ee..9e34521 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -49,7 +49,7 @@ endif # Disabled because fails on too many machines in # the OpenCL compiler -# CppunitTest_sc_opencl_test \ +# CppunitTest_sc_opencl_test $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_ucalc \ CppunitTest_sc_filters_test \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/Module_sc.mk
sc/Module_sc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a456efd65f53191ec8501f9b2982db376a472f41 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Nov 13 18:01:31 2013 -0500 Let's not comment out the whole unit test target. Change-Id: I1629e75bfc6a528a4cbeaf296e73937b0c18a81c diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index c4a38ee..9e34521 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -49,7 +49,7 @@ endif # Disabled because fails on too many machines in # the OpenCL compiler -# CppunitTest_sc_opencl_test \ +# CppunitTest_sc_opencl_test $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_ucalc \ CppunitTest_sc_filters_test \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. James Michael DuPont wikiuser Mdupont jamesmikedup...@googlemail.com -- James Michael DuPont Member of Free Libre Open Source Software Kosova http://flossk.org Saving wikipedia(tm) articles from deletion http://SpeedyDeletion.wikia.com Contributor FOSM, the CC-BY-SA map of the world http://fosm.org Mozilla Rep https://reps.mozilla.org/u/h4ck3rm1k3 Free Software Foundation Europe Fellow http://fsfe.org/support/?h4ck3rm1k3 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/ucalc_formula.cxx | 33 ++--- sc/source/core/tool/interpr6.cxx |2 +- 2 files changed, 27 insertions(+), 8 deletions(-) New commits: commit 6b160fa3e4a343387048279d0d85355b0a70a770 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Nov 13 18:11:17 2013 -0500 Fix regression with SUM(), and test case to catch it. Change-Id: I76061ce5d975ac565d49b89f8365e355aa0ad009 diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index ce407e7..d12e45d 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1514,14 +1514,33 @@ void Test::testFuncSUM() CPPUNIT_ASSERT_MESSAGE (failed to insert sheet, m_pDoc-InsertTab (0, aTabName)); -double val = 1; -double result; -m_pDoc-SetValue (0, 0, 0, val); -m_pDoc-SetValue (0, 1, 0, val); -m_pDoc-SetString (0, 2, 0, OUString(=SUM(A1:A2))); +// Single argument case. +m_pDoc-SetValue(ScAddress(0,0,0), 1); +m_pDoc-SetValue(ScAddress(0,1,0), 1); +m_pDoc-SetString(ScAddress(0,2,0), =SUM(A1:A2)); +m_pDoc-CalcAll(); +CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc-GetValue(ScAddress(0,2,0))); + +// Multiple argument case. +m_pDoc-SetValue(ScAddress(0,0,0), 1); +m_pDoc-SetValue(ScAddress(0,1,0), 22); +m_pDoc-SetValue(ScAddress(0,2,0), 4); +m_pDoc-SetValue(ScAddress(0,3,0), 5); +m_pDoc-SetValue(ScAddress(0,4,0), 6); + +m_pDoc-SetValue(ScAddress(1,0,0), 3); +m_pDoc-SetValue(ScAddress(1,1,0), 4); +m_pDoc-SetValue(ScAddress(1,2,0), 5); +m_pDoc-SetValue(ScAddress(1,3,0), 6); +m_pDoc-SetValue(ScAddress(1,4,0), 7); + +m_pDoc-SetString(ScAddress(3,0,0), =SUM(A1:A2;B1:B2)); +m_pDoc-SetString(ScAddress(3,1,0), =SUM(A2:A3;B2:B3)); +m_pDoc-SetString(ScAddress(3,2,0), =SUM(A3:A4;B3:B4)); m_pDoc-CalcAll(); -m_pDoc-GetValue (0, 2, 0, result); -CPPUNIT_ASSERT_MESSAGE (calculation failed, result == 2.0); +CPPUNIT_ASSERT_EQUAL(30.0, m_pDoc-GetValue(ScAddress(3,0,0))); +CPPUNIT_ASSERT_EQUAL(35.0, m_pDoc-GetValue(ScAddress(3,1,0))); +CPPUNIT_ASSERT_EQUAL(20.0, m_pDoc-GetValue(ScAddress(3,2,0))); m_pDoc-DeleteTab(0); } diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index c8b417a..8999e04 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -806,7 +806,7 @@ void ScInterpreter::ScSum() FuncSum aAction; aSet.executeColumnAction(*pDok, aAction); -fRes = aAction.getSum(); +fRes += aAction.getSum(); // Get the number format of the last iterated cell. nFuncFmtIndex = aAction.getNumberFormat(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/qa sc/source
sc/qa/unit/ucalc_formula.cxx | 33 ++--- sc/source/core/tool/interpr6.cxx |2 +- 2 files changed, 27 insertions(+), 8 deletions(-) New commits: commit 305ecba52ce59dba70f92a2aa1a1ddf7c5b2624d Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Nov 13 18:11:17 2013 -0500 Fix regression with SUM(), and test case to catch it. Change-Id: I76061ce5d975ac565d49b89f8365e355aa0ad009 diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index ce407e7..d12e45d 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1514,14 +1514,33 @@ void Test::testFuncSUM() CPPUNIT_ASSERT_MESSAGE (failed to insert sheet, m_pDoc-InsertTab (0, aTabName)); -double val = 1; -double result; -m_pDoc-SetValue (0, 0, 0, val); -m_pDoc-SetValue (0, 1, 0, val); -m_pDoc-SetString (0, 2, 0, OUString(=SUM(A1:A2))); +// Single argument case. +m_pDoc-SetValue(ScAddress(0,0,0), 1); +m_pDoc-SetValue(ScAddress(0,1,0), 1); +m_pDoc-SetString(ScAddress(0,2,0), =SUM(A1:A2)); +m_pDoc-CalcAll(); +CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc-GetValue(ScAddress(0,2,0))); + +// Multiple argument case. +m_pDoc-SetValue(ScAddress(0,0,0), 1); +m_pDoc-SetValue(ScAddress(0,1,0), 22); +m_pDoc-SetValue(ScAddress(0,2,0), 4); +m_pDoc-SetValue(ScAddress(0,3,0), 5); +m_pDoc-SetValue(ScAddress(0,4,0), 6); + +m_pDoc-SetValue(ScAddress(1,0,0), 3); +m_pDoc-SetValue(ScAddress(1,1,0), 4); +m_pDoc-SetValue(ScAddress(1,2,0), 5); +m_pDoc-SetValue(ScAddress(1,3,0), 6); +m_pDoc-SetValue(ScAddress(1,4,0), 7); + +m_pDoc-SetString(ScAddress(3,0,0), =SUM(A1:A2;B1:B2)); +m_pDoc-SetString(ScAddress(3,1,0), =SUM(A2:A3;B2:B3)); +m_pDoc-SetString(ScAddress(3,2,0), =SUM(A3:A4;B3:B4)); m_pDoc-CalcAll(); -m_pDoc-GetValue (0, 2, 0, result); -CPPUNIT_ASSERT_MESSAGE (calculation failed, result == 2.0); +CPPUNIT_ASSERT_EQUAL(30.0, m_pDoc-GetValue(ScAddress(3,0,0))); +CPPUNIT_ASSERT_EQUAL(35.0, m_pDoc-GetValue(ScAddress(3,1,0))); +CPPUNIT_ASSERT_EQUAL(20.0, m_pDoc-GetValue(ScAddress(3,2,0))); m_pDoc-DeleteTab(0); } diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index c8b417a..8999e04 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -806,7 +806,7 @@ void ScInterpreter::ScSum() FuncSum aAction; aSet.executeColumnAction(*pDok, aAction); -fRes = aAction.getSum(); +fRes += aAction.getSum(); // Get the number format of the last iterated cell. nFuncFmtIndex = aAction.getNumberFormat(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - 2 commits - include/svl sc/inc sc/source svl/Library_svl.mk svl/source
include/svl/broadcast.hxx | 28 +
include/svl/listener.hxx | 28 +++--
include/svl/listeneriter.hxx | 65
sc/inc/pch/precompiled_sc.hxx |1
sc/source/core/data/bcaslot.cxx| 10 +--
sc/source/core/data/column2.cxx| 11 +--
svl/Library_svl.mk |2
svl/source/notify/broadcast.cxx| 113
svl/source/notify/listener.cxx | 115 ++---
svl/source/notify/listenerbase.cxx | 66 -
svl/source/notify/listenerbase.hxx | 50
svl/source/notify/listeneriter.cxx | 105 -
12 files changed, 136 insertions(+), 458 deletions(-)
New commits:
commit dd4c7c88f26c229a9cae7cd88f18a953a9318095
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 13 22:04:49 2013 -0500
No need to individually remove listeners when being destroyed.
Otherwise a crash would ensue.
Change-Id: I9a52524cc205765d059745e9f7e914b636667cb6
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx
index ab62d48..80d9568 100644
--- a/include/svl/broadcast.hxx
+++ b/include/svl/broadcast.hxx
@@ -55,6 +55,7 @@ public:
private:
ListenersType maListeners;
+bool mbDying;
};
diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index 79c1757..7e59e36 100644
--- a/svl/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.cxx
@@ -69,21 +69,25 @@ void SvtBroadcaster::Add( SvtListener* p )
void SvtBroadcaster::Remove( SvtListener* p )
{
+if (mbDying)
+return;
+
maListeners.erase(p);
if (maListeners.empty())
ListenersGone();
}
-SvtBroadcaster::SvtBroadcaster() {}
+SvtBroadcaster::SvtBroadcaster() : mbDying(false) {}
SvtBroadcaster::SvtBroadcaster( const SvtBroadcaster rBC ) :
-maListeners(rBC.maListeners)
+maListeners(rBC.maListeners), mbDying(false)
{
std::for_each(maListeners.begin(), maListeners.end(),
StartListeningHandler(*this));
}
SvtBroadcaster::~SvtBroadcaster()
{
+mbDying = true;
Broadcast( SfxSimpleHint(SFX_HINT_DYING) );
// unregister all listeners.
commit a235b940cddb68436300d225a8a69e247aa23f33
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 13 20:33:50 2013 -0500
Rework SvtListener and SvtBroadcaster internals.
The old code was simply awkward.
Change-Id: I1a58a9af86c100be238d306570b40f70c5100314
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx
index 0b533ba..ab62d48 100644
--- a/include/svl/broadcast.hxx
+++ b/include/svl/broadcast.hxx
@@ -20,36 +20,41 @@
#define INCLUDED_SVL_BROADCAST_HXX
#include svl/svldllapi.h
-#include tools/rtti.hxx
+
+#include boost/unordered_set.hpp
class SvtListener;
class SfxHint;
-class SvtListenerBase;
-
-//-
class SVL_DLLPUBLIC SvtBroadcaster
{
-friend class SvtListener;
-friend class SvtListenerBase;
-friend class SvtListenerIter;
-SvtListenerBase* pRoot;
+public:
+friend class SvtListener;
+
+typedef boost::unordered_setSvtListener* ListenersType;
+private:
const SvtBroadcaster operator=(const SvtBroadcaster ); // verboten
+void Add( SvtListener* p );
+void Remove( SvtListener* p );
+
protected:
virtual voidListenersGone();
public:
-TYPEINFO();
-
SvtBroadcaster();
SvtBroadcaster( const SvtBroadcaster rBC );
virtual ~SvtBroadcaster();
voidBroadcast( const SfxHint rHint );
-sal_BoolHasListeners() const { return 0 != pRoot; }
+ListenersType GetAllListeners();
+
+bool HasListeners() const;
+
+private:
+ListenersType maListeners;
};
diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx
index 4204b2b..c871023 100644
--- a/include/svl/listener.hxx
+++ b/include/svl/listener.hxx
@@ -20,34 +20,30 @@
#define INCLUDED_SVL_LISTENER_HXX
#include svl/svldllapi.h
-#include tools/rtti.hxx
+
+#include boost/unordered_set.hpp
class SvtBroadcaster;
class SfxHint;
-class SvtListenerBase;
-
-//-
class SVL_DLLPUBLIC SvtListener
{
-friend class SvtListenerBase;
-SvtListenerBase *pBrdCastLst;
+typedef boost::unordered_setSvtBroadcaster* BroadcastersType;
+BroadcastersType maBroadcasters;
const SvtListener operator=(const SvtListener ); // n.i., ist verboten
public:
-TYPEINFO();
-
-SvtListener();
-SvtListener( const SvtListener rCopy );
-virtual ~SvtListener();
+SvtListener();
+SvtListener( const SvtListener r );
+virtual ~SvtListener();
-sal_Bool
LibreOffice Gerrit News for core on 2013-11-14
Moin! * Open changes on master for project core changed in the last 25 hours: + nss: upgrade to 3.15.3 in https://gerrit.libreoffice.org/6670 from Michael Stahl + make l10n buildable separately in https://gerrit.libreoffice.org/6660 from Björn Michaelsen + ooxml: Remove white artifact inside exported pictures in https://gerrit.libreoffice.org/6648 from Jacobo Aragunde Pérez + [docx] activeX files saved in InteropGrabBag and exported. in https://gerrit.libreoffice.org/6654 from Sushil Shinde + (WIP) fdo#70144 Don't reset Document's modified flag when inserting new t in https://gerrit.libreoffice.org/6632 from Andrzej J.R. Hunt + fdo#70144 Mark database document as modified when data inserted in firebi in https://gerrit.libreoffice.org/6621 from Andrzej J.R. Hunt + remove unnecessary sal_Unicode casts in XMLOFF module in https://gerrit.libreoffice.org/6665 from Noel Grandin + helper makefile and idl list in https://gerrit.libreoffice.org/5693 from James Michael Dupont + cleanup includes and remove files not there in https://gerrit.libreoffice.org/5694 from James Michael Dupont + fdo#70457: Preserve rotation of embedded bitmaps from docx in https://gerrit.libreoffice.org/6484 from Jacobo Aragunde Pérez * Merged changes on master for project core changed in the last 25 hours: + Generate configure before calling ./configure --help in https://gerrit.libreoffice.org/6291 from Arnaud Versini + Add Lao breakiterator support for selecting and counting Lao words. in https://gerrit.libreoffice.org/6669 from Robert Campbell + upgrade to ICU 52.1, fdo#70995 in https://gerrit.libreoffice.org/ from Robert Campbell + Pass Document directly to Driver for embedded databases. in https://gerrit.libreoffice.org/6627 from Andrzej J.R. Hunt + Added unit test for multicolumn section separator line in https://gerrit.libreoffice.org/6318 from Yogesh Bharate + Respect svg:font-face-format element. in https://gerrit.libreoffice.org/6144 from Brennan T Vincent + Convert ImpSWFDialog.src to ui in https://gerrit.libreoffice.org/6592 from Laurent BP + fdo#71428: Spelling of turquise in Impress Table Design in https://gerrit.libreoffice.org/6624 from Julien Nabet + [docx] CustomXml relationship files saved in InteropGrabBag and exported. in https://gerrit.libreoffice.org/6603 from Sushil Shinde + What is a thread-local mutex? in https://gerrit.libreoffice.org/6651 from Tor Lillqvist * Abandoned changes on master for project core changed in the last 25 hours: + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza * Open changes needing tweaks, but being untouched for more than a week: + fdo#70978 Improve Word Count display in https://gerrit.libreoffice.org/6479 from Samuel Mehrbrodt + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] quick question on function in Master
Hello Cor, *, On Dienstag, 12. November 2013 21:16 Cor Nouws wrote: Thomas Hackert wrote (01-11-13 09:50) On Donnerstag, 31. Oktober 2013 21:02 Cor Nouws wrote: People running a daily/master build, could the pls look what is the result when choosing: File Templates Save As Template and File Templates New Document From Template what exactly are you experiencing? Ah, I did not disclose that when asking ;) :) In my local build, the menus did not start anything but showed/hid toolbars .. :-\ O.K. But I cannot confirm this here, sorry ... :( The only differences I see so far is, that – when I choose the first one – I get a preview of the presentation template while I did see them, when I choose the second one. The other one is, that this button above is labelled Save in the first dialog, but Repository in the second one. And in the first dialog you can only choose to save between the different template folders, while in the second one you can also choose between Documents, Spreadsheets, Presentations and Drawings Ah yes, it's a rather clumsy work around. But as for now the most simple/only way getting some attention to do something at the relatively hidden Template Edit experience. Obviously, the second Entry has to be changed from New document from .. to Edit Do you know, if someone has reported this already to bugzilla? snip Background: for me there is some strange behaviour, but for someone else it works fine... And what exactly? Could you give us a more detailed description, please? Is this strange behaviour related to the UI or if you try to save/apply a template? See my explanation above. As from yesterday evening I have the 420alpha1 installed and I see that it works as expected there. O.K. (BTW: the latter entry should be renamed). How would you name it then? From New document from .. to Edit A new feature request then? Thanks for testing and reporting! You are welcome :) Thomas. -- Chisolm's First Corollary to Murphy's Second Law: When things just can't possibly get any worse, they will. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Existing German translation in Moztrap
Hi all, I'm currently working on Moztrap to create a test run for 4.2.0 beta 2. For that, I'll update all the existing tests and adapt them to the version and create new ones. There is a German translation for some tests, is it somewhere else than in Moztrap? If not, I don't want to lose the previous work done by translators, I'll remove the existing German translations from the basic test suites and will upload the corresponding files to owncloud as a repository for this translation. When we will have a way to handle translations correctly in Moztrap, the corresponding translation can be added again. What do you think about it? Kind regards Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Existing German translation in Moztrap
Hello Sophie, *, On Mittwoch, 13. November 2013 13:56 Sophie wrote: I'm currently working on Moztrap to create a test run for 4.2.0 beta 2. cool, thank you very much :) For that, I'll update all the existing tests and adapt them to the version and create new ones. O.K. There is a German translation for some tests, is it somewhere else than in Moztrap? Not as far as I know. I started translating them, but alas did not find the time to translate them all ... :( I found it a little bit too labour-intensive ... :( But Yifan has as far as I remember mentioned the possibility to import the old testcases from OOo's TCM. But I am not sure, if this was ever started and/or finished at all ... :( If not, I don't want to lose the previous work done by translators, I'll remove the existing German translations from the basic test suites and will upload the corresponding files to owncloud as a repository for this translation. O.K. When we will have a way to handle translations correctly in Moztrap, the corresponding translation can be added again. O.K. What do you think about it? Would it not be possible to add the MozTrap translation to Pootle to translate them there? I think, this would ease the translation process ... ;) Thank you for your info Thomas. -- It's all in the mind, ya know. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
