LibreOffice Gerrit News for core on 2013-10-31
Moin! * Open changes on master for project core changed in the last 25 hours: + Windows: Set minimum Windows SDK to 0x0501 (Windows XP) in https://gerrit.libreoffice.org/6496 from Thomas Arnhold + sw/qa: 1 individual unit test per filter (import/export) test in https://gerrit.libreoffice.org/6289 from Pierre-Eric Pelloux-Prayer + fdo#69762 Scientific number AutoCorrect as ordinal in https://gerrit.libreoffice.org/6204 from Laurent BP + windows: check for _WIN32 not WIN32 in https://gerrit.libreoffice.org/6490 from Thomas Arnhold + remove nonsense FOLD comments in https://gerrit.libreoffice.org/6491 from Thomas Arnhold + fdo#70978 Improve Word Count display in https://gerrit.libreoffice.org/6479 from Samuel Mehrbrodt + fdo#60698: Move generic fpicker to svtools in https://gerrit.libreoffice.org/6436 from Marcos Souza + fdo#70457: Preserve rotation of embedded bitmaps from docx in https://gerrit.libreoffice.org/6484 from Jacobo Aragunde Pérez + fdo#70998 Termchange: Graphics-Image in https://gerrit.libreoffice.org/6483 from Samuel Mehrbrodt * Merged changes on master for project core changed in the last 25 hours: + update libodfgen in https://gerrit.libreoffice.org/6487 from David Tardon + bundle libetonyek in https://gerrit.libreoffice.org/6486 from David Tardon + integrate Apple Keynote import filter in https://gerrit.libreoffice.org/6488 from David Tardon + fdo#44134 fix omission in support of Excel 2010 in https://gerrit.libreoffice.org/6495 from Winfried Donkers + fdo#7 fix omission in support of Excel 2010 in https://gerrit.libreoffice.org/6494 from Winfried Donkers + fdo#61002 add Excel 2010 functions VAR.P and VAR.S in https://gerrit.libreoffice.org/6477 from Winfried Donkers + fdo#54938: Convert svx to use cppu::supportsService in https://gerrit.libreoffice.org/6455 from Marcos Souza + fdo#54938: Convert package, writerfilter and writerperfect in https://gerrit.libreoffice.org/6456 from Marcos Souza + added stub for void touch_ui_selection_none in MLOGestureEngine in https://gerrit.libreoffice.org/6492 from Ptyl + Unit tests for Chart Series Name in https://gerrit.libreoffice.org/6383 from Markus Mohrhard + Fix for Chart Series Names in https://gerrit.libreoffice.org/6350 from Vinaya Mandke * Abandoned changes on master for project core changed in the last 25 hours: + Don't destroy OString until we need its char array in https://gerrit.libreoffice.org/6475 from Arnaud Versini * Open changes needing tweaks, but being untouched for more than a week: + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + 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 + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + 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
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on||71075 -- 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
what is the point of the IMPL_RTL_STRINGNAME macro?
There are some odd macros here: http://opengrok.libreoffice.org/xref/core/sal/rtl/string.cxx#58 which look like: #define IMPL_RTL_STRINGNAME( n )rtl_string_ ## n and then they are used in the code like this: IMPL_RTL_STRINGNAME( release )( *pTarget ); and in methods definitions like this: static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )( sal_Int32 nLen ) I'm not seeing the points of these macros? They make the methods in questions invisible to OpenGrok and grep and they don't seem to add any value. Thanks, Noel Grandin. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/AutoRetrievingBase.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 526e754b2ac52c9e4366cce63e2c9bbf817b2e76
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 10:46:55 2013 +0200
WaE: while loop has empty body
Not just a warning, but clearly an accidental editing error.
Change-Id: Ib708b1de774d56d6c4b144c4e10e280f8181b67b
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx
b/connectivity/source/commontools/AutoRetrievingBase.cxx
index fd82b62..189e756 100644
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -42,7 +42,7 @@ namespace connectivity
{ // we need a table name
sal_Int32 nIntoIndex = sStmt.indexOf(INTO );
sStmt = sStmt.copy(nIntoIndex+5);
-while (sStmt.startsWith( ));
+while (sStmt.startsWith( ))
{
sStmt = sStmt.copy(1);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/evoab2/NStatement.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dc6e04878da4fdd3df5da8d4457d5c92c09731c1
Author: Noel Grandin n...@peralex.com
Date: Thu Oct 31 10:54:16 2013 +0200
fix ambiguous OUString constructor call
after commit e2451bd729d0f1d795a5b689deba65bc4e9d92c6
Convert indexOf-startsWith and lastIndexOf-endsWith
Change-Id: I19c0e33e318cbf4be90d60bcbb83bc5de4336190
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx
b/connectivity/source/drivers/evoab2/NStatement.cxx
index d341edd..31612ce 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -387,7 +387,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const
OSQLParseNode* parseTree )
}
else if( (aMatchString.indexOf ( WILDCARD ) ==
aMatchString.lastIndexOf ( WILDCARD ) ) )
{ // One occurrence of '%' matches...
-if ( aMatchString.startsWith( WILDCARD ) )
+if ( aMatchString.startsWith( OUString(WILDCARD) ) )
pResult = createTest( aColumnName, E_BOOK_QUERY_ENDS_WITH,
aMatchString.copy( 1 ) );
else if ( aMatchString.indexOf ( WILDCARD ) ==
aMatchString.getLength() - 1 )
pResult = createTest( aColumnName, E_BOOK_QUERY_BEGINS_WITH,
aMatchString.copy( 0, aMatchString.getLength() - 1 ) );
@@ -398,7 +398,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const
OSQLParseNode* parseTree )
pResult = e_book_query_not( pResult, TRUE );
}
else if( aMatchString.getLength() = 3
- aMatchString.startsWith( WILDCARD )
+ aMatchString.startsWith( OUString(WILDCARD) )
aMatchString.indexOf ( WILDCARD, 1) ==
aMatchString.getLength() - 1 ) {
// one '%' at the start and another at the end
pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS,
aMatchString.copy (1, aMatchString.getLength() - 2) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: what is the point of the IMPL_RTL_STRINGNAME macro?
On 10/31/2013 09:46 AM, Noel Grandin wrote: There are some odd macros here: http://opengrok.libreoffice.org/xref/core/sal/rtl/string.cxx#58 which look like: #define IMPL_RTL_STRINGNAME( n )rtl_string_ ## n and then they are used in the code like this: IMPL_RTL_STRINGNAME( release )( *pTarget ); and in methods definitions like this: static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )( sal_Int32 nLen ) I'm not seeing the points of these macros? They make the methods in questions invisible to OpenGrok and grep and they don't seem to add any value. Those IMPL_RTL_* macros are for use in the #include strtmpl.cxx a few lines further down. Sort of poor man's templates, to do code sharing among string.cxx and ustring.cxx. Uses of the macros directly in string.cxx could be resolved, of course. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Cheers, Fridrich -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlJyHyMACgkQu9a1imXPdA9trACfX/ms89eRhm04qFH08rtvQBrd GM0AniEL8dx+jJ9ZH9bddSbNAGk6G/C3 =E+qZ -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: License statement
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 31/10/13 10:13, Fridrich Strba wrote: All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Where the past clearly was covered by http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html already Cheers, Fridrich -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlJyH34ACgkQu9a1imXPdA8GVACeNdj41Gl+kqFurTcjgJpgsMrJ UjUAnA+jfV7EQIzRAadTSYKO2I/SOCvH =FhJO -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: what is the point of the IMPL_RTL_STRINGNAME macro?
On 2013-10-31 10:58, Stephan Bergmann wrote: On 10/31/2013 09:46 AM, Noel Grandin wrote: There are some odd macros here: http://opengrok.libreoffice.org/xref/core/sal/rtl/string.cxx#58 which look like: #define IMPL_RTL_STRINGNAME( n )rtl_string_ ## n and then they are used in the code like this: IMPL_RTL_STRINGNAME( release )( *pTarget ); and in methods definitions like this: static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )( sal_Int32 nLen ) I'm not seeing the points of these macros? They make the methods in questions invisible to OpenGrok and grep and they don't seem to add any value. Those IMPL_RTL_* macros are for use in the #include strtmpl.cxx a few lines further down. Sort of poor man's templates, to do code sharing among string.cxx and ustring.cxx. Uses of the macros directly in string.cxx could be resolved, of course. Ah, that makes more sense. I'll add a comment in the code to that effect for the next confused newbie :-) Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Samuel M. s.mehrbr...@gmail.com changed: What|Removed |Added Depends on||70885 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx |4 +++-
sc/source/core/opencl/opbase.cxx |1 -
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 9aa6fbb518c0b690741af1e07bae894e5cd4ebba
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 31 10:30:30 2013 +0100
warning C4702: unreachable code
Change-Id: Id8d87765c1e3c9a1549dc6d4baa65fe47dcd6af4
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index c71d2a0..898b91b 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1368,6 +1368,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
std::cerr ut.mMessage \n;
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
+return true;
#else
return false;
#endif
@@ -1377,6 +1378,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
std::cerr oce.mError \n;
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
+return true;
#else
return false;
#endif
@@ -1385,11 +1387,11 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
std::cerr Dynamic formula compiler: unhandled compiler error\n;
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
+return true;
#else
return false;
#endif
}
-return true;
} // namespace opencl
}} // namespace sc
diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index 88042ef..113049d 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -79,7 +79,6 @@ size_t DynamicKernelArgument::GetWindowSize(void) const
{
throw Unhandled();
}
-return 0;
}
void Normal::GenSlidingWindowFunction(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Failing ucb test, due to nss changes
On Wed, Oct 30, 2013 at 01:11:41PM +0100, Michael Stahl mst...@redhat.com wrote: problem is that libcurl.so.4 has no RPATH. before 30e1d4c0a9202d5c8057efdb0bfda11f46a25251 the libcurl.so.4 was not actually used because the wrong file was copied; now it's the right file but due to missing rpath it doesn't find its libs... fixed in 07a31ccc02f3553f1be3e8bb5ff67e6e6f7ce016 Wonderful, that indeed helped. Thanks! signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
My C++ extension does not work with LO4 anymore
Hi, The problem occurs on LO4 windows (installation or update of my extension with extension manager) : Runtime Error ! c:\Program Files\LibreOffice 4\URE\bin\uno.exe R6034 An application has made an attenpt to load the C runtime library incorrectly. My extension for windows is compiled on MSVC2008. LO is compiled with MSVC 2010, isn't it ? I think that's the problem because it's OK with LO3 and Apache OpenOffice 4. How to fix that without recompiling my extension ? Here is my extension : http://cdeval.free.fr/spip.php?article132(translations available on the top right) Thanks for any help. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - connectivity/Library_mozabdrv.mk languagetool/Module_languagetool.mk RepositoryExternal.mk
RepositoryExternal.mk | 23 --- connectivity/Library_mozabdrv.mk| 20 languagetool/Module_languagetool.mk |2 +- 3 files changed, 21 insertions(+), 24 deletions(-) New commits: commit 495cd12da44f3efc9626aa68a5c06653c2049b26 Author: Michael Stahl mst...@redhat.com Date: Thu Oct 31 11:07:58 2013 +0100 languagetool: argh... added the wrong file Change-Id: I817067f0f56dca6b2b086b73c97eeaea266fb363 diff --git a/languagetool/Module_languagetool.mk b/languagetool/Module_languagetool.mk index 565a14c..0574d55 100644 --- a/languagetool/Module_languagetool.mk +++ b/languagetool/Module_languagetool.mk @@ -13,7 +13,7 @@ ifneq ($(ENABLE_JAVA),) ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,languagetool,\ ExternalProject_languagetool \ - ExtensionPackage_languagetool \ + ExtensionPackage_LanguageTool \ UnpackedTarball_languagetool \ )) endif commit bf80dfc0615f6179a9dcf0fc1fbca5a72ad7bfba Author: Michael Stahl mst...@redhat.com Date: Thu Oct 31 11:00:47 2013 +0100 clean up mozilla external Change-Id: Ic69b8763da2933159b55a243c7aed4a8ce557183 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index efc9542..f0138aa 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2306,21 +2306,38 @@ endef endif # SYSTEM_POSTGRESQL ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) + define gb_LinkTarget__use_mozilla +$(call gb_LinkTarget_use_unpacked,$(1),moz_lib) +$(call gb_LinkTarget_use_unpacked,$(1),moz_inc) + $(call gb_LinkTarget_add_defs,$(1),\ -DMOZILLA_INTERNAL_API \ ) $(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,moz_inc) \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/addrbook \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/content \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/embed_base \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/intl \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/mime \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/mozldap \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/msgbase \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/necko \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/pref \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/profile \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/rdf \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/string \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/uconv \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/xpcom \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc)/xpcom_obsolete \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/mozilla \ ) $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \ -) -$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom.lib \ $(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom_core.lib \ ) diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index 97cde49..ae0ef14 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -12,32 +12,12 @@ $(eval $(call gb_Library_Library,mozabdrv)) $(eval $(call gb_Library_set_include,mozabdrv,\ -I$(SRCDIR)/connectivity/source/drivers/mozab \ -I$(SRCDIR)/connectivity/source/inc \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc) \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/addrbook \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/content \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/embed_base \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/intl \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/mime \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/mozldap \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/msgbase \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/necko \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/pref \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/profile \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/rdf \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/string \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/uconv \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/xpcom \ - -I$(call gb_UnpackedTarball_get_dir,moz_inc)/xpcom_obsolete \ $$(INCLUDE) \ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_use_sdk_api,mozabdrv)) -$(eval $(call gb_Library_use_package,mozabdrv,moz_lib)) - -$(eval $(call gb_Library_use_unpacked,mozabdrv,moz_inc)) - $(eval $(call gb_Library_use_libraries,mozabdrv,\ comphelper \ cppu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/wsfrm.cxx | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit e8e12b32ae23ee9b1613ef7794b83adbde27e9f8
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 31 10:08:46 2013 +
Resolves: fdo#70358 crash when deleting tables
Change-Id: I87282e363425a1bb6d9ab92e07717f66ee56a6c5
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 05d90e5..985b787 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2607,8 +2607,15 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool
bTst, sal_Bool bInfo )
{
_InvalidateAll();
InvalidatePage( pPage );
-const SvxGraphicPosition ePos =
GetFmt()-GetBackground().GetGraphicPos();
-if ( GPOS_NONE != ePos GPOS_TILED != ePos )
+bool bCompletePaint = true;
+const SwFrmFmt* pFmt = GetFmt();
+if (pFmt)
+{
+const SvxGraphicPosition ePos =
pFmt-GetBackground().GetGraphicPos();
+if ( GPOS_NONE == ePos || GPOS_TILED == ePos )
+bCompletePaint = false;
+}
+if (bCompletePaint)
SetCompletePaint();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: My C++ extension does not work with LO4 anymore
On 10/31/2013 10:40 AM, Christophe Devalland wrote: The problem occurs on LO4 windows (installation or update of my extension with extension manager) : Runtime Error ! c:\Program Files\LibreOffice 4\URE\bin\uno.exe R6034 An application has made an attenpt to load the C runtime library incorrectly. My extension for windows is compiled on MSVC2008. LO is compiled with MSVC 2010, isn't it ? I think that's the problem because it's OK with LO3 and Apache OpenOffice 4. How to fix that without recompiling my extension ? Here is my extension : http://cdeval.free.fr/spip.php?article132 (translations available on the top right) That's a consequence of http://www.libreoffice.org/download/4-0-new-features-and-fixes/#C.2B.2B_UNO_language_binding_and_URE_libraries Base-line Windows / C++ compiler upgraded to Visual Studio 2010 [...] runtime libraries for Visual Studio 2008 (msvcr90.dll) are no longer bundled. Short of recompiling your extension against the LO 4 baseline, another option might be to tell users of your extension to first download and install the old MS runtime libraries on their system (which are available from MS, IIUC). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - ios/MobileLibreOffice ios/shared
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
| 186 ++
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
|4
2 files changed, 188 insertions(+), 2 deletions(-)
New commits:
commit 77b38b197f5997f988dd02ab5673d8fe84bd01d4
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 12:26:50 2013 +0200
Add a bunch of LO source files, not in any target, for convenience
Change-Id: I06eefc339b9b2fead6c80979b86d30975875fa51
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 7663e69..41a9625 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -131,6 +131,67 @@
68C6FC57180AD28C005ACB02 /* MessageUI.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework;
sourceTree = SDKROOT; };
88E94769180DB9B600771808 /* NSObject+MLOFileUtils.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
NSObject+MLOFileUtils.h; sourceTree = group; };
88E9476A180DB9B600771808 /* NSObject+MLOFileUtils.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= NSObject+MLOFileUtils.m; sourceTree = group; };
+ BE82BDB8182261AD00A447B5 /* pagechg.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pagechg.cxx;
path = ../../sw/source/core/layout/pagechg.cxx; sourceTree = group; };
+ BE82BDBA182261E900A447B5 /* pagepreviewlayout.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
pagepreviewlayout.cxx; path = ../../sw/source/core/view/pagepreviewlayout.cxx;
sourceTree = group; };
+ BE82BDBB182261E900A447B5 /* printdata.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdata.cxx;
path = ../../sw/source/core/view/printdata.cxx; sourceTree = group; };
+ BE82BDBC182261E900A447B5 /* vdraw.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vdraw.cxx;
path = ../../sw/source/core/view/vdraw.cxx; sourceTree = group; };
+ BE82BDBD182261E900A447B5 /* viewimp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = viewimp.cxx;
path = ../../sw/source/core/view/viewimp.cxx; sourceTree = group; };
+ BE82BDBE182261E900A447B5 /* viewpg.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = viewpg.cxx;
path = ../../sw/source/core/view/viewpg.cxx; sourceTree = group; };
+ BE82BDBF182261E900A447B5 /* viewsh.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = viewsh.cxx;
path = ../../sw/source/core/view/viewsh.cxx; sourceTree = group; };
+ BE82BDC0182261E900A447B5 /* vnew.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vnew.cxx; path
= ../../sw/source/core/view/vnew.cxx; sourceTree = group; };
+ BE82BDC1182261E900A447B5 /* vprint.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vprint.cxx;
path = ../../sw/source/core/view/vprint.cxx; sourceTree = group; };
+ BE82BDC21822622000A447B5 /* anchoreddrawobject.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
anchoreddrawobject.cxx; path =
../../sw/source/core/layout/anchoreddrawobject.cxx; sourceTree = group; };
+ BE82BDC31822622000A447B5 /* anchoredobject.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
anchoredobject.cxx; path = ../../sw/source/core/layout/anchoredobject.cxx;
sourceTree = group; };
+ BE82BDC41822622000A447B5 /* atrfrm.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = atrfrm.cxx;
path = ../../sw/source/core/layout/atrfrm.cxx; sourceTree = group; };
+ BE82BDC51822622000A447B5 /* calcmove.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = calcmove.cxx;
path = ../../sw/source/core/layout/calcmove.cxx; sourceTree = group; };
+ BE82BDC61822622000A447B5 /* colfrm.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colfrm.cxx;
path = ../../sw/source/core/layout/colfrm.cxx; sourceTree = group; };
+ BE82BDC71822622000A447B5 /* dbg_lay.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbg_lay.cxx;
path = ../../sw/source/core/layout/dbg_lay.cxx; sourceTree = group; };
+ BE82BDC81822622000A447B5 /* dumpfilter.cxx */ = {isa =
PBXFileReference; lastKnownFileType =
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/UnpackedTarball_libetonyek.mk |1 +
external/libetonyek/libetonyek-doubledelete.patch.0 | 18 ++
2 files changed, 19 insertions(+)
New commits:
commit cad751d28c356ef302f8eeb0d112a8a0e16dedbc
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 31 11:33:16 2013 +0100
libetonyek: I assume this is what was intended?
...at least it makes JunitTest_chart2_unoapi not crash any more.
Change-Id: Ibc14f141398e518ab8f06b661a198d50c7732e4a
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 173a6c8..1a6b32d 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1))
$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-fix-windows-build.patch \
+ external/libetonyek/libetonyek-doubledelete.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/libetonyek-doubledelete.patch.0
b/external/libetonyek/libetonyek-doubledelete.patch.0
new file mode 100644
index 000..a377c44
--- /dev/null
+++ b/external/libetonyek/libetonyek-doubledelete.patch.0
@@ -0,0 +1,18 @@
+--- src/lib/KEYXMLReader.cpp
src/lib/KEYXMLReader.cpp
+@@ -335,6 +335,7 @@
+ catch (...)
+ {
+ delete m_impl;
++throw;
+ }
+ }
+
+@@ -350,6 +351,7 @@
+ catch (...)
+ {
+ delete m_impl;
++throw;
+ }
+ }
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/Executable_soffice.bin.mk scp2/source
desktop/Executable_soffice.bin.mk | 15 --- scp2/source/ooo/common_brand.scp | 10 -- 2 files changed, 25 deletions(-) New commits: commit 26bddf3e80865d847f52e649ab60f97269177a3e Author: Michael Stahl mst...@redhat.com Date: Thu Oct 31 11:54:13 2013 +0100 desktop: stop packaging soffice.bin.manifest It was introduced to get newer File Picker dialogs (i#70927) but the special manifest file for that was not actually used for years; LO 3.5 already includes a generic manifest file that is like any other and probably has zero benefit over the manfiest that is embedded in the soffice.bin binary anyway. Change-Id: I0f41f10ecf26201043a8c9964cdfef95bc348eb8 diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 90b56fd..cc66af5 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -51,21 +51,6 @@ $(eval $(call gb_Executable_add_ldflags,soffice_bin,\ /STACK:1000 \ )) -# HACK: Copy manifest to $(OUTDIR)/bin under the right name. The -# executable is copied in Package_soffice_bin, but that does not work -# for the manifest, for some reason... -$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest - -$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,soffice_bin) -$(call gb_Executable_get_clean_target,soffice_bin) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest - -$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) - $(call gb_Deliver_deliver,$(call gb_LinkTarget_get_manifestfile,$(call gb_LinkTarget__get_workdir_linktargetname,$(call gb_Executable_get_linktarget,soffice_bin))),$@) - -.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest -$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest : - rm -f $(OUTDIR)/bin/soffice.bin.manifest - endif endif diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index c2e296d..d2842ec 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -550,16 +550,6 @@ End #endif -// use this for high detail file open dialog = 5.1 windows -#if defined( _MSC_VER ) -File gid_Brand_File_Bin_Soffice_Bin_Manifest -TXT_FILE_BODY; -Styles = (PACKED); -Dir = gid_Brand_Dir_Program; -Name = soffice.bin.manifest; -End -#endif - #ifdef WNT File gid_Brand_File_Desktophelper_Txt TXT_FILE_BODY; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - include/touch
include/touch/touch.h |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 59cc423a3056a0253a24244373f79d94ffe6ff20
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 13:11:40 2013 +0200
Fix copypasta
Change-Id: Ib5e7162426ab08a1912a19d4e3a00c794e4fb80e
diff --git a/include/touch/touch.h b/include/touch/touch.h
index f0cdabe..6601a05 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -120,8 +120,8 @@ CGSizeToMLOPixelSize(CGSize cgSize)
CG_INLINE CGSize
MLOPixelsToCGSize(MLOPixel width, MLOPixel height)
{
-CGFloat fWidth = CGFloatToMLOPixel(width);
-CGFloat fHeight = CGFloatToMLOPixel(height);
+CGFloat fWidth = MLOPixelToCGFloat(width);
+CGFloat fHeight = MLOPixelToCGFloat(height);
return CGSizeMake(fWidth, fHeight);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx | 103 +--
sw/qa/extras/odfexport/odfexport.cxx | 71 ++--
sw/qa/extras/odfimport/odfimport.cxx | 94 +++
3 files changed, 141 insertions(+), 127 deletions(-)
New commits:
commit effeb7b039bbed5e4eb0c4af1f600b61ffbb4546
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Oct 17 11:41:51 2013 +0200
sw/qa: 1 individual unit test per filter (import/export) test
The goal is to have clearer failure message by distinguishing
failures (only import, import and export, only export).
Change-Id: Ic4fc5f7bfd7c9ddb0705597c3fb994e41d04b5ba
Reviewed-on: https://gerrit.libreoffice.org/6289
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 29f4dc1..afd0cb3 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -38,12 +38,58 @@ using namespace com::sun::star;
#define DEFAULT_STYLE Default Style
+/**
+ * Macro to declare a new test (with full round-trip. To test
+ * import only use the DECLARE_SW_IMPORT_TEST macro instead).
+ * In order to add a new test, one only needs to use this macro
+ * and then specify the test content, like this:
+ *
+ * DECLARE_SW_ROUNDTRIP_TEST(MyTest, myfilename.docx, Test)
+ * {
+ * CPPUNIT_ASSERT_EQUAL(blabla);
+ * }
+ *
+ */
+#define DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, BaseClass) \
+class TestName : public BaseClass { \
+public:\
+CPPUNIT_TEST_SUITE(TestName); \
+CPPUNIT_TEST(Import); \
+CPPUNIT_TEST(Import_Export_Import); \
+CPPUNIT_TEST_SUITE_END(); \
+\
+void Import() { \
+executeImportTest(filename);\
+}\
+void Import_Export_Import() {\
+executeImportExportImportTest(filename);\
+}\
+void verify();\
+}; \
+CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \
+void TestName::verify()
+
+#define DECLARE_SW_IMPORT_TEST(TestName, filename, BaseClass) \
+class TestName : public BaseClass { \
+public:\
+CPPUNIT_TEST_SUITE(TestName); \
+CPPUNIT_TEST(Import); \
+CPPUNIT_TEST_SUITE_END(); \
+\
+void Import() { \
+executeImportTest(filename);\
+}\
+void verify();\
+}; \
+CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \
+void TestName::verify()
+
/// Base class for filter tests loading or roundtriping a document, then
asserting the document model.
class SwModelTestBase : public test::BootstrapFixture, public
unotest::MacrosTest
{
public:
-SwModelTestBase()
-: mpXmlBuffer(0)
+SwModelTestBase(const char* pTestDocumentPath = , const char* pFilter =
)
+: mpXmlBuffer(0), mpTestDocumentPath(pTestDocumentPath),
mpFilter(pFilter)
{
}
@@ -66,6 +112,53 @@ public:
test::BootstrapFixture::tearDown();
}
+protected:
+/**
+ * Helper func used by each unit test to test the 'import' code.
+ * (Loads the requested file and then calls 'verify' method)
+ */
+void executeImportTest(const char* filename)
+{
+// If the testcase is stored in some other format, it's pointless to
test.
+if (mustTestImportOf(filename))
+{
+header();
+load(mpTestDocumentPath, filename);
+verify();
+finish();
+}
+}
+
+/**
+ * Helper func used by each unit test to test the 'export' code.
+ * (Loads the requested file, save it to temp file, load the
+ * temp file and then calls 'verify' method)
+ */
+void executeImportExportImportTest(const char* filename)
+{
+header();
+load(mpTestDocumentPath, filename);
+reload(mpFilter);
+verify();
+finish();
+}
+
+/**
+ * Function overloaded by unit test. See DECLARE_SW_*_TEST macros
+ */
+virtual void verify()
+{
+CPPUNIT_FAIL( verify method must be overriden );
+}
+
+/**
+ * Override this function if interested in skipping import test for this
file
+ */
+ virtual bool mustTestImportOf(const char* /* filename */) const
+ {
+return true;
+ }
+
private:
void dumpLayout()
{
@@ -295,12 +388,12 @@ protected:
calcLayout();
}
-void reload(OUString aFilter)
+void reload(const char* pFilter)
{
uno::Referenceframe::XStorable xStorable(mxComponent,
uno::UNO_QUERY);
uno::Sequencebeans::PropertyValue aArgs(1);
aArgs[0].Name = FilterName;
-aArgs[0].Value = aFilter;
+aArgs[0].Value = OUString::createFromAscii(pFilter);
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
xStorable-storeToURL(aTempFile.GetURL(), aArgs);
@@ -349,6 +442,8 @@
[Libreoffice-commits] core.git: sc/source
sc/source/ui/src/scfuncs.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5085b66ef12298f488c4d7254c31292ef8fa621b
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date: Thu Oct 31 10:47:10 2013 +0100
fix incorrect strings for calc functions STDEVP and STDEV.P
Change-Id: I13f7127afbc05a352ffd74a4715e6cc6260a1a07
Reviewed-on: https://gerrit.libreoffice.org/6506
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index b6d157f..86be3de 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5300,7 +5300,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 3 // Description of Parameter 1
{
-Text [ en-US ] = Number 1, number 2, ... are 1 to 30 numerical
arguments which portray a sample of a population. ;
+Text [ en-US ] = Number 1, number 2, ... are 1 to 30 numerical
arguments which portray a population. ;
};
};
// -=*# Resource for function STDEV.P #*=-
@@ -5324,7 +5324,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 3 // Description of Parameter 1
{
-Text [ en-US ] = Number 1, number 2, ... are 1 to 30 numerical
arguments which portray a sample of a population. ;
+Text [ en-US ] = Number 1, number 2, ... are 1 to 30 numerical
arguments which portray a population. ;
};
};
// -=*# Resource for function STABWNA #*=-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff xmloff/source
include/xmloff/xmltoken.hxx |9 ---
xmloff/source/core/ProgressBarHelper.cxx|4 ---
xmloff/source/core/xmlexp.cxx |2 -
xmloff/source/core/xmlimp.cxx |2 -
xmloff/source/core/xmltoken.cxx | 32
xmloff/source/transform/TransformerBase.cxx |2 -
6 files changed, 51 deletions(-)
New commits:
commit 8b8ef8d6331d84638bc253cb7d06faf37e0cc1b3
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 31 12:45:04 2013 +0100
Remove the xmloff::token::ResetTokens race condition
...where multiple parallel calls to xmloff::token::ResetTokens or
xmloff::token::GetXMLToken can see dangling pOUString pointers. There is no
point in releasing this (bounded) amount of memory referenced from global
aTokenList, anyway.
There is still a race when parallel calls to xmloff::token::GetXMLToken
write to
a pOUString pointer in parallel, but that's more harmless, and maybe calls
to
GetXMLToken are synchronized by Solar Mutex? Calls to ResetTokens (e.g.,
via
URP remote release request - ~ScXMLExport - ~SvXMLExport) were definitely
/not/ synchronized via any mutex.
The xmloff::token::Inc/DecRescheduleCount functions are now pointless and
have
been removed, too.
Change-Id: I85905d4de1f042ed5c9a37589f942910d8ef80fd
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 265a2e5..360a01b 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3227,15 +3227,6 @@ namespace xmloff { namespace token {
XMLOFF_DLLPUBLIC sal_Bool IsXMLToken(
const OUString rString,
enum XMLTokenEnum eToken );
-
-// gives all allocated memory for OUString* back
-XMLOFF_DLLPUBLIC void ResetTokens();
-
-XMLOFF_DLLPUBLIC void IncRescheduleCount();
-
-XMLOFF_DLLPUBLIC void DecRescheduleCount();
-
-
} }
#endif
diff --git a/xmloff/source/core/ProgressBarHelper.cxx
b/xmloff/source/core/ProgressBarHelper.cxx
index e201351..87b67f7 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -93,12 +93,8 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
double fValue(nValue);
double fNewValue ((fValue * nRange) / nReference);
-xmloff::token::IncRescheduleCount();
-
xStatusIndicator-setValue((sal_Int32)fNewValue);
-xmloff::token::DecRescheduleCount();
-
// #95181# disabled, because we want to call setValue very often
to enable a good reschedule
}
#ifdef DBG_UTIL
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 1c76433..43c3d4d 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -578,8 +578,6 @@ SvXMLExport::~SvXMLExport()
delete mpNumExport;
}
-xmloff::token::ResetTokens();
-
if (mxEventListener.is() mxModel.is())
mxModel-removeEventListener(mxEventListener);
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 757352c..e733ed7 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -432,8 +432,6 @@ SvXMLImport::~SvXMLImport() throw ()
delete mpNumImport;
delete mpProgressBarHelper;
-xmloff::token::ResetTokens();
-
if( mpImpl )
delete mpImpl;
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 92701ba..4051104 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3222,8 +3222,6 @@ namespace xmloff { namespace token {
#endif
};
-sal_Int32 nRescheduleCount = 0;
-
// get OUString representation of token
const OUString GetXMLToken( enum XMLTokenEnum eToken )
{
@@ -3269,36 +3267,6 @@ namespace xmloff { namespace token {
const XMLTokenEntry* pToken = aTokenList[(sal_uInt16)eToken];
return rString.equalsAsciiL( pToken-pChar, pToken-nLength );
}
-
-// gives all allocated memory for OUString* back
-void ResetTokens()
-{
-if (nRescheduleCount == 0)
-{
-for (sal_Int16 i=0, nEnd = sizeof ( aTokenList ) / sizeof (
XMLTokenEntry );
- i nEnd;
- i++)
-{
-delete aTokenList[i].pOUString;
-aTokenList[i].pOUString = NULL;
-}
-}
-}
-
-void IncRescheduleCount()
-{
-++nRescheduleCount;
-}
-
-void DecRescheduleCount()
-{
-if (nRescheduleCount 0)
---nRescheduleCount;
-else {
-OSL_FAIL(RescheduleCount not increased);
-}
-}
-
}
}
diff --git a/xmloff/source/transform/TransformerBase.cxx
b/xmloff/source/transform/TransformerBase.cxx
index e93d04a..37662a5 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/Library_scfilt.mk sc/source sc/util
sc/Library_scfilt.mk |1
sc/source/filter/excel/xestream.cxx | 10 +
sc/source/filter/inc/ooxformulaparser.hxx | 110
sc/source/filter/oox/ooxformulaparser.cxx | 196 ++
sc/util/scfilt.component |3
5 files changed, 320 insertions(+)
New commits:
commit 4a7096b9c8c0e6451fa0ced06143cb8a65ec10fc
Author: Eike Rathke er...@redhat.com
Date: Mon Oct 28 22:46:01 2013 +0100
resolved fdo#56209 reviving FilterFormulaParser
First it was moved from oox to sc without carrying over the component
factory bits, then subsequent commits removed the remaining bits in
steps as it appeared to be unused:
8ada1cd2846e5e60ad63250c68ddea3a9356546f
887d7945addeb823e0d3f783609c4e79d92ad4a7
effda59a12cedd3cf200d2e9f5186a623b0855bb
f2fd2a66ee827024b31a310d67804cb7cb18d2da
(cherry picked from commit 20e0afa76087e20f95247406d265a122263a8c6f)
Backported.
Change-Id: I445b11c95daff6f30b3654936d0f22a113158f97
Reviewed-on: https://gerrit.libreoffice.org/6469
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 5b383c4..3cc4b1a 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -188,6 +188,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/oox/formulabuffer \
sc/source/filter/oox/formulaparser \
sc/source/filter/oox/numberformatsbuffer \
+ sc/source/filter/oox/ooxformulaparser \
sc/source/filter/oox/pagesettings \
sc/source/filter/oox/pivotcachebuffer \
sc/source/filter/oox/pivotcachefragment \
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index bf9c1d8..8421006 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1179,6 +1179,11 @@ namespace oox { namespace xls {
Sequence OUString SAL_CALL ExcelFilter_getSupportedServiceNames()
throw();
Reference XInterface SAL_CALL ExcelFilter_createInstance(
const Reference XComponentContext rxContext ) throw( Exception );
+
+OUString SAL_CALL OOXMLFormulaParser_getImplementationName() throw();
+Sequence OUString SAL_CALL
OOXMLFormulaParser_getSupportedServiceNames() throw();
+Reference XInterface SAL_CALL OOXMLFormulaParser_create(
+const Reference XComponentContext rxContext ) throw();
} }
#ifdef __cplusplus
@@ -1201,6 +1206,11 @@ extern C
oox::xls::ExcelFilter_getSupportedServiceNames,
::cppu::createSingleComponentFactory,
0, 0
},
+{
+oox::xls::OOXMLFormulaParser_create,
oox::xls::OOXMLFormulaParser_getImplementationName,
+oox::xls::OOXMLFormulaParser_getSupportedServiceNames,
::cppu::createSingleComponentFactory,
+0, 0
+},
{ 0, 0, 0, 0, 0, 0 }
};
diff --git a/sc/source/filter/inc/ooxformulaparser.hxx
b/sc/source/filter/inc/ooxformulaparser.hxx
new file mode 100644
index 000..e6c5797
--- /dev/null
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * 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 .
+ */
+
+#ifndef OOX_XLS_OOXFORMULAPARSER_HXX
+#define OOX_XLS_OOXFORMULAPARSER_HXX
+
+#include boost/shared_ptr.hpp
+#include com/sun/star/lang/XComponent.hpp
+#include com/sun/star/uno/XComponentContext.hpp
+#include com/sun/star/lang/XInitialization.hpp
+#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/sheet/XFilterFormulaParser.hpp
+#include cppuhelper/implbase3.hxx
+
+namespace oox {
+namespace xls {
+
+class OOXMLFormulaParserImpl;
+
+//
+
+typedef ::cppu::WeakImplHelper3
+::com::sun::star::lang::XServiceInfo,
+::com::sun::star::lang::XInitialization,
+::com::sun::star::sheet::XFilterFormulaParser OOXMLFormulaParser_BASE;
+
+/** OOXML formula parser/compiler service for usage in ODF filters. */
+class OOXMLFormulaParser : public OOXMLFormulaParser_BASE
+{
+public:
+
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |1
sw/source/filter/ww8/docxtablestyleexport.cxx | 48 +++
writerfilter/source/dmapper/TDefTableHandler.cxx | 264 +
writerfilter/source/dmapper/TDefTableHandler.hxx | 17 -
writerfilter/source/dmapper/TablePropertiesHandler.cxx |4
5 files changed, 330 insertions(+), 4 deletions(-)
New commits:
commit 62f67d64b4c98cdfe20cad824cf11f343d3f8d7f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Oct 31 12:14:40 2013 +0100
writerfilter: implement TDefTableHandler::getInteropGrabBag
This allows to roundtrip table cell borders in conditional table style
definitions for DOCX.
Change-Id: Ibc0da9996e98e89864c001294695328c15c1549c
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5028733..1e46c83 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1476,6 +1476,7 @@ void Test::testCalendar1()
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='firstRow']/w:rPr/w:rFonts,
hAnsiTheme, minorHAnsi);
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='firstRow']/w:tblPr,
1);
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='firstRow']/w:tcPr/w:vAlign,
val, bottom);
+assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='lastRow']/w:tcPr/w:tcBorders/w:tr2bl,
val, nil);
}
void Test::testSmartart()
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 634368a..9aaad80 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -91,6 +91,49 @@ void lcl_TableStyleTblCellMar(sax_fastparser::FSHelperPtr
pSerializer, uno::Sequ
pSerializer-endElementNS(XML_w, XML_tblCellMar);
}
+/// Export of a given table cell border type in a table style.
+void lcl_TableStyleTcBorder(sax_fastparser::FSHelperPtr pSerializer, sal_Int32
nToken, const uno::Sequencebeans::PropertyValue rTcBorder)
+{
+if (!rTcBorder.hasElements())
+return;
+
+sax_fastparser::FastAttributeList* pAttributeList =
pSerializer-createAttrList();
+for (sal_Int32 i = 0; i rTcBorder.getLength(); ++i)
+{
+if (rTcBorder[i].Name == val)
+pAttributeList-add(FSNS(XML_w, XML_val),
OUStringToOString(rTcBorder[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
+}
+sax_fastparser::XFastAttributeListRef xAttributeList(pAttributeList);
+pSerializer-singleElementNS(XML_w, nToken, xAttributeList);
+}
+
+DocxStringTokenMap const aTcBordersTokens[] = {
+{left, XML_left},
+{right, XML_right},
+{start, XML_start},
+{end, XML_end},
+{top, XML_top},
+{bottom, XML_bottom},
+{insideH, XML_insideH},
+{insideV, XML_insideV},
+{tl2br, XML_tl2br},
+{tr2bl, XML_tr2bl},
+{0, 0}
+};
+
+/// Export of w:tcBorders in a table style.
+void lcl_TableStyleTcBorders(sax_fastparser::FSHelperPtr pSerializer,
uno::Sequencebeans::PropertyValue rTcBorders)
+{
+if (!rTcBorders.hasElements())
+return;
+
+pSerializer-startElementNS(XML_w, XML_tcBorders, FSEND);
+for (sal_Int32 i = 0; i rTcBorders.getLength(); ++i)
+if (sal_Int32 nToken = DocxStringGetToken(aTcBordersTokens,
rTcBorders[i].Name))
+lcl_TableStyleTcBorder(pSerializer, nToken,
rTcBorders[i].Value.get uno::Sequencebeans::PropertyValue ());
+pSerializer-endElementNS(XML_w, XML_tcBorders);
+}
+
/// Export of w:shd in a table style.
void lcl_TableStyleShd(sax_fastparser::FSHelperPtr pSerializer,
uno::Sequencebeans::PropertyValue rShd)
{
@@ -325,15 +368,18 @@ void lcl_TableStyleTcPr(sax_fastparser::FSHelperPtr
pSerializer, uno::Sequenceb
pSerializer-startElementNS(XML_w, XML_tcPr, FSEND);
-uno::Sequencebeans::PropertyValue aShd;
+uno::Sequencebeans::PropertyValue aShd, aTcBorders;
OUString aVAlign;
for (sal_Int32 i = 0; i rTcPr.getLength(); ++i)
{
if (rTcPr[i].Name == shd)
aShd = rTcPr[i].Value.get uno::Sequencebeans::PropertyValue ();
+else if (rTcPr[i].Name == tcBorders)
+aTcBorders = rTcPr[i].Value.get
uno::Sequencebeans::PropertyValue ();
else if (rTcPr[i].Name == vAlign)
aVAlign = rTcPr[i].Value.getOUString();
}
+lcl_TableStyleTcBorders(pSerializer, aTcBorders);
lcl_TableStyleShd(pSerializer, aShd);
if (!aVAlign.isEmpty())
pSerializer-singleElementNS(XML_w, XML_vAlign,
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx
b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 04466f4..5e9c5b5 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -49,6 +49,205
[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst external/libfreehand external/Module_external.mk Makefile.fetch RepositoryExternal.mk
Makefile.fetch |1
RepositoryExternal.mk | 35 +++
config_host.mk.in |3 +
configure.ac|5 ++
download.lst|2
external/Module_external.mk |1
external/libfreehand/ExternalProject_libfreehand.mk | 44
external/libfreehand/Makefile |7 +++
external/libfreehand/Module_libfreehand.mk | 17 +++
external/libfreehand/README |1
external/libfreehand/UnpackedTarball_libfreehand.mk | 14 ++
11 files changed, 130 insertions(+)
New commits:
commit 67153d76844fe8d8f3aba17f019443c96fbdd829
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Oct 31 12:42:50 2013 +0100
bundle libfreehand
Change-Id: I12de5e96754a8dba94dfdef3deb2aac18af28f22
Reviewed-on: https://gerrit.libreoffice.org/6510
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/Makefile.fetch b/Makefile.fetch
index be6c2e9..81acd0f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -76,6 +76,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk
$(SRCDIR)/download.lst $(SRCDIR)
$(foreach item, \
$(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \
$(call fetch_Optional,CDR,CDR_TARBALL) \
+ $(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \
$(call fetch_Optional,ETONYEK,ETONYEK_TARBALL) \
$(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f0138aa..d1b0b08 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1466,6 +1466,41 @@ endef
endif # SYSTEM_ETONYEK
+ifeq ($(SYSTEM_FREEHAND),YES)
+
+define gb_LinkTarget__use_freehand
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+$(FREEHAND_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(FREEHAND_LIBS))
+
+endef
+
+gb_ExternalProject__use_freehand :=
+
+else # !SYSTEM_FREEHAND
+
+define gb_LinkTarget__use_freehand
+$(call gb_LinkTarget_set_include,$(1),\
+ $(FREEHAND_CFLAGS) \
+ $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(call
gb_UnpackedTarball_get_dir,libfreehand)/src/lib/.libs/libfreehand-0.0$(gb_StaticLibrary_PLAINEXT)
\
+)
+$(call gb_LinkTarget_use_external_project,$(1),libfreehand)
+
+endef
+
+define gb_ExternalProject__use_freehand
+$(call gb_ExternalProject_use_external_project,$(1),libfreehand)
+
+endef
+
+endif # SYSTEM_FREEHAND
+
+
ifeq ($(SYSTEM_ODFGEN),YES)
define gb_LinkTarget__use_odfgen
diff --git a/config_host.mk.in b/config_host.mk.in
index 1c88ba1..7c59af6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -179,6 +179,8 @@ export FLEX=@FLEX@
export FLUTE_JAR=@FLUTE_JAR@
export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@
export FONTCONFIG_LIBS=$(gb_SPACE)@FONTCONFIG_LIBS@
+export FREEHAND_CFLAGS=$(gb_SPACE)@FREEHAND_CFLAGS@
+export FREEHAND_LIBS=$(gb_SPACE)@FREEHAND_LIBS@
export FREETYPE_CFLAGS=$(gb_SPACE)@FREETYPE_CFLAGS@
export FREETYPE_LIBS=$(gb_SPACE)@FREETYPE_LIBS@
export GCC_VERSION=@GCC_VERSION@
@@ -514,6 +516,7 @@ export SYSTEM_LCMS2=@SYSTEM_LCMS2@
export SYSTEM_CDR=@SYSTEM_CDR@
export SYSTEM_CMIS=@SYSTEM_CMIS@
export SYSTEM_ETONYEK=@SYSTEM_ETONYEK@
+export SYSTEM_FREEHAND=@SYSTEM_FREEHAND@
export SYSTEM_LIBATOMIC_OPS=@SYSTEM_LIBATOMIC_OPS@
export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
diff --git a/configure.ac b/configure.ac
index 10a9055..11baeae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7721,6 +7721,11 @@ dnl
===
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.0],[-I${WORKDIR}/UnpackedTarball/libetonyek/inc],[-L${WORKDIR}/UnpackedTarball/libetonyek/src/lib/.libs
-letonyek-0.0])
dnl ===
+dnl Check for system libfreehand
+dnl ===
+libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.0],[-I${WORKDIR}/UnpackedTarball/libfreehand/inc],[-L${WORKDIR}/UnpackedTarball/libfreehand/src/lib/.libs
-lfreehand-0.0])
+
+dnl ===
dnl Check for system libodfgen
dnl ===
libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.0])
diff --git a/download.lst b/download.lst
index e8cbc2a..ca0c9d0 100644
--- a/download.lst
+++ b/download.lst
@@ -2,6 +2,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
export
[Libreoffice-commits] core.git: external/libfreehand
external/libfreehand/ExternalProject_libfreehand.mk | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) New commits: commit 8215dcfe7d59f151d30612542c8a1fb4a5f40b95 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Oct 31 13:44:37 2013 +0100 Build only what is needed: less probability to mess up Change-Id: I1855e3c23380883df74f29aa8282f1c57e2e45bd Reviewed-on: https://gerrit.libreoffice.org/6512 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk index 24bda09..ac03a40 100644 --- a/external/libfreehand/ExternalProject_libfreehand.mk +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -16,9 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,libfreehand,\ )) $(eval $(call gb_ExternalProject_use_externals,libfreehand,\ - boost_headers \ - libxml2 \ wpd \ + wpg \ zlib \ )) @@ -33,12 +32,10 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) : --disable-debug \ --disable-werror \ --disable-weffc \ - --without-tools \ - BOOST_CFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ - XML_CFLAGS=$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include,$(LIBXML_CFLAGS)) \ - XML_LIBS=$(LIBXML_LIBS) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ -$(MAKE) $(if $(VERBOSE)$(verbose),V=1) \ +(cd $(EXTERNAL_WORKDIR)/src/lib \ + $(if $(VERBOSE)$(verbose),V=1) \ + $(MAKE)) \ ) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source writerperfect/Library_wpftdraw.mk writerperfect/Module_writerperfect.mk writerperfect/source writerperfect/util
filter/Configuration_filter.mk |2 filter/source/config/fragments/filters/FreehandDocument.xcu | 13 filter/source/config/fragments/types/draw_Freehand_Document.xcu | 12 writerperfect/Library_wpftdraw.mk |2 writerperfect/Module_writerperfect.mk |2 writerperfect/source/draw/FreehandImportFilter.cxx | 212 ++ writerperfect/source/draw/FreehandImportFilter.hxx | 86 writerperfect/source/draw/wpftdraw_genericfilter.cxx|5 writerperfect/util/wpftdraw.component |4 9 files changed, 338 insertions(+) New commits: commit 660800d6f33a01ad53fc0f5717e1c33868440d2f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Oct 31 13:23:30 2013 +0100 BIPU Freehand importer Change-Id: I5b233343269b4107bbcfef5ea1c9b1fc7b735ed2 Reviewed-on: https://gerrit.libreoffice.org/6511 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 62f21b6..269866b 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -556,6 +556,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s draw_Publisher_Document \ draw_CorelDraw_Document \ draw_Corel_Presentation_Exchange \ + draw_Freehand_Document \ ) $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\ @@ -569,6 +570,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filt PublisherDocument \ CorelDrawDocument \ CorelPresentationExchange \ + FreehandDocument \ ) $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\ diff --git a/filter/source/config/fragments/filters/FreehandDocument.xcu b/filter/source/config/fragments/filters/FreehandDocument.xcu new file mode 100644 index 000..12bfd5f --- /dev/null +++ b/filter/source/config/fragments/filters/FreehandDocument.xcu @@ -0,0 +1,13 @@ +node oor:name=Freehand Document oor:op=replace +prop oor:name=FlagsvalueIMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED/value/prop +prop oor:name=UIComponent/ +prop oor:name=FilterServicevaluecom.sun.star.comp.Draw.FreehandImportFilter/value/prop +prop oor:name=UserDatavalue/value/prop +prop oor:name=UIName +value xml:lang=x-defaultAdobe/Macromedia Freehand/value +/prop +prop oor:name=FileFormatVersionvalue0/value/prop +prop oor:name=Typevaluedraw_Freehand_Document/value/prop +prop oor:name=TemplateName/ +prop oor:name=DocumentServicevaluecom.sun.star.drawing.DrawingDocument/value/prop +/node diff --git a/filter/source/config/fragments/types/draw_Freehand_Document.xcu b/filter/source/config/fragments/types/draw_Freehand_Document.xcu new file mode 100644 index 000..1cc887e --- /dev/null +++ b/filter/source/config/fragments/types/draw_Freehand_Document.xcu @@ -0,0 +1,12 @@ +node oor:name=draw_Freehand_Document oor:op=replace +prop oor:name=DetectServicevaluecom.sun.star.comp.Draw.FreehandImportFilter/value/prop +prop oor:name=URLPattern/ +prop oor:name=Extensionsvaluefh fh1 fh2 fh3 fh4 fh5 fh6 fh7 fh8 fh9 fh10 fh11/value/prop +prop oor:name=MediaTypevalueapplication/x-freehand/value/prop +prop oor:name=Preferredvaluetrue/value/prop +prop oor:name=PreferredFiltervalueFreehand Document/value/prop +prop oor:name=UIName +valueAdobe/Macromedia Freehand/value +/prop +prop oor:name=ClipboardFormat/ +/node diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 5be55c8..84bb959 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_static_libraries,wpftdraw,\ $(eval $(call gb_Library_use_externals,wpftdraw,\ cdr \ etonyek \ + freehand \ mspub \ odfgen \ visio \ @@ -63,6 +64,7 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\ $(eval $(call gb_Library_add_exception_objects,wpftdraw,\ writerperfect/source/draw/CDRImportFilter \ writerperfect/source/draw/CMXImportFilter \ + writerperfect/source/draw/FreehandImportFilter \ writerperfect/source/draw/MSPUBImportFilter \ writerperfect/source/draw/VisioImportFilter \ writerperfect/source/draw/WPGImportFilter \ diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 8f02300..06115f2 100644 --- a/writerperfect/Module_writerperfect.mk +++
[Libreoffice-commits] core.git: ios/CustomTarget_MobileLibreOffice_app.mk ios/MobileLibreOffice ios/shared
ios/CustomTarget_MobileLibreOffice_app.mk | 27
+-
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 14 +
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 10 +--
ios/shared/ios_sharedlo/cxx/mlo.mm|5 +
4 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit aae312db554af9c8de711d67d6d83de44d7c0eed
Author: Roi Illouz roi.ill...@cloudon.com
Date: Thu Oct 31 14:19:56 2013 +0200
Fixe project for Xcode5 iOS7 new solver changes
Change-Id: I13c33cb0806dd16c2255788f5bcf635413644792
Reviewed-on: https://gerrit.libreoffice.org/6514
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk
b/ios/CustomTarget_MobileLibreOffice_app.mk
index e2119a1..64b66a1 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -15,9 +15,9 @@ BUILDID :=$(shell cd $(SRCDIR) git
log -1 --format=%H)
#- Macros -
define MobileLibreOfficeXcodeBuild
- CC=;xcodebuild -project shared/ios_sharedlo.xcodeproj -target
ios_sharedlo -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release)
$(1) /dev/null
- CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj
-target MobileLibreOffice -arch armv7 -configuration $(if
$(ENABLE_DEBUG),Debug,Release) $(1) /dev/null
+ CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj
-scheme MobileLibreOffice -arch armv7 -configuration $(if
$(ENABLE_DEBUG),Debug,Release) $(1) /dev/null
endef
+
#- Targets
.PHONY: MobileLibreOffice_setup
@@ -47,25 +47,30 @@ MobileLibreOffice_setup:
# Libs #
# Create the link flags in the xcconfig for Xcode linkage
- for path in $(OUTDIR)/lib \
- $(INSTDIR)/program \
+ for path in $(INSTDIR)/program \
+ $(WORKDIR)/Headers/Library \
$(WORKDIR)/LinkTarget/StaticLibrary \
- $(WORKDIR)/UnpackedTarball/*/.libs/ \
+ $(WORKDIR)/UnpackedTarball/*/.libs \
$(WORKDIR)/UnpackedTarball/*/src/.libs \
$(WORKDIR)/UnpackedTarball/*/src/*/.libs \
+ $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs \
+ $(WORKDIR)/UnpackedTarball/icu/source/lib \
$(WORKDIR)/UnpackedTarball/openssl; do \
- flags+= -L$$path; \
+ flags=''; \
for lib in $$path/lib*.a; do \
if [ ! -r $$lib ]; then \
continue; \
fi; \
- base=$${lib##*/lib}; \
+ base=$${lib##*/lib}; \
base=$${base%\.a}; \
flags+= -l$${base}; \
done; \
+ if [ $$flags ]; then \
+ all_flags+= -L$$path $$flags; \
+ fi; \
done; \
file=$(LO_XCCONFIG); \
- sed -i '' -e s|^\(LINK_LDFLAGS =\).*$$|\1 $$flags| $$file;
+ sed -i '' -e s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_flags| $$file;
# Resources #
rm -rf $(DEST_RESOURCE) 2/dev/null
@@ -73,9 +78,8 @@ MobileLibreOffice_setup:
mkdir -p $(DEST_RESOURCE)/ure
# copy rdb files
- cp $(OUTDIR)/bin/offapi.rdb $(DEST_RESOURCE)
- cp $(OUTDIR)/bin/udkapi.rdb $(DEST_RESOURCE)
- cp $(OUTDIR)/bin/oovbaapi.rdb $(DEST_RESOURCE)
+ cp $(INSTDIR)/program/types/offapi.rdb $(DEST_RESOURCE)
+ cp $(INSTDIR)/program/types/oovbaapi.rdb$(DEST_RESOURCE)
cp $(INSTDIR)/program/services/services.rdb $(DEST_RESOURCE)
cp $(INSTDIR)/ure/share/misc/services.rdb $(DEST_RESOURCE)/ure
@@ -131,7 +135,6 @@ $(call
gb_CustomTarget_get_clean_target,ios/MobileLibreOffice):
#==
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),APP,2)
$(call MobileLibreOfficeXcodeBuild, clean)
- rm -f $(LO_XCCONFIG) 2/dev/null
#--
# vim: set noet sw=4 ts=4:
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 2f30ea4..0700663 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -14,7 +14,6 @@
681D78BE180C12D300D52D5E /* rc in Resources */ = {isa =
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - include/touch ios/shared sw/source
include/touch/touch.h
| 98 ++
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
|8
sw/source/core/view/viewsh.cxx
| 46 ++--
3 files changed, 90 insertions(+), 62 deletions(-)
New commits:
commit d1528ec8e05d2a8bde93facbe338bde4cc1e017a
Author: Ptyl Dragon p...@cloudon.com
Date: Thu Oct 31 15:20:13 2013 +0200
added units MLODpxes and MLORips
Change-Id: Ica09fbd0f6a822f464df302dba4cf40d1d089697
diff --git a/include/touch/touch.h b/include/touch/touch.h
index 6601a05..5902376 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -71,69 +71,89 @@ typedef basegfx::B2IBox MLORect;
// MLODip - Device Independent Pixels
-typedef long long MLOPixel;
-static const MLOPixel LO_TWIPS_TO_MLO_PIXEL_RATIO = 10L;
-struct MLOPixelSize {
-MLOPixel width;
-MLOPixel height;
+typedef long long MLORip;
+typedef CGFloat MLODpx;
+typedef CGPoint MLODpxPoint;
+typedef CGSize MLODpxSize;
+
+CG_INLINE MLODpxPoint
+MLODpxPointByDpxes(MLODpx x, MLODpx y)
+{
+return CGPointMake(x, y);
+}
+
+CG_INLINE MLODpxSize
+MLODpxSizeByDpxes(MLODpx width, MLODpx height)
+{
+return CGSizeMake(width, height);
+}
+
+static const MLORip LO_TWIPS_TO_MLO_RIP_RATIO = 10L;
+
+struct MLORipSize
+{
+MLORip width;
+MLORip height;
};
-typedef struct MLOPixelSize MLOPixelSize;
-struct MLOPixelPoint {
-MLOPixel x;
-MLOPixel y;
+typedef struct MLORipSize MLORipSize;
+
+struct MLORipPoint
+{
+MLORip x;
+MLORip y;
};
-typedef struct MLOPixelPoint MLOPixelPoint;
+typedef struct MLORipPoint MLORipPoint;
-CG_INLINE CGFloat
-MLOPixelToCGFloat(MLOPixel mloPixel)
+CG_INLINE MLODpx
+MLODpxByRip(MLORip rip)
{
-return (CGFloat) (mloPixel / LO_TWIPS_TO_MLO_PIXEL_RATIO);
+return (MLODpx) (rip / LO_TWIPS_TO_MLO_RIP_RATIO);
}
-CG_INLINE MLOPixel
-CGFloatToMLOPixel(CGFloat cgFloat)
+CG_INLINE MLORip
+MLORipByDpx(MLODpx dpx)
{
-return (MLOPixel) cgFloat * LO_TWIPS_TO_MLO_PIXEL_RATIO;
+return (MLORip) (dpx * LO_TWIPS_TO_MLO_RIP_RATIO);
}
-CG_INLINE MLOPixelSize
-MLOPixelSizeMake(MLOPixel width, MLOPixel height)
+CG_INLINE MLORipSize
+MLORipSizeByRips(MLORip width, MLORip height)
{
-MLOPixelSize size; size.width = width; size.height = height; return size;
+MLORipSize ripSize; ripSize.width = width; ripSize.height = height; return
ripSize;
}
-CG_INLINE MLOPixelPoint
-MLOPixelPointMake(MLOPixel x, MLOPixel y)
+CG_INLINE MLORipPoint
+MLORipPointByRips(MLORip x, MLORip y)
{
-MLOPixelPoint point; point.x = x; point.y = y; return point;
+MLORipPoint point; point.x = x; point.y = y; return point;
}
-CG_INLINE MLOPixelSize
-CGSizeToMLOPixelSize(CGSize cgSize)
+CG_INLINE MLORipSize
+MLORipSizeByDpxSize(MLODpxSize dpxSize)
{
-MLOPixelSize mloPixelSize;
-mloPixelSize.width = MLOPixelToCGFloat(cgSize.width);
-mloPixelSize.height = MLOPixelToCGFloat(cgSize.height);
-return mloPixelSize;
+MLORipSize ripSize;
+ripSize.width = MLORipByDpx(dpxSize.width);
+ripSize.height = MLORipByDpx(dpxSize.height);
+return ripSize;
}
-CG_INLINE CGSize
-MLOPixelsToCGSize(MLOPixel width, MLOPixel height)
+CG_INLINE MLODpxSize
+MLODpxSizeByRips(MLORip width, MLORip height)
{
-CGFloat fWidth = MLOPixelToCGFloat(width);
-CGFloat fHeight = MLOPixelToCGFloat(height);
+CGFloat fWidth = MLODpxByRip(width);
+CGFloat fHeight = MLODpxByRip(height);
return CGSizeMake(fWidth, fHeight);
}
-CG_INLINE CGSize
-MLOPixelSizeToCGSize(MLOPixelSize mloPixelSize)
+CG_INLINE MLODpxSize
+MLODpxSizeByRipSize(MLORipSize ripSize)
{
-return MLOPixelsToCGSize(mloPixelSize.width, mloPixelSize.height);
+return MLODpxSizeByRips(ripSize.width, ripSize.height);
}
-MLOPixelPoint CGPointToMLOPixelPoint(CGPoint cgPoint);
+MLORipPoint MLORipPointByDpxPoint(MLODpxPoint mloDpxPoint);
-CGPoint MLOPixelPointToCGPoint(MLOPixelPoint mloPixelPoint);
+MLODpxPoint MLODpxPointByMLORipPoint(MLORipPoint mloRipPoint);
// selection
@@ -178,9 +198,9 @@ void touch_lo_keyboard_input(int c);
tilePosX, tilePosY, tileWidth, tileHeight address the part of the document to
be drawn.
context, contextHeight, contextWidth specify where to draw.
*/
-void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight,
int tilePosX, int tilePosY, int tileWidth, int tileHeight);
+void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight,
MLODpxPoint tilePosition, MLODpxSize tileSize);
void touch_lo_copy_buffer(const void * source, size_t sourceWidth, size_t
sourceHeight, size_t sourceBytesPerRow, void * target, size_t targetWidth,
size_t targetHeight);
-CGSize touch_lo_get_content_size();
+MLODpxSize touch_lo_get_content_size();
void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state);
// Move the start of the selection to (x,y)
diff --git
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 378 +--
1 file changed, 111 insertions(+), 267 deletions(-)
New commits:
commit 5dc0c2701690f39d7f5d44aed745dc82723e710d
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Wed Oct 30 17:03:22 2013 +0100
sw/qa: adapt ooxmlexport to use new tests macros
Change-Id: Iacdcb70e369f3f48e2885480ec5acabdae422f99
Reviewed-on: https://gerrit.libreoffice.org/6513
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1e46c83..32f5925 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -7,6 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include swmodeltestbase.hxx
+
+#if !defined(WNT)
+
#include com/sun/star/frame/XStorable.hpp
#include com/sun/star/drawing/FillStyle.hpp
#include com/sun/star/drawing/LineStyle.hpp
@@ -37,7 +41,6 @@
#include unotools/tempfile.hxx
#include unotools/ucbstreamhelper.hxx
#include rtl/strbuf.hxx
-#include swmodeltestbase.hxx
#include libxml/xpathInternals.h
#include libxml/parserInternals.h
@@ -47,92 +50,10 @@
class Test : public SwModelTestBase
{
public:
-void testZoom();
-void defaultTabStopNotInStyles();
-void testFdo38244();
-void testMathEscape();
-void testFdo51034();
-void testMathAccents();
-void testMathD();
-void testMathEscaping();
-void testMathLim();
-void testMathMalformedXml();
-void testMathMatrix();
-void testMathMso2k7();
-void testMathNary();
-void testMathOverbraceUnderbrace();
-void testMathOverstrike();
-void testMathPlaceholders();
-void testMathRad();
-void testMathSubscripts();
-void testMathVerticalStacks();
-void testTablePosition();
-void testFdo47669();
-void testTableBorders();
-void testFdo51550();
-void testN789482();
-//void test1Table1Page();
-void testTextFrames();
-void testTextFrameBorders();
-void testTextframeGradient();
-void testCellBtlr();
-void testTableStylerPrSz();
-void testMathLiteral();
-void testFdo48557();
-void testI120928();
-void testFdo64826();
-void testPageBackground();
-void testPageGraphicBackground();
-void testFdo65265();
-void testFdo65655();
-void testFDO63053();
-void testWatermark();
-void testFdo43093();
-void testFdo64238_a();
-void testFdo64238_b();
-void testFdo56679();
-void testFdo65400();
-void testFdo66543();
-void testN822175();
-void testFdo66688();
-void testFdo66773();
-void testFdo58577();
-void testBnc581614();
-void testFdo66929();
-void testFdo66145();
-void testPageBorderSpacingExportCase2();
-void testGrabBag();
-void testFdo66781();
-void testFdo60990();
-void testFdo65718();
-void testFdo64350();
-void testFdo67013();
-void testParaShadow();
-void testTableFloating();
-void testTableFloatingMargins();
-void testFdo44689_start_page_0();
-void testFdo44689_start_page_7();
-void testFdo67737();
-void testTransparentShadow();
-void testBnc834035();
-void testFdo68418();
-void testA4AndBorders();
-void testFdo68787();
-void testCharacterBorder();
-void testStyleInheritance();
-void testCalendar1();
-void testSmartart();
-void testFdo69636();
-void testCharHighlight();
-
-CPPUNIT_TEST_SUITE(Test);
-#if !defined(WNT)
-CPPUNIT_TEST(run);
-#endif
-CPPUNIT_TEST_SUITE_END();
+Test() : SwModelTestBase(/sw/qa/extras/ooxmlexport/data/, Office Open
XML Text) {}
+
+protected:
-private:
-void run();
/**
* Given that some problem doesn't affect the result in the importer, we
* test the resulting file directly, by opening the zip file, parsing an
@@ -163,108 +84,21 @@ private:
* Same as the assertXPath(), but don't assert: return the string instead.
*/
OUString getXPath(xmlDocPtr pXmlDoc, const OString rXPath, const OString
rAttribute);
-};
-void Test::run()
-{
-MethodEntryTest aMethods[] = {
-{zoom.docx, Test::testZoom},
-{empty.odt, Test::defaultTabStopNotInStyles},
-{fdo38244.docx, Test::testFdo38244},
-{math-escape.docx, Test::testMathEscape},
-{fdo51034.odt, Test::testFdo51034},
-{math-accents.docx, Test::testMathAccents},
-{math-d.docx, Test::testMathD},
-{math-escaping.docx, Test::testMathEscaping},
-{math-lim.docx, Test::testMathLim},
-{math-malformed_xml.docx, Test::testMathMalformedXml},
-{math-matrix.docx, Test::testMathMatrix},
-{math-mso2k7.docx, Test::testMathMso2k7},
-{math-nary.docx, Test::testMathNary},
-{math-overbrace_underbrace.docx, Test::testMathOverbraceUnderbrace},
-
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/qa sc/source
sc/qa/unit/opencl-test.cxx |8 +-
sc/source/core/opencl/formulagroupcl.cxx | 90 ---
sc/source/core/opencl/op_financial.hxx |2
sc/source/core/opencl/opbase.cxx |2
sc/source/core/opencl/opbase.hxx |4 +
5 files changed, 94 insertions(+), 12 deletions(-)
New commits:
commit abc2223a2a40dee89f7aabebe2d238120792d6ff
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date: Wed Oct 30 23:16:41 2013 -0500
Fix an integration regression on GPU Calc compiler string test case.
A new DynamicKernelArgument subclass is added to handle mixed
string and numeric values in the same VectorRef.
Change-Id: I2e394a95644a8fc41efbe15a04feea24140a4c12
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 687391b..8e8424b 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -137,7 +137,7 @@ public:
CPPUNIT_TEST(testStatisticalFormulaHarMean);
CPPUNIT_TEST(testFinancialCoupdaybsFormula);
CPPUNIT_TEST(testFinacialDollardeFormula);
-// CPPUNIT_TEST(testCompilerString);
+CPPUNIT_TEST(testCompilerString);
CPPUNIT_TEST(testCompilerInEq);
CPPUNIT_TEST(testFinacialDollarfrFormula);
CPPUNIT_TEST(testFinacialSYDFormula);
@@ -239,11 +239,13 @@ void ScOpenclTest::testCompilerString()
// Check the results of formula cells in the shared formula range.
for (SCROW i = 1; i 5; ++i)
{
+#if 0
double fLibre = pDoc-GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes-GetValue(ScAddress(2, i, 0));
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
-fLibre = pDoc-GetValue(ScAddress(3, i, 0));
-fExcel = pDocRes-GetValue(ScAddress(3, i, 0));
+#endif
+double fLibre = pDoc-GetValue(ScAddress(3, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(3, i, 0));
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
}
xDocSh-DoClose();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 1c113f6..c44a200 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -207,6 +207,10 @@ public:
{
ss __global unsigned int *mSymName;
}
+virtual void GenSlidingWindowDecl(std::stringstream ss) const
+{
+DynamicKernelStringArgument::GenDecl(ss);
+}
virtual size_t Marshal(cl_kernel, int, int);
};
@@ -231,8 +235,6 @@ size_t DynamicKernelStringArgument::Marshal(cl_kernel k,
int argno, int)
const formula::DoubleVectorRefToken* pDVR =
dynamic_cast const formula::DoubleVectorRefToken* (ref);
assert(pDVR);
-if (pDVR-GetArrays()[0].mpNumericArray != NULL)
-throw Unhandled();
nStrings = pDVR-GetArrayLength();
vRef = pDVR-GetArrays()[0];
}
@@ -250,8 +252,15 @@ size_t DynamicKernelStringArgument::Marshal(cl_kernel k,
int argno, int)
throw OpenCLError(err);
for (size_t i = 0; i nStrings; i++)
{
-const OUString tmp = OUString(vRef.mpStringArray[i]);
-pHashBuffer[i] = tmp.hashCode();
+if (vRef.mpStringArray[i])
+{
+const OUString tmp = OUString(vRef.mpStringArray[i]);
+pHashBuffer[i] = tmp.hashCode();
+}
+else
+{
+pHashBuffer[i] = 0;
+}
}
err = clEnqueueUnmapMemObject(kEnv.mpkCmdQueue, mpClmem,
pHashBuffer, 0, NULL, NULL);
@@ -264,6 +273,52 @@ size_t DynamicKernelStringArgument::Marshal(cl_kernel k,
int argno, int)
return 1;
}
+/// A mixed string/numberic vector
+class DynamicKernelMixedArgument: public DynamicKernelArgument
+{
+public:
+DynamicKernelMixedArgument(const std::string s,
+FormulaTreeNodeRef ft):
+DynamicKernelArgument(s, ft), mStringArgument(s+s, ft) {}
+virtual void GenSlidingWindowDecl(std::stringstream ss) const
+{
+DynamicKernelArgument::GenSlidingWindowDecl(ss);
+ss , ;
+mStringArgument.GenSlidingWindowDecl(ss);
+}
+virtual void GenSlidingWindowFunction(std::stringstream ) {}
+/// Generate declaration
+virtual void GenDecl(std::stringstream ss) const
+{
+DynamicKernelArgument::GenDecl(ss);
+ss , ;
+mStringArgument.GenDecl(ss);
+}
+virtual void GenDeclRef(std::stringstream ss) const
+{
+DynamicKernelArgument::GenDeclRef(ss);
+ss ,;
+mStringArgument.GenDeclRef(ss);
+}
+virtual std::string GenSlidingWindowDeclRef(bool) const
+{
+std::stringstream ss;
+ss (!isNan( DynamicKernelArgument::GenSlidingWindowDeclRef(ss);
+ss )? DynamicKernelArgument::GenSlidingWindowDeclRef(ss);
+ss : mStringArgument.GenSlidingWindowDeclRef(ss);
+ss );
+return ss.str();
+}
+virtual size_t Marshal(cl_kernel k, int
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/opencl-test.cxx |8 +-
sc/source/core/opencl/formulagroupcl.cxx | 90 ---
sc/source/core/opencl/op_financial.hxx |2
sc/source/core/opencl/opbase.cxx |2
sc/source/core/opencl/opbase.hxx |4 +
5 files changed, 94 insertions(+), 12 deletions(-)
New commits:
commit 3a57c1f4d6b430110074cd0b3bfd7ba2bb9fea24
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date: Wed Oct 30 23:16:41 2013 -0500
Fix an integration regression on GPU Calc compiler string test case.
A new DynamicKernelArgument subclass is added to handle mixed
string and numeric values in the same VectorRef.
Change-Id: I2e394a95644a8fc41efbe15a04feea24140a4c12
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 38fb153..cf5fa7e 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -135,7 +135,7 @@ public:
CPPUNIT_TEST(testStatisticalFormulaHarMean);
CPPUNIT_TEST(testFinancialCoupdaybsFormula);
CPPUNIT_TEST(testFinacialDollardeFormula);
-// CPPUNIT_TEST(testCompilerString);
+CPPUNIT_TEST(testCompilerString);
CPPUNIT_TEST(testCompilerInEq);
CPPUNIT_TEST(testFinacialDollarfrFormula);
CPPUNIT_TEST(testFinacialSYDFormula);
@@ -237,11 +237,13 @@ void ScOpenclTest::testCompilerString()
// Check the results of formula cells in the shared formula range.
for (SCROW i = 1; i 5; ++i)
{
+#if 0
double fLibre = pDoc-GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes-GetValue(ScAddress(2, i, 0));
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
-fLibre = pDoc-GetValue(ScAddress(3, i, 0));
-fExcel = pDocRes-GetValue(ScAddress(3, i, 0));
+#endif
+double fLibre = pDoc-GetValue(ScAddress(3, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(3, i, 0));
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
}
xDocSh-DoClose();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 898b91b..2c15ef5 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -207,6 +207,10 @@ public:
{
ss __global unsigned int *mSymName;
}
+virtual void GenSlidingWindowDecl(std::stringstream ss) const
+{
+DynamicKernelStringArgument::GenDecl(ss);
+}
virtual size_t Marshal(cl_kernel, int, int);
};
@@ -231,8 +235,6 @@ size_t DynamicKernelStringArgument::Marshal(cl_kernel k,
int argno, int)
const formula::DoubleVectorRefToken* pDVR =
dynamic_cast const formula::DoubleVectorRefToken* (ref);
assert(pDVR);
-if (pDVR-GetArrays()[0].mpNumericArray != NULL)
-throw Unhandled();
nStrings = pDVR-GetArrayLength();
vRef = pDVR-GetArrays()[0];
}
@@ -250,8 +252,15 @@ size_t DynamicKernelStringArgument::Marshal(cl_kernel k,
int argno, int)
throw OpenCLError(err);
for (size_t i = 0; i nStrings; i++)
{
-const OUString tmp = OUString(vRef.mpStringArray[i]);
-pHashBuffer[i] = tmp.hashCode();
+if (vRef.mpStringArray[i])
+{
+const OUString tmp = OUString(vRef.mpStringArray[i]);
+pHashBuffer[i] = tmp.hashCode();
+}
+else
+{
+pHashBuffer[i] = 0;
+}
}
err = clEnqueueUnmapMemObject(kEnv.mpkCmdQueue, mpClmem,
pHashBuffer, 0, NULL, NULL);
@@ -264,6 +273,52 @@ size_t DynamicKernelStringArgument::Marshal(cl_kernel k,
int argno, int)
return 1;
}
+/// A mixed string/numberic vector
+class DynamicKernelMixedArgument: public DynamicKernelArgument
+{
+public:
+DynamicKernelMixedArgument(const std::string s,
+FormulaTreeNodeRef ft):
+DynamicKernelArgument(s, ft), mStringArgument(s+s, ft) {}
+virtual void GenSlidingWindowDecl(std::stringstream ss) const
+{
+DynamicKernelArgument::GenSlidingWindowDecl(ss);
+ss , ;
+mStringArgument.GenSlidingWindowDecl(ss);
+}
+virtual void GenSlidingWindowFunction(std::stringstream ) {}
+/// Generate declaration
+virtual void GenDecl(std::stringstream ss) const
+{
+DynamicKernelArgument::GenDecl(ss);
+ss , ;
+mStringArgument.GenDecl(ss);
+}
+virtual void GenDeclRef(std::stringstream ss) const
+{
+DynamicKernelArgument::GenDeclRef(ss);
+ss ,;
+mStringArgument.GenDeclRef(ss);
+}
+virtual std::string GenSlidingWindowDeclRef(bool) const
+{
+std::stringstream ss;
+ss (!isNan( DynamicKernelArgument::GenSlidingWindowDeclRef(ss);
+ss )? DynamicKernelArgument::GenSlidingWindowDeclRef(ss);
+ss : mStringArgument.GenSlidingWindowDeclRef(ss);
+ss );
+return ss.str();
+}
+virtual size_t Marshal(cl_kernel k, int
WRITER : Extend support for RDF Metadata
Hi, 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. Thanks. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: My C++ extension does not work with LO4 anymore
2013/10/31 Stephan Bergmann sberg...@redhat.com That's a consequence of http://www.libreoffice.org/download/4-0-new-features-and-fixes/#C.2B.2B_UNO_language_binding_and_URE_libraries Base-line Windows / C++ compiler upgraded to Visual Studio 2010 [...] runtime libraries for Visual Studio 2008 (msvcr90.dll) are no longer bundled. Yes, but I provide this dll in my extension. Short of recompiling your extension against the LO 4 baseline, another option might be to tell users of your extension to first download and install the old MS runtime libraries on their system (which are available from MS, IIUC). I tried to install MS runtime libraires ( http://www.microsoft.com/en-us/download/details.aspx?id=5582) but the problem still occurs (uno.exe reports runtime error). On the same computer my extension works fine with AOO4. The only issue is to recompile ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 11 commits - bin/verify-custom-widgets-libs ios/CustomTarget_LibreOffice_app.mk ios/CustomTarget_MobileLibreOffice_app.mk ios/Executable_LibreOffice.mk ios/lo.xcconfig.
bin/verify-custom-widgets-libs|2
ios/CustomTarget_LibreOffice_app.mk |6
ios/CustomTarget_MobileLibreOffice_app.mk |1
ios/Executable_LibreOffice.mk |1
ios/lo.xcconfig.in|1
ios/qa/sc/Makefile| 10
ios/qa/sc/filters-test.m |1
libxmlsec/ExternalProject_xmlsec.mk |2
postprocess/CustomTarget_signing.mk |9
smoketest/Executable_libtest.mk |2
solenv/bin/install-gdb-printers | 38 --
solenv/bin/modules/installer/control.pm |4
solenv/bin/modules/installer/windows/admin.pm |4
solenv/bin/modules/installer/windows/msiglobal.pm | 10
solenv/bin/relocate | 290 --
solenv/gbuild/AllLangResTarget.mk |2
solenv/gbuild/CppunitTest.mk |2
solenv/gbuild/ExternalPackage.mk |2
solenv/gbuild/Helper.mk |8
19 files changed, 42 insertions(+), 353 deletions(-)
New commits:
commit fc68745898647e1b9070459be43c5d1e0e933150
Author: Michael Stahl mst...@redhat.com
Date: Thu Oct 31 14:29:01 2013 +0100
verify-custom-widgets-libs: check libraries in instdir
Change-Id: Ia46c8df28ad2eed8ccdd6ec00f6bcd8358d8bb26
diff --git a/bin/verify-custom-widgets-libs b/bin/verify-custom-widgets-libs
index 8ca2784..3337013 100755
--- a/bin/verify-custom-widgets-libs
+++ b/bin/verify-custom-widgets-libs
@@ -20,7 +20,7 @@ for foo in $FOO; do
lib=$(echo $foo | cut -f1 -d-)
symbol=$(echo $foo | cut -f2 -d-)
echo testing if lib$lib.so contains make$symbol
-nm -D solver/unxlng*/lib/lib$lib.so | grep make$symbol /dev/null
+nm -D instdir/unxlng*/program/lib$lib.so | grep make$symbol /dev/null
if [ $? != 0 ]; then
echo MISSING. Windows will crash
else
commit b9120cbb170bac1b82b5e3d4a3ad1369e1526c8b
Author: Michael Stahl mst...@redhat.com
Date: Thu Oct 31 14:23:10 2013 +0100
bin unused solver-using perl script
Change-Id: Ia2f122904ed6958109b864c487a8a7758d9b959b
diff --git a/solenv/bin/relocate b/solenv/bin/relocate
deleted file mode 100755
index 19789c7..000
--- a/solenv/bin/relocate
+++ /dev/null
@@ -1,290 +0,0 @@
-:
-eval 'exec perl -S $0 ${1+$@}'
-if 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 .
-#
-#*
-#
-#This tool makes it easy to cleanly re-locate a
-# build, eg. after you have copied or moved it to a new
-# path. It tries to re-write all the hard-coded path logic
-# internally.
-#
-
-sub sniff_set($)
-{
-my $build_dir = shift;
-my ($dirhandle, $fname);
-
-opendir ($dirhandle, $build_dir) || die Can't open $build_dir;
-while ($fname = readdir ($dirhandle)) {
- $fname =~ /Set.sh$/ last;
-}
-closedir ($dirhandle);
-
-return $fname;
-}
-
-sub sed_file($$$)
-{
-my ($old_fname, $function, $state) = @_;
-my $tmp_fname = $old_fname.new;
-my $old_file;
-my $new_file;
-
-open ($old_file, $old_fname) || die Can't open $old_fname: $!;
-open ($new_file, $tmp_fname) || die Can't open $tmp_fname: $!;
-
-while ($old_file) {
- my $value = $function($state, $_);
- print $new_file $value;
-}
-
-close ($new_file) || die Failed to close $tmp_fname: $!;
-close ($old_file) || die Failed to close $old_fname: $!;
-
-rename $tmp_fname, $old_fname || die Failed to replace $old_fname: $!;
-}
-
-sub rewrite_value($$)
-{
-my ($state, $value) = @_;
-
-$value =~ s/$state-{'old_root'}/$state-{'new_root'}/g;
-$value =~ s/$state-{'win32_old_root'}/$state-{'win32_new_root'}/g;
-
-return $value;
-}
-
-sub rewrite_set($$$)
-{
-my $new_root = shift;
-my $old_root = shift;
-my $set = shift;
-my $tmp;
-my %state;
-
-print$set\n;
-
-# unix style
-$state{'old_root'} = $old_root;
-$state{'new_root'} = $new_root;
-# win32 style
-$tmp = $old_root;
-$tmp =~ s/\///g;
-
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |1
sw/source/filter/ww8/docxtablestyleexport.cxx| 16 ---
writerfilter/source/dmapper/TDefTableHandler.cxx | 32 +++
3 files changed, 45 insertions(+), 4 deletions(-)
New commits:
commit fbe12f72bc59ca0b202d972ee098d16f66195c13
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Oct 31 15:23:12 2013 +0100
DOCX filter: roundtrip more table cell border properties for table styles
Change-Id: Ia93bd2083b00f62770970a4efa783b6b19967acb
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 32f5925..f63dd4a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1320,6 +1320,7 @@ DECLARE_OOXML_TEST(testCalendar1, calendar1.docx)
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='firstRow']/w:tblPr,
1);
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='firstRow']/w:tcPr/w:vAlign,
val, bottom);
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='lastRow']/w:tcPr/w:tcBorders/w:tr2bl,
val, nil);
+assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='band2Horz']/w:tcPr/w:tcBorders/w:top,
themeColor, text1);
}
DECLARE_OOXML_TEST(testSmartart, smartart.docx)
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 9aaad80..940301f 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -91,6 +91,15 @@ void lcl_TableStyleTblCellMar(sax_fastparser::FSHelperPtr
pSerializer, uno::Sequ
pSerializer-endElementNS(XML_w, XML_tblCellMar);
}
+static DocxStringTokenMap const aTcBorderTokens[] = {
+{val, XML_val},
+{sz, XML_sz},
+{color, XML_color},
+{space, XML_space},
+{themeColor, XML_themeColor},
+{0, 0}
+};
+
/// Export of a given table cell border type in a table style.
void lcl_TableStyleTcBorder(sax_fastparser::FSHelperPtr pSerializer, sal_Int32
nToken, const uno::Sequencebeans::PropertyValue rTcBorder)
{
@@ -99,10 +108,9 @@ void lcl_TableStyleTcBorder(sax_fastparser::FSHelperPtr
pSerializer, sal_Int32 n
sax_fastparser::FastAttributeList* pAttributeList =
pSerializer-createAttrList();
for (sal_Int32 i = 0; i rTcBorder.getLength(); ++i)
-{
-if (rTcBorder[i].Name == val)
-pAttributeList-add(FSNS(XML_w, XML_val),
OUStringToOString(rTcBorder[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
-}
+if (sal_Int32 nAttrToken = DocxStringGetToken(aTcBorderTokens,
rTcBorder[i].Name))
+pAttributeList-add(FSNS(XML_w, nAttrToken),
OUStringToOString(rTcBorder[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
+
sax_fastparser::XFastAttributeListRef xAttributeList(pAttributeList);
pSerializer-singleElementNS(XML_w, nToken, xAttributeList);
}
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx
b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 5e9c5b5..f242f28 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -21,6 +21,7 @@
#include ConversionHelper.hxx
#include ooxml/resourceids.hxx
#include doctok/resourceids.hxx
+#include filter/msfilter/util.hxx
#include com/sun/star/table/BorderLine2.hpp
#include com/sun/star/text/TableColumnSeparator.hpp
#include com/sun/star/text/VertOrientation.hpp
@@ -249,6 +250,32 @@ OUString lcl_getBorderTypeString(sal_Int32 nType)
return OUString();
}
+OUString lcl_getThemeColorTypeString(sal_Int32 nType)
+{
+switch (nType)
+{
+case NS_ooxml::LN_Value_St_ThemeColor_dark1: return OUString(dark1);
+case NS_ooxml::LN_Value_St_ThemeColor_light1: return
OUString(light1);
+case NS_ooxml::LN_Value_St_ThemeColor_dark2: return OUString(dark2);
+case NS_ooxml::LN_Value_St_ThemeColor_light2: return
OUString(light2);
+case NS_ooxml::LN_Value_St_ThemeColor_accent1: return
OUString(accent1);
+case NS_ooxml::LN_Value_St_ThemeColor_accent2: return
OUString(accent2);
+case NS_ooxml::LN_Value_St_ThemeColor_accent3: return
OUString(accent3);
+case NS_ooxml::LN_Value_St_ThemeColor_accent4: return
OUString(accent4);
+case NS_ooxml::LN_Value_St_ThemeColor_accent5: return
OUString(accent5);
+case NS_ooxml::LN_Value_St_ThemeColor_accent6: return
OUString(accent6);
+case NS_ooxml::LN_Value_St_ThemeColor_hyperlink: return
OUString(hyperlink);
+case NS_ooxml::LN_Value_St_ThemeColor_followedHyperlink: return
OUString(followedHyperlink);
+case NS_ooxml::LN_Value_St_ThemeColor_none: return OUString(none);
+case NS_ooxml::LN_Value_St_ThemeColor_background1: return
OUString(background1);
+
Re: My C++ extension does not work with LO4 anymore
On 31/10/13 14:44, Christophe Devalland wrote: 2013/10/31 Stephan Bergmann sberg...@redhat.com mailto:sberg...@redhat.com That's a consequence of http://www.libreoffice.org/download/4-0-new-features-and-fixes/#C.2B.2B_UNO_language_binding_and_URE_libraries Base-line Windows / C++ compiler upgraded to Visual Studio 2010 [...] runtime libraries for Visual Studio 2008 (msvcr90.dll) are no longer bundled. Yes, but I provide this dll in my extension. Short of recompiling your extension against the LO 4 baseline, another option might be to tell users of your extension to first download and install the old MS runtime libraries on their system (which are available from MS, IIUC). I tried to install MS runtime libraires (http://www.microsoft.com/en-us/download/details.aspx?id=5582 http://www.microsoft.com/en-us/download/details..aspx?id=5582) but the problem still occurs (uno.exe reports runtime error). On the same computer my extension works fine with AOO4. The only issue is to recompile ? IIRC with MSVC 2008 it is required that the DLL/EXE using the MSVCRT DLLs needs to embed some crazy XML manifest, because the 2008 MSVCRT DLLs are installed in some non-default location, not in the usual search paths; this is different with MSVC 2010/2012 where the redistributatble installs the DLLs into a default search path. relevant bits in the LO build system are: - passing -manifestfile:mydll.manifest to the link.exe so it writes the manifest to the file - mt.exe $(MTFLAGS) -nologo -manifest mydll.manifest -outputresource:mydll.dll\;2 to get the manifest file into the DLL ... and if you want to know why that is so ridiculously complicated (why can't link.exe just put in the manifest into the DLL itself) you have to use Microsoft. or speaking of that, why do applications need to bundle the libc in the first place... i hope with the above info it should be possible to get a DLL that loads with the user installed 2008 redistributable. or you can rebuild it with 2010 compiler. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: compilerplugins/clang config_host/config_clang.h.in config_host.mk.in configure.ac cppuhelper/test distro-configs/OxygenOfficeLinux.conf external/curl .gitignore instse
.gitignore|3 -- Makefile.in |3 -- compilerplugins/clang/plugin.cxx |3 -- compilerplugins/clang/pluginhandler.cxx | 25 ++- config_host.mk.in |4 --- config_host/config_clang.h.in |1 configure.ac | 28 +++--- cppuhelper/test/bootstrap/bootstrap.test.cxx | 17 - distro-configs/OxygenOfficeLinux.conf |1 external/curl/ExternalProject_curl.mk |2 - instsetoo_native/util/openoffice.lst.in |8 +++--- redland/ExternalProject_raptor.mk |4 +-- redland/ExternalProject_rasqal.mk |2 - redland/ExternalProject_redland.mk|4 +-- solenv/bin/create-ids |6 ++-- solenv/bin/create-tags|4 +-- solenv/bin/modules/installer/control.pm |3 -- solenv/bin/modules/installer/download.pm |2 - solenv/bin/modules/installer/environment.pm |5 --- solenv/bin/modules/installer/parameter.pm |2 - solenv/bin/modules/installer/simplepackage.pm |4 +-- solenv/bin/modules/installer/worker.pm|2 - solenv/bin/ooinstall |3 -- solenv/doc/gbuild/solenv/gbuild/gbuild.mk |1 solenv/doc/gbuild/solenv/gbuild/helper.mk |6 solenv/doc/gbuild/solenv/gbuild/library.mk|2 - solenv/doc/gbuild/solenv/gbuild/package.mk|4 +-- solenv/doc/gbuild/solenv/gbuild/static_library.mk |4 --- solenv/gbuild/Deliver.mk |2 - solenv/gbuild/Extension.mk|4 +-- solenv/gbuild/Helper.mk |3 -- solenv/gbuild/Library.mk |1 solenv/gbuild/LinkTarget.mk |8 +++--- solenv/gbuild/SdiTarget.mk|4 --- solenv/gbuild/TargetLocations.mk |6 solenv/gbuild/extensions/pre_Counters.mk |4 --- solenv/gbuild/gbuild.help.txt |2 - solenv/gbuild/gbuild.mk |9 ++- solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk |2 - solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk|2 - solenv/gbuild/platform/IOS_ARM_GCC.mk |2 - solenv/gbuild/platform/NETBSD_INTEL_GCC.mk|4 +-- solenv/gbuild/platform/NETBSD_X86_64_GCC.mk |4 +-- solenv/gbuild/platform/com_GCC_defs.mk|6 ++-- solenv/gbuild/platform/com_MSC_class.mk |7 - solenv/gbuild/platform/com_MSC_defs.mk|4 --- solenv/gbuild/platform/filter-showIncludes.awk|2 - solenv/gbuild/platform/macosx.mk |4 +-- solenv/gbuild/platform/mingw.mk |4 --- testtools/CustomTarget_bridgetest.mk |6 +--- unotest/source/cpp/bootstrapfixturebase.cxx |3 -- 51 files changed, 67 insertions(+), 179 deletions(-) New commits: commit 5d8f48c81eac8650315b936d0e89ad1d54b566fc Author: Michael Stahl mst...@redhat.com Date: Thu Oct 31 14:02:40 2013 +0100 solver doesn't solve anything... ... it is an abbreviation of Solar Version. Since nobody can remember that: remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath and any mention thereof. Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad Reviewed-on: https://gerrit.libreoffice.org/6515 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/.gitignore b/.gitignore index fb97926..4680de1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ # can be listed here... These must be deleted by maek distclean # # Files that are generated by the build but deleted by make clean -# should all be under workdir or solver +# should all be under workdir or instdir # if that is not the case, don't hide it here, but try to fix it # # The intent is that after a make distclean, .gitignore @@ -22,7 +22,6 @@ # where stuff are built /instdir /workdir -/solver # where the external downloads maybe located /src diff --git a/Makefile.in b/Makefile.in index 8523722..bc8ed76 100644 --- a/Makefile.in +++ b/Makefile.in @@ -149,14 +149,13 @@ clean: clean-host clean-build clean-host: rm -fr $(TESTINSTALLDIR) rm -fr $(INSTDIR) - rm -fr $(OUTDIR) rm -fr $(WORKDIR) + rm -fr solver rm -fr install clean-build: ifeq ($(CROSS_COMPILING),YES) rm -fr $(INSTDIR_FOR_BUILD) - rm -fr $(OUTDIR_FOR_BUILD) rm -fr $(WORKDIR_FOR_BUILD) endif diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx index
minutes of ESC call ...
* Present: + Christian, Eike, David, Stephan, Adam, Andras, Kohei, Markus, Kendy, Michael M, Michael S., Miklos, Norbert * Completed Action Items: + poke Matus wrt. callgrind / performance VM (Michael) + Include new C* font google replacements into vanilla install (Caolan) + draw bugzilla migration threads together propose funding to the board (Robinson) [ migration seems to be ongoing thanks to Thorsten / Tollef ] + produce a VM for the load / crash regressions (Cloph / Markus) [ setup, and running the tests - quite a few false positives, need to make it public. Running the second batch of tests ] http://dev-builds.libreoffice.org/crashtest/7cd77d5cb0b6fd3343f2703c73e2dc4b65fc0e9e/ The interesting files are crashlog.txt if it is there. Encourage people with time - mid compile or whatever to take a file fix it. Quite a few string-length assertions firing now. 40-50 to address in 4.2 / master. ] + test and get backtraces for Java issue on Maverick (Norbert) [ have to re-install Java after upgrade, the OS/prompt dialog can cause a crash. The solution - not publish wiki-publisher on Mac. The wiki-publisher, as soon as you type in writer Java is instantiated on Mac. Wikipublisher brings a menu entry from file-send-... when you type we instantiate all the menus so Mac can decided if there is a shortcut ... (sberg) Should we remove wiki-publisher completely ? (Michael) + just for Mac is enough for now (Sberg) ] * Pending Action Items: + New templates (Ahmad) [ work in progress hard-coding templates as code ] + produce a VM with callgrind metrics (Matus) [ waiting for details on what should be installed ] + partition document test loads / run them on tinderboxen (Norbert) [ started, need to work on script to split it down ] + get setup wrt. mobile app-store access (Cloph / Thorsten) [ in progress around 4.1.3, pending Thorsten overcoming some Android remote build problems with all langs ] + poke people around FOSDEM, and get submission details from Italo (Kendy) [ pending reply from Italo ] * Release Engineering update (Cloph) + 4.1.3 status + confusion again wrt. communication, now scheduled for tomorrow morning. + 4.2 Alpha 1 release planned for Monday ... + Feature freeze is Nov 18th. + GSOC / Android iOS remote control releases from master update + credentials setup, iOS pending input from Thorsten + OpenCL functions feature freeze + not concerned wrt. continuing development if not enabled by default * New Keynote import filter (David) + first version integrated into LibreOffice + https://plus.google.com/photos/109896341870720226179/albums/5940508193610436897/5940508196458171922?pid=5940508196458171922oid=109896341870720226179 + supports text, shapes, images + missing tables, formatting, comments etc. + https://gerrit.libreoffice.org/gitweb?p=libetonyek.git;a=blob;f=FEATURES AI: + create mirror of libetonyek on freedesktop (Michael) * New commit access: + Marcos Souza - doing some good work (Norbert) + will be at the hack-fest. + Ray - doing good openCL work (Kohei) AI:+ add ijsung. * 'UniString' is truly dead ? (Caolan) + still get the occasional StringLen class around the place, and a few legacy 64k limits are around with 16bit indexes into strings etc. + does that finally fix the 64k limit on paragraphs ? (Michael) - nearly done, but not got to that yet (Caolan) + lots of work, and a great outcome - thanks to all that helped, AI: + ask Noel Grandin to blog about it (Caolan) * solver going away (Michael S) https://gerrit.libreoffice.org/#/c/6515/ + will push when finished building in gerrit. + instdir vs. instsetoo_.. tab completion pain (Michael) + need to get workdir instdir combined (Stephan) + avoiding ORIGIN problems LD_LIBRARY_PATH horrors during build + perhaps move instdir under workdir ? + could we use absolute paths ? (Michael S) + path from instdir - workdir is always fixed (Michael S) + just an idea, easy sol'n make it a subdir of workdir (Stephan) + want to remove INPATH [ eg. unxlngi6.pro ] (Michael S) + except for cross-compilation with two inpaths + use two different paths ? * Google C* font replacements / update (Caolan) + we should back-port to 4.1.x + would be a good plan, but no time to get to it yet. AI:+ already looking into that (Caolan) * Certification progress (Kendy) + worth re-running the statistics of top bug fixers see if there are new names. + script - sorts by number of bugs fixed. + what about people who implemented features ? eg. GSOC (Michael) + critera -
Compiling LibreOffice 4.1.2.3 on Solaris
Hi All.
I'm trying to compile LibreOffice 4.1.2.3 on Solaris 12 (build 26, currently).
Note: don't get excited, I'm doing this in my spare time and Oracle are in
no way endorsing, supporting, or anything else'ing my efforts.
I've been using this thread for assistance and it's been a great help:
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/51422
I'm currently struggling with getting a working idlc compiled. Here's what
happens:
[build IDL] udkapi/com/sun/star/idl
ld.so.1: idlc: fatal: relocation error: file
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/bin/idlc:
symbol rtl_string_new: referenced symbol not found
/bin/sh: line 1: 8411: Killed
make[1]: ***
[/export/home/bautsche/libre-office/libreoffice-4.1.2.3/workdir/unxsogi.pro/UnoApiPartTarget/udkapi/com/sun/star/idl.done]
Killed
gmake: *** [build] Error 2
bautsche@cressida $
I think rtl_string_new is defined in include/rtl/string.h, but I can't see where
the function is actually coming from (running a find -exec grep across the code).
Here's the compile command for idlc:
S=/export/home/bautsche/libre-office/libreoffice-4.1.2.3
O=$S/solver/unxsogi.pro W=$S/workdir/unxsogi.pro mkdir -p
$W/LinkTarget/Executable/ g++ '-Wl,-rpath,$ORIGIN/../../ure-link/lib'
-Wl,-rpath,$O/lib -Wl,-rpath-link,$O/lib -Wl,-rpath-link,/lib:/usr/lib
-Wl,-z,combreloc -L$O/lib -L/usr/lib -L/usr/local/bin -L/usr/dt/lib
-L/usr/openwin/lib -Wl,--hash-style=gnu -Wl,--dynamic-list-cpp-new
-Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions -Wl,-O1
$W/CxxObject/idlc/source/idlcmain.o $W/CxxObject/idlc/source/idlc.o
$W/CxxObject/idlc/source/idlccompile.o
$W/CxxObject/idlc/source/idlcproduce.o
$W/CxxObject/idlc/source/errorhandler.o $W/CxxObject/idlc/source/options.o
$W/CxxObject/idlc/source/fehelper.o
$W/CxxObject/idlc/source/astdeclaration.o
$W/CxxObject/idlc/source/astscope.o $W/CxxObject/idlc/source/aststack.o
$W/CxxObject/idlc/source/astdump.o $W/CxxObject/idlc/source/astinterface.o
$W/CxxObject/idlc/source/aststruct.o
$W/CxxObject/idlc/source/aststructinstance.o
$W/CxxObject/idlc/source/astoperation.o
$W/CxxObject/idlc/source/astconstant.o $W/CxxObject/idlc/source/astenum.o
$W/CxxObject/idlc/source/astarray.o $W/CxxObject/idlc/source/astunion.o
$W/CxxObject/idlc/source/astexpression.o
$W/CxxObject/idlc/source/astservice.o
$W/GenCxxObject/YaccTarget/idlc/source/parser.o
$W/GenCxxObject/LexTarget/idlc/source/scanner.o -Wl,--start-group
-Wl,--end-group -Wl,--no-as-needed -lm -lnsl -lsocket -lreglo -luno_sal
-luno_salhelpergcc3 -o $W/LinkTarget/Executable/idlc
I have attached the solenv/gbuild/platform/solaris.mk I am using.
Any help would be greatly appreciated.
Thanks a lot.
Ciao,
Eric
P.S. If this isn't known yet, boost/boost.6139.clang.patch needs a dos2unix
running on it.
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# 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 .
#
gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt
gb_PROGRAMDIRNAME := program
include $(GBUILDDIR)/platform/com_GCC_defs.mk
gb_MKTEMP := mktemp -t gbuild.XX
ifneq ($(origin AR),default)
gb_AR := $(AR)
endif
# use CC/CXX if they are nondefaults
ifneq ($(origin CC),default)
gb_CC := $(CC)
gb_GCCP := $(CC)
endif
ifneq ($(origin CXX),default)
gb_CXX := $(CXX)
endif
ifeq ($(CPUNAME),SPARC)
gb_CPUDEFS := -D__sparcv8plus
endif
gb_OSDEFS := \
-D$(OS) \
-DSYSV \
-DSUN \
-DSUN4 \
-D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS \
-D_PTHREADS \
-DUNIX \
-DUNX \
$(PTHREAD_CFLAGS) \
gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
-fPIC \
-Wdeclaration-after-statement \
-Wshadow \
gb_CXXFLAGS := \
$(gb_CXXFLAGS_COMMON) \
-fPIC \
-Wshadow \
-Woverloaded-virtual \
-Wno-non-virtual-dtor \
# enable debug STL
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
gb_COMPILERDEFS += \
-D_GLIBCXX_DEBUG \
endif
gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print
$$1*1+$$2*100+$$3 }')
gb_GccLess460 := $(shell expr $(gb_CCVER) \
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f1/5874d8f976f3874bdbcb53429eeefa65c28841
f1/5874d8f976f3874bdbcb53429eeefa65c28841 |1 + 1 file changed, 1 insertion(+) New commits: commit a58b98e88fc5dec6fd1f6f0c4593692bc71422d0 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 31 15:56:27 2013 + Notes added by 'git notes add' diff --git a/f1/5874d8f976f3874bdbcb53429eeefa65c28841 b/f1/5874d8f976f3874bdbcb53429eeefa65c28841 new file mode 100644 index 000..1153d31 --- /dev/null +++ b/f1/5874d8f976f3874bdbcb53429eeefa65c28841 @@ -0,0 +1 @@ +merged as: 223f6b631c1b087754c0f9051fb55f029f2503ce ___ 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 sc/inc sc/qa sc/source
formula/source/core/resource/core_resource.src | 12 ++
include/formula/compiler.hrc |4
include/formula/opcode.hxx |2
sc/inc/helpids.h |2
sc/qa/unit/ucalc.cxx |2
sc/source/core/inc/interpre.hxx|1
sc/source/core/tool/interpr3.cxx | 61
sc/source/core/tool/interpr4.cxx |4
sc/source/filter/excel/xlformula.cxx |4
sc/source/filter/oox/formulabase.cxx |4
sc/source/ui/src/scfuncs.src | 120 +
11 files changed, 212 insertions(+), 4 deletions(-)
New commits:
commit 6d2f42199c2a9b48c9e19d7ae087f5452bfbd401
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date: Thu Oct 31 10:33:06 2013 +0100
fdo#71008 add Excel 2010 functions BETA.DEST and BETA.INV
Change-Id: I65863031cc2795713bf80c17dfc787e2700a556a
Reviewed-on: https://gerrit.libreoffice.org/6505
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 3ec56c0..8f49229 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -335,6 +335,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_TABLE_OP { Text = MULTIPLE.OPERATIONS ; };
String SC_OPCODE_BETA_DIST { Text = BETADIST ; };
String SC_OPCODE_BETA_INV { Text = BETAINV ; };
+String SC_OPCODE_BETA_DIST_MS { Text = COM.MICROSOFT.BETA.DIST ; };
+String SC_OPCODE_BETA_INV_MS { Text = COM.MICROSOFT.BETA.INV ; };
String SC_OPCODE_WEEK { Text = ISOWEEKNUM ; };
String SC_OPCODE_EASTERSUNDAY { Text = ORG.OPENOFFICE.EASTERSUNDAY ; };
String SC_OPCODE_GET_DAY_OF_WEEK { Text = WEEKDAY ; };
@@ -689,6 +691,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_TABLE_OP { Text = TABLE ; };
String SC_OPCODE_BETA_DIST { Text = BETADIST ; };
String SC_OPCODE_BETA_INV { Text = BETAINV ; };
+String SC_OPCODE_BETA_DIST_MS { Text = BETA.DIST ; };
+String SC_OPCODE_BETA_INV_MS { Text = BETA.INV ; };
String SC_OPCODE_WEEK { Text = WEEKNUM ; };
String SC_OPCODE_EASTERSUNDAY { Text = EASTERSUNDAY ; };
String SC_OPCODE_GET_DAY_OF_WEEK { Text = WEEKDAY ; };
@@ -1904,6 +1908,14 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = BETAINV ;
};
+String SC_OPCODE_BETA_DIST_MS
+{
+Text [ en-US ] = BETA.DIST ;
+};
+String SC_OPCODE_BETA_INV_MS
+{
+Text [ en-US ] = BETA.INV ;
+};
String SC_OPCODE_WEEK
{
Text [ en-US ] = WEEKNUM ;
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index b9b4f7a..d8c45b2 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -414,8 +414,10 @@
#define SC_OPCODE_ST_DEV_S 416
#define SC_OPCODE_VAR_P_MS 417
#define SC_OPCODE_VAR_S 418
+#define SC_OPCODE_BETA_DIST_MS 419
+#define SC_OPCODE_BETA_INV_MS 420
-#define SC_OPCODE_STOP_2_PAR419 /* last function with two or more
parameters' OpCode + 1 */
+#define SC_OPCODE_STOP_2_PAR421 /* last function with two or more
parameters' OpCode + 1 */
#define SC_OPCODE_STOP_FUNCTION SC_OPCODE_STOP_2_PAR/* last
function's OpCode + 1 */
#define SC_OPCODE_LAST_OPCODE_ID(SC_OPCODE_STOP_FUNCTION - 1) /* last
OpCode */
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 6dd28d3..5d96e07 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -378,6 +378,8 @@ enum OpCodeEnum
ocTableOp = SC_OPCODE_TABLE_OP,
ocBetaDist = SC_OPCODE_BETA_DIST,
ocBetaInv = SC_OPCODE_BETA_INV,
+ocBetaDist_MS = SC_OPCODE_BETA_DIST_MS,
+ocBetaInv_MS= SC_OPCODE_BETA_INV_MS,
// Bit functions
ocBitAnd= SC_OPCODE_BITAND,
ocBitOr = SC_OPCODE_BITOR,
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 831e2d9..820086e 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -684,5 +684,7 @@
#define HID_FUNC_ST_DEV_S
SC_HID_FUNC_ST_DEV_S
#define HID_FUNC_VAR_P_MS
SC_HID_FUNC_VAR_P_MS
#define HID_FUNC_VAR_S
SC_HID_FUNC_VAR_S
+#define HID_FUNC_BETADIST_MS
SC_HID_FUNC_BETADIST_MS
+#define HID_FUNC_BETAINV_MS
SC_HID_FUNC_BETAINV_MS
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 90af819..b5de6a5 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2357,6
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/opencl-test.cxx |7 +++
sc/qa/unit/ucalc_formula.cxx| 36 +++-
sc/source/core/data/column2.cxx |2 +-
3 files changed, 39 insertions(+), 6 deletions(-)
New commits:
commit 94a569c25026ea67f18ace8a075e13ac355ff3d2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 31 12:35:30 2013 -0400
Don't hard-code the start row position of string array to 0...
Change-Id: I06724e2e8754ac20217f5375a445c85f9a5b31e6
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index cf5fa7e..862d24c 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -237,13 +237,12 @@ void ScOpenclTest::testCompilerString()
// Check the results of formula cells in the shared formula range.
for (SCROW i = 1; i 5; ++i)
{
-#if 0
double fLibre = pDoc-GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes-GetValue(ScAddress(2, i, 0));
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
-#endif
-double fLibre = pDoc-GetValue(ScAddress(3, i, 0));
-double fExcel = pDocRes-GetValue(ScAddress(3, i, 0));
+
+fLibre = pDoc-GetValue(ScAddress(3, i, 0));
+fExcel = pDocRes-GetValue(ScAddress(3, i, 0));
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
}
xDocSh-DoClose();
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ce9ce2e..92eebc2 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -61,7 +61,13 @@ bool equals( const formula::VectorRefArray rArray, size_t
nPos, const OUString
if (!rArray.mpStringArray)
return false;
-return OUString(rArray.mpStringArray[nPos]).equalsIgnoreAsciiCase(rVal);
+bool bEquals =
OUString(rArray.mpStringArray[nPos]).equalsIgnoreAsciiCase(rVal);
+if (!bEquals)
+{
+cerr Expected: rVal.toAsciiUpperCase() (upcased)
endl;
+cerr Actual: OUString(rArray.mpStringArray[nPos])
(upcased) endl;
+}
+return bEquals;
}
}
@@ -235,6 +241,34 @@ void Test::testFetchVectorRefArray()
CPPUNIT_ASSERT_MESSAGE(Array should have a numeric array.,
aArray.mpNumericArray);
CPPUNIT_ASSERT_MESSAGE(Array should NOT have a string array.,
!aArray.mpStringArray);
+// Column G consists only of strings.
+m_pDoc-SetString(ScAddress(6,0,0), Title);
+m_pDoc-SetString(ScAddress(6,1,0), foo);
+m_pDoc-SetString(ScAddress(6,2,0), bar);
+m_pDoc-SetString(ScAddress(6,3,0), foo);
+m_pDoc-SetString(ScAddress(6,4,0), baz);
+m_pDoc-SetString(ScAddress(6,5,0), quack);
+m_pDoc-SetString(ScAddress(6,6,0), beep);
+m_pDoc-SetString(ScAddress(6,7,0), kerker);
+
+aArray = m_pDoc-FetchVectorRefArray(ScAddress(6,1,0), 4); // G2:G5
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array should NOT have a numeric array.,
!aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE(Array should have a string array.,
aArray.mpStringArray);
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 0,
foo));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 1,
bar));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 2,
foo));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 3,
baz));
+
+aArray = m_pDoc-FetchVectorRefArray(ScAddress(6,2,0), 4); // G3:G6
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array should NOT have a numeric array.,
!aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE(Array should have a string array.,
aArray.mpStringArray);
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 0,
bar));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 1,
foo));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 2,
baz));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 3,
quack));
+
m_pDoc-DeleteTab(0);
}
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5176d82..4715b48 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2722,7 +2722,7 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray(
SCROW nRow1, SCROW nRow2
{
// Requested range falls within the first block.
copyFirstStringBlock(*pDocument, rArray, nRow2+1, itBlk);
-return formula::VectorRefArray(rArray[0]);
+return formula::VectorRefArray(rArray[nRow1]);
}
copyFirstStringBlock(*pDocument, rArray, itBlk-size, itBlk);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/qa sc/source
sc/qa/unit/opencl-test.cxx |7 +++
sc/qa/unit/ucalc_formula.cxx| 36 +++-
sc/source/core/data/column2.cxx |2 +-
3 files changed, 39 insertions(+), 6 deletions(-)
New commits:
commit f762d1a344875691369aa33aec8a26973eb0a1e7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 31 12:35:30 2013 -0400
Don't hard-code the start row position of string array to 0...
Change-Id: I06724e2e8754ac20217f5375a445c85f9a5b31e6
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 8e8424b..2418df7 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -239,13 +239,12 @@ void ScOpenclTest::testCompilerString()
// Check the results of formula cells in the shared formula range.
for (SCROW i = 1; i 5; ++i)
{
-#if 0
double fLibre = pDoc-GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes-GetValue(ScAddress(2, i, 0));
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
-#endif
-double fLibre = pDoc-GetValue(ScAddress(3, i, 0));
-double fExcel = pDocRes-GetValue(ScAddress(3, i, 0));
+
+fLibre = pDoc-GetValue(ScAddress(3, i, 0));
+fExcel = pDocRes-GetValue(ScAddress(3, i, 0));
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
}
xDocSh-DoClose();
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ce9ce2e..92eebc2 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -61,7 +61,13 @@ bool equals( const formula::VectorRefArray rArray, size_t
nPos, const OUString
if (!rArray.mpStringArray)
return false;
-return OUString(rArray.mpStringArray[nPos]).equalsIgnoreAsciiCase(rVal);
+bool bEquals =
OUString(rArray.mpStringArray[nPos]).equalsIgnoreAsciiCase(rVal);
+if (!bEquals)
+{
+cerr Expected: rVal.toAsciiUpperCase() (upcased)
endl;
+cerr Actual: OUString(rArray.mpStringArray[nPos])
(upcased) endl;
+}
+return bEquals;
}
}
@@ -235,6 +241,34 @@ void Test::testFetchVectorRefArray()
CPPUNIT_ASSERT_MESSAGE(Array should have a numeric array.,
aArray.mpNumericArray);
CPPUNIT_ASSERT_MESSAGE(Array should NOT have a string array.,
!aArray.mpStringArray);
+// Column G consists only of strings.
+m_pDoc-SetString(ScAddress(6,0,0), Title);
+m_pDoc-SetString(ScAddress(6,1,0), foo);
+m_pDoc-SetString(ScAddress(6,2,0), bar);
+m_pDoc-SetString(ScAddress(6,3,0), foo);
+m_pDoc-SetString(ScAddress(6,4,0), baz);
+m_pDoc-SetString(ScAddress(6,5,0), quack);
+m_pDoc-SetString(ScAddress(6,6,0), beep);
+m_pDoc-SetString(ScAddress(6,7,0), kerker);
+
+aArray = m_pDoc-FetchVectorRefArray(ScAddress(6,1,0), 4); // G2:G5
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array should NOT have a numeric array.,
!aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE(Array should have a string array.,
aArray.mpStringArray);
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 0,
foo));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 1,
bar));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 2,
foo));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 3,
baz));
+
+aArray = m_pDoc-FetchVectorRefArray(ScAddress(6,2,0), 4); // G3:G6
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array should NOT have a numeric array.,
!aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE(Array should have a string array.,
aArray.mpStringArray);
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 0,
bar));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 1,
foo));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 2,
baz));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 3,
quack));
+
m_pDoc-DeleteTab(0);
}
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index c7b8f26..b804e82 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2721,7 +2721,7 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray(
SCROW nRow1, SCROW nRow2
{
// Requested range falls within the first block.
copyFirstStringBlock(*pDocument, rArray, nRow2+1, itBlk);
-return formula::VectorRefArray(rArray[0]);
+return formula::VectorRefArray(rArray[nRow1]);
}
copyFirstStringBlock(*pDocument, rArray, itBlk-size, itBlk);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/customize/cfg.cxx | 106 -
cui/source/customize/cfg.hrc |4
cui/source/customize/cfg.src | 83 ---
cui/source/inc/cfg.hxx | 17 +---
cui/source/inc/helpid.hrc|2
cui/uiconfig/ui/movemenu.ui | 182 +--
7 files changed, 201 insertions(+), 194 deletions(-)
New commits:
commit c1e2b7fee37b9f3fb54caea8046de5356e199b37
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 31 16:59:49 2013 +
convert new/move menu to .ui
Change-Id: I77e46382cae6da03c3a972c9838afb3f8698c9a3
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 3090851..830689b 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/linestyletabpage \
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/messbox \
+ cui/uiconfig/ui/movemenu \
cui/uiconfig/ui/namedialog \
cui/uiconfig/ui/newtabledialog \
cui/uiconfig/ui/newtoolbardialog \
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 8605ade..eefab7d 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1611,8 +1611,6 @@ SvxConfigPage::SvxConfigPage(
aDescriptionField.SetAutoScroll( sal_True );
aDescriptionField.EnableCursor( sal_False );
-aMoveUpButton.SetAccessibleName(CUI_RES(BUTTON_STR_UP));
-aMoveDownButton.SetAccessibleName(CUI_RES(BUTTON_STR_DOWN));
aMoveUpButton.SetAccessibleRelationMemberOf(aContentsSeparator);
aMoveDownButton.SetAccessibleRelationMemberOf(aContentsSeparator);
aNewTopLevelButton.SetAccessibleRelationMemberOf(aTopLevelSeparator);
@@ -2741,20 +2739,15 @@ SaveInData* SvxMenuConfigPage::CreateSaveInData(
SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
Window* pParent, SvxEntries* entries,
SvxConfigEntry* selection, bool bCreateMenu )
-:
-ModalDialog( pParent, CUI_RES( MD_MENU_ORGANISER ) ),
-aMenuNameText( this, CUI_RES( TXT_MENU_NAME ) ),
-aMenuNameEdit( this, CUI_RES( EDIT_MENU_NAME ) ),
-aMenuListText( this, CUI_RES( TXT_MENU ) ),
-aMenuListBox( this, CUI_RES( BOX_MAIN_MENUS ) ),
-aMoveUpButton( this, CUI_RES( BTN_MENU_UP ) ),
-aMoveDownButton( this, CUI_RES( BTN_MENU_DOWN ) ),
-aOKButton( this, CUI_RES( BTN_MENU_ADD ) ),
-aCloseButton( this, CUI_RES( BTN_MENU_CLOSE ) ),
-aHelpButton( this, CUI_RES( BTN_MENU_HELP ) ),
-bModified( sal_False )
+: ModalDialog(pParent, MoveMenuDialog, cui/ui/movemenu.ui)
+, bModified(false)
{
-FreeResource();
+get(m_pMenuBox, namebox);
+get(m_pMenuNameEdit, menuname);
+get(m_pMoveUpButton, up);
+get(m_pMoveDownButton, down);
+get(m_pMenuListBox, menulist);
+m_pMenuListBox-set_height_request(m_pMenuListBox-GetTextHeight() * 12);
// Copy the entries list passed in
if ( entries != NULL )
@@ -2769,13 +2762,13 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
{
pEntry = *iter;
pLBEntry =
-aMenuListBox.InsertEntry( stripHotKey( pEntry-GetName() ) );
+m_pMenuListBox-InsertEntry( stripHotKey( pEntry-GetName() )
);
pLBEntry-SetUserData( pEntry );
pEntries-push_back( pEntry );
if ( pEntry == selection )
{
-aMenuListBox.Select( pLBEntry );
+m_pMenuListBox-Select( pLBEntry );
}
++iter;
}
@@ -2795,63 +2788,32 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
pNewEntryData-SetMain( sal_True );
pNewMenuEntry =
-aMenuListBox.InsertEntry( stripHotKey( pNewEntryData-GetName() )
);
-aMenuListBox.Select( pNewMenuEntry );
+m_pMenuListBox-InsertEntry( stripHotKey( pNewEntryData-GetName()
) );
+m_pMenuListBox-Select( pNewMenuEntry );
pNewMenuEntry-SetUserData( pNewEntryData );
pEntries-push_back( pNewEntryData );
-aMenuNameEdit.SetText( newname );
-aMenuNameEdit.SetModifyHdl(
+m_pMenuNameEdit-SetText( newname );
+m_pMenuNameEdit-SetModifyHdl(
LINK( this, SvxMainMenuOrganizerDialog, ModifyHdl ) );
}
else
{
-Point p, newp;
-Size s, news;
-
-// get offset to bottom of name textfield from top of dialog
-p = aMenuNameEdit.GetPosPixel();
-s = aMenuNameEdit.GetSizePixel();
-long offset = p.Y() + s.Height();
-
-// reposition menu list and label
-aMenuListText.SetPosPixel( aMenuNameText.GetPosPixel() );
-aMenuListBox.SetPosPixel( aMenuNameEdit.GetPosPixel() );
-
-// reposition up and down buttons
-p = aMoveUpButton.GetPosPixel();
-newp = Point( p.X(), p.Y() - offset );
-aMoveUpButton.SetPosPixel( newp
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b74e0da1df405151cfdb6c8cc84fad797f28e1f7 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 31 17:09:24 2013 + Updated core Project: help da63fbfdefb02c5026b05b33a57afe03a30f42b8 diff --git a/helpcontent2 b/helpcontent2 index 095662e..da63fbf 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 095662e815939e3819e055fc48e5853355671788 +Subproject commit da63fbfdefb02c5026b05b33a57afe03a30f42b8 ___ 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 source/text
helpers/help_hid.lst |5 - source/text/shared/01/06140102.xhp |2 +- 2 files changed, 1 insertion(+), 6 deletions(-) New commits: commit da63fbfdefb02c5026b05b33a57afe03a30f42b8 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 31 17:09:24 2013 + update helpids for move menu dialog .ui conversion Change-Id: I9cfcdbadd541ea15a0ada54352219faf79aaa0c3 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 8234a1f..951e908 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3604,8 +3604,6 @@ HID_SVX_CONFIG_EVENT,40001, HID_SVX_CONFIG_ICON_SELECTOR,40044, HID_SVX_CONFIG_MENU,40007, HID_SVX_CONFIG_MENU_CONTENTS,40008, -HID_SVX_CONFIG_MENU_LISTBOX,40053, -HID_SVX_CONFIG_MENU_ORGANIZER,40043, HID_SVX_CONFIG_NAME_SUBMENU,40045, HID_SVX_CONFIG_RENAME_MENU,40046, HID_SVX_CONFIG_RENAME_MENU_ITEM,40047, @@ -,7 +6664,6 @@ svx_Edit_MD_INSERT_OBJECT_APPLET_ED_CLASSLOCATION,1598179340, svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_FRAMENAME,1598212100, svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_URL,1598212102, svx_Edit_MD_LINKEDIT_ED_FULL_SOURCE_NAME,1598097409, -svx_Edit_MD_MENU_ORGANISER_EDIT_MENU_NAME,1079953796, svx_Edit_RID_DLG_NEWLIB_ED_LIBNAME,1242335246, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT,1368852494, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME,1368852492, @@ -6735,8 +6732,6 @@ svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_LIGHTING,1790656512, svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_SURFACE,1790672896, svx_FloatingWindow_RID_SVXFLOAT_FONTWORK_ALIGNMENT,1790869504, svx_FloatingWindow_RID_SVXFLOAT_FONTWORK_CHARSPACING,1790885888, -svx_ImageButton_MD_MENU_ORGANISER_BTN_MENU_DOWN,1079963519, -svx_ImageButton_MD_MENU_ORGANISER_BTN_MENU_UP,1079963518, svx_ImageButton_RID_SVXFLOAT_3D_BTN_AMBIENT_COLOR,3388501583, svx_ImageButton_RID_SVXFLOAT_3D_BTN_ASSIGN,3388501512, svx_ImageButton_RID_SVXFLOAT_3D_BTN_CHANGE_TO_3D,3388501514, diff --git a/source/text/shared/01/06140102.xhp b/source/text/shared/01/06140102.xhp index 683e557..f2c9d20 100644 --- a/source/text/shared/01/06140102.xhp +++ b/source/text/shared/01/06140102.xhp @@ -32,7 +32,7 @@ embed href=text/shared/00/0406.xhp#menuemove/ /section -bookmark xml-lang=en-US branch=hid/CUI_HID_SVX_CONFIG_MENU_LISTBOX id=bm_id16574660 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/movemenu/MoveMenuDialog id=bm_id16574660 localize=false/ paragraph role=heading id=par_idN10558 xml-lang=en-US level=2 l10n=NEWMenu position/paragraph paragraph role=paragraph id=par_idN1055C xml-lang=en-US l10n=NEWahelp hid=.Moves the selected menu entry up one position or down one position in the menu when you click an arrow button./ahelp/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/calendar2.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 14 +++
sw/source/filter/ww8/docxtablestyleexport.cxx | 39 +++---
writerfilter/source/dmapper/BorderHandler.cxx | 66 -
writerfilter/source/dmapper/BorderHandler.hxx |6 +
writerfilter/source/dmapper/DomainMapper.cxx | 12 ++-
writerfilter/source/dmapper/TDefTableHandler.cxx |9 +-
writerfilter/source/dmapper/TDefTableHandler.hxx |2
writerfilter/source/dmapper/TablePropertiesHandler.cxx |4 +
9 files changed, 134 insertions(+), 18 deletions(-)
New commits:
commit f91775c00dfd50e89cfcbc280d90309a5d08d727
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Oct 31 17:05:57 2013 +0100
writerfilter: implement BorderHandler::getInteropGrabBag()
Change-Id: I86922585122898692dc4fb1fbbee11e1864dad29
diff --git a/sw/qa/extras/ooxmlexport/data/calendar2.docx
b/sw/qa/extras/ooxmlexport/data/calendar2.docx
new file mode 100644
index 000..e89222f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/calendar2.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f63dd4a..86e50ad 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1323,6 +1323,20 @@ DECLARE_OOXML_TEST(testCalendar1, calendar1.docx)
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='band2Horz']/w:tcPr/w:tcBorders/w:top,
themeColor, text1);
}
+DECLARE_OOXML_TEST(testCalendar2, calendar2.docx)
+{
+// This paragraph property was missing in table style.
+xmlDocPtr pXmlStyles = parseExport(word/styles.xml);
+assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar2']/w:pPr/w:jc, val, center);
+
+// These run properties were missing
+assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar2']/w:rPr/w:lang, val, en-US);
+assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar2']/w:rPr/w:lang, bidi, ar-SA);
+
+// Table borders were also missing
+assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar2']/w:tblPr/w:tblBorders/w:insideV,
themeTint, 99);
+}
+
DECLARE_OOXML_TEST(testSmartart, smartart.docx)
{
uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 940301f..cc92461 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -97,6 +97,7 @@ static DocxStringTokenMap const aTcBorderTokens[] = {
{color, XML_color},
{space, XML_space},
{themeColor, XML_themeColor},
+{themeTint, XML_themeTint},
{0, 0}
};
@@ -129,17 +130,17 @@ DocxStringTokenMap const aTcBordersTokens[] = {
{0, 0}
};
-/// Export of w:tcBorders in a table style.
-void lcl_TableStyleTcBorders(sax_fastparser::FSHelperPtr pSerializer,
uno::Sequencebeans::PropertyValue rTcBorders)
+/// Export of w:tcBorders (and w:tblBorders) in a table style.
+void lcl_TableStyleTcBorders(sax_fastparser::FSHelperPtr pSerializer,
uno::Sequencebeans::PropertyValue rTcBorders, sal_Int32 nToken =
XML_tcBorders)
{
if (!rTcBorders.hasElements())
return;
-pSerializer-startElementNS(XML_w, XML_tcBorders, FSEND);
+pSerializer-startElementNS(XML_w, nToken, FSEND);
for (sal_Int32 i = 0; i rTcBorders.getLength(); ++i)
-if (sal_Int32 nToken = DocxStringGetToken(aTcBordersTokens,
rTcBorders[i].Name))
-lcl_TableStyleTcBorder(pSerializer, nToken,
rTcBorders[i].Value.get uno::Sequencebeans::PropertyValue ());
-pSerializer-endElementNS(XML_w, XML_tcBorders);
+if (sal_Int32 nSubToken = DocxStringGetToken(aTcBordersTokens,
rTcBorders[i].Name))
+lcl_TableStyleTcBorder(pSerializer, nSubToken,
rTcBorders[i].Value.get uno::Sequencebeans::PropertyValue ());
+pSerializer-endElementNS(XML_w, nToken);
}
/// Export of w:shd in a table style.
@@ -189,6 +190,10 @@ void lcl_TableStyleRLang(sax_fastparser::FSHelperPtr
pSerializer, uno::Sequence
{
if (rLang[i].Name == eastAsia)
pAttributeList-add(FSNS(XML_w, XML_eastAsia),
OUStringToOString(rLang[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
+else if (rLang[i].Name == val)
+pAttributeList-add(FSNS(XML_w, XML_val),
OUStringToOString(rLang[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
+else if (rLang[i].Name == bidi)
+pAttributeList-add(FSNS(XML_w, XML_bidi),
OUStringToOString(rLang[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
}
sax_fastparser::XFastAttributeListRef xAttributeList(pAttributeList);
pSerializer-singleElementNS(XML_w, XML_lang, xAttributeList);
@@ -280,7 +285,7 @@ void
Re: Compiling LibreOffice 4.1.2.3 on Solaris
On Thu, Oct 31, 2013 at 7:25 AM, Eric Bautsch eric.baut...@pobox.com wrote: I think rtl_string_new is defined in include/rtl/string.h, but I can't see where the function is actually coming from (running a find -exec grep across the code). see sal/rtl/strtmpl.cxx This is a hacky way to implement both ustring and string using the same source and some macro-magic Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/shapeexport.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 09c53251150d7ad3f4db0cc3390714912db8b0bb Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 31 18:51:11 2013 +0100 I assume this is missing ...from the changes to xmloff/source/draw/shapeexport2.cxx of f15874d8f976f3874bdbcb53429eeefa65c28841 i123433 Detect pseudo-vertices at svg import, unify svg:d handling, correct svg:d import for relative sub-polygons in svg import [...], given how other changes in that file that introduce aPolygonString use it. Found by -Werror,-Wunused-variable. Change-Id: I915b53ed74e03f84f240f1fa1f17768148f030d6 diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 3a2a636..e341f71 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2586,6 +2586,9 @@ void XMLShapeExport::ImpExportConnectorShape( true, // bUseRelativeCoordinates false, // bDetectQuadraticBeziers: not used in old, but maybe activated now true)); // bHandleRelativeNextPointCompatible + +// write point array +mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aPolygonString); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/coretext
vcl/coretext/salgdi2.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit e77f18f4975bb731f8445cacfff7609a5fe2d7a9 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 31 20:06:51 2013 +0200 Better warnings when CheckContext() fails Change-Id: I94627e5b4efda92ac80a618e5aa4b0b33340f4ef diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx index c0ae17a..a78c8a3 100644 --- a/vcl/coretext/salgdi2.cxx +++ b/vcl/coretext/salgdi2.cxx @@ -828,6 +828,7 @@ bool SvpSalGraphics::CheckContext() const basegfx::B2IVector bufferSize = m_aDevice-getBufferSize(); const sal_Int32 scanlineStride = m_aDevice-getScanlineStride(); basebmp::RawMemorySharedArray pixelBuffer = m_aDevice-getBuffer(); +bool warned = false; SAL_INFO( vcl.ios, CheckContext: device= m_aDevice.get() @@ -852,10 +853,11 @@ bool SvpSalGraphics::CheckContext() kCGImageAlphaNoneSkipLast); break; default: -SAL_INFO( vcl.ios, CheckContext: unsupported color format basebmp::formatName( m_aDevice-getScanlineFormat() ) ); +SAL_WARN( vcl.ios, CheckContext: unsupported color format basebmp::formatName( m_aDevice-getScanlineFormat() ) ); +warned = true; } -SAL_WARN_IF( mrContext == NULL, vcl.ios, CheckContext() failed ); +SAL_WARN_IF( mrContext == NULL !warned, vcl.ios, CheckContext: CGBitmapContextCreate() failed ); // Should we also clip the context? (Then we need to add a // getBounds() function to BitmapDevice.) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Problems compiling LO with Visual Studio 2008
Hi all, I am trying to compile LO 4.1.3 on my machine with Windows XP and Visual Studio 2008 and I have run into some problems. Is Visual Studio 2008 still supported? Or should I try to get a newer version? First problem was that build did not start at all with error in external/Package_msvc_dlls.mk. I think it was failing on MSVC_DLL_PATH being empty. I tried to set it to a bogus path to make build start. Later I got error about undefined SHARDAPPIDINFO structure. On the net I found MSDN mentioning the structure is available from Windows 7 up. Thanks -- 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: Problems compiling LO with Visual Studio 2008
Hi Pavel,
about the SHARDAPPINFO: I run into this, too. See the attached patch,
I'll commit this soon.
Thomas
On 31.10.2013 19:36, Pavel Laštovička wrote:
Hi all,
I am trying to compile LO 4.1.3 on my machine with Windows XP and Visual
Studio 2008 and I have run into some problems.
Is Visual Studio 2008 still supported? Or should I try to get a newer
version?
First problem was that build did not start at all with error in
external/Package_msvc_dlls.mk. I think it was failing on MSVC_DLL_PATH
being empty.
I tried to set it to a bogus path to make build start.
Later I got error about undefined SHARDAPPIDINFO structure. On the net I
found MSDN mentioning the structure is available from Windows 7 up.
Thanks
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 22917e8..46cbbe4 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -1044,6 +1044,7 @@ void WinSalInstance::AddToRecentDocumentList(const OUString rFileUrl, const OUS
if (osl::FileBase::E_None == rc)
{
+#if WINVER = 0x0600
if ( aSalShlData.mbW7 )
{
typedef HRESULT ( WINAPI *SHCREATEITEMFROMPARSINGNAME )( PCWSTR, IBindCtx*, REFIID, void **ppv );
@@ -1105,6 +1106,9 @@ void WinSalInstance::AddToRecentDocumentList(const OUString rFileUrl, const OUS
}
// For whatever reason, we could not use the SHARD_APPIDINFO semantics
SHAddToRecentDocs(SHARD_PATHW, (PCWSTR) system_path.getStr());
+#else
+(void) rDocumentService;
+#endif
}
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/app/salinst.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 9a4a84df5406cdcde1f4d23a1cea2b109998f35b
Author: Thomas Arnhold tho...@arnhold.org
Date: Thu Oct 31 19:45:02 2013 +0100
Windows: SHARDAPPIDINFO since 0x0600
This requires at least Windows 7 / Windows Server 2008.
Otherwise it won't compile under WinXP.
http://msdn.microsoft.com/en-us/library/windows/desktop/dd391556
Change-Id: I984e8bc1e9dc80a9c8bf236be9af3cffabcabd05
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 22917e8..cb19f87 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -1044,6 +1044,7 @@ void WinSalInstance::AddToRecentDocumentList(const
OUString rFileUrl, const OUS
if (osl::FileBase::E_None == rc)
{
+#if WINVER = 0x0600
if ( aSalShlData.mbW7 )
{
typedef HRESULT ( WINAPI *SHCREATEITEMFROMPARSINGNAME )( PCWSTR,
IBindCtx*, REFIID, void **ppv );
@@ -1102,6 +1103,9 @@ void WinSalInstance::AddToRecentDocumentList(const
OUString rFileUrl, const OUS
}
}
}
+#else
+(void) rDocumentService;
+#endif
}
// For whatever reason, we could not use the SHARD_APPIDINFO semantics
SHAddToRecentDocs(SHARD_PATHW, (PCWSTR) system_path.getStr());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0539e7868643200ed929501d4974f4947f97af07
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date: Thu Oct 31 13:02:49 2013 -0500
Fixed a typo in the GPU Calc compiler.
Change-Id: I40994de5e445dbd6f3c5e6597a90e63b7dc3cbcf
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 2c15ef5..c40c289 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -303,9 +303,9 @@ public:
virtual std::string GenSlidingWindowDeclRef(bool) const
{
std::stringstream ss;
-ss (!isNan( DynamicKernelArgument::GenSlidingWindowDeclRef(ss);
-ss )? DynamicKernelArgument::GenSlidingWindowDeclRef(ss);
-ss : mStringArgument.GenSlidingWindowDeclRef(ss);
+ss (!isNan( DynamicKernelArgument::GenSlidingWindowDeclRef();
+ss )? DynamicKernelArgument::GenSlidingWindowDeclRef();
+ss : mStringArgument.GenSlidingWindowDeclRef();
ss );
return ss.str();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Problems compiling LO with Visual Studio 2008
The patch is wrong. The reason why it's wrong is because your generated binary will not work as expected on Windows Vista and higher. The code should compile fine if you use the Windows 7 SDK to compile it. In case I am wrong and it doesn't, the proper way to fix it is to define SHARDAPPIDINFO. 2013/10/31 Thomas Arnhold thomas-l...@arnhold.org Hi Pavel, about the SHARDAPPINFO: I run into this, too. See the attached patch, I'll commit this soon. Thomas On 31.10.2013 19:36, Pavel Laštovička wrote: Hi all, I am trying to compile LO 4.1.3 on my machine with Windows XP and Visual Studio 2008 and I have run into some problems. Is Visual Studio 2008 still supported? Or should I try to get a newer version? First problem was that build did not start at all with error in external/Package_msvc_dlls.mk. I think it was failing on MSVC_DLL_PATH being empty. I tried to set it to a bogus path to make build start. Later I got error about undefined SHARDAPPIDINFO structure. On the net I found MSDN mentioning the structure is available from Windows 7 up. Thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 93f2bee483b23c426966c5232ca4bd75044b7ada
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date: Thu Oct 31 13:02:49 2013 -0500
Fixed a typo in the GPU Calc compiler.
Change-Id: I40994de5e445dbd6f3c5e6597a90e63b7dc3cbcf
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index c44a200..d1ece4c 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -303,9 +303,9 @@ public:
virtual std::string GenSlidingWindowDeclRef(bool) const
{
std::stringstream ss;
-ss (!isNan( DynamicKernelArgument::GenSlidingWindowDeclRef(ss);
-ss )? DynamicKernelArgument::GenSlidingWindowDeclRef(ss);
-ss : mStringArgument.GenSlidingWindowDeclRef(ss);
+ss (!isNan( DynamicKernelArgument::GenSlidingWindowDeclRef();
+ss )? DynamicKernelArgument::GenSlidingWindowDeclRef();
+ss : mStringArgument.GenSlidingWindowDeclRef();
ss );
return ss.str();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - shell/source vcl/win
shell/source/win32/simplemail/simplemapi.hxx |5 - vcl/win/source/app/salinst.cxx |2 +- 2 files changed, 1 insertion(+), 6 deletions(-) New commits: commit 326f3e40ba427f901e68642229c5e2c422d6135f Author: Thomas Arnhold tho...@arnhold.org Date: Thu Oct 31 21:06:25 2013 +0100 shell: mapix.h is not needed at all Change-Id: I1a55a4c260b781f7427bf149d32f1cae6149fe9a diff --git a/shell/source/win32/simplemail/simplemapi.hxx b/shell/source/win32/simplemail/simplemapi.hxx index 6495d4f..58f72fc 100644 --- a/shell/source/win32/simplemail/simplemapi.hxx +++ b/shell/source/win32/simplemail/simplemapi.hxx @@ -26,11 +26,6 @@ #endif #include windows.h #include mapi.h -#ifndef __MINGW32__ -#if NTDDI_VERSION NTDDI_WIN8 -#include mapix.h -#endif -#endif #if defined _MSC_VER #pragma warning(pop) #endif commit b4655065ad8866a346dc7c01658eaef30f85bbec Author: Thomas Arnhold tho...@arnhold.org Date: Thu Oct 31 21:04:54 2013 +0100 vcl: fix brace Change-Id: Ib41c9521a8b8e5b8ebc170f9b7e45379a51f1bd5 diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index cb19f87..ee72036 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -1103,10 +1103,10 @@ void WinSalInstance::AddToRecentDocumentList(const OUString rFileUrl, const OUS } } } +} #else (void) rDocumentService; #endif -} // For whatever reason, we could not use the SHARD_APPIDINFO semantics SHAddToRecentDocs(SHARD_PATHW, (PCWSTR) system_path.getStr()); } ___ 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 - sc/inc sc/source
sc/inc/tokenuno.hxx |2 -
sc/source/filter/inc/workbookhelper.hxx |7 +++
sc/source/filter/inc/worksheethelper.hxx | 20 +++---
sc/source/filter/oox/defnamesbuffer.cxx |2 -
sc/source/filter/oox/numberformatsbuffer.cxx |2 -
sc/source/filter/oox/workbookhelper.cxx | 50 +++
sc/source/filter/oox/worksheethelper.cxx | 27 +++---
sc/source/ui/unoobj/tokenuno.cxx |2 -
8 files changed, 67 insertions(+), 45 deletions(-)
New commits:
commit c2780da92bcb99e8cf95dec404da4837e4cd9f3d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 31 16:25:32 2013 -0400
Populate raw cell values using ScDocumentImport.
Also fix incorrect const methods. Methods that populate the document
model should not be marked const even if the compiler allows it.
Change-Id: Ic5d1670ce93c166d0f44ace04494fccab6eac275
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index a323b62..4287405 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -43,7 +43,7 @@ public:
ScTokenArray rTokenArray,
const com::sun::star::uno::Sequence
com::sun::star::sheet::FormulaToken rSequence );
static SC_DLLPUBLIC bool ConvertToTokenSequence(
-ScDocument rDoc,
+const ScDocument rDoc,
com::sun::star::uno::Sequence
com::sun::star::sheet::FormulaToken rSequence,
const ScTokenArray rTokenArray );
};
diff --git a/sc/source/filter/inc/workbookhelper.hxx
b/sc/source/filter/inc/workbookhelper.hxx
index 4db98ce..a905612 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -149,7 +149,11 @@ public:
voiduseInternalChartDataTable( bool bInternal );
// document model -
-ScDocument getScDocument() const;
+ScDocument getScDocument();
+const ScDocument getScDocument() const;
+
+ScDocumentImport getDocImport();
+
ScEditEngineDefaulter getEditEngine() const;
/** Returns a reference to the source/target spreadsheet document model. */
::com::sun::star::uno::Reference
::com::sun::star::sheet::XSpreadsheetDocument
diff --git a/sc/source/filter/inc/worksheethelper.hxx
b/sc/source/filter/inc/worksheethelper.hxx
index 270cafe..8cda876 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -281,23 +281,17 @@ public:
voidsetManualRowHeight( sal_Int32 nRow );
/** Inserts a value cell directly into the Calc sheet. */
-voidputValue(
-const ::com::sun::star::table::CellAddress
rAddress,
-double fValue ) const;
+void putValue( const com::sun::star::table::CellAddress rAddress, double
fValue );
/** Inserts a string cell directly into the Calc sheet. */
-voidputString(
-const ::com::sun::star::table::CellAddress
rAddress,
-const OUString rText ) const;
+void putString( const com::sun::star::table::CellAddress rAddress, const
OUString rText );
/** Inserts a rich-string cell directly into the Calc sheet. */
-voidputRichString(
-const ::com::sun::star::table::CellAddress
rAddress,
-const RichString rString,
-const Font* pFirstPortionFont ) const;
+void putRichString(
+const com::sun::star::table::CellAddress rAddress,
+const RichString rString, const Font* pFirstPortionFont );
/** Inserts a formula cell directly into the Calc sheet. */
-voidputFormulaTokens(
-const ::com::sun::star::table::CellAddress
rAddress,
-const ApiTokenSequence rTokens ) const;
+void putFormulaTokens(
+const com::sun::star::table::CellAddress rAddress, const
ApiTokenSequence rTokens );
/** Initial conversion before importing the worksheet. */
voidinitializeWorksheetImport();
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx
b/sc/source/filter/oox/defnamesbuffer.cxx
index 3c3dd09..94203a8 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -458,7 +458,7 @@ bool DefinedName::getAbsoluteRange( CellRangeAddress
orRange ) const
{
ScTokenArray* pTokenArray = mpScRangeData-GetCode();
Sequence FormulaToken aFTokenSeq;
-ScTokenConversion::ConvertToTokenSequence( this-getScDocument(),
aFTokenSeq, *pTokenArray );
+ScTokenConversion::ConvertToTokenSequence(getScDocument(), aFTokenSeq,
*pTokenArray);
return getFormulaParser().extractCellRange( orRange, aFTokenSeq, false );
[Libreoffice-commits] core.git: instsetoo_native/util
instsetoo_native/util/openoffice.lst.in |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dd08ef89d53831246acefcd7c14d00b3c3da4e0f
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 31 21:50:29 2013 +0100
Hack to find instdir/*/LibreOffice.app/Contents/LICENSE.html on Mac OS X
Change-Id: I3f2b12534b6d83e4ae2c2a61a6f81ddf8cdad2cc
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index a2d240e..0d11f86 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -78,7 +78,7 @@ LibreOffice
downloadnameLibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
-include
{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+include
{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/LibreOffice.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
@@ -131,7 +131,7 @@ LibreOffice_Dev
downloadname
LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-include
{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+include
{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/LibreOffice_Dev.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - solenv/bin
solenv/bin/modules/installer/scriptitems.pm |2 +-
solenv/bin/modules/installer/simplepackage.pm |5 +
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 42f8c6feccb3168d1a39683497e7a6ec6e7215a8
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 31 22:00:57 2013 +0100
Disambiguate where a Source for ... not found! error originates from
Change-Id: I424036d3a940fa53b1553c1c539bf1065cdc2759
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index b3d106a..fe767f7 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -916,7 +916,7 @@ sub get_sourcepath_from_filename_and_includepath_classic
$onefile = ; # the sourcepath has to be empty
if ( $write_logfile)
{
-$infoline = ERROR: Source for $$searchfilenameref not found!\n;
# Important message in log file
+$infoline = ERROR: Source for $$searchfilenameref not found
(classic)!\n;# Important message in log file
push( @installer::globals::logfileinfo, $infoline);
}
}
commit 2208fca2feb0360af95c7cb1bbe663577084bd15
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 31 21:59:04 2013 +0100
$installer::globals::macinstallfilename is already an absolute pathname
Change-Id: I35ced0ef75f6b411807f24ecc19b4f2a9622f98c
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 8ed693f..da58b40 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -345,15 +345,12 @@ sub create_package
my $scripthelperfilename = $ENV{'SRCDIR'} .
/setup_native/scripts/mac_install.script;
# my $scripthelperrealfilename = $volume_name;
my $scripthelperrealfilename = $volume_name_classic_app;
-my $translationfilename = $installer::globals::macinstallfilename;
# Finding both files in source tree
my $scriptref = $ENV{'SRCDIR'} . /setup_native/scripts/ .
$scriptfilename;
if (! -f $scriptref) { installer::exiter::exit_program(ERROR:
Could not find Apple script $scriptfilename ($scriptref)!, create_package); }
if (! -f $scripthelperfilename) {
installer::exiter::exit_program(ERROR: Could not find Apple script
$scripthelperfilename!, create_package); }
-my $translationfileref =
installer::scriptitems::get_sourcepath_from_filename_and_includepath(
\$translationfilename, $includepatharrayref, 0);
-if ($$translationfileref eq ) {
installer::exiter::exit_program(ERROR: Could not find Apple script translation
file $translationfilename ( includepatharrayref = $includepatharrayref ),
create_package); }
$scriptfilename = $contentsfolder . / . $scriptrealfilename;
$scripthelperrealfilename = $contentsfolder . / .
$scripthelperrealfilename;
@@ -364,7 +361,7 @@ sub create_package
# Replacing variables in script $scriptfilename
# Localizing script $scriptfilename
my $scriptfilecontent =
installer::files::read_file($scriptfilename);
-my $translationfilecontent =
installer::files::read_file($$translationfileref);
+my $translationfilecontent =
installer::files::read_file($installer::globals::macinstallfilename);
localize_scriptfile($scriptfilecontent, $translationfilecontent,
$languagestringref);
# replace_variables_in_scriptfile($scriptfilecontent,
$volume_name, $allvariables);
replace_variables_in_scriptfile($scriptfilecontent,
$volume_name_classic, $volume_name_classic_app, $allvariables);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Problems compiling LO with Visual Studio 2008
Hi Jesús, ah sorry. I did it with the Windows 7 SDK and _WINNT_VERSION set to Windows XP. The problem is the missing SHARD_APPIDINFO definition. http://msdn.microsoft.com/en-us/library/windows/desktop/dd378453(v=vs.85).aspx Should we just define the hex value of it? SHARDAPPIDINFO was defined by Fridrich some time ago with 918ddde5be4fde7bf8679bdf19805c618deabbf5. Thomas On 31.10.2013 20:05, Jesús Corrius wrote: The patch is wrong. The reason why it's wrong is because your generated binary will not work as expected on Windows Vista and higher. The code should compile fine if you use the Windows 7 SDK to compile it. In case I am wrong and it doesn't, the proper way to fix it is to define SHARDAPPIDINFO. 2013/10/31 Thomas Arnhold thomas-l...@arnhold.org mailto:thomas-l...@arnhold.org Hi Pavel, about the SHARDAPPINFO: I run into this, too. See the attached patch, I'll commit this soon. Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 --- Comment #5 from Björn Michaelsen bjoern.michael...@canonical.com --- FWIW, I had a vendor patch for this in on 4.1, but will of course push _your_ changes as soon as I am back home. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 11 commits - include/touch ios/experimental ios/MobileLibreOffice ios/shared vcl/coretext vcl/source
include/touch/touch.h | 21 +
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 170
++
ios/experimental/LibreOffice/LibreOffice/AppDelegate.m| 25 +
ios/experimental/LibreOffice/LibreOffice/lo.mm|2
ios/shared/ios_sharedlo/cxx/mlo.mm| 13
vcl/coretext/salgdi2.cxx | 13
vcl/source/window/dialog.cxx | 66 +++
7 files changed, 294 insertions(+), 16 deletions(-)
New commits:
commit 180896820aa4ec1d719fff62072e21de8343187a
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 23:37:36 2013 +0200
Handle also FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA
It seems to be used to draw something related to rulers, which we of
course don't show at all, but apparently they get initialised anyway.
So, to avoid a warning, handle this format, too. (As such, I am not
sure if I handle BGRA the right way, but there is no way to check as
nothing works properly in this branch at the moment anyway.)
Change-Id: I6a7444872f90a34e1e568769a595443c45aa6722
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index a78c8a3..594670c 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -852,6 +852,13 @@ bool SvpSalGraphics::CheckContext()
CGColorSpaceCreateDeviceRGB(),
kCGImageAlphaNoneSkipLast);
break;
+case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
+mrContext = CGBitmapContextCreate(pixelBuffer.get(),
+ bufferSize.getX(), bufferSize.getY(),
+ 8, scanlineStride,
+ CGColorSpaceCreateDeviceRGB(),
+ kCGImageAlphaNoneSkipFirst |
kCGBitmapByteOrder32Little);
+break;
default:
SAL_WARN( vcl.ios, CheckContext: unsupported color format
basebmp::formatName( m_aDevice-getScanlineFormat() ) );
warned = true;
commit f8a56351baa3a113885421aece49bc86831b0fd2
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 22:20:32 2013 +0200
Use actual executable path
Change-Id: I75ffc83be6af34b09b4a98a5890b3585b4a76bde
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 16d0752..eec4c43 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -155,7 +155,7 @@ lo_initialize(void)
const int argc = sizeof(argv)/sizeof(*argv);
-argv[0] = NSBundle mainBundle] bundlePath]
stringByAppendingPathComponent: @LibreOffice] UTF8String];
+argv[0] = [[[NSBundle mainBundle] executablePath] UTF8String];
NSString *app_root_escaped = [[[NSBundle mainBundle] bundlePath]
stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
commit 9a26543a5fc388bc2c1420c40e9ff5e7bb603916
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 22:20:15 2013 +0200
Add dummy touch_ui_dialog_modal() here, too
Change-Id: I1b1e47de2eec94150a0abee4aa74994f55b9b88e
diff --git a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
index a2abfb8..ee16e84 100644
--- a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
+++ b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
@@ -219,6 +219,31 @@ bool touch_ui_keyboard_visible()
return keyboardShows;
}
+static const char *
+dialog_kind_to_string(MLODialogKind kind)
+{
+switch (kind) {
+case MLODialogMessage:
+return MSG;
+case MLODialogInformation:
+return INF;
+case MLODialogWarning:
+return WRN;
+case MLODialogError:
+return ERR;
+case MLODialogQuery:
+return QRY;
+default:
+return WTF;
+}
+}
+
+MLODialogResult touch_ui_dialog_modal(MLODialogKind kind, const char *message)
+{
+NSLog(@=== %s: %s, dialog_kind_to_string(kind), message);
+return MLODialogOK;
+}
+
void touch_ui_selection_start(MLOSelectionKind kind,
const void *documentHandle,
MLORect *rectangles,
commit 0895645c314f4731a6d2a3ef58605d1cb30f130f
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 21:53:18 2013 +0200
Use actual executable path in the fake argv
Not that I think it is needed for anything useful, but better to be
correct than to use the leftover Viewer name.
Change-Id: I0878d39abf99c9d07807aa6854bfdcf12bc81ab8
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm
b/ios/shared/ios_sharedlo/cxx/mlo.mm
index 46a14ad..13f7c24 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -201,9 +201,7 @@
[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/inc sc/source
sc/inc/column.hxx|1
sc/inc/document.hxx | 10
sc/inc/table.hxx |1
sc/source/core/data/column3.cxx | 15
sc/source/core/data/documen2.cxx |8 --
sc/source/core/data/table2.cxx |8 --
sc/source/filter/oox/formulabuffer.cxx | 38 +++
sc/source/filter/oox/worksheethelper.cxx |6 ++--
8 files changed, 12 insertions(+), 75 deletions(-)
New commits:
commit 7a0b81ad65f50eaff3c787f1bf74d4d8db02da66
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 31 17:53:02 2013 -0400
Insert matrix formula vis ScDocumentImport, and more formula imorts.
Now SetGroupFormulaCell() is no longer used.
Change-Id: I10a387da04724794974eaf491a8efa4cda09d82a
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 44ddf38..e1b4ec3 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -284,7 +284,6 @@ public:
*/
ScFormulaCell* SetFormulaCell( SCROW nRow, ScFormulaCell* pCell );
ScFormulaCell* SetFormulaCell( sc::ColumnBlockPosition rBlockPos, SCROW
nRow, ScFormulaCell* pCell );
-bool SetGroupFormulaCell( SCROW nRow, ScFormulaCell* pCell );
svl::SharedString GetSharedString( SCROW nRow ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fb3a175..6929e9b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -825,16 +825,6 @@ public:
*/
SC_DLLPUBLIC ScFormulaCell* SetFormulaCell( const ScAddress rPos,
ScFormulaCell* pCell );
-/**
- * Set formula cell, and transfer its ownership to the document. Unlike
- * SetFormulaCell(), this call will inot/i attempt to group the passed
- * formula cell with the adjacent cells or cell groups.
- *
- * @return true if the cell is inserted, false otherwise. The caller
- * should delete the cell instance if the method returns false.
- */
-SC_DLLPUBLIC bool SetGroupFormulaCell( const ScAddress rPos,
ScFormulaCell* pCell );
-
SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2,
const ScMarkData rMark,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 394847f..7b51575 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -338,7 +338,6 @@ public:
* is deleted automatically on failure to insert.
*/
ScFormulaCell* SetFormulaCell( SCCOL nCol, SCROW nRow, ScFormulaCell*
pCell );
-bool SetGroupFormulaCell( SCCOL nCol, SCROW nRow, ScFormulaCell* pCell );
svl::SharedString GetSharedString( SCCOL nCol, SCROW nRow ) const;
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index e1cb2a1..3b9475a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1767,21 +1767,6 @@ ScFormulaCell* ScColumn::SetFormulaCell(
sc::ColumnBlockPosition rBlockPos, SCR
return pCell;
}
-bool ScColumn::SetGroupFormulaCell( SCROW nRow, ScFormulaCell* pCell )
-{
-sc::CellStoreType::iterator it = GetPositionToInsert(nRow);
-sal_uInt32 nCellFormat = GetNumberFormat(nRow);
-if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
-pCell-SetNeedNumberFormat(true);
-it = maCells.set(it, nRow, pCell);
-maCellTextAttrs.set(nRow, sc::CellTextAttr());
-
-CellStorageModified();
-
-ActivateNewFormulaCell(it, nRow, *pCell, false);
-return true;
-}
-
svl::SharedString ScColumn::GetSharedString( SCROW nRow ) const
{
sc::CellStoreType::const_position_type aPos = maCells.position(nRow);
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 930c8d1..1e0bb87 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1093,14 +1093,6 @@ ScFormulaCell* ScDocument::SetFormulaCell( const
ScAddress rPos, ScFormulaCell*
return maTabs[rPos.Tab()]-SetFormulaCell(rPos.Col(), rPos.Row(), pCell);
}
-bool ScDocument::SetGroupFormulaCell( const ScAddress rPos, ScFormulaCell*
pCell )
-{
-if (!TableExists(rPos.Tab()))
-return false;
-
-return maTabs[rPos.Tab()]-SetGroupFormulaCell(rPos.Col(), rPos.Row(),
pCell);
-}
-
void ScDocument::SetConsolidateDlgData( const ScConsolidateParam* pData )
{
delete pConsolidateDlgData;
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 5295af6..c94d66a 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1383,14 +1383,6 @@ ScFormulaCell* ScTable::SetFormulaCell( SCCOL nCol,
SCROW nRow, ScFormulaCell* p
return aCol[nCol].SetFormulaCell(nRow, pCell);
}
-bool ScTable::SetGroupFormulaCell( SCCOL nCol, SCROW nRow, ScFormulaCell*
pCell )
-{
-if (!ValidColRow(nCol, nRow))
-return false;
-
-return aCol[nCol].SetGroupFormulaCell(nRow, pCell);
-}
-
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/doctok/WW8FontTable.cxx | 25 -
writerfilter/source/doctok/resources.xmi|3 ---
2 files changed, 28 deletions(-)
New commits:
commit 86ecd9560fe5666cd8814f513b80de7c67d1cbce
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Oct 31 22:57:09 2013 +0100
writerfilter: remove unused WW8FontTable class in doctok
Change-Id: I649e21460ad00b2a364a8adc91061ba95a6623d9
diff --git a/writerfilter/source/doctok/WW8FontTable.cxx
b/writerfilter/source/doctok/WW8FontTable.cxx
index 95fc233..8c439ab 100644
--- a/writerfilter/source/doctok/WW8FontTable.cxx
+++ b/writerfilter/source/doctok/WW8FontTable.cxx
@@ -22,31 +22,6 @@
namespace writerfilter {
namespace doctok {
-sal_uInt32 WW8FontTable::getEntryCount()
-{
-return entryOffsets.size() - 1;
-}
-
-writerfilter::ReferenceProperties::Pointer_t
-WW8FontTable::getEntry(sal_uInt32 nIndex)
-{
-writerfilter::ReferenceProperties::Pointer_t pResult;
-
-sal_uInt32 nCount = entryOffsets[nIndex + 1] - entryOffsets[nIndex];
-
-if (nCount 1)
-{
-WW8Font * pFont = new WW8Font(this,
- entryOffsets[nIndex], nCount);
-
-pFont-setIndex(nIndex);
-
-pResult = writerfilter::ReferenceProperties::Pointer_t(pFont);
-}
-
-return pResult;
-}
-
sal_uInt32 WW8Font::get_f()
{
return mnIndex;
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index a6a68c6..40a694e 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -3125,9 +3125,6 @@
!--Class FontTable--
UML:Class xmi.id=FontTable name=FontTable
UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8resource/
- /UML:ModelElement.stereotype
- UML:ModelElement.stereotype
UML:Stereotype xmi.idref=ww8nopayloadoffset/
/UML:ModelElement.stereotype
UML:ModelElement.stereotype
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Problems compiling LO with Visual Studio 2008
On 31/10/13 19:36, Pavel Laštovička wrote: Hi all, I am trying to compile LO 4.1.3 on my machine with Windows XP and Visual Studio 2008 and I have run into some problems. Is Visual Studio 2008 still supported? Or should I try to get a newer version? i don't believe that libreoffice-4-1 branch is buildable with 2008; only 2010 and 2012 are known to work. First problem was that build did not start at all with error in external/Package_msvc_dlls.mk. I think it was failing on MSVC_DLL_PATH being empty. yes that was probably broken for MSVC 2008 by commit 5c0a2940428c5c4b8451ee4e9ce30f0b7739f3c8 and never fixed. perhaps you will run into other issues too; since 2008 support was removed completely on master due to the high maintenace effort (uses different project files than newer versions etc.), there is probably little interest in getting the 4-1 branch to build; better to just use a newer MSVC. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/inc vcl/source
include/vcl/bitmap.hxx |7 --
vcl/inc/impbmp.hxx | 46 -
vcl/source/gdi/bitmap.cxx |6 -
vcl/source/gdi/impbmp.cxx | 32 ++-
vcl/source/gdi/impvect.cxx |3 --
vcl/source/gdi/pngread.cxx |2 -
6 files changed, 12 insertions(+), 84 deletions(-)
New commits:
commit 8204fadf2089d1c0eeb65a409fe3964d1537c765
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 16:08:29 2013 +0200
Bin dead code
Change-Id: I7c3ae0afd6740df326a5c74826e7f204e9df2219
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 027a416..7c5ed11 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -275,9 +275,6 @@ private:
voidImplGetSpace();
-voidImplCreate();
-voidImplCreateInner();
-voidImplCreateOuter();
voidImplPostProcess( const ImplPointArray rArr );
public:
commit d68e1a2fcccf0e61c3b480c94c226ee1a58c7da1
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 16:05:34 2013 +0200
Cosmetics and style cleanups
Change-Id: I45b072e5d6a216f0b82f7a0b3a4554ef4cc3570f
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index b29cabe..31b6e43 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -23,58 +23,43 @@
#include tools/gen.hxx
#include tools/solar.h
-// ---
-// - ImpBitmap -
-// ---
-
struct BitmapBuffer;
class SalBitmap;
class BitmapPalette;
class SalGraphics;
class Bitmap;
-class OutputDevice;
-class Color;
-class AlphaMask;
class ImpBitmap
{
private:
-
-sal_uLong mnRefCount;
-sal_uLong mnChecksum;
+sal_uLong mnRefCount;
+sal_uLong mnChecksum;
SalBitmap* mpSalBitmap;
public:
-
ImpBitmap();
~ImpBitmap();
-public:
-
voidImplSetSalBitmap( SalBitmap* pSalBitmap );
SalBitmap* ImplGetSalBitmap() const { return mpSalBitmap; }
-public:
-
-sal_BoolImplCreate( const Size rSize, sal_uInt16
nBitCount, const BitmapPalette rPal );
-sal_BoolImplCreate( const ImpBitmap rImpBitmap );
-sal_BoolImplCreate( const ImpBitmap rImpBitmap,
SalGraphics* pGraphics );
-sal_BoolImplCreate( const ImpBitmap rImpBitmap,
sal_uInt16 nNewBitCount );
+sal_BoolImplCreate( const Size rSize, sal_uInt16 nBitCount,
const BitmapPalette rPal );
+sal_BoolImplCreate( const ImpBitmap rImpBitmap );
+sal_BoolImplCreate( const ImpBitmap rImpBitmap, SalGraphics*
pGraphics );
+sal_BoolImplCreate( const ImpBitmap rImpBitmap, sal_uInt16
nNewBitCount );
SizeImplGetSize() const;
-sal_uInt16 ImplGetBitCount() const;
+sal_uInt16 ImplGetBitCount() const;
BitmapBuffer* ImplAcquireBuffer( sal_Bool bReadOnly );
voidImplReleaseBuffer( BitmapBuffer* pBuffer, sal_Bool
bReadOnly );
-public:
-
-sal_uLong ImplGetRefCount() const { return mnRefCount; }
+sal_uLong ImplGetRefCount() const { return mnRefCount; }
voidImplIncRefCount() { mnRefCount++; }
voidImplDecRefCount() { mnRefCount--; }
inline void ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum =
nChecksum; }
-inline sal_uLongImplGetChecksum() const { return mnChecksum; }
+inline sal_uLongImplGetChecksum() const { return mnChecksum; }
};
#endif // INCLUDED_VCL_INC_IMPBMP_HXX
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 7181c0d..852f211 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -25,83 +25,60 @@
#include salbmp.hxx
#include impbmp.hxx
-// --
-// - ImpBitmap -
-// --
-
ImpBitmap::ImpBitmap() :
-mnRefCount ( 1UL ),
-mnChecksum ( 0UL ),
+mnRefCount ( 1 ),
+mnChecksum ( 0 ),
mpSalBitmap ( ImplGetSVData()-mpDefInst-CreateSalBitmap() )
{
}
-// ---
-
ImpBitmap::~ImpBitmap()
{
delete mpSalBitmap;
}
-// ---
void ImpBitmap::ImplSetSalBitmap( SalBitmap* pBitmap )
{
delete mpSalBitmap, mpSalBitmap = pBitmap;
}
-// ---
-
sal_Bool ImpBitmap::ImplCreate( const Size rSize, sal_uInt16 nBitCount, const
BitmapPalette rPal )
{
return mpSalBitmap-Create( rSize, nBitCount, rPal );
}
-// ---
-
sal_Bool ImpBitmap::ImplCreate( const ImpBitmap rImpBitmap )
{
mnChecksum
[Libreoffice-commits] core.git: 6 commits - include/touch ios/experimental ios/shared vcl/source
include/touch/touch.h | 21 +
ios/experimental/LibreOffice/LibreOffice/AppDelegate.m | 25 ++
ios/experimental/LibreOffice/LibreOffice/lo.mm |2
ios/shared/ios_sharedlo/cxx/mlo.mm |9 ++
vcl/source/window/dialog.cxx | 66 ++---
5 files changed, 112 insertions(+), 11 deletions(-)
New commits:
commit 5a0aec771f10e14558ce229ff70cd81717d85ac8
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 22:20:15 2013 +0200
Add dummy touch_ui_dialog_modal() here, too
Change-Id: I1b1e47de2eec94150a0abee4aa74994f55b9b88e
diff --git a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
index 11d4642..198fb34 100644
--- a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
+++ b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
@@ -218,6 +218,31 @@ bool touch_ui_keyboard_visible()
return keyboardShows;
}
+static const char *
+dialog_kind_to_string(MLODialogKind kind)
+{
+switch (kind) {
+case MLODialogMessage:
+return MSG;
+case MLODialogInformation:
+return INF;
+case MLODialogWarning:
+return WRN;
+case MLODialogError:
+return ERR;
+case MLODialogQuery:
+return QRY;
+default:
+return WTF;
+}
+}
+
+MLODialogResult touch_ui_dialog_modal(MLODialogKind kind, const char *message)
+{
+NSLog(@=== %s: %s, dialog_kind_to_string(kind), message);
+return MLODialogOK;
+}
+
void touch_ui_selection_start(MLOSelectionKind kind,
const void *documentHandle,
MLORect *rectangles,
commit 9fabf25bc47c7b16eb22eca3a934c18070e1e9e5
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 21:30:19 2013 +0200
Dummy implementation of touch_ui_dialog_modal()
Change-Id: I38b72837d8a26ef95d84deca299023c1646169cf
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm
b/ios/shared/ios_sharedlo/cxx/mlo.mm
index 8f551fb..dc6fa42 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -216,5 +216,12 @@ mlo_initialize(void)
osl_setCommandArgs(argc, (char **) argv);
}
+// Dummy implementation for now, probably this should be handled in a
+// different way in each app that uses this shared library? Like
+// most in touch.h, the dialog API is not set in stone yet.
-
+MLODialogResult touch_ui_dialog_modal(MLODialogKind kind, const char *message)
+{
+NSLog(@=== %s, message);
+return MLODialogOK;
+}
commit ec2ea6e6e087d13d484d0e4b938144d28c4395dd
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 31 21:29:47 2013 +0200
Maybe Dialog::Execute() is one good place to call touch_ui_dialog_modal()
Change-Id: I5f1b9fd266d7920a947d3dfb6bcd584e3cc30b53
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e0cd445..0298d5d 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/util/PathSettings.hpp
#include comphelper/processfactory.hxx
@@ -45,6 +47,10 @@
#include vcl/unowrap.hxx
#include iostream
+#if !HAVE_FEATURE_DESKTOP
+#include touch/touch.h
+#endif
+
// ===
static OString ImplGetDialogText( Dialog* pDialog )
@@ -884,6 +890,8 @@ void Dialog::ImplEndExecuteModal()
short Dialog::Execute()
{
+#if HAVE_FEATURE_DESKTOP
+
setDeferredProperties();
if ( !ImplStartExecuteModal() )
@@ -904,7 +912,7 @@ short Dialog::Execute()
while ( !aDelData.IsDead() mbInExecute )
Application::Yield();
-ImplEndExecuteModal();
+ImplEndExecutModal();
#ifdef DBG_UTIL
if( pDialogParent )
@@ -927,6 +935,56 @@ short Dialog::Execute()
long nRet = mpDialogImpl-mnResult;
mpDialogImpl-mnResult = -1;
return (short)nRet;
+
+#else
+
+MLODialogKind kind;
+
+switch (GetType())
+{
+case WINDOW_MESSBOX:
+kind = MLODialogMessage;
+break;
+case WINDOW_INFOBOX:
+kind = MLODialogInformation;
+break;
+case WINDOW_WARNINGBOX:
+kind = MLODialogWarning;
+break;
+case WINDOW_ERRORBOX:
+kind = MLODialogError;
+break;
+case WINDOW_QUERYBOX:
+kind = MLODialogQuery;
+break;
+default:
+SAL_WARN(vcl, Dialog::Execute: Unhandled window type %d
GetType());
+kind = MLODialogInformation;
+break;
+}
+
+MLODialogResult result = touch_ui_dialog_modal(kind,
ImplGetDialogText(this).getStr());
+
+switch (result)
+{
+case MLODialogOK:
+return RET_OK;
+case MLODialogCancel:
+return RET_CANCEL;
+case MLODialogNo:
+
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dialog.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2ee41f402fdea5bed8076295ae3e94c79f92bd64 Author: Tor Lillqvist t...@collabora.com Date: Fri Nov 1 00:26:56 2013 +0200 Typo Change-Id: I31cd13e6b11b73166e7a7f351c5eb3ea8038a4fc diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 0298d5d..1e08a5a 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -912,7 +912,7 @@ short Dialog::Execute() while ( !aDelData.IsDead() mbInExecute ) Application::Yield(); -ImplEndExecutModal(); +ImplEndExecuteModal(); #ifdef DBG_UTIL if( pDialogParent ) ___ 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' - sc/source
sc/source/core/data/column.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit e271ea0dceca3f8ac664246ef2f9d65b2fa360a8 Author: Eike Rathke er...@redhat.com Date: Thu Oct 31 15:28:58 2013 +0100 resolved fdo#70815 broadcast emptied cell in ScColumn::SwapRow() Change-Id: Ie939f12a54d0b4cf8bedc34683e20fb924f1bf3b Reviewed-on: https://gerrit.libreoffice.org/6516 Tested-by: Kohei Yoshida libreoff...@kohei.us Reviewed-by: Kohei Yoshida libreoff...@kohei.us diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 800c200..305eeb5 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -901,6 +901,12 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2) // insert ColEntry at new position. Insert( nRow2, pCell1 ); + +// A broadcaster that exists at cell 1 will have no effect in a +// subsequent SetDirty(ScRange) that broadcasts only existing cells +// so broadcast the change here. fdo#70815 +// Delete(SCROW) does broadcast for other cases below. +pDocument-Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress( nCol, nRow1, nTab))); } return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 21
sc/source/core/opencl/formulagroupcl_finacial.hxx | 31
sc/source/core/opencl/op_financial.cxx|9 +++
sc/source/core/opencl/op_financial.hxx|1
sc/source/core/opencl/opbase.hxx |6 ++
sc/source/core/opencl/opinlinefun_finacial.cxx| 53 ++
6 files changed, 89 insertions(+), 32 deletions(-)
New commits:
commit d3f16e81ffb66d89d3954fd624c1a2e764d62415
Author: Xukai Liu xu...@multicorewareinc.com
Date: Thu Oct 31 20:20:37 2013 -0500
GPU Calc: refactor code generation for inlined library routines
Refactored two library functions: Round and approxEqual. Generate them
only when corresponding Calc spreadsheet functions are used.
Change-Id: Ibf532d551ba0d99a117cedd4a0f3397acb5e017d
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index d1ece4c..ed186b3 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -823,6 +823,13 @@ public:
t = t + mvSubArguments[i]-DumpOpName();
return t;
}
+virtual void DumpInlineFun(std::setstd::string decls,
+std::setstd::string funs) const
+{
+mpCodeGen-BinInlineFun(decls,funs);
+for (unsigned i = 0; i mvSubArguments.size(); i++)
+mvSubArguments[i]-DumpInlineFun(decls,funs);
+}
private:
SubArgumentsType mvSubArguments;
boost::scoped_ptrSlidingFunctionBase mpCodeGen;
@@ -1181,6 +1188,18 @@ public:
// preambles
decl publicFunc;
decl finacialFunc;
+DK-DumpInlineFun(inlineDecl,inlineFun);
+for(std::setstd::string::iterator set_iter=inlineDecl.begin();
+ set_iter!=inlineDecl.end();set_iter++)
+{
+decl*set_iter;
+}
+
+for(std::setstd::string::iterator set_iter=inlineFun.begin();
+ set_iter!=inlineFun.end();set_iter++)
+{
+decl*set_iter;
+}
mSyms.DumpSlidingWindowFunctions(decl);
mKernelSignature = DK-DumpOpName();
decl __kernel void DynamicKernel mKernelSignature;
@@ -1256,6 +1275,8 @@ private:
cl_program mpProgram;
cl_kernel mpKernel;
cl_mem mpResClmem; // Results
+std::setstd::string inlineDecl;
+std::setstd::string inlineFun;
};
DynamicKernel::~DynamicKernel()
diff --git a/sc/source/core/opencl/formulagroupcl_finacial.hxx
b/sc/source/core/opencl/formulagroupcl_finacial.hxx
index a8db8e9..da09168 100644
--- a/sc/source/core/opencl/formulagroupcl_finacial.hxx
+++ b/sc/source/core/opencl/formulagroupcl_finacial.hxx
@@ -9,38 +9,7 @@
#ifndef SC_OPENCL_FORMULAGROUPCL_FINACIAL_HXX
#define SC_OPENCL_FORMULAGROUPCL_FINACIAL_HXX
-
const char* finacialFunc =
-bool approxEqual(double a, double b)\n
-{\n
-\tif (a == b)\n
-\t\treturn true;\n
-\tdouble x = a - b;\n
-\treturn (x 0.0 ? -x : x) ((a 0.0 ? -a : a) * (1.0 / (16777216.0 *
-16777216.0)));\n
-}\n
-double constant nKorrVal[] = {0, 9e-1, 9e-2, 9e-3, 9e-4, 9e-5, 9e-6, 9e-7,
-9e-8,9e-9, 9e-10, 9e-11, 9e-12, 9e-13, 9e-14, 9e-15};\n
-constant double SCdEpsilon = 1.0E-7;\n
-double Round(double fValue)\n
-{\n
-\tif (fValue == 0.0)\n
-\t\treturn fValue;\n
-\tdouble fFac = 0;\n
-\tint nExp;\n
-\tif (fValue 0.0)\n
-\t\tnExp = (floor(log10(fValue)));\n
-\telse\n
-\t\tnExp = 0;\n
-\tint nIndex = 15 - nExp;\n
-\tif (nIndex 15)\n
-\t\tnIndex = 15;\n
-\telse if (nIndex = 1)\n
-\t\tnIndex = 0;\n
-\tfValue = floor(fValue + 0.5 + nKorrVal[nIndex]);\n
-\treturn fValue;\n
-}\n
-void RateIteration(){\n\tdouble tmp = Round(3.0);\n\treturn;\n}\n
double GetRmz( double fZins, double fZzr, double fBw, double fZw, int nF )\n
{\n
\tdouble fRmz;\n
diff --git a/sc/source/core/opencl/op_financial.cxx
b/sc/source/core/opencl/op_financial.cxx
index 5ae04ff..da4845c 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -21,6 +21,8 @@
using namespace formula;
namespace sc { namespace opencl {
+// Definitions of inline functions
+#include opinlinefun_finacial.cxx
void RRI::GenSlidingWindowFunction(
std::stringstream ss, const std::string sSymName, SubArguments
vSubArguments)
@@ -2513,6 +2515,13 @@ void OpTbillprice::GenSlidingWindowFunction(
ss return tmp;\n;
ss }\n;
}
+ void RATE::BinInlineFun(std::setstd::string decls,
+std::setstd::string funs)
+{
+decls.insert(approxEqualDecl);decls.insert(nKorrValDecl);
+decls.insert(SCdEpsilonDecl);decls.insert(RoundDecl);
+funs.insert(approxEqual);funs.insert(Round);
+}
void RATE::GenSlidingWindowFunction(
std::stringstream ss,
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx | 21
sc/source/core/opencl/formulagroupcl_finacial.hxx | 31
sc/source/core/opencl/op_financial.cxx|9 +++
sc/source/core/opencl/op_financial.hxx|1
sc/source/core/opencl/opbase.hxx |6 ++
sc/source/core/opencl/opinlinefun_finacial.cxx| 53 ++
6 files changed, 89 insertions(+), 32 deletions(-)
New commits:
commit 7abfae3622fc952ecac8ebacb1d70650ef773619
Author: Xukai Liu xu...@multicorewareinc.com
Date: Thu Oct 31 20:20:37 2013 -0500
GPU Calc: refactor code generation for inlined library routines
Refactored two library functions: Round and approxEqual. Generate them
only when corresponding Calc spreadsheet functions are used.
Change-Id: Ibf532d551ba0d99a117cedd4a0f3397acb5e017d
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index c40c289..2dfc0cf 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -823,6 +823,13 @@ public:
t = t + mvSubArguments[i]-DumpOpName();
return t;
}
+virtual void DumpInlineFun(std::setstd::string decls,
+std::setstd::string funs) const
+{
+mpCodeGen-BinInlineFun(decls,funs);
+for (unsigned i = 0; i mvSubArguments.size(); i++)
+mvSubArguments[i]-DumpInlineFun(decls,funs);
+}
private:
SubArgumentsType mvSubArguments;
boost::scoped_ptrSlidingFunctionBase mpCodeGen;
@@ -1181,6 +1188,18 @@ public:
// preambles
decl publicFunc;
decl finacialFunc;
+DK-DumpInlineFun(inlineDecl,inlineFun);
+for(std::setstd::string::iterator set_iter=inlineDecl.begin();
+ set_iter!=inlineDecl.end();set_iter++)
+{
+decl*set_iter;
+}
+
+for(std::setstd::string::iterator set_iter=inlineFun.begin();
+ set_iter!=inlineFun.end();set_iter++)
+{
+decl*set_iter;
+}
mSyms.DumpSlidingWindowFunctions(decl);
mKernelSignature = DK-DumpOpName();
decl __kernel void DynamicKernel mKernelSignature;
@@ -1255,6 +1274,8 @@ private:
cl_program mpProgram;
cl_kernel mpKernel;
cl_mem mpResClmem; // Results
+std::setstd::string inlineDecl;
+std::setstd::string inlineFun;
};
DynamicKernel::~DynamicKernel()
diff --git a/sc/source/core/opencl/formulagroupcl_finacial.hxx
b/sc/source/core/opencl/formulagroupcl_finacial.hxx
index a8db8e9..da09168 100644
--- a/sc/source/core/opencl/formulagroupcl_finacial.hxx
+++ b/sc/source/core/opencl/formulagroupcl_finacial.hxx
@@ -9,38 +9,7 @@
#ifndef SC_OPENCL_FORMULAGROUPCL_FINACIAL_HXX
#define SC_OPENCL_FORMULAGROUPCL_FINACIAL_HXX
-
const char* finacialFunc =
-bool approxEqual(double a, double b)\n
-{\n
-\tif (a == b)\n
-\t\treturn true;\n
-\tdouble x = a - b;\n
-\treturn (x 0.0 ? -x : x) ((a 0.0 ? -a : a) * (1.0 / (16777216.0 *
-16777216.0)));\n
-}\n
-double constant nKorrVal[] = {0, 9e-1, 9e-2, 9e-3, 9e-4, 9e-5, 9e-6, 9e-7,
-9e-8,9e-9, 9e-10, 9e-11, 9e-12, 9e-13, 9e-14, 9e-15};\n
-constant double SCdEpsilon = 1.0E-7;\n
-double Round(double fValue)\n
-{\n
-\tif (fValue == 0.0)\n
-\t\treturn fValue;\n
-\tdouble fFac = 0;\n
-\tint nExp;\n
-\tif (fValue 0.0)\n
-\t\tnExp = (floor(log10(fValue)));\n
-\telse\n
-\t\tnExp = 0;\n
-\tint nIndex = 15 - nExp;\n
-\tif (nIndex 15)\n
-\t\tnIndex = 15;\n
-\telse if (nIndex = 1)\n
-\t\tnIndex = 0;\n
-\tfValue = floor(fValue + 0.5 + nKorrVal[nIndex]);\n
-\treturn fValue;\n
-}\n
-void RateIteration(){\n\tdouble tmp = Round(3.0);\n\treturn;\n}\n
double GetRmz( double fZins, double fZzr, double fBw, double fZw, int nF )\n
{\n
\tdouble fRmz;\n
diff --git a/sc/source/core/opencl/op_financial.cxx
b/sc/source/core/opencl/op_financial.cxx
index 5ae04ff..da4845c 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -21,6 +21,8 @@
using namespace formula;
namespace sc { namespace opencl {
+// Definitions of inline functions
+#include opinlinefun_finacial.cxx
void RRI::GenSlidingWindowFunction(
std::stringstream ss, const std::string sSymName, SubArguments
vSubArguments)
@@ -2513,6 +2515,13 @@ void OpTbillprice::GenSlidingWindowFunction(
ss return tmp;\n;
ss }\n;
}
+ void RATE::BinInlineFun(std::setstd::string decls,
+std::setstd::string funs)
+{
+decls.insert(approxEqualDecl);decls.insert(nKorrValDecl);
+decls.insert(SCdEpsilonDecl);decls.insert(RoundDecl);
+funs.insert(approxEqual);funs.insert(Round);
+}
void RATE::GenSlidingWindowFunction(
std::stringstream ss,
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/opencl-test.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 22119b5a476748bb5eee5e624eebc7afee9d9141 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Thu Oct 31 22:46:33 2013 -0500 GPU Calc: re-enable regression test testSharedFormulaXLS Change-Id: Ica508140d849cfd7754aea91e019fb3ed565d993 diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 862d24c..4e7e92e 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -117,7 +117,7 @@ public: void testFinacialYIELDDISCFormula(); void testFinacialYIELDMATFormula(); CPPUNIT_TEST_SUITE(ScOpenclTest); -// CPPUNIT_TEST(testSharedFormulaXLS); +CPPUNIT_TEST(testSharedFormulaXLS); CPPUNIT_TEST(testFinacialFormula); CPPUNIT_TEST(testStatisticalFormulaFisher); CPPUNIT_TEST(testStatisticalFormulaFisherInv); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/qa
sc/qa/unit/opencl-test.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1c1232a7a785057dc3fa4be681b5ba2d7f7372d6 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Thu Oct 31 22:46:33 2013 -0500 GPU Calc: re-enable regression test testSharedFormulaXLS Change-Id: Ica508140d849cfd7754aea91e019fb3ed565d993 diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 2418df7..0367468 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -119,7 +119,7 @@ public: void testFinacialYIELDDISCFormula(); void testFinacialYIELDMATFormula(); CPPUNIT_TEST_SUITE(ScOpenclTest); -// CPPUNIT_TEST(testSharedFormulaXLS); +CPPUNIT_TEST(testSharedFormulaXLS); CPPUNIT_TEST(testFinacialFormula); CPPUNIT_TEST(testStatisticalFormulaFisher); CPPUNIT_TEST(testStatisticalFormulaFisherInv); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] minutes of ESC call ...
* Present: + Christian, Eike, David, Stephan, Adam, Andras, Kohei, Markus, Kendy, Michael M, Michael S., Miklos, Norbert * Completed Action Items: + poke Matus wrt. callgrind / performance VM (Michael) + Include new C* font google replacements into vanilla install (Caolan) + draw bugzilla migration threads together propose funding to the board (Robinson) [ migration seems to be ongoing thanks to Thorsten / Tollef ] + produce a VM for the load / crash regressions (Cloph / Markus) [ setup, and running the tests - quite a few false positives, need to make it public. Running the second batch of tests ] http://dev-builds.libreoffice.org/crashtest/7cd77d5cb0b6fd3343f2703c73e2dc4b65fc0e9e/ The interesting files are crashlog.txt if it is there. Encourage people with time - mid compile or whatever to take a file fix it. Quite a few string-length assertions firing now. 40-50 to address in 4.2 / master. ] + test and get backtraces for Java issue on Maverick (Norbert) [ have to re-install Java after upgrade, the OS/prompt dialog can cause a crash. The solution - not publish wiki-publisher on Mac. The wiki-publisher, as soon as you type in writer Java is instantiated on Mac. Wikipublisher brings a menu entry from file-send-... when you type we instantiate all the menus so Mac can decided if there is a shortcut ... (sberg) Should we remove wiki-publisher completely ? (Michael) + just for Mac is enough for now (Sberg) ] * Pending Action Items: + New templates (Ahmad) [ work in progress hard-coding templates as code ] + produce a VM with callgrind metrics (Matus) [ waiting for details on what should be installed ] + partition document test loads / run them on tinderboxen (Norbert) [ started, need to work on script to split it down ] + get setup wrt. mobile app-store access (Cloph / Thorsten) [ in progress around 4.1.3, pending Thorsten overcoming some Android remote build problems with all langs ] + poke people around FOSDEM, and get submission details from Italo (Kendy) [ pending reply from Italo ] * Release Engineering update (Cloph) + 4.1.3 status + confusion again wrt. communication, now scheduled for tomorrow morning. + 4.2 Alpha 1 release planned for Monday ... + Feature freeze is Nov 18th. + GSOC / Android iOS remote control releases from master update + credentials setup, iOS pending input from Thorsten + OpenCL functions feature freeze + not concerned wrt. continuing development if not enabled by default * New Keynote import filter (David) + first version integrated into LibreOffice + https://plus.google.com/photos/109896341870720226179/albums/5940508193610436897/5940508196458171922?pid=5940508196458171922oid=109896341870720226179 + supports text, shapes, images + missing tables, formatting, comments etc. + https://gerrit.libreoffice.org/gitweb?p=libetonyek.git;a=blob;f=FEATURES AI: + create mirror of libetonyek on freedesktop (Michael) * New commit access: + Marcos Souza - doing some good work (Norbert) + will be at the hack-fest. + Ray - doing good openCL work (Kohei) AI:+ add ijsung. * 'UniString' is truly dead ? (Caolan) + still get the occasional StringLen class around the place, and a few legacy 64k limits are around with 16bit indexes into strings etc. + does that finally fix the 64k limit on paragraphs ? (Michael) - nearly done, but not got to that yet (Caolan) + lots of work, and a great outcome - thanks to all that helped, AI: + ask Noel Grandin to blog about it (Caolan) * solver going away (Michael S) https://gerrit.libreoffice.org/#/c/6515/ + will push when finished building in gerrit. + instdir vs. instsetoo_.. tab completion pain (Michael) + need to get workdir instdir combined (Stephan) + avoiding ORIGIN problems LD_LIBRARY_PATH horrors during build + perhaps move instdir under workdir ? + could we use absolute paths ? (Michael S) + path from instdir - workdir is always fixed (Michael S) + just an idea, easy sol'n make it a subdir of workdir (Stephan) + want to remove INPATH [ eg. unxlngi6.pro ] (Michael S) + except for cross-compilation with two inpaths + use two different paths ? * Google C* font replacements / update (Caolan) + we should back-port to 4.1.x + would be a good plan, but no time to get to it yet. AI:+ already looking into that (Caolan) * Certification progress (Kendy) + worth re-running the statistics of top bug fixers see if there are new names. + script - sorts by number of bugs fixed. + what about people who implemented features ? eg. GSOC (Michael) + critera -
[Libreoffice-qa] Why does the Tools - Options menu get that wide?
Hello @ll, be prepared: I will send a couple of different mails with different questions, which I noticed since the release of 4.1 for Debian Testing AMD64 ... ;) First one: When I open LO Version: 4.1.2.3 Build ID: 40b2d7fde7e8d2d7bc5a449dc65df4d08a7dd38 with installed Germanophone help- as well as langpack, go to Tools – Options – LibreOffice – General, I can see the field for the initials, but not the end of the field of it. The same applies for the Back button at the bottom right of the dialog, where I can only see Rückgän instead of Rückgängig in the Germanophone UI ... :( If I open LO Version: 4.2.0.0.alpha0+ Build ID: aeb29afa11b7be87153f048044a2d4af9a87b50c TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:master, Time: 2013-10-29_20:58:33 (but I have also seen it on other builds before), it is more horrible: The dialog window is too far to the right to see the initials field or the text on the Back button ... :( Is it only on my system? Or can someone confirm it with an other OS/architecture/graphics chip or card/driver/something else? With up to version 4.0.x that dialog fits from the left to the right side on my monitor, without vanishing parts of it ... ;) OS: Debian Testing AMD64 Graphics chip: NVidia C61 GeForce 6150 Driver: ii libdrm-nouveau1a:amd64 2.4.40-1~deb7u2 amd64 Userspace interface to nouveau-specific kernel DRM services -- runtime ii libdrm-nouveau2:amd64 2.4.46-3 amd64 Userspace interface to nouveau-specific kernel DRM services -- runtime ii xserver-xorg-video-nouveau 1:1.0.9-2+b2 amd64 X.Org X server -- Nouveau display driver Resolution: 1024x768/24 Have a nice evening Thomas. -- The difference between a good haircut and a bad one is seven days. ___ 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] White bar at the bottom of Tools - Options - LibreOffice - Appearance
Hi @gain, and another one ... ;) If you 1. Go to Tools – Options – LibreOffice – Appearance and 2. Scroll to the bottom of the right window, there is a visible white bar below the last enty Text Box Bound Context below the Oracle Report Builder colour settings. Is this intended? Or can someone confirm it? In LO Version: 4.1.2.3 Build ID: 40b2d7fde7e8d2d7bc5a449dc65df4d08a7dd38 with installed Germanophone lang- as well as helppack, it does not evident, as the background of this dialog is white as well. It only seems to be a little more space than needed there ... ;) But if you have a look at LO Version: 4.2.0.0.alpha0+ Build ID: aeb29afa11b7be87153f048044a2d4af9a87b50c TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:master, Time: 2013-10-29_20:58:33 with installed en-US lang- as well as helppack, the background of this dialog is grey, so the space below is visible ... :( Is this a bug or a feature? OS: Debian Testing AMD64 Graphics chip: NVidia C61 GeForce 6150 Driver: ii libdrm-nouveau1a:amd64 2.4.40-1~deb7u2 amd64 Userspace interface to nouveau-specific kernel DRM services -- runtime ii libdrm-nouveau2:amd64 2.4.46-3 amd64 Userspace interface to nouveau-specific kernel DRM services -- runtime ii xserver-xorg-video-nouveau 1:1.0.9-2+b2 amd64 X.Org X server -- Nouveau display driver Resolution: 1024x768/24 on NEC MultiSync XE17 Is it only on my system, or can someone with another OS/architecture/graphics chip or card/something else can confirm it? Thanks for any info Thomas. -- A box without hinges, key, or lid, Yet golden treasure inside is hid. -- J. R. R. Tolkien ___ 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] Difference between Tools - Options - LibreOffice and OLH
Hi again, I hope, this is the last one for today ... ;) If you open Tools – Options, there is the button Revert at the bottom right of the dialog. If you open the OLH, click on Menus - Tools (after scrolling down to it ... ;) ) - scroll again to Options, click on LibreOfficeDev and scroll to the end of the page, you will find quote Back Resets modified values back to the LibreOfficeDev default values. /quote ... :( Should this not be change to quote Revert Resets modified values back to the LibreOfficeDev default values. /quote ? Or maybe use Reset in both cases? In the Germanophone OLH/UI it is the same problem (and maybe in other NLs as well?), as the button says Rückgängig, but OLH has quote Zurück Setzt geänderte Werte wieder auf die beim Öffnen von LibreOffice geltenden Standardwerte zurück. /quote in it ... :( LO: Version: 4.2.0.0.alpha0+ Build ID: aeb29afa11b7be87153f048044a2d4af9a87b50c TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:master, Time: 2013-10-29_20:58:33 with installed en-US lang- as well as helppack for the English example. German example from LO Version: 4.1.2.3 Build ID: 40b2d7fde7e8d2d7bc5a449dc65df4d08a7dd38 OS: Debian Testing AMD64 Sorry for the inconvenience and have a nice evening Thomas. -- The reward for working hard is more hard work. ___ 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] quick question on function in Master
Hi, 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 Background: for me there is some strange behaviour, but for someone else it works fine... (BTW: the latter entry should be renamed). thanks a lot, Cor -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ 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] Why does the Tools - Options menu get that wide?
Hi Thomas, Is it only on my system? No problem using Germanophone UI 4.1.2 OS: Windows 7 Resolution: 1920x1080 Regards Jochen Am 31.10.2013 18:22, schrieb Thomas Hackert: Hello @ll, be prepared: I will send a couple of different mails with different questions, which I noticed since the release of 4.1 for Debian Testing AMD64 ... ;) First one: When I open LO Version: 4.1.2.3 Build ID: 40b2d7fde7e8d2d7bc5a449dc65df4d08a7dd38 with installed Germanophone help- as well as langpack, go to Tools – Options – LibreOffice – General, I can see the field for the initials, but not the end of the field of it. The same applies for the Back button at the bottom right of the dialog, where I can only see Rückgän instead of Rückgängig in the Germanophone UI ... :( If I open LO Version: 4.2.0.0.alpha0+ Build ID: aeb29afa11b7be87153f048044a2d4af9a87b50c TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:master, Time: 2013-10-29_20:58:33 (but I have also seen it on other builds before), it is more horrible: The dialog window is too far to the right to see the initials field or the text on the Back button ... :( Is it only on my system? Or can someone confirm it with an other OS/architecture/graphics chip or card/driver/something else? With up to version 4.0.x that dialog fits from the left to the right side on my monitor, without vanishing parts of it ... ;) OS: Debian Testing AMD64 Graphics chip: NVidia C61 GeForce 6150 Driver: ii libdrm-nouveau1a:amd64 2.4.40-1~deb7u2 amd64 Userspace interface to nouveau-specific kernel DRM services -- runtime ii libdrm-nouveau2:amd64 2.4.46-3 amd64 Userspace interface to nouveau-specific kernel DRM services -- runtime ii xserver-xorg-video-nouveau 1:1.0.9-2+b2 amd64 X.Org X server -- Nouveau display driver Resolution: 1024x768/24 Have a nice evening Thomas. ___ 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] QA Call moving to Mondays at 19:30 UTC
Hi all, A big thanks to all of the QA folks who have listed their hours of availability on the Doodle or who have emailed us directly. We received a lot of useful input and are optimistic that our new time will allow more QA Team members to join the call! We're right around the switchover time for Daylight Savings, but I believe that most countries who observe the practice will have switched by this coming Monday. The easiest way to translate the UTC time into your local time is to use the following link: http://www.timeanddate.com/worldclock/fixedtime.html?hour=19min=30sec=0day=04month=11year=2013 We'll try out the new time for a meeting or two and see how much interest/attendance we get before making a permanent shift to Monday. I hope to see many of you on the next call! To review or add new items to the Agenda, please visit the following wiki page: https://wiki.documentfoundation.org/QA/Meetings/2013/November_04 Cheers, --R ___ 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-bugs] [Bug 70995] Update Code to Latest ICU 52.1
https://bugs.freedesktop.org/show_bug.cgi?id=70995 --- Comment #8 from Robert M Campbell robert.rcampb...@gmail.com --- I am reading a bit on crosscompiling on Linux for Windows XP - that would take a LOT less time than building it on Windows XP (which is a VM) and requiring the download of loads of Windows code I won't normally need on that VM. I've been reading http://www.derivativezero.com/blog/2012/07/tech-update-libreoffice-cross-compile-msi-installer-generation/. Seems doable, but not quite sure what the best seetings are... The settings that site lists are: CC=ccache i686-w64-mingw32-gcc CXX=ccache i686-w64-mingw32-g++ CC_FOR_BUILD=ccache gcc CXX_FOR_BUILD=ccache g++ –with-distro=LibreOfficeMinGW Does that build for Windows XP 32bit or a 64bit? Never done anything like this before... (It does, however, look really cool!) Noting I am working on a amd 64 bit version of Ubuntu 13.10 Saucy, and wanting to build for Windows XP 32bit, what should the CC, CXX, etc be set to? I'll report the results of my build if I can get it to crosscompile on Linux, or if my Internet speed allows me to do it on the Windows XP VM. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71075] New: chart mangling on paste
https://bugs.freedesktop.org/show_bug.cgi?id=71075 Priority: medium Bug ID: 71075 Assignee: libreoffice-bugs@lists.freedesktop.org Blocks: 60270 Summary: chart mangling on paste Severity: critical Classification: Unclassified OS: All Reporter: michael.me...@collabora.com Hardware: Other Status: NEW Version: 4.2.0.0.alpha0+ Master Component: Chart Product: LibreOffice Created attachment 88396 -- https://bugs.freedesktop.org/attachment.cgi?id=88396action=edit a simple calc file with a chart. Create the world's simplest chart in calc (sample attached), copy/paste it to impress - to show off the latest numbers. Notice the chart is completely mangled, geometry is busted, data is lost, looks totally different. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on||71075 -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71076] New: gdi metafile breakage on paste
https://bugs.freedesktop.org/show_bug.cgi?id=71076 Priority: medium Bug ID: 71076 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: gdi metafile breakage on paste Severity: major Classification: Unclassified OS: All Reporter: michael.me...@collabora.com Hardware: Other Status: NEW Version: 4.2.0.0.alpha0+ Master Component: Chart Product: LibreOffice Grab from bug #71075 the test file: https://bugs.freedesktop.org/attachment.cgi?id=88396 Now paste-as-GDI-metafile the data; notice that the chart x axis legends instead of being textual dates are numbers: not ideal :-) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70949] Please provide utility functions to get the current product (Office Suite) name, version, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=70949 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||pierre-yves.samyn@laposte.n ||et Ever confirmed|0 |1 --- Comment #1 from pierre-yves samyn pierre-yves.sa...@laposte.net --- Hello I completely agree with this request. Only slight attenuation: the current procedure for obtaining this information is a *little* documented (see GetRegistryKeyContent and GetProductname examples in the Misc module of Tools library). I also agree with the type request for ooSetupxxx properties(Extension, Version, ooSetupVersionAboutBox...). Could we not add to request a getBuildID utility function equivalent to: sub GetBuildID dim sID as string FA = createunoservice(com.sun.star.sheet.FunctionAccess) sID = FA.callFunction(INFO, array(Release) msgbox Build ID: sID end sub Regards Pierre-Yves -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71076] gdi metafile breakage on paste
https://bugs.freedesktop.org/show_bug.cgi?id=71076 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=71075 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71075] chart mangling on paste
https://bugs.freedesktop.org/show_bug.cgi?id=71075 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=71076 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71075] chart mangling on paste
https://bugs.freedesktop.org/show_bug.cgi?id=71075 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added CC||markus.mohrhard@googlemail. ||com, muthus...@gmail.com Keywords||regression --- Comment #1 from Michael Meeks michael.me...@collabora.com --- Muthu - do you have some cycles to look at this ? my experience with chart copy/paste is -so- enduringly terrible that I suspect that there are zero unit tests at all for this functionality :-) I believe that this used to work in 4.0 anyhow :-) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71077] New: Wrong tips for functions in Calc that have a *_ADD variant too
https://bugs.freedesktop.org/show_bug.cgi?id=71077 Priority: medium Bug ID: 71077 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Wrong tips for functions in Calc that have a *_ADD variant too Severity: normal Classification: Unclassified OS: All Reporter: ku...@libreoffice.org Hardware: Other Status: UNCONFIRMED Version: 4.1.1.2 release Component: Spreadsheet Product: LibreOffice Created attachment 88397 -- https://bugs.freedesktop.org/attachment.cgi?id=88397action=edit example screenshot for GDC function When you enter a function in Calc you get a tip in a yellow box with help for the entered function. This help tip is incorrect for functions that have a *_ADD variant too. For this functions you see the help tip for the *_ADD function instead of the correct help tip for the function whithout *_ADD. I added a screenshot with the wrong behavior of the GCD function. This behavior is present in 4.1 as well as in 4.0 but not present in 3.6 release. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 49853] EDITING: Attempting paste into find bar with Edit:Paste (or Cmd-V on OS X) pastes into document
https://bugs.freedesktop.org/show_bug.cgi?id=49853 Alexander Petrossian (PAF) p...@yandex.ru changed: What|Removed |Added CC||p...@yandex.ru --- Comment #55 from Alexander Petrossian (PAF) p...@yandex.ru --- two years :( still here Writer Version 4.0.5.2 (Build ID: 5464147a081647a250913f19c0715bca595af2f) MacOX Mavericks -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71075] chart mangling on paste
https://bugs.freedesktop.org/show_bug.cgi?id=71075 --- Comment #2 from suokunl...@gmail.com --- Tested and confirm in L.O. 4.1.3.2 Ubuntu 13.10 x86. * CTRL+c and CTRL+v to another application (writer,impress,draw...), x and y are reversed, so data are loss. * CTRL+c and paste special (CTRL+v) - StarObjectDescriptor(XML) to another application (writer,impress,draw...), x and y are reversed. * CTRL+c and paste special (CTRL+v) - GDIMetafile to another application (writer,impress,draw...), everything is OK. Maybe a regression but need confirm. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71076] gdi metafile breakage on paste
https://bugs.freedesktop.org/show_bug.cgi?id=71076 suokunl...@gmail.com changed: What|Removed |Added CC||suokunl...@gmail.com --- Comment #1 from suokunl...@gmail.com --- Tested and confirm in L.O. 4.1.3.2 x86. Not only date format but also comma-seperated number formats are changed to general numbers. Text format seems not affected. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 49853] EDITING: Attempting paste into find bar with Edit:Paste (or Cmd-V on OS X) pastes into document
https://bugs.freedesktop.org/show_bug.cgi?id=49853 --- Comment #56 from Frantisek Erben erben...@gmail.com --- still here Writer Version 4.1.3.2 Mac OX 10.9 Mavericks Two years and 27 duplicates signalize that this bug is really anoying for users and really nightmare for developers. My temporary workaround: assign common Cmd+F shortcut to function FindReplace. I'm afraid this temporary workaround becomes a permanent :( for all Mac and faithful LibreOfice users. My current workaround: switch to iWork completelly. (In reply to comment #55) two years :( still here Writer Version 4.0.5.2 (Build ID: 5464147a081647a250913f19c0715bca595af2f) MacOX Mavericks -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71080] New: Improper rendering for Word र्गकि
https://bugs.freedesktop.org/show_bug.cgi?id=71080 Priority: medium Bug ID: 71080 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Improper rendering for Word र्गकि Severity: normal Classification: Unclassified OS: All Reporter: snek...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.1.2.3 release Component: Libreoffice Product: LibreOffice Created attachment 88401 -- https://bugs.freedesktop.org/attachment.cgi?id=88401action=edit First window shows glyph rendering in Libre Office second one shows in gedit text editor Description of problem: first second glyphs are merging together Version-Release number of selected component (if applicable): Libre-Office 4.1.2.3 How reproducible: everytime Actual results: The two glyphs are merging Expected results: The Glyphs should not merge or overlap. Additional info: The specified word is working properly with harfbuzz windows . also the font family Sakal Marathi has the same issue regarding the above specified word. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70995] Update Code to Latest ICU 52.1
https://bugs.freedesktop.org/show_bug.cgi?id=70995 --- Comment #9 from Robert M Campbell robert.rcampb...@gmail.com --- Access forbidden on http://dev-www.libreoffice.org/src/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz Will do an Ubuntu build first, then figure out how to cross compile for Windows XP or build on Windows XP. To cross compile for Windows XP, what should build / host / target be set to? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71005] File locking: No warning dialog is shown when started with --nolockcheck
https://bugs.freedesktop.org/show_bug.cgi?id=71005 --- Comment #1 from ulk...@hotmail.de --- Created attachment 88402 -- https://bugs.freedesktop.org/attachment.cgi?id=88402action=edit possible patch, based on master -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44679] JRE can't be found/used
https://bugs.freedesktop.org/show_bug.cgi?id=44679 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #6 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #5) $ /usr/libexec/java_home -V Matching Java Virtual Machines (6): 1.7.0_45, x86_64: Java SE 7 /Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home 1.7.0_25, x86_64: Java SE 7 /Library/Java/JavaVirtualMachines/jdk1.7.0_25.jdk/Contents/Home 1.7.0_21, x86_64: Java SE 7 /Library/Java/JavaVirtualMachines/jdk1.7.0_21.jdk/Contents/Home 1.7.0_17, x86_64: Java SE 7 /Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home 1.6.0_43-b01-447, x86_64: Java SE 6 /Library/Java/JavaVirtualMachines/1.6.0_43-b01-447.jdk/Contents/Home The above are all 64-bit versions, so cannot be used by 32-bit LibreOffice... 1.6.0_43-b01-447, i386: Java SE 6 /Library/Java/JavaVirtualMachines/1.6.0_43-b01-447.jdk/Contents/Home ...but it is unclear to me why this one is not detected by LibreOffice. (On my Mac OS X 10.9 box I have 1.6.0_65-b14-462, i386: 'Java SE 6' /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home which does get detected fine by LibreOffice.) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
