[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 62155, which changed state. Bug 62155 Summary: Libreoffice crashes after upgrade while using formula bar https://bugs.freedesktop.org/show_bug.cgi?id=62155 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit 0d2a7adf4e12b08bb6017df03e6e4ea04acc5df5 Author: Tor Lillqvist Date: Tue Jul 23 10:36:34 2013 +0300 Correct help message for --enable-macosx-code-signing Change-Id: I453f53e7afc1474b4db2a89454718652b088ad6c diff --git a/configure.ac b/configure.ac index bcc9b4b..add4a6b 100644 --- a/configure.ac +++ b/configure.ac @@ -1120,11 +1120,9 @@ AC_ARG_ENABLE(desktop-gui-elements, AC_ARG_ENABLE(macosx-code-signing, AS_HELP_STRING([--enable-macosx-code-signing<=identity>], -[Sign executables, dylibs, frameworks and the app bundle. The - default is to do signing if there is a suitable certificate - in your keychain, so if you don't want that, use the - corresponding --disable option. Experimental work in - progress, don't use unless you are working on this.]), +[Sign executables, dylibs, frameworks and the app bundle. If you + don't provide an identity the first suitable certificate + in your keychain is used.]), ,) AC_ARG_ENABLE(macosx-sandbox, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang config_host/config_global.h.in configure.ac include/sal
compilerplugins/clang/unusedvariablecheck.cxx |9
config_host/config_global.h.in|4 +++
configure.ac | 28 ++
include/sal/types.h |6 ++---
4 files changed, 44 insertions(+), 3 deletions(-)
New commits:
commit 92dfa82d2d25f2acdee0a538bf15f1fac36c0ecf
Author: LuboÅ¡ LuÅák
Date: Tue Jul 23 09:49:57 2013 +0200
adjust for upstreaming of warn_unused attribute
The warn_unused attribute has been upstream to GCC and Clang, so use it if
present.
Still warn about STL types if those do not use it yet (which is the status
as of now).
Change-Id: I3c003e44c08d1d141e23bba38cf92e663a5ac353
diff --git a/compilerplugins/clang/unusedvariablecheck.cxx
b/compilerplugins/clang/unusedvariablecheck.cxx
index a0763ac..86f405d 100644
--- a/compilerplugins/clang/unusedvariablecheck.cxx
+++ b/compilerplugins/clang/unusedvariablecheck.cxx
@@ -8,6 +8,13 @@
*
*/
+#include
+
+// If there is support for warn_unused attribute even in STL classes, then
there's
+// no point in having this check enabled, otherwise keep it at least for STL
+// (LO classes won't get duplicated warnings, as the attribute is different).
+#if !HAVE_GCC_ATTRIBUTE_WARN_UNUSED_STL
+
#include "unusedvariablecheck.hxx"
#include
@@ -101,3 +108,5 @@ bool UnusedVariableCheck::VisitVarDecl( const VarDecl* var )
static Plugin::Registration< UnusedVariableCheck > X( "unusedvariablecheck" );
} // namespace
+
+#endif
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 9b1b12a..31f64e6 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -23,5 +23,9 @@ Any change in this header will cause a rebuild of almost
everything.
#define HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE 0
#define HAVE_THREADSAFE_STATICS 0
#define HAVE_SYSLOG_H 0
+/* Compiler supports __attribute__((warn_unused)). */
+#define HAVE_GCC_ATTRIBUTE_WARN_UNUSED 0
+/* C++ library uses __attribute__((warn_unused)) for basic types like
std::string. */
+#define HAVE_GCC_ATTRIBUTE_WARN_UNUSED_STL 0
#endif
diff --git a/configure.ac b/configure.ac
index add4a6b..1147e4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5668,6 +5668,34 @@ if test "$GCC" = "yes"; then
AC_MSG_RESULT([yes])
], [AC_MSG_RESULT([no])])
AC_LANG_POP([C++])
+
+AC_MSG_CHECKING([whether $CXX supports __attribute__((warn_unused))])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CFLAGS -Werror -Wunknown-pragmas"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+struct __attribute__((warn_unused)) dummy {};
+])], [
+AC_DEFINE([HAVE_GCC_ATTRIBUTE_WARN_UNUSED],[1])
+AC_MSG_RESULT([yes])
+], [AC_MSG_RESULT([no])])
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
+
+AC_MSG_CHECKING([whether STL uses __attribute__((warn_unused))])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CFLAGS -Werror -Wunused"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#include
+void f() { std::string s; }
+])], [
+AC_MSG_RESULT([no])
+], [
+AC_DEFINE([HAVE_GCC_ATTRIBUTE_WARN_UNUSED_STL],[1])
+AC_MSG_RESULT([yes])])
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
fi
AC_SUBST(HAVE_GCC_NO_LONG_DOUBLE)
diff --git a/include/sal/types.h b/include/sal/types.h
index 070a3f29..9ce2cef 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -551,13 +551,13 @@ template< typename T1, typename T2 > inline T1
static_int_cast(T2 n) {
or external constructors or destructors. Classes marked with SAL_WARN_UNUSED
will be warned about.
- Currently implemented by a Clang compiler plugin.
-
@since LibreOffice 4.0
*/
-#if defined __clang__
+#if HAVE_GCC_ATTRIBUTE_WARN_UNUSED
+#define SAL_WARN_UNUSED __attribute__((warn_unused))
+#elif defined __clang__
#define SAL_WARN_UNUSED __attribute__((annotate("lo_warn_unused")))
#else
#define SAL_WARN_UNUSED
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Thomas van der Meulen changed: What|Removed |Added Depends on||67206 --- Comment #53 from Thomas van der Meulen --- I added bug 67206 - No autocalculation of a cell referenced to a cell, if a column was inserted before -- stops productive work and calculation of cells doesn't work properly. -- 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: configure.ac
configure.ac | 23 +--
1 file changed, 17 insertions(+), 6 deletions(-)
New commits:
commit 19a6c484c3af376416398e78ac29db5aa9a235ce
Author: Lionel Elie Mamane
Date: Tue Jul 23 10:06:54 2013 +0200
configure.ac: working firebird version check with manual FIREBIRD_C/LDFLAGS
Change-Id: I511eb8bfcfab2d42073f43660518e1e8be0d5788
diff --git a/configure.ac b/configure.ac
index 1147e4d..f1fc3d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8159,15 +8159,26 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
FIREBIRD_CFLAGS=`$FIREBIRDCONFIG --cflags`
FIREBIRD_LIBS=`$FIREBIRDCONFIG --embedlibs`
fi
+AC_MSG_RESULT([includes `$FIREBIRD_CFLAGS', libraries
`$FIREBIRD_LIBS'])
AC_MSG_CHECKING([Firebird version])
-FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1`
-FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2`
-if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; then
-AC_MSG_RESULT([OK])
+if test -n "${FIREBIRD_VERSION}"; then
+FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1`
+FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2`
+if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5";
then
+AC_MSG_RESULT([OK])
+else
+AC_MSG_ERROR([Ensure firebird 2.5.x is installed])
+fi
else
-AC_MSG_ERROR([Ensure firebird 2.5.x is installed])
+__save_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} ${FIREBIRD_CFLAGS}"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include
+#if defined(FB_API_VER) && FB_API_VER == 25
+#else
+#error "Wrong Firebird API version"
+#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x is
installed]))
+CFLAGS="${__save_CFLAGS}"
fi
-AC_MSG_RESULT([includes $FIREBIRD_CFLAGS, libraries $FIREBIRD_LIBS])
ENABLE_FIREBIRD_SDBC="TRUE"
elif test "$enable_database_connectivity" != yes; then
AC_MSG_RESULT([none])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/components.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5d95193f85921863cc127b1a3aec5924ff693592
Author: Jelle van der Waa
Date: Sun Jul 21 21:08:10 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: I9c2405f92aea75756a0fbac7844ff16319210be3
Reviewed-on: https://gerrit.libreoffice.org/5014
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index fa1302a..068a73b 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -479,7 +479,7 @@ Components::Components(
OUString conf(
expand(
OUString("${CONFIGURATION_LAYERS}")));
-RTL_LOGFILE_TRACE("configmgr : begin parsing");
+SAL_INFO( "configmgr", "configmgr : begin parsing" );
int layer = 0;
for (sal_Int32 i = 0;;) {
while (i != conf.getLength() && conf[i] == ' ') {
@@ -561,7 +561,7 @@ Components::Components(
}
i = n;
}
-RTL_LOGFILE_TRACE("configmgr : end parsing");
+SAL_INFO( "configmgr", "configmgr : end parsing" );
}
Components::~Components()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Michael Meeks changed: What|Removed |Added Depends on||67086 -- 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
[PATCH libreoffice-4-1] fdo#67093 Change traduction of Title for some more languages
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5043 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/translations refs/changes/43/5043/1 fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Reviewed-on: https://gerrit.libreoffice.org/5038 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba --- M source/as/sw/source/ui/utlui.po M source/bg/sw/source/ui/utlui.po M source/br/sw/source/ui/utlui.po M source/gl/sw/source/ui/utlui.po M source/lt/sw/source/ui/utlui.po M source/pt-BR/sw/source/ui/utlui.po M source/pt/sw/source/ui/utlui.po M source/ru/sw/source/ui/utlui.po M source/sv/sw/source/ui/utlui.po M source/te/sw/source/ui/utlui.po M source/uk/sw/source/ui/utlui.po M source/zh-CN/sw/source/ui/utlui.po M source/zh-TW/sw/source/ui/utlui.po 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/as/sw/source/ui/utlui.po b/source/as/sw/source/ui/utlui.po index 467b55e..f1b1353 100644 --- a/source/as/sw/source/ui/utlui.po +++ b/source/as/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "শিৰোনাম" +msgstr "শীৰ্ষক" #: poolfmt.src msgctxt "" diff --git a/source/bg/sw/source/ui/utlui.po b/source/bg/sw/source/ui/utlui.po index 2628690..2e1e2ea 100644 --- a/source/bg/sw/source/ui/utlui.po +++ b/source/bg/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Заглавие" +msgstr "Заглавие на документ" #: poolfmt.src msgctxt "" diff --git a/source/br/sw/source/ui/utlui.po b/source/br/sw/source/ui/utlui.po index 0f723b2..f37d526 100644 --- a/source/br/sw/source/ui/utlui.po +++ b/source/br/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titl" +msgstr "Titl pennañ" #: poolfmt.src msgctxt "" diff --git a/source/gl/sw/source/ui/utlui.po b/source/gl/sw/source/ui/utlui.po index 62a5275..cbf818d 100644 --- a/source/gl/sw/source/ui/utlui.po +++ b/source/gl/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Título" +msgstr "Título de documento" #: poolfmt.src msgctxt "" diff --git a/source/lt/sw/source/ui/utlui.po b/source/lt/sw/source/ui/utlui.po index cb70517..d8627d6 100644 --- a/source/lt/sw/source/ui/utlui.po +++ b/source/lt/sw/source/ui/utlui.po @@ -3142,7 +3142,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Antraštė" +msgstr "Dokumento antraštė" #: poolfmt.src msgctxt "" diff --git a/source/pt-BR/sw/source/ui/utlui.po b/source/pt-BR/sw/source/ui/utlui.po index 02906b2..87e7004 100644 --- a/source/pt-BR/sw/source/ui/utlui.po +++ b/source/pt-BR/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Título" +msgstr "Título principal" #: poolfmt.src msgctxt "" diff --git a/source/pt/sw/source/ui/utlui.po b/source/pt/sw/source/ui/utlui.po index 73c1a98..41b8a07 100644 --- a/source/pt/sw/source/ui/utlui.po +++ b/source/pt/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Título" +msgstr "Título principal" #: poolfmt.src msgctxt "" diff --git a/source/ru/sw/source/ui/utlui.po b/source/ru/sw/source/ui/utlui.po index 06e319e..ccc0004 100644 --- a/source/ru/sw/source/ui/utlui.po +++ b/source/ru/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Заголовок" +msgstr "Заглавие" #: poolfmt.src msgctxt "" diff --git a/source/sv/sw/source/ui/utlui.po b/source/sv/sw/source/ui/utlui.po index f3daaf5..819944c 100644 --- a/source/sv/sw/source/ui/utlui.po +++ b/source/sv/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Rubrik" +msgstr "Titel" #: poolfmt.src msgctxt "" diff --git a/source/te/sw/source/ui/utlui.po b/source/te/sw/source/ui/utlui.po index 7a7b170..dc1ddab 100644 --- a/source/te/sw/source/ui/utlui.po +++ b/source/te/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "శీర్షిక" +msgstr "పత్ర శీర్షిక" #: poolfmt.src msgctxt "" diff --git a/source/uk/sw/source/ui/utlui.po b/source/uk/sw/source/ui/utlui.po index bd75e10..53856e1 100644 --- a/source/uk/sw/source/ui/utlui.po +++ b/source/uk/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Заголовок" +msgstr "Назва" #: poolfmt.src msgctxt "" diff --git a/source/zh-CN/sw/source/ui/utlui.po b/source/zh-CN/sw/source/ui/utlui.po index c3ff05d..6bf682b 100644 --- a/source/zh-CN/sw/source/ui/utlui.po +++ b/source/zh-C
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 35d902124bb230cb5575f105670bafb4124ae58c Author: Christian Lohmaier Date: Mon Jul 22 21:24:05 2013 +0200 Updated core Project: translations b2d3ee8989e207e7263dc53fb0535cbd3414f03f fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Reviewed-on: https://gerrit.libreoffice.org/5038 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba Reviewed-on: https://gerrit.libreoffice.org/5043 Reviewed-by: Petr Mladek Tested-by: Petr Mladek diff --git a/translations b/translations index 0d21655..b2d3ee8 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 0d21655cbcf22cd378725e2d23086ec51f746dd7 +Subproject commit b2d3ee8989e207e7263dc53fb0535cbd3414f03f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1' - source/as source/bg source/br source/gl source/lt source/pt source/pt-BR source/ru source/sv source/te source/uk source/zh-CN source/
source/as/sw/source/ui/utlui.po|2 +- source/bg/sw/source/ui/utlui.po|2 +- source/br/sw/source/ui/utlui.po|2 +- source/gl/sw/source/ui/utlui.po|2 +- source/lt/sw/source/ui/utlui.po|2 +- source/pt-BR/sw/source/ui/utlui.po |2 +- source/pt/sw/source/ui/utlui.po|2 +- source/ru/sw/source/ui/utlui.po|2 +- source/sv/sw/source/ui/utlui.po|2 +- source/te/sw/source/ui/utlui.po|2 +- source/uk/sw/source/ui/utlui.po|2 +- source/zh-CN/sw/source/ui/utlui.po |2 +- source/zh-TW/sw/source/ui/utlui.po |2 +- 13 files changed, 13 insertions(+), 13 deletions(-) New commits: commit b2d3ee8989e207e7263dc53fb0535cbd3414f03f Author: Christian Lohmaier Date: Mon Jul 22 21:24:05 2013 +0200 fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Reviewed-on: https://gerrit.libreoffice.org/5038 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba Reviewed-on: https://gerrit.libreoffice.org/5043 Reviewed-by: Petr Mladek Tested-by: Petr Mladek diff --git a/source/as/sw/source/ui/utlui.po b/source/as/sw/source/ui/utlui.po index 467b55e..f1b1353 100644 --- a/source/as/sw/source/ui/utlui.po +++ b/source/as/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "শিৰà§à¦¨à¦¾à¦®" +msgstr "শà§à§°à§à¦·à¦" #: poolfmt.src msgctxt "" diff --git a/source/bg/sw/source/ui/utlui.po b/source/bg/sw/source/ui/utlui.po index 2628690..2e1e2ea 100644 --- a/source/bg/sw/source/ui/utlui.po +++ b/source/bg/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Ðаглавие" +msgstr "Ðаглавие на докÑменÑ" #: poolfmt.src msgctxt "" diff --git a/source/br/sw/source/ui/utlui.po b/source/br/sw/source/ui/utlui.po index 0f723b2..f37d526 100644 --- a/source/br/sw/source/ui/utlui.po +++ b/source/br/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titl" +msgstr "Titl pennañ" #: poolfmt.src msgctxt "" diff --git a/source/gl/sw/source/ui/utlui.po b/source/gl/sw/source/ui/utlui.po index 62a5275..cbf818d 100644 --- a/source/gl/sw/source/ui/utlui.po +++ b/source/gl/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "TÃtulo" +msgstr "TÃtulo de documento" #: poolfmt.src msgctxt "" diff --git a/source/lt/sw/source/ui/utlui.po b/source/lt/sw/source/ui/utlui.po index cb70517..d8627d6 100644 --- a/source/lt/sw/source/ui/utlui.po +++ b/source/lt/sw/source/ui/utlui.po @@ -3142,7 +3142,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "AntraÅ¡tÄ" +msgstr "Dokumento antraÅ¡tÄ" #: poolfmt.src msgctxt "" diff --git a/source/pt-BR/sw/source/ui/utlui.po b/source/pt-BR/sw/source/ui/utlui.po index 02906b2..87e7004 100644 --- a/source/pt-BR/sw/source/ui/utlui.po +++ b/source/pt-BR/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "TÃtulo" +msgstr "TÃtulo principal" #: poolfmt.src msgctxt "" diff --git a/source/pt/sw/source/ui/utlui.po b/source/pt/sw/source/ui/utlui.po index 73c1a98..41b8a07 100644 --- a/source/pt/sw/source/ui/utlui.po +++ b/source/pt/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "TÃtulo" +msgstr "TÃtulo principal" #: poolfmt.src msgctxt "" diff --git a/source/ru/sw/source/ui/utlui.po b/source/ru/sw/source/ui/utlui.po index 06e319e..ccc0004 100644 --- a/source/ru/sw/source/ui/utlui.po +++ b/source/ru/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Ðаголовок" +msgstr "Ðаглавие" #: poolfmt.src msgctxt "" diff --git a/source/sv/sw/source/ui/utlui.po b/source/sv/sw/source/ui/utlui.po index f3daaf5..819944c 100644 --- a/source/sv/sw/source/ui/utlui.po +++ b/source/sv/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Rubrik" +msgstr "Titel" #: poolfmt.src msgctxt "" diff --git a/source/te/sw/source/ui/utlui.po b/source/te/sw/source/ui/utlui.po index 7a7b170..dc1ddab 100644 --- a/source/te/sw/source/ui/utlui.po +++ b/source/te/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "à°¶à±à°°à±à°·à°¿à°" +msgstr "పతà±à°° à°¶à±à°°à±à°·à°¿à°" #: poolfmt.src msgctxt "" diff --git a/source/uk/sw/source/ui/utlui.po b/source/uk/sw/s
[PUSHED libreoffice-4-1] fdo#67093 Change traduction of Title for some more languages
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5043 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5043 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Gerrit-PatchSet: 2 Gerrit-Project: translations Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Petr Mladek Gerrit-Reviewer: Christian Lohmaier Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: Petr Mladek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1-0] fdo#67093 Change traduction of Title for some more languages
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5044 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/translations refs/changes/44/5044/1 fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Reviewed-on: https://gerrit.libreoffice.org/5038 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba Reviewed-on: https://gerrit.libreoffice.org/5043 Reviewed-by: Petr Mladek Tested-by: Petr Mladek --- M source/as/sw/source/ui/utlui.po M source/bg/sw/source/ui/utlui.po M source/br/sw/source/ui/utlui.po M source/gl/sw/source/ui/utlui.po M source/lt/sw/source/ui/utlui.po M source/pt-BR/sw/source/ui/utlui.po M source/pt/sw/source/ui/utlui.po M source/ru/sw/source/ui/utlui.po M source/sv/sw/source/ui/utlui.po M source/te/sw/source/ui/utlui.po M source/uk/sw/source/ui/utlui.po M source/zh-CN/sw/source/ui/utlui.po M source/zh-TW/sw/source/ui/utlui.po 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/as/sw/source/ui/utlui.po b/source/as/sw/source/ui/utlui.po index 467b55e..f1b1353 100644 --- a/source/as/sw/source/ui/utlui.po +++ b/source/as/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "শিৰোনাম" +msgstr "শীৰ্ষক" #: poolfmt.src msgctxt "" diff --git a/source/bg/sw/source/ui/utlui.po b/source/bg/sw/source/ui/utlui.po index 2628690..2e1e2ea 100644 --- a/source/bg/sw/source/ui/utlui.po +++ b/source/bg/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Заглавие" +msgstr "Заглавие на документ" #: poolfmt.src msgctxt "" diff --git a/source/br/sw/source/ui/utlui.po b/source/br/sw/source/ui/utlui.po index 0f723b2..f37d526 100644 --- a/source/br/sw/source/ui/utlui.po +++ b/source/br/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titl" +msgstr "Titl pennañ" #: poolfmt.src msgctxt "" diff --git a/source/gl/sw/source/ui/utlui.po b/source/gl/sw/source/ui/utlui.po index 62a5275..cbf818d 100644 --- a/source/gl/sw/source/ui/utlui.po +++ b/source/gl/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Título" +msgstr "Título de documento" #: poolfmt.src msgctxt "" diff --git a/source/lt/sw/source/ui/utlui.po b/source/lt/sw/source/ui/utlui.po index cb70517..d8627d6 100644 --- a/source/lt/sw/source/ui/utlui.po +++ b/source/lt/sw/source/ui/utlui.po @@ -3142,7 +3142,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Antraštė" +msgstr "Dokumento antraštė" #: poolfmt.src msgctxt "" diff --git a/source/pt-BR/sw/source/ui/utlui.po b/source/pt-BR/sw/source/ui/utlui.po index 02906b2..87e7004 100644 --- a/source/pt-BR/sw/source/ui/utlui.po +++ b/source/pt-BR/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Título" +msgstr "Título principal" #: poolfmt.src msgctxt "" diff --git a/source/pt/sw/source/ui/utlui.po b/source/pt/sw/source/ui/utlui.po index 73c1a98..41b8a07 100644 --- a/source/pt/sw/source/ui/utlui.po +++ b/source/pt/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Título" +msgstr "Título principal" #: poolfmt.src msgctxt "" diff --git a/source/ru/sw/source/ui/utlui.po b/source/ru/sw/source/ui/utlui.po index 06e319e..ccc0004 100644 --- a/source/ru/sw/source/ui/utlui.po +++ b/source/ru/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Заголовок" +msgstr "Заглавие" #: poolfmt.src msgctxt "" diff --git a/source/sv/sw/source/ui/utlui.po b/source/sv/sw/source/ui/utlui.po index f3daaf5..819944c 100644 --- a/source/sv/sw/source/ui/utlui.po +++ b/source/sv/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Rubrik" +msgstr "Titel" #: poolfmt.src msgctxt "" diff --git a/source/te/sw/source/ui/utlui.po b/source/te/sw/source/ui/utlui.po index 7a7b170..dc1ddab 100644 --- a/source/te/sw/source/ui/utlui.po +++ b/source/te/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "శీర్షిక" +msgstr "పత్ర శీర్షిక" #: poolfmt.src msgctxt "" diff --git a/source/uk/sw/source/ui/utlui.po b/source/uk/sw/source/ui/utlui.po index bd75e10..53856e1 100644 --- a/source/uk/sw/source/ui/utlui.po +++ b/source/uk/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Заголовок" +msgstr "Назва" #: poolfmt.src msgctxt "" diff --git a/source/zh-CN/sw/source/ui/utlui.po b/source/zh-CN/sw/source/u
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1-0' - source/as source/bg source/br source/gl source/lt source/pt source/pt-BR source/ru source/sv source/te source/uk source/zh-CN sourc
source/as/sw/source/ui/utlui.po|2 +- source/bg/sw/source/ui/utlui.po|2 +- source/br/sw/source/ui/utlui.po|2 +- source/gl/sw/source/ui/utlui.po|2 +- source/lt/sw/source/ui/utlui.po|2 +- source/pt-BR/sw/source/ui/utlui.po |2 +- source/pt/sw/source/ui/utlui.po|2 +- source/ru/sw/source/ui/utlui.po|2 +- source/sv/sw/source/ui/utlui.po|2 +- source/te/sw/source/ui/utlui.po|2 +- source/uk/sw/source/ui/utlui.po|2 +- source/zh-CN/sw/source/ui/utlui.po |2 +- source/zh-TW/sw/source/ui/utlui.po |2 +- 13 files changed, 13 insertions(+), 13 deletions(-) New commits: commit 62f4929b2a7eec3fc5ba39d236c77ed1dccb0f56 Author: Christian Lohmaier Date: Mon Jul 22 21:24:05 2013 +0200 fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Reviewed-on: https://gerrit.libreoffice.org/5038 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba Reviewed-on: https://gerrit.libreoffice.org/5043 Reviewed-by: Petr Mladek Tested-by: Petr Mladek Reviewed-on: https://gerrit.libreoffice.org/5044 Reviewed-by: Thorsten Behrens Reviewed-by: Bosdonnat Cedric Tested-by: Bosdonnat Cedric diff --git a/source/as/sw/source/ui/utlui.po b/source/as/sw/source/ui/utlui.po index 467b55e..f1b1353 100644 --- a/source/as/sw/source/ui/utlui.po +++ b/source/as/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "শিৰà§à¦¨à¦¾à¦®" +msgstr "শà§à§°à§à¦·à¦" #: poolfmt.src msgctxt "" diff --git a/source/bg/sw/source/ui/utlui.po b/source/bg/sw/source/ui/utlui.po index 2628690..2e1e2ea 100644 --- a/source/bg/sw/source/ui/utlui.po +++ b/source/bg/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Ðаглавие" +msgstr "Ðаглавие на докÑменÑ" #: poolfmt.src msgctxt "" diff --git a/source/br/sw/source/ui/utlui.po b/source/br/sw/source/ui/utlui.po index 0f723b2..f37d526 100644 --- a/source/br/sw/source/ui/utlui.po +++ b/source/br/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titl" +msgstr "Titl pennañ" #: poolfmt.src msgctxt "" diff --git a/source/gl/sw/source/ui/utlui.po b/source/gl/sw/source/ui/utlui.po index 62a5275..cbf818d 100644 --- a/source/gl/sw/source/ui/utlui.po +++ b/source/gl/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "TÃtulo" +msgstr "TÃtulo de documento" #: poolfmt.src msgctxt "" diff --git a/source/lt/sw/source/ui/utlui.po b/source/lt/sw/source/ui/utlui.po index cb70517..d8627d6 100644 --- a/source/lt/sw/source/ui/utlui.po +++ b/source/lt/sw/source/ui/utlui.po @@ -3142,7 +3142,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "AntraÅ¡tÄ" +msgstr "Dokumento antraÅ¡tÄ" #: poolfmt.src msgctxt "" diff --git a/source/pt-BR/sw/source/ui/utlui.po b/source/pt-BR/sw/source/ui/utlui.po index 02906b2..87e7004 100644 --- a/source/pt-BR/sw/source/ui/utlui.po +++ b/source/pt-BR/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "TÃtulo" +msgstr "TÃtulo principal" #: poolfmt.src msgctxt "" diff --git a/source/pt/sw/source/ui/utlui.po b/source/pt/sw/source/ui/utlui.po index 73c1a98..41b8a07 100644 --- a/source/pt/sw/source/ui/utlui.po +++ b/source/pt/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "TÃtulo" +msgstr "TÃtulo principal" #: poolfmt.src msgctxt "" diff --git a/source/ru/sw/source/ui/utlui.po b/source/ru/sw/source/ui/utlui.po index 06e319e..ccc0004 100644 --- a/source/ru/sw/source/ui/utlui.po +++ b/source/ru/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Ðаголовок" +msgstr "Ðаглавие" #: poolfmt.src msgctxt "" diff --git a/source/sv/sw/source/ui/utlui.po b/source/sv/sw/source/ui/utlui.po index f3daaf5..819944c 100644 --- a/source/sv/sw/source/ui/utlui.po +++ b/source/sv/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Rubrik" +msgstr "Titel" #: poolfmt.src msgctxt "" diff --git a/source/te/sw/source/ui/utlui.po b/source/te/sw/source/ui/utlui.po index 7a7b170..dc1ddab 100644 --- a/source/te/sw/source/ui/utlui.po +++ b/source/te/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ msgctxt "" "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "à°¶
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 760a29b8d622a895875d798e340be66671e72e05 Author: Christian Lohmaier Date: Mon Jul 22 21:24:05 2013 +0200 Updated core Project: translations 62f4929b2a7eec3fc5ba39d236c77ed1dccb0f56 fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Reviewed-on: https://gerrit.libreoffice.org/5038 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba Reviewed-on: https://gerrit.libreoffice.org/5043 Reviewed-by: Petr Mladek Tested-by: Petr Mladek Reviewed-on: https://gerrit.libreoffice.org/5044 Reviewed-by: Thorsten Behrens Reviewed-by: Bosdonnat Cedric Tested-by: Bosdonnat Cedric diff --git a/translations b/translations index 4ad59c5..62f4929 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 4ad59c5fbe4386773ed4e8c33a0550a6385caf6b +Subproject commit 62f4929b2a7eec3fc5ba39d236c77ed1dccb0f56 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-1-0] fdo#67093 Change traduction of Title for some more languages
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5044 Approvals: Petr Mladek: Verified; Looks good to me, but someone else must approve Thorsten Behrens: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, approved Fridrich Strba: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/5044 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Gerrit-PatchSet: 2 Gerrit-Project: translations Gerrit-Branch: libreoffice-4-1-0 Gerrit-Owner: Petr Mladek Gerrit-Reviewer: Bosdonnat Cedric Gerrit-Reviewer: Christian Lohmaier Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: Petr Mladek Gerrit-Reviewer: Thorsten Behrens ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sd/Library_sdui.mk sd/source
sd/Library_sdui.mk|4 +++
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 43 --
2 files changed, 10 insertions(+), 37 deletions(-)
New commits:
commit 82447189ccfc662f86ec00f5001527cc997f5020
Author: Stephan Bergmann
Date: Tue Jul 23 11:34:53 2013 +0200
If this configuration access throws exceptions sth very fundamental is
broken
...with the LO installation, so it doesn't make much sense to "handle" them
locally.
Change-Id: I02fade858f9b507976bf612ba942be90bf25d51f
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 0f13c7f..c321325 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -454,16 +454,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
SFXWB_GRAPHIC | SFXWB_MULTISELECTION
);
// Read configuration
-OUString sUrl(".");
-try
-{
-sUrl = officecfg::Office::Impress::Pictures::Path::get();
-}
-catch(const Exception&)
-{
-OSL_FAIL("Could not find config for Create Photo Album function");
-}
-
+OUString sUrl(officecfg::Office::Impress::Pictures::Path::get());
INetURLObject aFile( SvtPathOptions().GetPalettePath() );
if (sUrl != "")
@@ -478,17 +469,12 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
{
sUrl = aDlg.GetDisplayDirectory();
// Write out configuration
-try
{
boost::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
officecfg::Office::Impress::Pictures::Path::set(sUrl, batch);
batch->commit();
}
-catch(const Exception&)
-{
-OSL_FAIL("Could not find config for Create Photo Album
function");
-}
for ( sal_Int32 i = 0; i < aFilesArr.getLength(); i++ )
{
commit 2b45d55d87ec1414e3a39a759d014d1e256f7975
Author: Julien Nabet
Date: Tue Jul 23 08:44:50 2013 +0200
fdo#46037: no more comphelper/configurationhelper.hxx in sd
Change-Id: If5d1fc3956b82edd0b68b26e14a9b9258ee6c10d
Signed-off-by: Stephan Bergmann
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 4ac9000..53f279d 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -28,6 +28,10 @@ endif
endif
+$(eval $(call gb_Library_use_custom_headers,sdui,\
+ officecfg/registry \
+))
+
$(eval $(call gb_Library_use_external,sdui,boost_headers))
$(eval $(call gb_Library_use_sdk_api,sdui))
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 244e236..0f13c7f 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -9,7 +9,6 @@
#include
#include
-#include
#include
#include
@@ -24,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
@@ -455,18 +455,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
);
// Read configuration
OUString sUrl(".");
-Reference< XInterface > xCfg;
try
{
-xCfg = ::comphelper::ConfigurationHelper::openConfig(
-::comphelper::getProcessComponentContext(),
-OUString("/org.openoffice.Office.Impress/"),
-::comphelper::ConfigurationHelper::E_READONLY);
-
-::comphelper::ConfigurationHelper::readRelativeKey(
-xCfg,
-OUString("Pictures"),
-OUString("Path")) >>= sUrl;
+sUrl = officecfg::Office::Impress::Pictures::Path::get();
}
catch(const Exception&)
{
@@ -489,18 +480,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
// Write out configuration
try
{
-xCfg = ::comphelper::ConfigurationHelper::openConfig(
-::comphelper::getProcessComponentContext(),
-OUString("/org.openoffice.Office.Impress/"),
-::comphelper::ConfigurationHelper::E_STANDARD);
-
-::comphelper::ConfigurationHelper::writeRelativeKey(
-xCfg,
-OUString("Pictures"),
-OUString("Path"),
-uno::makeAny(sUrl));
-
-::comphelper::ConfigurationHelper::flush(xCfg);
+boost::shared_ptr< comphelper::ConfigurationChanges > batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Impress::Pictures::Path::set(sUrl, batch);
+batch->commit();
}
catch(const Exception&)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk solenv/gbuild
postprocess/CustomTarget_signing.mk |3 ++- solenv/gbuild/Module.mk |3 +++ solenv/gbuild/Postprocess.mk|1 + 3 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 6872ad4764b5924a32f0929cbdbd13fb25ead885 Author: David Tardon Date: Tue Jul 23 11:58:41 2013 +0200 it is not possible to sign libs that are in use ... so we have to make sure they are not, by delaying the signing after all unit tests have been run. This is just a workaround; IMHO the real fix is fdo#63315 "sign windows binaries during build". Change-Id: Ia26826ec7d324f840f2606b1928bea71cb4f0c48 diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index fa0130b..3e2eec4 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -22,7 +22,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ $(SRCDIR)/postprocess/signing/no_signing.txt \ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \ - $(call gb_Postprocess_get_target,AllLibraries) $(call gb_Postprocess_get_target,AllExecutables) + $(call gb_Postprocess_get_target,AllLibraries) $(call gb_Postprocess_get_target,AllExecutables) \ + $(call gb_Postprocess_get_target,AllModuleTests) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) ifeq ($(COM),MSC) ifneq ($(ENABLE_DBGUTIL),TRUE) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 3477790..e5dcc3d 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -177,6 +177,9 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Module) $(if $(filter-out libreoffice instsetoo_native android ios,$(1)),\ $(call gb_Postprocess_register_target,AllModulesButInstsetNative,Module,$(1))) +$(call gb_Postprocess_get_target,AllModuleTests) : $(call gb_Module_get_check_target,$(1)) +$(call gb_Postprocess_get_clean_target,AllModuleTests) : $(call gb_Module_get_clean_target,$(1)) + endef # This is called inside the included file and pushes one target on each stack. diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk index 2e08cb1..445f0ea 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -45,6 +45,7 @@ $(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but ins $(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/) $(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/) $(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/) +$(call gb_Postprocess_Postprocess,AllModuleTests,All modules' tests,$(WORKDIR)/Module/check/) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/components.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit e667bcdf98513ed13d6ebb485f61cbf37c0b4aca
Author: Stephan Bergmann
Date: Tue Jul 23 12:08:00 2013 +0200
These SAL_INFOs do not make much sense any more
...now that the original RTL_LOGFILE_TRACEs got replaced.
Change-Id: I0997d6bbb90a22678fdc6398e7786ac36b9d73f4
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 068a73b..511dd41 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -40,7 +40,6 @@
#include "osl/file.hxx"
#include "osl/mutex.hxx"
#include "rtl/bootstrap.hxx"
-#include "rtl/logfile.h"
#include "rtl/ref.hxx"
#include "rtl/string.h"
#include "rtl/ustrbuf.hxx"
@@ -479,7 +478,6 @@ Components::Components(
OUString conf(
expand(
OUString("${CONFIGURATION_LAYERS}")));
-SAL_INFO( "configmgr", "configmgr : begin parsing" );
int layer = 0;
for (sal_Int32 i = 0;;) {
while (i != conf.getLength() && conf[i] == ' ') {
@@ -561,7 +559,6 @@ Components::Components(
}
i = n;
}
-SAL_INFO( "configmgr", "configmgr : end parsing" );
}
Components::~Components()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gui or ux libraries used
Hi Abhimanyu, *, On Monday, July 22, 2013, abhimanyu shegokar wrote: > > Thanks for your detailed explanation but i am looking for libraries like > gtk which are used for graphics. Can you enlist them? > gtk and many other stuff is optional - if you disable it, you'll get a slightly ugly LO that doesn't integrate that well into your desktop, but still works. And just grep for PKG_CHECK_MODULES in configure.ac - that will give you the stuff that LO *can* use (but not necessarily is a hard requirement), for example for the gtk-plugin there's this: PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) HTH, ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - postprocess/CustomTarget_signing.mk solenv/gbuild
postprocess/CustomTarget_signing.mk |3 ++- solenv/gbuild/Module.mk |3 +++ solenv/gbuild/Postprocess.mk|1 + 3 files changed, 6 insertions(+), 1 deletion(-) New commits: commit edecaede4288a661a32b50ae6816b9fb5a77ace7 Author: David Tardon Date: Tue Jul 23 11:58:41 2013 +0200 it is not possible to sign libs that are in use ... so we have to make sure they are not, by delaying the signing after all unit tests have been run. This is just a workaround; IMHO the real fix is fdo#63315 "sign windows binaries during build". Change-Id: Ia26826ec7d324f840f2606b1928bea71cb4f0c48 (cherry picked from commit 6872ad4764b5924a32f0929cbdbd13fb25ead885) Signed-off-by: Fridrich Å trba diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index fa0130b..3e2eec4 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -22,7 +22,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ $(SRCDIR)/postprocess/signing/no_signing.txt \ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \ - $(call gb_Postprocess_get_target,AllLibraries) $(call gb_Postprocess_get_target,AllExecutables) + $(call gb_Postprocess_get_target,AllLibraries) $(call gb_Postprocess_get_target,AllExecutables) \ + $(call gb_Postprocess_get_target,AllModuleTests) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) ifeq ($(COM),MSC) ifneq ($(ENABLE_DBGUTIL),TRUE) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index c709203..c971a47 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -170,6 +170,9 @@ gb_Module_CURRENTMODULE_DEBUG_ENABLED := $(call gb_Module__debug_enabled,$(1)) gb_Module_CURRENTMODULE_NAME := $(1) $(call gb_Helper_make_userfriendly_targets,$(1),Module) +$(call gb_Postprocess_get_target,AllModuleTests) : $(call gb_Module_get_check_target,$(1)) +$(call gb_Postprocess_get_clean_target,AllModuleTests) : $(call gb_Module_get_clean_target,$(1)) + endef # This is called inside the included file and pushes one target on each stack. diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk index 972a795..8f8900b 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -29,6 +29,7 @@ $(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but ins $(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/) $(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/) $(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/) +$(call gb_Postprocess_Postprocess,AllModuleTests,All modules' tests,$(WORKDIR)/Module/check/) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Myanmar Workers for your company
Your email client cannot read this email. To view it online, please go here: http://mailczar247.info/display.php?M=289105&C=0ecebf2bf8d67483a7be1ab70713a4ae&S=13&L=8&N=2 To stop receiving these emails:http://mailczar247.info/unsubscribe.php?M=289105&C=0ecebf2bf8d67483a7be1ab70713a4ae&L=8&N=13 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - postprocess/CustomTarget_signing.mk solenv/gbuild
postprocess/CustomTarget_signing.mk |3 ++- solenv/gbuild/Module.mk |3 +++ solenv/gbuild/Postprocess.mk|1 + 3 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 24aa881347992435db243fabe57da24b589d7c9f Author: David Tardon Date: Tue Jul 23 11:58:41 2013 +0200 it is not possible to sign libs that are in use ... so we have to make sure they are not, by delaying the signing after all unit tests have been run. This is just a workaround; IMHO the real fix is fdo#63315 "sign windows binaries during build". Change-Id: Ia26826ec7d324f840f2606b1928bea71cb4f0c48 (cherry picked from commit 6872ad4764b5924a32f0929cbdbd13fb25ead885) Signed-off-by: Fridrich Å trba (cherry picked from commit edecaede4288a661a32b50ae6816b9fb5a77ace7) Reviewed-on: https://gerrit.libreoffice.org/5045 Reviewed-by: Petr Mladek Reviewed-by: Thorsten Behrens Reviewed-by: Fridrich Strba Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index fa0130b..3e2eec4 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -22,7 +22,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ $(SRCDIR)/postprocess/signing/no_signing.txt \ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \ - $(call gb_Postprocess_get_target,AllLibraries) $(call gb_Postprocess_get_target,AllExecutables) + $(call gb_Postprocess_get_target,AllLibraries) $(call gb_Postprocess_get_target,AllExecutables) \ + $(call gb_Postprocess_get_target,AllModuleTests) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) ifeq ($(COM),MSC) ifneq ($(ENABLE_DBGUTIL),TRUE) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index c709203..c971a47 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -170,6 +170,9 @@ gb_Module_CURRENTMODULE_DEBUG_ENABLED := $(call gb_Module__debug_enabled,$(1)) gb_Module_CURRENTMODULE_NAME := $(1) $(call gb_Helper_make_userfriendly_targets,$(1),Module) +$(call gb_Postprocess_get_target,AllModuleTests) : $(call gb_Module_get_check_target,$(1)) +$(call gb_Postprocess_get_clean_target,AllModuleTests) : $(call gb_Module_get_clean_target,$(1)) + endef # This is called inside the included file and pushes one target on each stack. diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk index 972a795..8f8900b 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -29,6 +29,7 @@ $(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but ins $(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/) $(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/) $(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/) +$(call gb_Postprocess_Postprocess,AllModuleTests,All modules' tests,$(WORKDIR)/Module/check/) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo64637.rtf | 13 +
sw/qa/extras/rtfimport/rtfimport.cxx | 10 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 +++--
3 files changed, 30 insertions(+), 2 deletions(-)
New commits:
commit bb67e709b70919efb41ec41e93dd92953dc6a003
Author: Miklos Vajna
Date: Tue Jul 23 12:01:47 2013 +0200
fdo#64637 RTF import: handle multiple RTF_COMPANY
Instead of unconditionally calling addProperty(), first check the
existence with hasPropertyByName() and call setPropertyValue() instead,
if necessary.
Change-Id: Ie0a075bbfe6eaa1f66726c456105dcdef9001d30
diff --git a/sw/qa/extras/rtfimport/data/fdo64637.rtf
b/sw/qa/extras/rtfimport/data/fdo64637.rtf
new file mode 100644
index 000..9bec690
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo64637.rtf
@@ -0,0 +1,13 @@
+{\rtf1
+{\info
+{\upr
+{\company aaa}
+{\*\ud
+{\company
+bbb
+}
+}
+}
+}
+foo
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8e89c7d..93489d7 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -155,6 +155,7 @@ public:
void testGroupshape();
void testFdo66565();
void testFdo54900();
+void testFdo64637();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -294,6 +295,7 @@ void Test::run()
{"groupshape.rtf", &Test::testGroupshape},
{"fdo66565.rtf", &Test::testFdo66565},
{"fdo54900.rtf", &Test::testFdo54900},
+{"fdo64637.rtf", &Test::testFdo64637},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1432,6 +1434,14 @@ void Test::testFdo54900()
CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
static_cast(getProperty(getParagraphOfText(1,
xCell->getText()), "ParaAdjust")));
}
+void Test::testFdo64637()
+{
+// The problem was that the custom "Company" property was added twice, the
second invocation resulted in an exception.
+uno::Reference
xDocumentPropertiesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference
xPropertySet(xDocumentPropertiesSupplier->getDocumentProperties()->getUserDefinedProperties(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getProperty(xPropertySet,
"Company"));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 249e51b..840c2c2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4045,11 +4045,16 @@ int RTFDocumentImpl::popState()
case DESTINATION_COMPANY:
{
OUString aName = aState.nDestinationState ==
DESTINATION_OPERATOR ? OUString("Operator") : OUString("Company");
+uno::Any aValue =
uno::makeAny(m_aStates.top().aDestinationText.makeStringAndClear());
if (m_xDocumentProperties.is())
{
uno::Reference
xUserDefinedProperties = m_xDocumentProperties->getUserDefinedProperties();
-xUserDefinedProperties->addProperty(aName,
beans::PropertyAttribute::REMOVABLE,
-
uno::makeAny(m_aStates.top().aDestinationText.makeStringAndClear()));
+uno::Reference
xPropertySet(xUserDefinedProperties, uno::UNO_QUERY);
+uno::Reference xPropertySetInfo =
xPropertySet->getPropertySetInfo();
+if (xPropertySetInfo->hasPropertyByName(aName))
+xPropertySet->setPropertyValue(aName, aValue);
+else
+xUserDefinedProperties->addProperty(aName,
beans::PropertyAttribute::REMOVABLE, aValue);
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.0.4'
Tag 'libreoffice-4.1.0.4' created by Christian Lohmaier at 2013-07-23 11:41 -0700 Tag libreoffice-4.1.0.4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR7l2/AAoJEPQ0oe+v7q6jjGkQAJf877R0yPnoehc0IFja/I3T GUGVEV/q++lexWqab1ddBeHDFN80pXb8M00g/5+6USBDcPhZB5Pf1CI9gTNwWw2g SC+UmkQ5RxbzcfMNFyEvsNBkIUnIikz6kRxy6+KdOde0PZIgPBT1Ma06410SdRfZ TS5jGn/QkjY30Fq59xOZFkDhjis6p1mrJBerwti4b3QMvW6ajm3rs69ZSIksHFRT +w97QBgGHObVl0356pffZxF3dpfc+MXnP71T+7BhZgJnwFYQYNDe//mzqV9TefNA +1iM2elxiXFntXNV26QN2PB3WRZGTVZOj8H5oYv9UkeU9BBAmvZGpfBW3qnkYJHa eGPoeps1qKmW6C0eRwzuLDS5zmwA6o820scWu/FWX6Iu8zK2x+qnMr6rm1kMO59i QQdkjFLd1r2b2H/8NWGe1oNJDvrMclnoMxBzZgGxuAZjTnP/oeiwwGTo0iBlpewq unYFdaqFbEb1XeVsuoOaf0eDu7D3HfuEhCmdefn5mLxfDYNp1Kct3HjVQfkZ/6Wo LAzbBvR2r29hS9ejRNk5SAGXjKmrjPSI6baRPCP9VZc84fWBYetDdjps2SsZ/lEN 1ONd58k5wSlKqoYgL+sYP02vdKAIT+CGrW+6HVHY6TmCvQpoDSNLn5JSVfhVswKn nYjwqtaw282I/9DYill4 =wWfm -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-14: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.0.4'
Tag 'libreoffice-4.1.0.4' created by Christian Lohmaier at 2013-07-23 11:41 -0700 Tag libreoffice-4.1.0.4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR7l3CAAoJEPQ0oe+v7q6jnOMQAJeuKdlpT3VAYjLPtirsrTnZ FR+xaXCkz78YGPlhWZVLRUXL+fky/Jimlk8RNfEOHTEXmDM0BM3n+aEJfZtKuMmm 7MJlG66gLns+OLOYhDoP1Vy2HTLjBNh9NImFlcpiV7MYScuu4GriIlIfC4z2uyC2 FzKRaeY+1+WnWlkGQAYOomue22yAjX1AcB1NQ5f6IN8ebbgEtZZ4UR1/8kZ4sg7a 7/M3fWrZahF9MYjjb8TYlWiIX8wFRe3U/1t5UqWXFqIM/WaHEJWZLHsscWyw96rZ Gb+59Q2TGFRjKl6e7px2RxXsnhKy/B9+mhzikJI5P9kKa2+G8uoNA8BqUj9kTgIe /1KHaMmDRy8ssujNxQbI2EvqNoZOhSPZmaGf78PJ/ixaL8fMzRF1Kwy4xCtHC1Jn 5rIDGDt+zViG2YhCqAXgbC8kSiB6GZtNpo0mOHYSHU6OFpLJVpaYnrIBCsSBLLLI eAYOIR4kc58aTNGAlfAYVdxUy5QLIaJP1VEdGVsbIW2KUm1jq5v8TJ+jgTVB3Lax yP4fvZS97DPacpgU5k5eZnEYHTEaSiEJDVWlTheL3yZQYQl8mLl//5vTZHJRhisA Re/ifu6h8f9i3WTm0uaCuN2dNIzOZMomNhZZdsXjxLd6sXhIyC28bANLfS3xYEoW DE3fFMzU64On/k3F4Cr7 =7a82 -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-30: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.0.4'
Tag 'libreoffice-4.1.0.4' created by Christian Lohmaier at 2013-07-23 11:41 -0700 Tag libreoffice-4.1.0.4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR7l3BAAoJEPQ0oe+v7q6jWgEP/A+arkDuErIIPlKQdIKB9KUd L9szkd+Ca66Ksng2gfrnTubTGJCYlBs+5bg7tf9VXQ8DXIZerN1SPJ0NaG1WX0tI YSAKo5ifCFziC0naaHodEgZLb0E52hsn8xuxT5QqILKtnelm/56zwQjAh0InPeCt nR3rRsRWNCJtQSMTczOKaYpjQiOFSG7X3H9S494f/Gmoa1Obl4Np1MvuuJEffEsQ gG4uYI/zsRmsFozsrXCz2YrHQ0swRv3XQK++sVqkL7yDV+XwtPkO/G0mLYzWlx08 qNQLavC/7ZHTBwhNUKdhLIBNBLxLY0rpwNUXKrrzsVxzSQKsac9u9qnl5qD6aIwC 5ERIdb6Ao/p8R8TfJbrxOj1Q862HNWaZKjCv5A3CtZx2hLpIFSNxBOGQe9opRhxe w5pJREMnYyhuSz+iZExMl+mOP1Q3T0NEbf6r6q+C6iid7kSuVQ6YddAQlFrneZcW wlzFkrzHuUFQ0wLmx+MhY6H8cTPhhqK4tUOj8nlUq9uhGOVZhUtvjgKVUrrwEEja 6dnQsci+xw7Gzz4ZXIlT73251jJc6LYcvUWXa/r8HLUPf4L5zaBEnvn4kZwAsQAe fcnsxVbsxnVmhm/lHdOLaJx75GLXBskiOfgAV5PqC02PEaeLqnJFFDVF/8cJA5gO Ov0ZyPvqa0QLpjAbhC/p =uzaW -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-15: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.0.4'
Tag 'libreoffice-4.1.0.4' created by Christian Lohmaier at 2013-07-23 11:41 -0700 Tag libreoffice-4.1.0.4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR7l3EAAoJEPQ0oe+v7q6jIkQQALSIgJVV5YeMlxItbVkAksR5 rqd+xPEqRlcQ8fKqtu/M8KogsUhUKy3ApWMeB1xgit+dh8Bm36rQYEk+PONwCZHg 20Y+5SNAVJAYRmueFUK7YUIm93TOChNh7aIIld/N31WF82iDiIv8LyTnGYHi4yO5 +1fnd4SVKSkZMxyBBSHsUCk6NnBLQp2/oHAKftczvxmm0EZIoQYKJKvxlTBQIisg Up7nCx7M3ZUR66sR4N5I28uCDwtzFemN6jxMmq7GFba6Gli3aWXTRMAMk2ntn9pJ PLn6/C9Mtz4UGu906w1V52+CjLyZy8niR9sERSGoCegb1KcZp7WSegGybe9R39cB 9K1GYMgSmlt12j5Gat1SoWq1Yi64kL5FAjd5inJKyM3b6H+4on2QzvG+t/B87WOY lYtPz7z0fW4c8hVgDH+BO4gjV5lTsNUM8ZjRKTc+HhZu/OAZc8ZYXoRuCtennmCh B55CiniR1kxu35XuRzVG/rcmRdJZdSby9n7BZEiVQKMUgAuHCWTDfN0+UwsZ/xJn P3i7bTq5Kw/16XYbjNveES6x5RXg0JcFtB5SGjBR8/hS9ZpBnhPygokeuqFHMw/2 UyAmVKzhDaA/HVZ1sU/fBOOR9Bl8A4lpIaCw8ps64ZORh8O2SkhrVAyqGeT8I8Rt w9/eTGCCDloiFHit2juI =o/9F -END PGP SIGNATURE- Changes since libreoffice-4.1.0.1-246: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 07d528294e6559a631ad994f8e20095067516d98 Author: Christian Lohmaier Date: Tue Jul 23 12:43:18 2013 +0200 bump product version to 4.1.0.4.0+ Change-Id: Icb96aaaf1b95c1d5f456348f04c2718c3ef3c75b diff --git a/configure.ac b/configure.ac index 2fa4abf..5df4ac8 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.0.3.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.0.4.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Merging Calc's label range functionality with named range.
Hi Kohei, On Thursday, 2013-07-18 08:25:45 -0400, Kohei Yoshida wrote: > >* The actual label name displayed is taken from a cell's content, > > formula expressions using a label automatically change their display > > label names whenever that cell content is changed. > > * This is not possible with named ranges. > Sure. But is this *that* important to users? To me the whole label > range implementation is such a duplicate functionality for very > little marginal difference, and I'm not really sure if that > difference even matters. For those who use it it probably is important ... anyhow, this is even part of ODFF, so we somehow should support it. What is debatable is the "automatic label lookup" that IMHO should be deprecated and the default configuration setting be disabled. > >* One label names exactly one row or one column, expressions or > > multi-column/row ranges are not possible. > > * The named expressions dialog could restrict that though. > > I don't see how that restriction could be useful. You can define > one column / one row only named ranges (or database ranges for that > matter). Is there a use case where having this restriction is > useful in real life? It is needed for the intersection of row and column labels, that works only with vectors, e.g. ='Sales' 'Hamburg' > >* The label name can include spaces and other arbitrary characters that > > in a formula expression would have special meanings, using such a name > > in an expression is possible by enclosing the entire label name in > > single quotes. A label name can even be a string that otherwise would > > be a cell reference. > Yes. And the fact that this can be a string is actually very scary > to me. This potentially makes tracking references very difficult > without sacrificing performance. Dropping it would enable us to > optimize it further. The performance bottleneck is the automatic label thing where the sheet's content is searched for a string; searching just a few defined label ranges (if any) doesn't make much difference compared to named ranges. > > * A named range currently has to consist of alphanumeric+underscore > > characters and can't resemble a cell reference. > > * ODFF does provide means to store usage of such non-simple names > > though with $$SingleQuoted but we need to implement that in the > > formula compiler (anyway), see > > > > http://docs.oasis-open.org/office/v1.2/cs01/OpenDocument-v1.2-cs01-part2.html#__RefHeading__1017964_715980110 > > > >Furthermore we probably could use exactly the Label functionality for > >the GSoC "Enhanced Database Ranges" Table feature when it comes to > >in-Table formula expressions adressing the Table's rows or columns. > >Actually it would be necessary to support identical label names for > >different Tables (ranges) within one sheet, again this is not possible > >with named ranges. > > I'd rather we extend the database range code to support these > missing bits rather than piggybacking on top of the label range > code. I don't see it as a reason why we need to keep label range. I meant the special Excel cell formula syntax for formulas in cells of a Table that address rows/columns/intersections of the Table by their header names. That is very similar to defined labels compiler/interpreter-wise. Of course it doesn't matter where we actually stick the "defined label" in, having them as part of the database range probably is best because we usually can derive it from the top-row of the database range (don't know currently if Excel allows more than one row for those Table labels, they did a very awkward thing with their labels back then). Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpn4l6eo23Y3.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/sal
include/sal/types.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 68c8dcec1f8689191e1be3366ec3c127096ae4d4
Author: David Tardon
Date: Tue Jul 23 13:36:51 2013 +0200
WaE: "HAVE_GCC_ATTRIBUTE_WARN_UNUSED" is not defined
Change-Id: Id45e2a5c31471b4f5a59c4511bbacc12f78356f6
diff --git a/include/sal/types.h b/include/sal/types.h
index 9ce2cef..7e3a0b6 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -555,7 +555,7 @@ template< typename T1, typename T2 > inline T1
static_int_cast(T2 n) {
*/
-#if HAVE_GCC_ATTRIBUTE_WARN_UNUSED
+#if defined HAVE_GCC_ATTRIBUTE_WARN_UNUSED
#define SAL_WARN_UNUSED __attribute__((warn_unused))
#elif defined __clang__
#define SAL_WARN_UNUSED __attribute__((annotate("lo_warn_unused")))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/sdi basctl/source basic/source include/basic
basctl/sdi/baside.sdi | 13 ++-
basctl/source/basicide/baside2.cxx | 20 +-
basctl/source/basicide/baside2b.cxx| 20 ++
basic/source/classes/codecompletecache.cxx | 32 +
basic/source/classes/sbxmod.cxx|1
basic/source/comp/dim.cxx | 16 +++---
basic/source/inc/codegen.hxx |1
include/basic/codecompletecache.hxx| 21 ++-
8 files changed, 104 insertions(+), 20 deletions(-)
New commits:
commit 93c8f072caddd6434558aa11cdd7e981c3d1030a
Author: Gergo Mocsi
Date: Tue Jul 23 12:42:37 2013 +0200
GSOC work, code complete option, menu entry fixes
Menu entry is added under View->Enable Code Completition when in
Experimental mode.
Fixed the call of funtion SbModule::GetCodeCompleteDataFromParse() to be
called only when code completition is enabled.
Replaced the occurences of SvtMiscOptions to CodeCompleteOptions.
Change-Id: If0520123ab5f612d7d24fb98f8e9bf6881af76cb
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 7dfe68a..42873f6 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -35,6 +35,13 @@ shell basctl_Shell
StateMethod = GetState;
ExecMethod = ExecuteCurrent;
]
+
+SID_BASICIDE_CODECOMPLETITION
+[
+StateMethod = GetState;
+ExecMethod = ExecuteCurrent;
+]
+
SID_BASICIDE_HIDECURPAGE
[
ExecMethod = ExecuteCurrent;
@@ -138,12 +145,6 @@ shell basctl_Shell
StateMethod = GetState;
]
-SID_BASICIDE_CODECOMPLETITION
-[
-ExecMethod = ExecuteCurrent;
-StateMethod = GetState;
-]
-
SID_BASICIDE_LIBSELECTED
[
ExecMethod = ExecuteGlobal;
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 4fc6674..1fff14a 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -52,6 +52,8 @@
#include
#include
#include
+#include
+#include
namespace basctl
{
@@ -1011,7 +1013,8 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
break;
case SID_BASICIDE_CODECOMPLETITION:
{
-std::cerr << "code completition enabled" << std::endl;
+SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot(), false);
+CodeCompleteOptions::SetCodeCompleteOn( pItem && pItem->GetValue()
);
}
break;
case SID_CUT:
@@ -1160,6 +1163,21 @@ void ModulWindow::GetState( SfxItemSet &rSet )
rSet.Put(SfxBoolItem(nWh, bSourceLinesEnabled));
break;
}
+case SID_BASICIDE_CODECOMPLETITION:
+{
+SvtMiscOptions aMiscOptions;
+if( aMiscOptions.IsExperimentalMode() )
+{
+rSet.Put(SfxBoolItem( nWh,
CodeCompleteOptions::IsCodeCompleteOn() ));
+std::cerr <<"code complete set to: " <<
CodeCompleteOptions::IsCodeCompleteOn() << std::endl;
+}
+else
+{
+rSet.Put( SfxVisibilityItem(nWh, false) );
+//CodeCompleteOptions::SetCodeCompleteOn( false );
+}
+}
+break;
}
}
}
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 0dddf7f..8c5f6212 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -48,7 +48,6 @@
#include
#include
-#include
#include "com/sun/star/reflection/XIdlReflection.hpp"
#include
#include
@@ -486,7 +485,6 @@ bool EditorWindow::ImpCanModify()
void EditorWindow::KeyInput( const KeyEvent& rKEvt )
{
-SvtMiscOptions aMiscOptions;
if ( !pEditView ) // Happens in Win95
return;
@@ -501,7 +499,7 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
// see if there is an accelerator to be processed first
bool bDone = SfxViewShell::Current()->KeyInput( rKEvt );
-if( rKEvt.GetKeyCode().GetCode() == KEY_POINT &&
aMiscOptions.IsExperimentalMode() )
+if( rKEvt.GetKeyCode().GetCode() == KEY_POINT &&
CodeCompleteOptions::IsCodeCompleteOn() )
{
rModulWindow.UpdateModule();
TextSelection aSel = GetEditView()->GetSelection();
@@ -829,14 +827,20 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
{
ParagraphInsertedDeleted( rTextHint.GetValue(), true );
DoDelayedSyntaxHighlight( rTextHint.GetValue() );
-rModulWindow.UpdateModule();
-
aCodeCompleteCache.SetVars(rModulWindow.GetSbModule()->GetCodeCompleteDataFromParse().GetVars());
+if( CodeCompleteOptions::IsCodeCompleteOn() )
+{
+rModulWindow.UpdateModule();
+
aCodeCompleteCache
[GSOC]Use Widget Layout for the Start Center Weekly Update 05
Hi all! Since my last update I was working on the custom widget for thumbnails. After updating my master, and recompiling, it came to light that I introduced circular dependencies, which I've been trying to resolve ever since. I wanted to use the class ThumbnailView ( http://opengrok.libreoffice.org/xref/core/include/sfx2/thumbnailview.hxx) in BackingWindow. ThumbnailView is in sfx2 and BackingWindow is in framework. Sfx2 depends on framework, so I can't just simply include it. Kendy told me to move the class. I tried putting it in vcl, since UI stuff is in there, and both framework and sfx2 uses it, but ThumbnailView uses stuff from drawinglayer, which depends on vcl, so that didn't work. I thought about putting it in framework, but I'm not sure it'd logically belong there. Also, I found the structure of framework somewhat confusing, and it seems to me that the only submodule that exports things globally is fwe, where ThumbnailView doesn't seem to belong either (and sorry if I'm using any terms horribly wrong here). I'd be really glad if someone would be kind enough to give some suggestions about resolving this, because I'm stuck. All the best, Krisztian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/sal
include/sal/types.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2fbcff579b54cb1c3148fb1fb20c1c7d42857ec9
Author: Tor Lillqvist
Date: Tue Jul 23 15:08:56 2013 +0300
Revert "WaE: "HAVE_GCC_ATTRIBUTE_WARN_UNUSED" is not defined"
Nope, that caused warning: unknown attribute 'warn_unused' ignored with
Clang.
This reverts commit 68c8dcec1f8689191e1be3366ec3c127096ae4d4.
diff --git a/include/sal/types.h b/include/sal/types.h
index 7e3a0b6..9ce2cef 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -555,7 +555,7 @@ template< typename T1, typename T2 > inline T1
static_int_cast(T2 n) {
*/
-#if defined HAVE_GCC_ATTRIBUTE_WARN_UNUSED
+#if HAVE_GCC_ATTRIBUTE_WARN_UNUSED
#define SAL_WARN_UNUSED __attribute__((warn_unused))
#elif defined __clang__
#define SAL_WARN_UNUSED __attribute__((annotate("lo_warn_unused")))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] update ids for move tab dialog .ui conversion
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5047 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/47/5047/1 update ids for move tab dialog .ui conversion Change-Id: Ie0efc7dad30b37ce996b9de0e162e3ddbe024b06 --- M helpers/help_hid.lst M source/text/scalc/01/0218.xhp 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index cc6dc8e..e129ca0 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6309,7 +6309,6 @@ sc_CheckBox_RID_SCDLG_INSCONT_BTN_LINK,1493435427, sc_CheckBox_RID_SCDLG_INSCONT_BTN_SKIP_EMPTY,1493435425, sc_CheckBox_RID_SCDLG_INSCONT_BTN_TRANSPOSE,1493435426, -sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781, sc_CheckBox_RID_SCDLG_NEWSCENARIO_CB_ATTRIB,1493845017, sc_CheckBox_RID_SCDLG_NEWSCENARIO_CB_COPYALL,1493845019, sc_CheckBox_RID_SCDLG_NEWSCENARIO_CB_PRINTFRAME,1493845015, @@ -6431,8 +6430,6 @@ sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SORT_BY,1495404037, sc_ListBox_RID_SCDLG_IMPORTOPT_DDLB_FONT,1494175241, sc_ListBox_RID_SCDLG_IMPORTOPT_LB_FONT,1494175242, -sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338, -sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340, sc_ListBox_RID_SCDLG_NEWSCENARIO_LB_COLOR,1493847574, sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND1,1493749277, sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND2,1493749278, diff --git a/source/text/scalc/01/0218.xhp b/source/text/scalc/01/0218.xhp index d3d0547..dd4a82f 100644 --- a/source/text/scalc/01/0218.xhp +++ b/source/text/scalc/01/0218.xhp @@ -45,14 +45,14 @@ When you copy and paste cells containing date values between different spreadsheets, both spreadsheet documents must be set to the same date base. If date bases differ, the displayed date values will change! - + To Document -Indicates where the current sheet is to be moved or copied to. Select - new document - if you want to create a new location for the sheet to be moved or copied. - +Indicates where the current sheet is to be moved or copied to. Select - new document - if you want to create a new location for the sheet to be moved or copied. + Insert Before -The current sheet is moved or copied in front of the selected sheet. The - move to end position - option places the current sheet at the end. - +The current sheet is moved or copied in front of the selected sheet. The - move to end position - option places the current sheet at the end. + Copy -Specifies that the sheet is to be copied. If the option is unmarked, the sheet is moved. Moving sheets is the default. +Specifies that the sheet is to be copied. If the option is unmarked, the sheet is moved. Moving sheets is the default. -- To view, visit https://gerrit.libreoffice.org/5047 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0efc7dad30b37ce996b9de0e162e3ddbe024b06 Gerrit-PatchSet: 1 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Tamás Csikós ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source sw/source
include/sfx2/sfxuno.hxx |5 -
sfx2/source/bastyp/mieclip.cxx |2 +-
sfx2/source/bastyp/sfxhtml.cxx |2 +-
sfx2/source/control/shell.cxx |2 +-
sw/source/core/unocore/unodraw.cxx |2 +-
sw/source/core/unocore/unoframe.cxx |2 +-
sw/source/core/unocore/unotext.cxx |2 +-
sw/source/ui/utlui/unotools.cxx |9 -
8 files changed, 14 insertions(+), 12 deletions(-)
New commits:
commit d8fa15f0ea3bbf38f5142f83121b7c72c483c7f5
Author: Noel Grandin
Date: Tue Jul 23 14:55:38 2013 +0200
fdo#67213 - crash on opening AutoText dialog (Ctrl+F3)
I created this bug with commit
32eaa77db33b3b1f5793e92167b9f8c2708ea543
"fdo#46808, Convert frame::FrameControl service to new style"
If we cannot create a css::frame::FrameControl service, just continue.
Change-Id: Iffd6952fd5153af5a1ab72af2bc55864816a750d
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx
index 62fadcc..64d97c9 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/ui/utlui/unotools.cxx
@@ -112,7 +112,14 @@ void SwOneExampleFrame::CreateControl()
uno::Reference< lang::XMultiServiceFactory >
xMgr =
comphelper::getProcessServiceFactory();
uno::Reference< uno::XComponentContext > xContext =
comphelper::getProcessComponentContext();
-m_xFrameControl = frame::FrameControl::create(xContext);
+try
+{
+m_xFrameControl = frame::FrameControl::create(xContext);
+}
+catch ( css::uno::DeploymentException& )
+{
+return;
+}
uno::Reference< awt::XWindowPeer > xParent(
aTopWindow.GetComponentInterface() );
commit 312f3aac56b410021bdf3db70d36b7fe88b3744f
Author: Noel Grandin
Date: Tue Jul 23 14:32:10 2013 +0200
expand out the U2S and S2U macros from sfxuno.hxx
They are vestiges of the old string classes.
Change-Id: I5dd458bd2dac5f2e867ddaa731190f159b8a3b65
diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index 3dee2ba..cab9200 100644
--- a/include/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
@@ -66,11 +66,6 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet,
css::uno::Sequence< css::be
#define FrameSearchFlagssal_Int32
-// Macros to convert string -> unicode and unicode -> string.
-// We use UTF8 everytime. Its the best way to do this!
-#define S2U(STRING) OStringToOUString(STRING,
RTL_TEXTENCODING_UTF8)
-#define U2S(STRING) OUStringToOString(STRING,
RTL_TEXTENCODING_UTF8)
-
//
// macros for declaration and definition of uno-services
//
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index 71776fd..45404d8 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -60,7 +60,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndFragment")))
nFragEnd = sLine.copy(nIndex).toInt32();
else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("SourceURL")))
-sBaseURL = S2U(sLine.copy(nIndex));
+sBaseURL = OStringToOUString( sLine.copy(nIndex),
RTL_TEXTENCODING_UTF8 );
if (nEnd >= 0 && nStt >= 0 &&
(sBaseURL.Len() || rStream.Tell() >=
static_cast(nStt)))
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index bbbd5de..e45fcc1 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -255,7 +255,7 @@ sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr )
aStream.Seek( 0 );
OString sBuffer = read_uInt8s_ToOString(aStream, nLen);
-rStr = S2U(sBuffer);
+rStr = OStringToOUString( sBuffer, RTL_TEXTENCODING_UTF8 );
}
delete pDLMedium;
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 5542998..4f8b945 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -992,7 +992,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence
< com::sun::star::em
pNewSlot->fnExec = SFX_STUB_PTR(SfxShell,VerbExec);
pNewSlot->fnState = SFX_STUB_PTR(SfxShell,VerbState);
pNewSlot->pType = 0; // HACK(SFX_TYPE(SfxVoidItem)) ???
-pNewSlot->pName = U2S(aVerbs[n].VerbName).getStr();
+pNewSlot->pName = OUStringToOString( aVerbs[n].VerbName,
RTL_TEXTENCODING_UTF8 ).getStr();
pNewSlot->pLinkedSlot = 0;
pNewSlot->nArgDefCount = 0;
pNewSlot->pFirstArgDef = 0;
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 70b6528.
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - 2 commits - cui/source
Rebased ref, commits from common ancestor:
commit e48c4f22d018037868e8aee4790d8ae6e7aa6162
Author: Efe Gürkan YALAMAN
Date: Tue Jul 23 16:28:39 2013 +0300
Reset method implementation.
Change-Id: I34fb54feb636eb9b3f61062969855f9d80140c08
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 48036df..b7072c3 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -14,8 +14,8 @@
#include
#include
#include
-#include
#include
+#include
#include
#include
@@ -83,14 +83,20 @@ void CuiAboutConfigTabPage::InsertEntry( OUString& rProp,
OUString& rStatus, OU
pPrefBox->Insert( pEntry );
}
+void CuiAboutConfigTabPage::Reset( const SfxItemSet& )
+{
+ pPrefBox->Clear();
+
+ Reference< XNameAccess > xConfigAccess = getConfigAccess();
+
+ FillItems( xConfigAccess, OUString("org.openoffice") );
+}
void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess,
OUString sPath)
{
sal_Bool bIsLeafNode;
-//Reference< XNameAccess > xNextNameAccess;
Reference< XHierarchicalNameAccess > xHierarchicalNameAccess( xNameAccess,
uno::UNO_QUERY_THROW );
-//Reference< XHierarchicalNameAccess > xNextHierarchicalNameAccess;
uno::Sequence< OUString > seqItems = xNameAccess->getElementNames();
for( sal_Int16 i = 0; i < seqItems.getLength(); ++i )
@@ -115,6 +121,8 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
if( bIsLeafNode )
{
//InsertEntry( sPath, "", "", "");
+//Reference< beans::Property > aProperty =
xHierarchicalNameAccess->getAsProperty();//getPropertyValue( seqItems[ i ] );
+//InsertEntry( sPath + OUString("/") + seqItems[ i ],
OUString(""), OUString(""), xNameAccess->getPropertyValue( seqItems[ i ] ) );
}
}
}
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 2982378..343f0c9 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -35,6 +35,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rItemset );
void InsertEntry(OUString& rProp, OUString& rStatus, OUString& rType,
OUString& rValue);
+ void Reset( const SfxItemSet& );
void FillItems( com::sun::star::uno::Reference <
com::sun::star::container::XNameAccess > xNameAccess, OUString sPath);
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
getConfigAccess();
commit 5bb3a60925b6b49811a225120f09b575234d5d15
Author: Efe Gürkan YALAMAN
Date: Mon Jul 22 23:09:28 2013 +0300
FillItems implemened
This method will be used for traversing configuration tree.
Change-Id: Iefd8a21d1cb27496c87502755834c31b1a35ba44
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 09805c0..48036df 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -16,10 +16,14 @@
#include
#include
#include
+#include
+#include
using namespace svx;
using namespace ::com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::container;
#define ITEMID_PREF 1
#define ITEMID_TYPE 2
@@ -79,12 +83,43 @@ void CuiAboutConfigTabPage::InsertEntry( OUString& rProp,
OUString& rStatus, OU
pPrefBox->Insert( pEntry );
}
-sal_Bool CuiAboutConfigTabPage::FillItems()
+
+void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess,
OUString sPath)
{
-return sal_False;
+sal_Bool bIsLeafNode;
+
+//Reference< XNameAccess > xNextNameAccess;
+Reference< XHierarchicalNameAccess > xHierarchicalNameAccess( xNameAccess,
uno::UNO_QUERY_THROW );
+//Reference< XHierarchicalNameAccess > xNextHierarchicalNameAccess;
+
+uno::Sequence< OUString > seqItems = xNameAccess->getElementNames();
+for( sal_Int16 i = 0; i < seqItems.getLength(); ++i )
+{
+Any aNode = xHierarchicalNameAccess->getByHierarchicalName(
seqItems[i] );
+Reference< XHierarchicalNameAccess >xNextHierarchicalNameAccess(
aNode, uno::UNO_QUERY_THROW );
+Reference< XNameAccess > xNextNameAccess( xNextHierarchicalNameAccess,
uno::UNO_QUERY_THROW );
+
+bIsLeafNode = sal_True;
+
+try
+{
+uno::Sequence < OUString > seqNext =
xNextNameAccess->getElementNames();
+FillItems( xNextNameAccess, sPath + OUString("/") + seqItems[i] );
+bIsLeafNode = sal_False;
+
+}
+catch( uno::Exception& )
+{
+}
+
+if( bIsLeafNode )
+{
+//InsertEntry( sPath, "", "", "");
+}
+}
}
-uno::Reference< container::XNameAccess >
CuiAboutConfigTabPage::getConfigAccess()
+Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess()
{
uno::Reference< uno::XComponentContext > xC
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/column3.cxx |1 -
sc/source/core/data/table2.cxx |1 -
sc/source/core/tool/consoli.cxx | 16 ++--
3 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 3346bbca14734129ddd1900570b1c28afcc553db
Author: Kohei Yoshida
Date: Tue Jul 23 09:50:10 2013 -0400
More on removing use of CalcRelFromAbs().
Some of them were called for all absolute references, which is not
necessary.
Change-Id: If19ee74731f40ca208e1cc1804c6b6e53073d891
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 83592fe..1e0ec16 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -920,7 +920,6 @@ void ScColumn::CopyFromClip(
aRef.nRow = nDestRow - nDy; // Source row
aDestPos.SetRow( nDestRow );
-aRef.CalcRelFromAbs( aDestPos );
ScTokenArray aArr;
aArr.AddSingleReference( aRef );
SetFormulaCell(nDestRow, new ScFormulaCell(pDocument, aDestPos,
&aArr));
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index f54912b..96839f1 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -975,7 +975,6 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2,
aRef.nTab = nTab;
aRef.InitFlags(); // -> all absolute
aRef.SetFlag3D(true);
-aRef.CalcRelFromAbs( aDestPos );
ScTokenArray aArr;
aArr.AddSingleReference( aRef );
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 5f05383..f7795ca 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -708,8 +708,8 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc,
SCCOL nCol, SCROW nRow,
String aString;
ScSingleRefData aSRef; // Daten fuer Referenz-Formelzellen
-aSRef.InitFlags();
-aSRef.SetFlag3D(sal_True);
+aSRef.InitFlags(); // This reference is absolute at all times.
+aSRef.SetFlag3D(true);
ScComplexRefData aCRef; // Daten fuer Summen-Zellen
aCRef.InitFlags();
@@ -741,9 +741,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc,
SCCOL nCol, SCROW nRow,
{
// Referenz einfuegen (absolut, 3d)
-aSRef.nCol = aRef.nCol;
-aSRef.nRow = aRef.nRow;
-aSRef.nTab = aRef.nTab;
+
aSRef.SetAddress(ScAddress(aRef.nCol,aRef.nRow,aRef.nTab), ScAddress());
ScTokenArray aRefArr;
aRefArr.AddSingleReference(aSRef);
@@ -760,11 +758,9 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc,
SCCOL nCol, SCROW nRow,
ScAddress aDest(
sal::static_int_cast(nCol+nArrX),
sal::static_int_cast(nRow+nArrY+nNeeded), nTab );
-aCRef.Ref1.nTab = aCRef.Ref2.nTab = nTab;
-aCRef.Ref1.nCol = aCRef.Ref2.nCol =
sal::static_int_cast( nCol+nArrX );
-aCRef.Ref1.nRow = nRow+nArrY;
-aCRef.Ref2.nRow = nRow+nArrY+nNeeded-1;
-aCRef.CalcRelFromAbs( aDest );
+ScRange
aRange(sal::static_int_cast(nCol+nArrX), nRow+nArrY, nTab);
+aRange.aEnd.SetRow(nRow+nArrY+nNeeded-1);
+aCRef.SetRange(aRange, aDest);
ScTokenArray aArr;
aArr.AddOpCode(eOpCode);//
ausgewaehlte Funktion
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - sw/source
sw/source/core/docnode/ndtbl.cxx | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
New commits:
commit 338f4d7f21180a997fdd045669fb0c09f2e3
Author: Alex Ivan
Date: Tue Jul 23 17:00:46 2013 +0300
Fix hard format/table style separation issue
Fixed the failed unit test brought by the previous
patch which attempted to correctly separate the hard
format from the table style in table insertion and
text to table methods.
Change-Id: I5eb7ddf074c8c8aaf2b2ec58aa7a94db8792a309
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index eaa15ac..cefcef2 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -329,8 +329,8 @@ const SwTable* SwDoc::InsertTable( const
SwInsertTableOptions& rInsTblOpts,
// Create the Box/Line/Table construct
SwTableLineFmt* pLineFmt = MakeTableLineFmt();
-SwTableFmt* pTableFmt = pTAFmt ? pTAFmt->GetTableStyle()
-: MakeTblFrmFmt( aTblName, GetDfltFrmFmt() );
+SwTableFmt* pTableStyle = pTAFmt ? pTAFmt->GetTableStyle() : NULL;
+SwTableFmt* pTableFmt = MakeTblFrmFmt( aTblName, pTableStyle );
/* If the node to insert the table at is a context node and has a
non-default FRAMEDIR propagate it to the table. */
@@ -350,10 +350,6 @@ const SwTable* SwDoc::InsertTable( const
SwInsertTableOptions& rInsTblOpts,
pTableFmt->SetFmtAttr( SwFmtHoriOrient( 0, eAdjust ) );
// All lines use the left-to-right Fill-Order!
pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
-pTableFmt->GetFirstLineFmt()->SetFmtAttr( SwFmtFillOrder(
ATT_LEFT_TO_RIGHT ) );
-pTableFmt->GetOddLineFmt()->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT
) );
-pTableFmt->GetEvenLineFmt()->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT
) );
-pTableFmt->GetLastLineFmt()->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT
) );
// Set USHRT_MAX as the Table's default SSize
SwTwips nWidth = USHRT_MAX;
@@ -404,7 +400,7 @@ const SwTable* SwDoc::InsertTable( const
SwInsertTableOptions& rInsTblOpts,
::lcl_SetDfltBorders( pTableFmt );
SwTable * pNdTbl = &pTblNd->GetTable();
-pNdTbl->GetTableFmt()->RegisterToFormat( *pTableFmt );
+pNdTbl->RegisterToFormat( *pTableFmt );
pNdTbl->SetRowsToRepeat( nRowsToRepeat );
pNdTbl->SetTableModel( bNewModel );
@@ -603,15 +599,11 @@ const SwTable* SwDoc::TextToTable( const
SwInsertTableOptions& rInsTblOpts,
// Create the Box/Line/Table construct
SwTableBoxFmt* pBoxFmt = MakeTableBoxFmt();
SwTableLineFmt* pLineFmt = MakeTableLineFmt();
-SwTableFmt* pTableFmt = pTAFmt ? pTAFmt->GetTableStyle()
-: MakeTblFrmFmt( GetUniqueTblName(), GetDfltFrmFmt() );
+SwTableFmt* pTableStyle = pTAFmt ? pTAFmt->GetTableStyle() : NULL;
+SwTableFmt* pTableFmt = MakeTblFrmFmt( GetUniqueTblName(), pTableStyle );
// All Lines have a left-to-right Fill Order
pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ));
-pTableFmt->GetFirstLineFmt()->SetFmtAttr( SwFmtFillOrder(
ATT_LEFT_TO_RIGHT ));
-pTableFmt->GetOddLineFmt()->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT
));
-pTableFmt->GetEvenLineFmt()->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT
));
-pTableFmt->GetLastLineFmt()->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT
));
// The Table's SSize is USHRT_MAX
pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
@@ -658,7 +650,8 @@ const SwTable* SwDoc::TextToTable( const
SwInsertTableOptions& rInsTblOpts,
// Set Orientation in the Table's Fmt
pTableFmt->SetFmtAttr( SwFmtHoriOrient( 0, eAdjust ) );
-pNdTbl->GetTableFmt()->RegisterToFormat( *pTableFmt );
+
+pNdTbl->RegisterToFormat( *pTableFmt );
if( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/LibreOffice/LibreOffice/lo.mm | 36 ++---
1 file changed, 33 insertions(+), 3 deletions(-)
New commits:
commit 70e247733e762ed7b20645c8c843e78294b38f0f
Author: Ptyl Dragon
Date: Tue Jul 9 13:20:00 2013 +0300
Add more components
Change-Id: I30daf067fe9a1804a55be75c040db49dfbb18d92
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 53c9921..167948c 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -19,11 +19,18 @@ extern "C" {
extern void * analysis_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
extern void * animcore_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
extern void * avmedia_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
-extern void * dba_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * chartcore_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
+extern void * cui_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * date_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * dba_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * dbaxml_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * embobj_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * emboleobj_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
extern void * evtatt_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * expwrap_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * fastsax_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * fileacc_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * filterconfig1_component_getFactory( const char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * frm_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * fsstorage_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
extern void * fwk_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
@@ -42,17 +49,25 @@ extern "C" {
extern void * sdd_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * sm_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * smd_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * sot_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * spell_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * spl_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * svgfilter_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
extern void * svt_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * svx_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * svxcore_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * sw_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * swd_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * t602filter_component_getFactory( const char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * textfd_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
-extern void * unoxml_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * tk_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * ucppkg1_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * unordf_component_getFactor
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/refdata.hxx |3 ---
sc/source/core/tool/refdata.cxx |7 ---
sc/source/core/tool/refupdat.cxx | 36 ++--
3 files changed, 22 insertions(+), 24 deletions(-)
New commits:
commit 1d070b2e03ae34519077edf856502ad285c7cfcb
Author: Kohei Yoshida
Date: Tue Jul 23 10:43:38 2013 -0400
CalcRelFromAbs() is no more.
Change-Id: I974d8282eaf49a6c6d56fe209012f5e54170acc2
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 07ea7ef..145da50 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -88,7 +88,6 @@ struct SC_DLLPUBLIC ScSingleRefData
SCCOL GetCol() const;
SCTAB GetTab() const;
-void CalcRelFromAbs( const ScAddress& rPos );
bool operator==( const ScSingleRefData& ) const;
bool operator!=( const ScSingleRefData& ) const;
@@ -135,8 +134,6 @@ struct ScComplexRefData
Ref1.InitAddress( nCol1, nRow1, nTab1 );
Ref2.InitAddress( nCol2, nRow2, nTab2 );
}
-inline void CalcRelFromAbs( const ScAddress& rPos )
-{ Ref1.CalcRelFromAbs( rPos ); Ref2.CalcRelFromAbs( rPos ); }
inline bool IsDeleted() const
{ return Ref1.IsDeleted() || Ref2.IsDeleted(); }
inline bool Valid() const
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 439886e..3d49fa8 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -75,13 +75,6 @@ bool ScSingleRefData::IsDeleted() const
return IsColDeleted() || IsRowDeleted() || IsTabDeleted();
}
-void ScSingleRefData::CalcRelFromAbs( const ScAddress& rPos )
-{
-nRelCol = nCol - rPos.Col();
-nRelRow = nRow - rPos.Row();
-nRelTab = nTab - rPos.Tab();
-}
-
ScAddress ScSingleRefData::toAbs( const ScAddress& rPos ) const
{
SCCOL nRetCol = Flags.bColRel ? nRelCol + rPos.Col() : nCol;
diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index 8ad478b..ca993bd 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -830,39 +830,47 @@ ScRefUpdateRes ScRefUpdate::Move(
void ScRefUpdate::MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos,
SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData&
rRef )
{
+ScRange aAbsRange = rRef.toAbs(rPos);
if( rRef.Ref1.IsColRel() )
{
-rRef.Ref1.nCol = rRef.Ref1.nRelCol + rPos.Col();
-lcl_MoveItWrap( rRef.Ref1.nCol, static_cast(0), nMaxCol );
+SCCOL nCol = aAbsRange.aStart.Col();
+lcl_MoveItWrap(nCol, static_cast(0), nMaxCol);
+aAbsRange.aStart.SetCol(nCol);
}
if( rRef.Ref2.IsColRel() )
{
-rRef.Ref2.nCol = rRef.Ref2.nRelCol + rPos.Col();
-lcl_MoveItWrap( rRef.Ref2.nCol, static_cast(0), nMaxCol );
+SCCOL nCol = aAbsRange.aEnd.Col();
+lcl_MoveItWrap(nCol, static_cast(0), nMaxCol);
+aAbsRange.aEnd.SetCol(nCol);
}
if( rRef.Ref1.IsRowRel() )
{
-rRef.Ref1.nRow = rRef.Ref1.nRelRow + rPos.Row();
-lcl_MoveItWrap( rRef.Ref1.nRow, static_cast(0), nMaxRow );
+SCROW nRow = aAbsRange.aStart.Row();
+lcl_MoveItWrap(nRow, static_cast(0), nMaxRow);
+aAbsRange.aStart.SetRow(nRow);
}
if( rRef.Ref2.IsRowRel() )
{
-rRef.Ref2.nRow = rRef.Ref2.nRelRow + rPos.Row();
-lcl_MoveItWrap( rRef.Ref2.nRow, static_cast(0), nMaxRow );
+SCROW nRow = aAbsRange.aEnd.Row();
+lcl_MoveItWrap(nRow, static_cast(0), nMaxRow);
+aAbsRange.aEnd.SetRow(nRow);
}
SCsTAB nMaxTab = (SCsTAB) pDoc->GetTableCount() - 1;
if( rRef.Ref1.IsTabRel() )
{
-rRef.Ref1.nTab = rRef.Ref1.nRelTab + rPos.Tab();
-lcl_MoveItWrap( rRef.Ref1.nTab, static_cast(0),
static_cast(nMaxTab) );
+SCTAB nTab = aAbsRange.aStart.Tab();
+lcl_MoveItWrap(nTab, static_cast(0),
static_cast(nMaxTab));
+aAbsRange.aStart.SetTab(nTab);
}
if( rRef.Ref2.IsTabRel() )
{
-rRef.Ref2.nTab = rRef.Ref2.nRelTab + rPos.Tab();
-lcl_MoveItWrap( rRef.Ref2.nTab, static_cast(0),
static_cast(nMaxTab) );
+SCTAB nTab = aAbsRange.aEnd.Tab();
+lcl_MoveItWrap(nTab, static_cast(0),
static_cast(nMaxTab));
+aAbsRange.aEnd.SetTab(nTab);
}
-rRef.PutInOrder();
-rRef.CalcRelFromAbs( rPos );
+
+aAbsRange.PutInOrder();
+rRef.SetRange(aAbsRange, rPos);
}
//--
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/refdata.hxx | 36 +++-
sc/source/core/tool/refdata.cxx | 32
2 files changed, 39 insertions(+), 29 deletions(-)
New commits:
commit d46a4ac204ff0d85f94d64d196c75e701d9187d0
Author: Kohei Yoshida
Date: Tue Jul 23 11:16:46 2013 -0400
Make these non-inline.
Change-Id: I99cf45edfe584f69fb6465de84cdcff5842e37a6
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 145da50..ccbc1c5 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -78,9 +78,9 @@ struct SC_DLLPUBLIC ScSingleRefData
inline void SetRelName( bool bVal ){ Flags.bRelName = (bVal ? true :
false ); }
inline bool IsRelName() const { return Flags.bRelName; }
-inline bool Valid() const;
+bool Valid() const;
/// In external references nTab is -1
-inline bool ValidExternal() const;
+bool ValidExternal() const;
ScAddress toAbs( const ScAddress& rPos ) const;
void SetAddress( const ScAddress& rAddr, const ScAddress& rPos );
@@ -96,20 +96,6 @@ struct SC_DLLPUBLIC ScSingleRefData
#endif
};
-inline bool ScSingleRefData::Valid() const
-{
-return nCol >= 0 && nCol <= MAXCOL &&
-nRow >= 0 && nRow <= MAXROW &&
-nTab >= 0 && nTab <= MAXTAB;
-}
-
-inline bool ScSingleRefData::ValidExternal() const
-{
-return nCol >= 0 && nCol <= MAXCOL &&
-nRow >= 0 && nRow <= MAXROW &&
-nTab == -1;
-}
-
/// Complex reference (a range) into the sheet
struct ScComplexRefData
{
@@ -134,13 +120,13 @@ struct ScComplexRefData
Ref1.InitAddress( nCol1, nRow1, nTab1 );
Ref2.InitAddress( nCol2, nRow2, nTab2 );
}
-inline bool IsDeleted() const
-{ return Ref1.IsDeleted() || Ref2.IsDeleted(); }
-inline bool Valid() const
-{ return Ref1.Valid() && Ref2.Valid(); }
+
+bool IsDeleted() const;
+bool Valid() const;
+
/** In external references nTab is -1 for the start tab and -1 for the end
tab if one sheet, or >=0 if more than one sheets. */
-inline bool ValidExternal() const;
+bool ValidExternal() const;
SC_DLLPUBLIC ScRange toAbs( const ScAddress& rPos ) const;
void SetRange( const ScRange& rRange, const ScAddress& rPos );
@@ -160,14 +146,6 @@ struct ScComplexRefData
#endif
};
-inline bool ScComplexRefData::ValidExternal() const
-{
-return Ref1.ValidExternal() &&
-Ref2.nCol >= 0 && Ref2.nCol <= MAXCOL &&
-Ref2.nRow >= 0 && Ref2.nRow <= MAXROW &&
-Ref2.nTab >= Ref1.nTab;
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 3d49fa8..a804838 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -75,6 +75,20 @@ bool ScSingleRefData::IsDeleted() const
return IsColDeleted() || IsRowDeleted() || IsTabDeleted();
}
+bool ScSingleRefData::Valid() const
+{
+return nCol >= 0 && nCol <= MAXCOL &&
+nRow >= 0 && nRow <= MAXROW &&
+nTab >= 0 && nTab <= MAXTAB;
+}
+
+bool ScSingleRefData::ValidExternal() const
+{
+return nCol >= 0 && nCol <= MAXCOL &&
+nRow >= 0 && nRow <= MAXROW &&
+nTab == -1;
+}
+
ScAddress ScSingleRefData::toAbs( const ScAddress& rPos ) const
{
SCCOL nRetCol = Flags.bColRel ? nRelCol + rPos.Col() : nCol;
@@ -292,6 +306,24 @@ ScComplexRefData& ScComplexRefData::Extend( const
ScComplexRefData & rRef, const
return Extend( rRef.Ref1, rPos).Extend( rRef.Ref2, rPos);
}
+bool ScComplexRefData::IsDeleted() const
+{
+return Ref1.IsDeleted() || Ref2.IsDeleted();
+}
+
+bool ScComplexRefData::Valid() const
+{
+return Ref1.Valid() && Ref2.Valid();
+}
+
+bool ScComplexRefData::ValidExternal() const
+{
+return Ref1.ValidExternal() &&
+Ref2.nCol >= 0 && Ref2.nCol <= MAXCOL &&
+Ref2.nRow >= 0 && Ref2.nRow <= MAXROW &&
+Ref2.nTab >= Ref1.nTab;
+}
+
ScRange ScComplexRefData::toAbs( const ScAddress& rPos ) const
{
return ScRange(Ref1.toAbs(rPos), Ref2.toAbs(rPos));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/celltextparacontext.cxx | 84 +++
sc/source/filter/xml/celltextparacontext.hxx | 23 +++
sc/source/filter/xml/xmlimprt.cxx| 19 ++
sc/source/filter/xml/xmlimprt.hxx| 14
4 files changed, 138 insertions(+), 2 deletions(-)
New commits:
commit be10607d358f7587f10e76084893ceed3a4c9215
Author: Eike Rathke
Date: Tue Jul 23 17:17:18 2013 +0200
resolved fdo#67094 handle in and
821521f757569c96ded6004bb2cb0d003481b55b introduced XML_SPAN but removed
handling of XML_S repeated U+0020, SPACE
Change-Id: Ic1b00c9dbc33c750b9a8cae910b4ca0bed42ab5a
diff --git a/sc/source/filter/xml/celltextparacontext.cxx
b/sc/source/filter/xml/celltextparacontext.cxx
index fbbcf6f..f251f11 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -12,6 +12,7 @@
#include "xmlcelli.hxx"
#include "xmloff/nmspmap.hxx"
+#include "comphelper/string.hxx"
#include
@@ -53,6 +54,8 @@ SvXMLImportContext*
ScXMLCellTextParaContext::CreateChildContext(
const SvXMLTokenMap& rTokenMap =
GetScImport().GetCellTextParaElemTokenMap();
switch (rTokenMap.Get(nPrefix, rLocalName))
{
+case XML_TOK_CELL_TEXT_S:
+return new ScXMLCellFieldSContext(GetScImport(), nPrefix,
rLocalName, *this);
case XML_TOK_CELL_TEXT_SPAN:
return new ScXMLCellTextSpanContext(GetScImport(), nPrefix,
rLocalName, *this);
case XML_TOK_CELL_TEXT_SHEET_NAME:
@@ -179,6 +182,12 @@ SvXMLImportContext*
ScXMLCellTextSpanContext::CreateChildContext(
p->SetStyleName(maStyleName);
return p;
}
+case XML_TOK_CELL_TEXT_SPAN_ELEM_S:
+{
+ScXMLCellFieldSContext* p = new
ScXMLCellFieldSContext(GetScImport(), nPrefix, rLocalName, mrParentCxt);
+p->SetStyleName(maStyleName);
+return p;
+}
default:
;
}
@@ -338,4 +347,79 @@ SvXMLImportContext*
ScXMLCellFieldURLContext::CreateChildContext(
return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
}
+ScXMLCellFieldSContext::ScXMLCellFieldSContext(
+ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName,
ScXMLCellTextParaContext& rParent) :
+ScXMLImportContext(rImport, nPrefix, rLName),
+mrParentCxt(rParent),
+mnCount(1)
+{
+}
+
+void ScXMLCellFieldSContext::SetStyleName(const OUString& rStyleName)
+{
+maStyleName = rStyleName;
+}
+
+void ScXMLCellFieldSContext::StartElement(const
uno::Reference& xAttrList)
+{
+if (!xAttrList.is())
+return;
+
+OUString aLocalName;
+sal_Int16 nAttrCount = xAttrList->getLength();
+
+const SvXMLTokenMap& rTokenMap = GetScImport().GetCellTextSAttrTokenMap();
+for (sal_Int16 i = 0; i < nAttrCount; ++i)
+{
+sal_uInt16 nAttrPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName(
+xAttrList->getNameByIndex(i), &aLocalName);
+
+const OUString& rAttrValue = xAttrList->getValueByIndex(i);
+sal_uInt16 nToken = rTokenMap.Get(nAttrPrefix, aLocalName);
+switch (nToken)
+{
+case XML_TOK_CELL_TEXT_S_ATTR_C:
+mnCount = rAttrValue.toInt32();
+if (mnCount <= 0)
+mnCount = 1; // worth a warning?
+break;
+default:
+;
+}
+}
+}
+
+void ScXMLCellFieldSContext::EndElement()
+{
+if (mnCount)
+PushSpaces();
+}
+
+SvXMLImportContext* ScXMLCellFieldSContext::CreateChildContext(
+sal_uInt16 nPrefix, const OUString& rLocalName, const
uno::Reference& /*xAttrList*/)
+{
+// does not have child elements, but ...
+if (mnCount)
+{
+PushSpaces();
+}
+
+return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
+}
+
+void ScXMLCellFieldSContext::PushSpaces()
+{
+if (mnCount > 0)
+{
+if (mnCount == 1)
+mrParentCxt.PushSpan(" ", maStyleName);
+else
+{
+OUStringBuffer aBuf( mnCount);
+comphelper::string::padToLength( aBuf, mnCount, ' ');
+mrParentCxt.PushSpan( aBuf.makeStringAndClear(), maStyleName);
+}
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/celltextparacontext.hxx
b/sc/source/filter/xml/celltextparacontext.hxx
index 10e5a23..68adaae 100644
--- a/sc/source/filter/xml/celltextparacontext.hxx
+++ b/sc/source/filter/xml/celltextparacontext.hxx
@@ -134,6 +134,27 @@ public:
sal_uInt16 nPrefix, const OUString& rLocalName, const
com::sun::star::uno::Reference&
xAttrList);
};
+/**
+ * This context handles element inside or .
+ */
+class ScXMLCellFieldSContext : public ScXMLImportContext
+{
+ScXMLCellTextParaContext& mrParentCxt;
+OUString maStyleName;
+sal_Int32 mnCount;
+
+void PushSpaces();
+public:
+ScXMLCellFieldSC
[Libreoffice-commits] core.git: Branch 'feature/table-style' - sw/source
sw/source/ui/table/tautofmt.cxx | 63 ++--
1 file changed, 36 insertions(+), 27 deletions(-)
New commits:
commit 09cd784b800e448e7e8ad2b0d499a01236c978ea
Author: Cédric Bosdonnat
Date: Tue Jul 23 17:53:36 2013 +0200
More protection for pCurData: NULL means default, not much to do then
Change-Id: Ied3a04a7b7be4f4f7b6174e3d6d2a6e53848afd0
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index c0f2bc9..bdb2478 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -89,7 +89,7 @@ private:
voidPaintCells ();
sal_uInt8GetFormatIndex( size_t nCol, size_t nRow ) const;
-const SvxBoxItem& GetBoxItem( size_t nCol, size_t nRow ) const;
+const SvxBoxItem* GetBoxItem( size_t nCol, size_t nRow ) const;
voidDrawString( size_t nCol, size_t nRow );
voidDrawStrings();
@@ -584,21 +584,23 @@ rCTLFont.MethodName( Value );
void AutoFmtPreview::MakeFonts( sal_uInt8 nIndex, Font& rFont, Font& rCJKFont,
Font& rCTLFont )
{
-const SwTableBoxFmt& rBoxFmt = *pCurData->GetBoxFmt( nIndex );
-
rFont = rCJKFont = rCTLFont = GetFont();
Size aFontSize( rFont.GetSize().Width(), 10 );
-lcl_SetFontProperties( rFont, rBoxFmt.GetFont(), rBoxFmt.GetWeight(),
rBoxFmt.GetPosture() );
-lcl_SetFontProperties( rCJKFont, rBoxFmt.GetCJKFont(),
rBoxFmt.GetCJKWeight(), rBoxFmt.GetCJKPosture() );
-lcl_SetFontProperties( rCTLFont, rBoxFmt.GetCTLFont(),
rBoxFmt.GetCTLWeight(), rBoxFmt.GetCTLPosture() );
-
-SETONALLFONTS( SetUnderline,
(FontUnderline)rBoxFmt.GetUnderline().GetValue() );
-SETONALLFONTS( SetOverline,
(FontUnderline)rBoxFmt.GetOverline().GetValue() );
-SETONALLFONTS( SetStrikeout,
(FontStrikeout)rBoxFmt.GetCrossedOut().GetValue() );
-SETONALLFONTS( SetOutline, rBoxFmt.GetContour().GetValue() );
-SETONALLFONTS( SetShadow, rBoxFmt.GetShadowed().GetValue() );
-SETONALLFONTS( SetColor,rBoxFmt.GetColor().GetValue() );
+if ( pCurData )
+{
+const SwTableBoxFmt& rBoxFmt = *pCurData->GetBoxFmt( nIndex );
+lcl_SetFontProperties( rFont, rBoxFmt.GetFont(), rBoxFmt.GetWeight(),
rBoxFmt.GetPosture() );
+lcl_SetFontProperties( rCJKFont, rBoxFmt.GetCJKFont(),
rBoxFmt.GetCJKWeight(), rBoxFmt.GetCJKPosture() );
+lcl_SetFontProperties( rCTLFont, rBoxFmt.GetCTLFont(),
rBoxFmt.GetCTLWeight(), rBoxFmt.GetCTLPosture() );
+
+SETONALLFONTS( SetUnderline,
(FontUnderline)rBoxFmt.GetUnderline().GetValue() );
+SETONALLFONTS( SetOverline,
(FontUnderline)rBoxFmt.GetOverline().GetValue() );
+SETONALLFONTS( SetStrikeout,
(FontStrikeout)rBoxFmt.GetCrossedOut().GetValue() );
+SETONALLFONTS( SetOutline, rBoxFmt.GetContour().GetValue() );
+SETONALLFONTS( SetShadow, rBoxFmt.GetShadowed().GetValue() );
+SETONALLFONTS( SetColor,rBoxFmt.GetColor().GetValue() );
+}
SETONALLFONTS( SetSize, aFontSize );
SETONALLFONTS( SetTransparent, sal_True );
}
@@ -616,9 +618,12 @@ sal_uInt8 AutoFmtPreview::GetFormatIndex( size_t nCol,
size_t nRow ) const
return pnFmtMap[ maArray.GetCellIndex( nCol, nRow, mbRTL ) ];
}
-const SvxBoxItem& AutoFmtPreview::GetBoxItem( size_t nCol, size_t nRow ) const
+const SvxBoxItem* AutoFmtPreview::GetBoxItem( size_t nCol, size_t nRow ) const
{
-return pCurData->GetBoxFmt( GetFormatIndex( nCol, nRow ) )->GetBox();
+if ( pCurData )
+return &pCurData->GetBoxFmt( GetFormatIndex( nCol, nRow ) )->GetBox();
+else
+return NULL;
}
void AutoFmtPreview::DrawString( size_t nCol, size_t nRow )
@@ -664,7 +669,7 @@ void AutoFmtPreview::DrawString( size_t nCol, size_t nRow )
case 23:nVal = 39; nNum = 13; goto MAKENUMSTR;
case 24:nVal = 108; nNum = 15; goto MAKENUMSTR;
MAKENUMSTR:
-if( pCurData->IsValueFormat() )
+if( pCurData && pCurData->IsValueFormat() )
{
String sFmt; LanguageType eLng, eSys;
pCurData->GetBoxFmt( (sal_uInt8)nNum )->GetValueFormat( sFmt,
eLng, eSys );
@@ -693,7 +698,7 @@ MAKENUMSTR:
Size theMaxStrSize( cellRect.GetWidth() - FRAME_OFFSET,
cellRect.GetHeight() - FRAME_OFFSET );
-if( pCurData->IsFont() )
+if( pCurData && pCurData->IsFont() )
{
Font aFont, aCJKFont, aCTLFont;
MakeFonts( nFmtIndex, aFont, aCJKFont, aCTLFont );
@@ -705,7 +710,7 @@ MAKENUMSTR:
aScriptedText.SetText( cellString, m_xBreak );
aStrSize = aScriptedText.GetTextSize();
-if( pCurData->IsFont() &&
+if( pCurData && pCurData->IsFont() &&
theMaxStrSize.Height() < aStrSize.Height() )
{
// If the string in this font does not
@@ -733,7 +738,7 @@ MAKENUMSTR:
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/celltextparacontext.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 1de20e764ed64beed83bb455b6bdbc9fbebed0a3
Author: Eike Rathke
Date: Tue Jul 23 17:56:42 2013 +0200
unset mnCount in ScXMLCellFieldSContext::CreateChildContext()
For the syntactically invalid (because does not have child
elements and thus unlikely) case that there would be a child element
nevertheless, so we wouldn't import the sequence of spaces multiple
times.
Change-Id: I2b2288aee21f200c9fd2ba961974ef4de074f57e
diff --git a/sc/source/filter/xml/celltextparacontext.cxx
b/sc/source/filter/xml/celltextparacontext.cxx
index f251f11..b8740f0 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -402,6 +402,7 @@ SvXMLImportContext*
ScXMLCellFieldSContext::CreateChildContext(
if (mnCount)
{
PushSpaces();
+mnCount = 0;
}
return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotools/source
unotools/source/config/configitem.cxx | 22 +-
1 file changed, 5 insertions(+), 17 deletions(-)
New commits:
commit 7f67dd5dfae59a492a88fb2569ee5600add1ecde
Author: Stephan Bergmann
Date: Tue Jul 23 19:00:33 2013 +0200
OSL_FAIL -> SAL_WARN
Change-Id: If0c4dce547184ca48f221793daf33e4592912cb2
diff --git a/unotools/source/config/configitem.cxx
b/unotools/source/config/configitem.cxx
index 228fc5d..3403140 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -487,23 +487,11 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence<
OUString >& rNames)
}
catch (const Exception& rEx)
{
-#if OSL_DEBUG_LEVEL > 0
-OString sMsg("XHierarchicalNameAccess: ");
-sMsg += OString(rEx.Message.getStr(),
-rEx.Message.getLength(),
- RTL_TEXTENCODING_ASCII_US);
-sMsg += OString("\n/org.openoffice.");
-sMsg += OString(sSubTree.getStr(),
-sSubTree.getLength(),
- RTL_TEXTENCODING_ASCII_US);
-sMsg += OString("/");
-sMsg += OString(pNames[i].getStr(),
-pNames[i].getLength(),
- RTL_TEXTENCODING_ASCII_US);
-OSL_FAIL(sMsg.getStr());
-#else
-(void) rEx; // avoid warning
-#endif
+SAL_WARN(
+"unotools.config",
+"ignoring XHierarchicalNameAccess to /org.openoffice."
+<< sSubTree << "/" << pNames[i] << " Exception: "
+<< rEx.Message);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - reportbuilder/java reportdesign/source
reportbuilder/java/libformula.properties
|4
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
| 57 ++
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
|4
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
|2
reportdesign/source/core/sdr/RptObject.cxx
|2
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
|2
6 files changed, 24 insertions(+), 47 deletions(-)
New commits:
commit c4ed35820178c6c990311e8fb48ea91b39c05988
Author: Lionel Elie Mamane
Date: Tue Jul 23 19:24:54 2013 +0200
a date is a date, not a float
Change-Id: Id9beab6a9cd9b7fa15ce0699b6eeb8a1e32448fe
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index d4c86c6..eca94e6 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -84,9 +84,9 @@ public class FormatValueUtility
}
else if (value instanceof Date)
{
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "float");
-ret = HSSFDateUtil.getExcelDate((Date) value).toString();
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE,
ret);
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "date");
+ret = formatDate((Date) value);
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
"date-value", ret);
}
else if (value instanceof Number)
{
commit cab9b82fb31217223511afcea88ad7446999492b
Author: Lionel Elie Mamane
Date: Tue Jul 23 19:14:04 2013 +0200
fdo#67186 switch reporbuilder to null date == 1899-12-30
This brings it in line with the default for other LibreOffice
components (e.g. Calc), or with the only supported value (e.g. Writer
tables), respectively.
Configure Pentaho jfreereport to also take null date == 1899-12-30
This combined allows reportbuilder to make absolutely no fiddly
conversion itself, leaving them to jfreereport and Writer table
cell format.
Also:
- Make absolutely no conversion itself, also e.g. for booleans.
- ODF compliance: make the value-type match the set foo-value attribute.
- Use value-type="void" instead of empty value-type="string"
Change-Id: I67990232dbc9e86ac3fa37cd0c20edecb87cf8ee
diff --git a/reportbuilder/java/libformula.properties
b/reportbuilder/java/libformula.properties
index f903736..79022b6 100644
--- a/reportbuilder/java/libformula.properties
+++ b/reportbuilder/java/libformula.properties
@@ -19,8 +19,8 @@
##
# Any configuration will happen here.
-org.pentaho.reporting.libraries.formula.datesystem.StartYear=1930
-org.pentaho.reporting.libraries.formula.datesystem.ExcelHack=false
+org.pentaho.reporting.libraries.formula.ZeroDate=1899
+org.pentaho.reporting.libraries.formula.ExcelDateBugAware=false
#
# A list of all known functions.
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index 4c1b8dd..d4c86c6 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -85,7 +85,7 @@ public class FormatValueUtility
else if (value instanceof Date)
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "float");
-ret = HSSFDateUtil.getExcelDate((Date) value, false, 2).toString();
+ret = HSSFDateUtil.getExcelDate((Date) value).toString();
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE,
ret);
}
else if (value instanceof Number)
@@ -112,8 +112,7 @@ public class FormatValueUtility
}
else
{
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "string");
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, "");
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "void");
}
return ret;
}
@@ -122,61 +121,39 @@ public class FormatValueUtility
{
if (value instanceof Time)
{
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "time");
Re: [Libreoffice-commits] core.git: #i121577# Allow setting toolbar name in Addons.xcu
Hi Stephan, On Tue, Jul 23, 2013 at 07:09:36PM +0200, Stephan Bergmann wrote: > Do we really want the below commits introduce an incompatible change > in LO 4.2? This change should only be applied on a major release - if ever (in retrospective, I wouldn't even commit this code, but not because I don't think it is an improvement...); in context: http://markmail.org/message/jpn4e3no4jgv3n4d http://markmail.org/message/fhsepy2a56yhubi2 > On 06/24/2013 12:58 PM, Ariel Constenla-Haile wrote: Regards -- Ariel Constenla-Haile La Plata, Argentina pgpKd4CYN57xU.pgp Description: PGP signature ___ 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 Mihkel Tõnnov changed: What|Removed |Added Depends on||61544 --- Comment #54 from Mihkel Tõnnov --- Adding bug 61544 - Some fields don't fit into Options dialog Several duplicates (so it must be annoying to several people), leaves parts of options dialog inaccessible. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/text/itrcrsr.cxx | 11 ++-
sw/source/core/text/txtdrop.cxx |3 +++
2 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 1f47b46959267a25195d4f3f5602ca638bb14c58
Author: Zolnai Tamás
Date: Tue Jul 23 13:14:53 2013 +0200
Fix drop caps background
Background were shifted upwards with the descent
of the character and so the default grey background
hanged out under the user added background.
Examples: A (no descent), S (small descent)
Q (big descent)
Change-Id: I044fc63cf9988152e7b6aa4042bcf14651e097c0
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index d61ca5c..d708cc67 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -281,9 +281,11 @@ void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf )
const
const SwDropPortionPart* pCurrPart = GetPart();
const xub_StrLen nOldLen = GetLen();
+const KSHORT nOldAscent = GetAscent();
const SwTwips nBasePosY = rInf.Y();
((SwTxtPaintInfo&)rInf).Y( nBasePosY + nY );
+((SwDropPortion*)this)->SetAscent( nOldAscent + nY );
SwDropSave aSave( rInf );
// for text inside drop portions we let vcl handle the text directions
SwLayoutModeModifier aLayoutModeModifier( *rInf.GetOut() );
@@ -304,6 +306,7 @@ void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf )
const
((SwTxtPaintInfo&)rInf).Y( nBasePosY );
((SwDropPortion*)this)->SetLen( nOldLen );
+((SwDropPortion*)this)->SetAscent( nOldAscent );
}
/*
commit c8b4ffc2adcc744c0d7d5e68944439238828692b
Author: Zolnai Tamás
Date: Tue Jul 23 11:18:38 2013 +0200
Check explicitily the space at the end of the line
Can be bugous when the last character not a space.
I don't have any real life examples, just some extreme
-Line break is inside a word without hyphenation
-A tabulator follow the last character of the line and so
this tabulator get to the next line.
Change-Id: I3c5d372295b960a5cc22c19ada382d0a995787cc
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index a162a24..42ab844 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1259,7 +1259,7 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos,
const Point &rPoint,
// If necessary, as catch up, do the adjustment
GetAdjusted();
-const XubString &rText = GetInfo().GetTxt();
+const OUString &rText = GetInfo().GetTxt();
xub_StrLen nOffset = 0;
// x is the horizontal offset within the line.
@@ -1452,7 +1452,7 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos,
const Point &rPoint,
( pPor->IsMarginPortion() && !pPor->GetPortion() &&
// 46598: Consider the situation: We might end up behind the
last character,
// in the last line of a centered paragraph
- nCurrStart < rText.Len() ) )
+ nCurrStart < rText.getLength() ) )
--nCurrStart;
else if( pPor->InFldGrp() && ((SwFldPortion*)pPor)->IsFollow()
&& nWidth > nX )
@@ -1523,7 +1523,9 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos,
const Point &rPoint,
}
}
-if( bLastPortion && (pCurr->GetNext() || pFrm->GetFollow() ) )
+// Skip space at the end of the line
+if( bLastPortion && (pCurr->GetNext() || pFrm->GetFollow() )
+&& rText[nCurrStart + nLength - 1] == ' ' )
--nLength;
if( nWidth > nX ||
@@ -1592,8 +1594,7 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos,
const Point &rPoint,
else
nOldProp = 0;
{
-OUString aText = rText;
-SwTxtSizeInfo aSizeInf( GetInfo(), &aText, nCurrStart );
+SwTxtSizeInfo aSizeInf( GetInfo(), &rText, nCurrStart );
((SwTxtCursor*)this)->SeekAndChg( aSizeInf );
SwTxtSlot aDiffTxt( &aSizeInf, ((SwTxtPortion*)pPor), false,
false );
SwFontSave aSave( aSizeInf, pPor->IsDropPortion() ?
___
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/filter/xml/celltextparacontext.cxx | 84 +++
sc/source/filter/xml/celltextparacontext.hxx | 23 +++
sc/source/filter/xml/xmlimprt.cxx| 19 ++
sc/source/filter/xml/xmlimprt.hxx| 14
4 files changed, 138 insertions(+), 2 deletions(-)
New commits:
commit f9f768c3443a6194e6b46c4c6a7be1de712d54f6
Author: Eike Rathke
Date: Tue Jul 23 17:17:18 2013 +0200
resolved fdo#67094 handle in and
821521f757569c96ded6004bb2cb0d003481b55b introduced XML_SPAN but removed
handling of XML_S repeated U+0020, SPACE
Change-Id: Ic1b00c9dbc33c750b9a8cae910b4ca0bed42ab5a
(cherry picked from commit be10607d358f7587f10e76084893ceed3a4c9215)
Reviewed-on: https://gerrit.libreoffice.org/5051
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sc/source/filter/xml/celltextparacontext.cxx
b/sc/source/filter/xml/celltextparacontext.cxx
index fbbcf6f..f251f11 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -12,6 +12,7 @@
#include "xmlcelli.hxx"
#include "xmloff/nmspmap.hxx"
+#include "comphelper/string.hxx"
#include
@@ -53,6 +54,8 @@ SvXMLImportContext*
ScXMLCellTextParaContext::CreateChildContext(
const SvXMLTokenMap& rTokenMap =
GetScImport().GetCellTextParaElemTokenMap();
switch (rTokenMap.Get(nPrefix, rLocalName))
{
+case XML_TOK_CELL_TEXT_S:
+return new ScXMLCellFieldSContext(GetScImport(), nPrefix,
rLocalName, *this);
case XML_TOK_CELL_TEXT_SPAN:
return new ScXMLCellTextSpanContext(GetScImport(), nPrefix,
rLocalName, *this);
case XML_TOK_CELL_TEXT_SHEET_NAME:
@@ -179,6 +182,12 @@ SvXMLImportContext*
ScXMLCellTextSpanContext::CreateChildContext(
p->SetStyleName(maStyleName);
return p;
}
+case XML_TOK_CELL_TEXT_SPAN_ELEM_S:
+{
+ScXMLCellFieldSContext* p = new
ScXMLCellFieldSContext(GetScImport(), nPrefix, rLocalName, mrParentCxt);
+p->SetStyleName(maStyleName);
+return p;
+}
default:
;
}
@@ -338,4 +347,79 @@ SvXMLImportContext*
ScXMLCellFieldURLContext::CreateChildContext(
return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
}
+ScXMLCellFieldSContext::ScXMLCellFieldSContext(
+ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName,
ScXMLCellTextParaContext& rParent) :
+ScXMLImportContext(rImport, nPrefix, rLName),
+mrParentCxt(rParent),
+mnCount(1)
+{
+}
+
+void ScXMLCellFieldSContext::SetStyleName(const OUString& rStyleName)
+{
+maStyleName = rStyleName;
+}
+
+void ScXMLCellFieldSContext::StartElement(const
uno::Reference& xAttrList)
+{
+if (!xAttrList.is())
+return;
+
+OUString aLocalName;
+sal_Int16 nAttrCount = xAttrList->getLength();
+
+const SvXMLTokenMap& rTokenMap = GetScImport().GetCellTextSAttrTokenMap();
+for (sal_Int16 i = 0; i < nAttrCount; ++i)
+{
+sal_uInt16 nAttrPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName(
+xAttrList->getNameByIndex(i), &aLocalName);
+
+const OUString& rAttrValue = xAttrList->getValueByIndex(i);
+sal_uInt16 nToken = rTokenMap.Get(nAttrPrefix, aLocalName);
+switch (nToken)
+{
+case XML_TOK_CELL_TEXT_S_ATTR_C:
+mnCount = rAttrValue.toInt32();
+if (mnCount <= 0)
+mnCount = 1; // worth a warning?
+break;
+default:
+;
+}
+}
+}
+
+void ScXMLCellFieldSContext::EndElement()
+{
+if (mnCount)
+PushSpaces();
+}
+
+SvXMLImportContext* ScXMLCellFieldSContext::CreateChildContext(
+sal_uInt16 nPrefix, const OUString& rLocalName, const
uno::Reference& /*xAttrList*/)
+{
+// does not have child elements, but ...
+if (mnCount)
+{
+PushSpaces();
+}
+
+return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
+}
+
+void ScXMLCellFieldSContext::PushSpaces()
+{
+if (mnCount > 0)
+{
+if (mnCount == 1)
+mrParentCxt.PushSpan(" ", maStyleName);
+else
+{
+OUStringBuffer aBuf( mnCount);
+comphelper::string::padToLength( aBuf, mnCount, ' ');
+mrParentCxt.PushSpan( aBuf.makeStringAndClear(), maStyleName);
+}
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/celltextparacontext.hxx
b/sc/source/filter/xml/celltextparacontext.hxx
index 10e5a23..68adaae 100644
--- a/sc/source/filter/xml/celltextparacontext.hxx
+++ b/sc/source/filter/xml/celltextparacontext.hxx
@@ -134,6 +134,27 @@ public:
sal_uInt16 nPrefix, const OUString& rLocalName, const
com::sun::star::uno::Reference&
xAttrList);
};
+/**
+ * This context handles element inside or .
+ */
+class ScXMLCellFieldSC
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/inc vcl/source
vcl/inc/svdata.hxx | 22 ++
vcl/source/app/svdata.cxx |9 +
vcl/source/app/svmain.cxx |3 +++
vcl/source/gdi/bitmapex.cxx | 42 ++
4 files changed, 52 insertions(+), 24 deletions(-)
New commits:
commit 8ec6ab11d6fd77405646636beeaccf913a5da53d
Author: Caolán McNamara
Date: Thu Jun 20 10:01:10 2013 +0100
move static bitmap into a svapp member
so it won't crash on exit when its dtor uses stuff destroyed by deinitvcl
already.
also fix comparisons, i.e. presumably
aLastColorTopLeft == aLastColorTopLeft etc
should have been aLastColorTopLeft == aColorTopLeft
Change-Id: I1f3dc47504c5add113b3a8bcadf010ca3b9f4c31
(cherry picked from commit a3694b1b32cb0677019962a5908fe775c83ed5a6)
Reviewed-on: https://gerrit.libreoffice.org/5050
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 86b0d7a9..a929165 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -284,6 +284,26 @@ struct ImplSVNWFData
boolmbDDListBoxNoTextArea:1;
};
+struct BlendFrameCache
+{
+Size m_aLastSize;
+sal_uInt8 m_nLastAlpha;
+Color m_aLastColorTopLeft;
+Color m_aLastColorTopRight;
+Color m_aLastColorBottomRight;
+Color m_aLastColorBottomLeft;
+BitmapEx m_aLastResult;
+
+BlendFrameCache()
+: m_aLastSize(0, 0)
+, m_nLastAlpha(0)
+, m_aLastColorTopLeft(COL_BLACK)
+, m_aLastColorTopRight(COL_BLACK)
+, m_aLastColorBottomRight(COL_BLACK)
+, m_aLastColorBottomLeft(COL_BLACK)
+{
+}
+};
struct ImplSVData
{
@@ -312,6 +332,7 @@ struct ImplSVData
UnoWrapperBase* mpUnoWrapper;
Window* mpIntroWindow; // the splash screen
DockingManager* mpDockingManager;
+BlendFrameCache*mpBlendFrameCache;
sal_BoolmbIsTestTool;
oslThreadIdentifier mnMainThreadId;
@@ -330,6 +351,7 @@ Window* ImplGetDefaultWindow();
VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr();
VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if
no res mgr
DockingManager* ImplGetDockingManager();
+BlendFrameCache*ImplGetBlendFrameCache();
voidImplWindowAutoMnemonic( Window* pWindow );
voidImplUpdateSystemProcessWindow();
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index feec982..2a7bc93 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -256,6 +256,15 @@ DockingManager* ImplGetDockingManager()
return pSVData->mpDockingManager;
}
+BlendFrameCache* ImplGetBlendFrameCache()
+{
+ImplSVData* pSVData = ImplGetSVData();
+if ( !pSVData->mpBlendFrameCache)
+pSVData->mpBlendFrameCache= new BlendFrameCache();
+
+return pSVData->mpBlendFrameCache;
+}
+
class AccessBridgeCurrentContext: public cppu::WeakImplHelper1<
com::sun::star::uno::XCurrentContext >
{
public:
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 21a351b..9104be9 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -540,6 +540,9 @@ void DeInitVCL()
if ( pSVData->maAppData.mpFirstEventHook )
ImplFreeEventHookData();
+if (pSVData->mpBlendFrameCache)
+delete pSVData->mpBlendFrameCache, pSVData->mpBlendFrameCache = NULL;
+
ImplDeletePrnQueueList();
delete pSVData->maGDIData.mpScreenFontList;
pSVData->maGDIData.mpScreenFontList = NULL;
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 1266043..094b7c7 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -959,31 +959,25 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame(
Color aColorBottomRight,
Color aColorBottomLeft)
{
-static Size aLastSize(0, 0);
-static sal_uInt8 nLastAlpha(0);
-static Color aLastColorTopLeft(COL_BLACK);
-static Color aLastColorTopRight(COL_BLACK);
-static Color aLastColorBottomRight(COL_BLACK);
-static Color aLastColorBottomLeft(COL_BLACK);
-static BitmapEx aLastResult;
-
-if(aLastSize == rSize
-&& nLastAlpha == nAlpha
-&& aLastColorTopLeft == aLastColorTopLeft
-&& aLastColorTopRight == aLastColorTopRight
-&& aLastColorBottomRight == aLastColorBottomRight
-&& aLastColorBottomLeft == aLastColorBottomLeft)
+BlendFrameCache* pBlendFrameCache = ImplGetBlendFrameCache();
+
+if(pBlendFrameCache->m_aLastSize == rSize
+&& pBlendFrameCache->m_nLastAlpha == nAlpha
+&& pBlendFrameCache->m_aLastColorTopLeft == aColorTopLeft
+&& pBlendFrameCache->m_aLastColorTopRight == aColorTopRight
+&& pBlendFrameCache->m_aLastColorBottomRight == aColorBottomRight
+&& pBlendFrameCache->m_aLastColorBottomLeft == aColorBottomLeft)
{
-return aLastResult;
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo64637.rtf | 13 +
sw/qa/extras/rtfimport/rtfimport.cxx | 10 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 +++--
3 files changed, 30 insertions(+), 2 deletions(-)
New commits:
commit 58a285d8d504c5ae952d314238dbbaa873b51db7
Author: Miklos Vajna
Date: Tue Jul 23 12:01:47 2013 +0200
fdo#64637 RTF import: handle multiple RTF_COMPANY
Instead of unconditionally calling addProperty(), first check the
existence with hasPropertyByName() and call setPropertyValue() instead,
if necessary.
(cherry picked from commit bb67e709b70919efb41ec41e93dd92953dc6a003)
Change-Id: Ie0a075bbfe6eaa1f66726c456105dcdef9001d30
Reviewed-on: https://gerrit.libreoffice.org/5049
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sw/qa/extras/rtfimport/data/fdo64637.rtf
b/sw/qa/extras/rtfimport/data/fdo64637.rtf
new file mode 100644
index 000..9bec690
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo64637.rtf
@@ -0,0 +1,13 @@
+{\rtf1
+{\info
+{\upr
+{\company aaa}
+{\*\ud
+{\company
+bbb
+}
+}
+}
+}
+foo
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 58353bf..9a6974f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -146,6 +146,7 @@ public:
void testFdo39001();
void testFdo66565();
void testFdo54900();
+void testFdo64637();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -279,6 +280,7 @@ void Test::run()
{"fdo39001.rtf", &Test::testFdo39001},
{"fdo66565.rtf", &Test::testFdo66565},
{"fdo54900.rtf", &Test::testFdo54900},
+{"fdo64637.rtf", &Test::testFdo64637},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1343,6 +1345,14 @@ void Test::testFdo54900()
CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
static_cast(getProperty(getParagraphOfText(1,
xCell->getText()), "ParaAdjust")));
}
+void Test::testFdo64637()
+{
+// The problem was that the custom "Company" property was added twice, the
second invocation resulted in an exception.
+uno::Reference
xDocumentPropertiesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference
xPropertySet(xDocumentPropertiesSupplier->getDocumentProperties()->getUserDefinedProperties(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getProperty(xPropertySet,
"Company"));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5e93fc2..769191b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4006,11 +4006,16 @@ int RTFDocumentImpl::popState()
case DESTINATION_COMPANY:
{
OUString aName = aState.nDestinationState ==
DESTINATION_OPERATOR ? OUString("Operator") : OUString("Company");
+uno::Any aValue =
uno::makeAny(m_aStates.top().aDestinationText.makeStringAndClear());
if (m_xDocumentProperties.is())
{
uno::Reference
xUserDefinedProperties = m_xDocumentProperties->getUserDefinedProperties();
-xUserDefinedProperties->addProperty(aName,
beans::PropertyAttribute::REMOVABLE,
-
uno::makeAny(m_aStates.top().aDestinationText.makeStringAndClear()));
+uno::Reference
xPropertySet(xUserDefinedProperties, uno::UNO_QUERY);
+uno::Reference xPropertySetInfo =
xPropertySet->getPropertySetInfo();
+if (xPropertySetInfo->hasPropertyByName(aName))
+xPropertySet->setPropertyValue(aName, aValue);
+else
+xUserDefinedProperties->addProperty(aName,
beans::PropertyAttribute::REMOVABLE, aValue);
}
}
break;
___
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-0' - vcl/inc vcl/source
vcl/inc/svdata.hxx | 22 ++
vcl/source/app/svdata.cxx |9 +
vcl/source/app/svmain.cxx |3 +++
vcl/source/gdi/bitmapex.cxx | 42 ++
4 files changed, 52 insertions(+), 24 deletions(-)
New commits:
commit 2331a7a2a748a94546c702a80e8916f548e30176
Author: Caolán McNamara
Date: Thu Jun 20 10:01:10 2013 +0100
move static bitmap into a svapp member
so it won't crash on exit when its dtor uses stuff destroyed by deinitvcl
already.
also fix comparisons, i.e. presumably
aLastColorTopLeft == aLastColorTopLeft etc
should have been aLastColorTopLeft == aColorTopLeft
Change-Id: I1f3dc47504c5add113b3a8bcadf010ca3b9f4c31
(cherry picked from commit a3694b1b32cb0677019962a5908fe775c83ed5a6)
Reviewed-on: https://gerrit.libreoffice.org/5048
Reviewed-by: Miklos Vajna
Reviewed-by: Fridrich Strba
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 86b0d7a9..a929165 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -284,6 +284,26 @@ struct ImplSVNWFData
boolmbDDListBoxNoTextArea:1;
};
+struct BlendFrameCache
+{
+Size m_aLastSize;
+sal_uInt8 m_nLastAlpha;
+Color m_aLastColorTopLeft;
+Color m_aLastColorTopRight;
+Color m_aLastColorBottomRight;
+Color m_aLastColorBottomLeft;
+BitmapEx m_aLastResult;
+
+BlendFrameCache()
+: m_aLastSize(0, 0)
+, m_nLastAlpha(0)
+, m_aLastColorTopLeft(COL_BLACK)
+, m_aLastColorTopRight(COL_BLACK)
+, m_aLastColorBottomRight(COL_BLACK)
+, m_aLastColorBottomLeft(COL_BLACK)
+{
+}
+};
struct ImplSVData
{
@@ -312,6 +332,7 @@ struct ImplSVData
UnoWrapperBase* mpUnoWrapper;
Window* mpIntroWindow; // the splash screen
DockingManager* mpDockingManager;
+BlendFrameCache*mpBlendFrameCache;
sal_BoolmbIsTestTool;
oslThreadIdentifier mnMainThreadId;
@@ -330,6 +351,7 @@ Window* ImplGetDefaultWindow();
VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr();
VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if
no res mgr
DockingManager* ImplGetDockingManager();
+BlendFrameCache*ImplGetBlendFrameCache();
voidImplWindowAutoMnemonic( Window* pWindow );
voidImplUpdateSystemProcessWindow();
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index feec982..2a7bc93 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -256,6 +256,15 @@ DockingManager* ImplGetDockingManager()
return pSVData->mpDockingManager;
}
+BlendFrameCache* ImplGetBlendFrameCache()
+{
+ImplSVData* pSVData = ImplGetSVData();
+if ( !pSVData->mpBlendFrameCache)
+pSVData->mpBlendFrameCache= new BlendFrameCache();
+
+return pSVData->mpBlendFrameCache;
+}
+
class AccessBridgeCurrentContext: public cppu::WeakImplHelper1<
com::sun::star::uno::XCurrentContext >
{
public:
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 21a351b..9104be9 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -540,6 +540,9 @@ void DeInitVCL()
if ( pSVData->maAppData.mpFirstEventHook )
ImplFreeEventHookData();
+if (pSVData->mpBlendFrameCache)
+delete pSVData->mpBlendFrameCache, pSVData->mpBlendFrameCache = NULL;
+
ImplDeletePrnQueueList();
delete pSVData->maGDIData.mpScreenFontList;
pSVData->maGDIData.mpScreenFontList = NULL;
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 1266043..094b7c7 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -959,31 +959,25 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame(
Color aColorBottomRight,
Color aColorBottomLeft)
{
-static Size aLastSize(0, 0);
-static sal_uInt8 nLastAlpha(0);
-static Color aLastColorTopLeft(COL_BLACK);
-static Color aLastColorTopRight(COL_BLACK);
-static Color aLastColorBottomRight(COL_BLACK);
-static Color aLastColorBottomLeft(COL_BLACK);
-static BitmapEx aLastResult;
-
-if(aLastSize == rSize
-&& nLastAlpha == nAlpha
-&& aLastColorTopLeft == aLastColorTopLeft
-&& aLastColorTopRight == aLastColorTopRight
-&& aLastColorBottomRight == aLastColorBottomRight
-&& aLastColorBottomLeft == aLastColorBottomLeft)
+BlendFrameCache* pBlendFrameCache = ImplGetBlendFrameCache();
+
+if(pBlendFrameCache->m_aLastSize == rSize
+&& pBlendFrameCache->m_nLastAlpha == nAlpha
+&& pBlendFrameCache->m_aLastColorTopLeft == aColorTopLeft
+&& pBlendFrameCache->m_aLastColorTopRight == aColorTopRight
+&& pBlendFrameCache->m_aLastColorBottomRight == aColorBottomRight
+&& pBlendFrameCache->m_aLastColorBottomLef
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e3/e2cffab73c3acb48e79ce148807cb9528014a3
e3/e2cffab73c3acb48e79ce148807cb9528014a3 |1 + 1 file changed, 1 insertion(+) New commits: commit c728c3a966c02dce0584ff99a98f8b9ee31fe394 Author: Caolán McNamara Date: Tue Jul 23 21:05:12 2013 +0100 Notes added by 'git notes add' diff --git a/e3/e2cffab73c3acb48e79ce148807cb9528014a3 b/e3/e2cffab73c3acb48e79ce148807cb9528014a3 new file mode 100644 index 000..9fd34f2 --- /dev/null +++ b/e3/e2cffab73c3acb48e79ce148807cb9528014a3 @@ -0,0 +1 @@ +reject: regression from 551fe0714a688ef563d4ab67e1fb55a23698b8f2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx|1
sc/inc/table.hxx | 20 ++-
sc/source/core/data/column.cxx | 30 ++-
sc/source/core/data/document.cxx | 50 ++-
sc/source/core/data/table2.cxx |7 +
5 files changed, 94 insertions(+), 14 deletions(-)
New commits:
commit fd340291c4ef579ee42850f9b7842d6afe98877d
Author: Kohei Yoshida
Date: Tue Jul 23 16:02:37 2013 -0400
Broadcast on formula cells containing COLUMN functions on column insertion.
To ensure that the change gets propagated properly. This fixes
testFuncCOLUMN() cppunit test.
Change-Id: Ia1ffc2880b7dae530ceb11c617c3963f7bfaeb00
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 00b2a63..5ef6cce 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -431,6 +431,7 @@ public:
voidStartAllListeners();
voidStartNeededListeners(); // only for cells where
NeedsListening()==true
voidSetRelNameDirty();
+void BroadcastRecalcOnRefMove();
voidCompileDBFormula();
voidCompileDBFormula( bool bCreateFormulaString );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 0e4305a..00cc7e5 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -862,6 +862,24 @@ public:
void SetFormulaResults( SCCOL nCol, SCROW nRow, const double* pResults,
size_t nLen );
+/**
+ * Have formula cells with NeedsListening() == true start listening to the
+ * document.
+ */
+void StartNeededListeners();
+
+/**
+ * Mark dirty those formula cells that has named ranges with relative
+ * references.
+ */
+void SetRelNameDirty();
+
+/**
+ * Broadcast dirty formula cells that contain functions such as CELL(),
+ * COLUMN() or ROW() which may change its value on move.
+ */
+void BroadcastRecalcOnRefMove();
+
#if DEBUG_COLUMN_STORAGE
void DumpFormulaGroups( SCCOL nCol ) const;
#endif
@@ -968,8 +986,6 @@ private:
void StartListening( sc::StartListeningContext& rCxt, SCCOL nCol, SCROW
nRow, SvtListener& rListener );
void EndListening( sc::EndListeningContext& rCxt, SCCOL nCol, SCROW nRow,
SvtListener& rListener );
voidStartAllListeners();
-voidStartNeededListeners(); // only for cells where
NeedsListening()==TRUE
-voidSetRelNameDirty();
voidSetLoadingMedium(bool bLoading);
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 23a740f..da3cb49 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2144,6 +2144,7 @@ void resetColumnPosition(sc::CellStoreType& rCells, SCCOL
nCol)
void ScColumn::SwapCol(ScColumn& rCol)
{
+maBroadcasters.swap(rCol.maBroadcasters);
maCells.swap(rCol.maCells);
maCellTextAttrs.swap(rCol.maCellTextAttrs);
@@ -2163,7 +2164,6 @@ void ScColumn::SwapCol(ScColumn& rCol)
CellStorageModified();
rCol.CellStorageModified();
-
}
void ScColumn::MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol)
@@ -3004,6 +3004,26 @@ void ScColumn::SetDirtyAfterLoad()
sc::ProcessFormula(maCells, aFunc);
}
+namespace {
+
+class RecalcOnRefMoveCollector
+{
+std::vector maDirtyRows;
+public:
+void operator() (size_t nRow, ScFormulaCell* pCell)
+{
+if (pCell->GetDirty() && pCell->GetCode()->IsRecalcModeOnRefMove())
+maDirtyRows.push_back(nRow);
+}
+
+const std::vector& getDirtyRows() const
+{
+return maDirtyRows;
+}
+};
+
+}
+
void ScColumn::SetRelNameDirty()
{
sc::AutoCalcSwitch aSwitch(*pDocument, false);
@@ -3011,6 +3031,14 @@ void ScColumn::SetRelNameDirty()
sc::ProcessFormula(maCells, aFunc);
}
+void ScColumn::BroadcastRecalcOnRefMove()
+{
+sc::AutoCalcSwitch aSwitch(*pDocument, false);
+RecalcOnRefMoveCollector aFunc;
+sc::ProcessFormula(maCells, aFunc);
+BroadcastCells(aFunc.getDirtyRows());
+}
+
void ScColumn::CalcAll()
{
CalcAllHandler aFunc;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index dfc17cf..9cba374 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1334,6 +1334,36 @@ bool ScDocument::CanInsertCol( const ScRange& rRange )
const
return bTest;
}
+namespace {
+
+struct StartNeededListenersHandler : std::unary_function
+{
+void operator() (ScTable* p)
+{
+if (p)
+p->StartNeededListeners();
+}
+};
+
+struct SetRelNameDirtyHandler : std::unary_function
+{
+void operator() (ScTable* p)
+{
+if (p)
+p->SetRelNameDirty();
+}
+};
+
+struct BroadcastRecalcOnRefMoveHandler : std::unary_function
+{
+void operator() (ScTable* p)
+{
+if (p)
+p->BroadcastRecalcOnRefMove();
+}
+};
+
+}
bool ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
SCROW nE
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sc/source
sc/source/filter/xml/celltextparacontext.cxx | 84 +++
sc/source/filter/xml/celltextparacontext.hxx | 23 +++
sc/source/filter/xml/xmlimprt.cxx| 19 ++
sc/source/filter/xml/xmlimprt.hxx| 14
4 files changed, 138 insertions(+), 2 deletions(-)
New commits:
commit 3d1ab404feb742c59652b381c54af4ca624dca15
Author: Eike Rathke
Date: Tue Jul 23 17:17:18 2013 +0200
resolved fdo#67094 handle in and
821521f757569c96ded6004bb2cb0d003481b55b introduced XML_SPAN but removed
handling of XML_S repeated U+0020, SPACE
Change-Id: Ic1b00c9dbc33c750b9a8cae910b4ca0bed42ab5a
(cherry picked from commit be10607d358f7587f10e76084893ceed3a4c9215)
Reviewed-on: https://gerrit.libreoffice.org/5052
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
Reviewed-by: Fridrich Strba
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/sc/source/filter/xml/celltextparacontext.cxx
b/sc/source/filter/xml/celltextparacontext.cxx
index fbbcf6f..f251f11 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -12,6 +12,7 @@
#include "xmlcelli.hxx"
#include "xmloff/nmspmap.hxx"
+#include "comphelper/string.hxx"
#include
@@ -53,6 +54,8 @@ SvXMLImportContext*
ScXMLCellTextParaContext::CreateChildContext(
const SvXMLTokenMap& rTokenMap =
GetScImport().GetCellTextParaElemTokenMap();
switch (rTokenMap.Get(nPrefix, rLocalName))
{
+case XML_TOK_CELL_TEXT_S:
+return new ScXMLCellFieldSContext(GetScImport(), nPrefix,
rLocalName, *this);
case XML_TOK_CELL_TEXT_SPAN:
return new ScXMLCellTextSpanContext(GetScImport(), nPrefix,
rLocalName, *this);
case XML_TOK_CELL_TEXT_SHEET_NAME:
@@ -179,6 +182,12 @@ SvXMLImportContext*
ScXMLCellTextSpanContext::CreateChildContext(
p->SetStyleName(maStyleName);
return p;
}
+case XML_TOK_CELL_TEXT_SPAN_ELEM_S:
+{
+ScXMLCellFieldSContext* p = new
ScXMLCellFieldSContext(GetScImport(), nPrefix, rLocalName, mrParentCxt);
+p->SetStyleName(maStyleName);
+return p;
+}
default:
;
}
@@ -338,4 +347,79 @@ SvXMLImportContext*
ScXMLCellFieldURLContext::CreateChildContext(
return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
}
+ScXMLCellFieldSContext::ScXMLCellFieldSContext(
+ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName,
ScXMLCellTextParaContext& rParent) :
+ScXMLImportContext(rImport, nPrefix, rLName),
+mrParentCxt(rParent),
+mnCount(1)
+{
+}
+
+void ScXMLCellFieldSContext::SetStyleName(const OUString& rStyleName)
+{
+maStyleName = rStyleName;
+}
+
+void ScXMLCellFieldSContext::StartElement(const
uno::Reference& xAttrList)
+{
+if (!xAttrList.is())
+return;
+
+OUString aLocalName;
+sal_Int16 nAttrCount = xAttrList->getLength();
+
+const SvXMLTokenMap& rTokenMap = GetScImport().GetCellTextSAttrTokenMap();
+for (sal_Int16 i = 0; i < nAttrCount; ++i)
+{
+sal_uInt16 nAttrPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName(
+xAttrList->getNameByIndex(i), &aLocalName);
+
+const OUString& rAttrValue = xAttrList->getValueByIndex(i);
+sal_uInt16 nToken = rTokenMap.Get(nAttrPrefix, aLocalName);
+switch (nToken)
+{
+case XML_TOK_CELL_TEXT_S_ATTR_C:
+mnCount = rAttrValue.toInt32();
+if (mnCount <= 0)
+mnCount = 1; // worth a warning?
+break;
+default:
+;
+}
+}
+}
+
+void ScXMLCellFieldSContext::EndElement()
+{
+if (mnCount)
+PushSpaces();
+}
+
+SvXMLImportContext* ScXMLCellFieldSContext::CreateChildContext(
+sal_uInt16 nPrefix, const OUString& rLocalName, const
uno::Reference& /*xAttrList*/)
+{
+// does not have child elements, but ...
+if (mnCount)
+{
+PushSpaces();
+}
+
+return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
+}
+
+void ScXMLCellFieldSContext::PushSpaces()
+{
+if (mnCount > 0)
+{
+if (mnCount == 1)
+mrParentCxt.PushSpan(" ", maStyleName);
+else
+{
+OUStringBuffer aBuf( mnCount);
+comphelper::string::padToLength( aBuf, mnCount, ' ');
+mrParentCxt.PushSpan( aBuf.makeStringAndClear(), maStyleName);
+}
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/celltextparacontext.hxx
b/sc/source/filter/xml/celltextparacontext.hxx
index 10e5a23..68adaae 100644
--- a/sc/source/filter/xml/celltextparacontext.hxx
+++ b/sc/source/filter/xml/celltextparacontext.hxx
@@ -134,6 +134,27 @@ public:
sal_uInt16 nPrefix, const OUString& rLocalName, const
com::sun::star::uno::Reference&
xAttrList
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.hxx |2 +
sc/qa/unit/ucalc_formula.cxx | 37 +
sc/source/core/data/document.cxx | 67 ---
3 files changed, 75 insertions(+), 31 deletions(-)
New commits:
commit d638ba896f4d52c06a5c452c6a56904a3c6429bb
Author: Kohei Yoshida
Date: Tue Jul 23 16:49:35 2013 -0400
Broadcast on recalc-ref-on-move cells for the other 3 directions.
Change-Id: I7794bd51c5fedb6c6c75f6910b7743df96d156c3
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 9cba374..f32fcd5 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1122,6 +1122,36 @@ bool ScDocument::CanInsertRow( const ScRange& rRange )
const
return bTest;
}
+namespace {
+
+struct StartNeededListenersHandler : std::unary_function
+{
+void operator() (ScTable* p)
+{
+if (p)
+p->StartNeededListeners();
+}
+};
+
+struct SetRelNameDirtyHandler : std::unary_function
+{
+void operator() (ScTable* p)
+{
+if (p)
+p->SetRelNameDirty();
+}
+};
+
+struct BroadcastRecalcOnRefMoveHandler : std::unary_function
+{
+void operator() (ScTable* p)
+{
+if (p)
+p->BroadcastRecalcOnRefMove();
+}
+};
+
+}
bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
SCCOL nEndCol, SCTAB nEndTab,
@@ -1204,6 +1234,8 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB
nStartTab,
for (; it != maTabs.end(); ++it)
if (*it)
(*it)->SetRelNameDirty();
+
+std::for_each(maTabs.begin(), maTabs.end(),
BroadcastRecalcOnRefMoveHandler());
}
bRet = true;
}
@@ -1297,6 +1329,8 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB
nStartTab,
for (; it != maTabs.end(); ++it)
if (*it)
(*it)->SetRelNameDirty();
+
+std::for_each(maTabs.begin(), maTabs.end(),
BroadcastRecalcOnRefMoveHandler());
}
SetAutoCalc( bOldAutoCalc );
@@ -1334,37 +1368,6 @@ bool ScDocument::CanInsertCol( const ScRange& rRange )
const
return bTest;
}
-namespace {
-
-struct StartNeededListenersHandler : std::unary_function
-{
-void operator() (ScTable* p)
-{
-if (p)
-p->StartNeededListeners();
-}
-};
-
-struct SetRelNameDirtyHandler : std::unary_function
-{
-void operator() (ScTable* p)
-{
-if (p)
-p->SetRelNameDirty();
-}
-};
-
-struct BroadcastRecalcOnRefMoveHandler : std::unary_function
-{
-void operator() (ScTable* p)
-{
-if (p)
-p->BroadcastRecalcOnRefMove();
-}
-};
-
-}
-
bool ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
SCROW nEndRow, SCTAB nEndTab,
SCCOL nStartCol, SCSIZE nSize, ScDocument*
pRefUndoDoc,
@@ -1524,6 +1527,8 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB
nStartTab, SCROW nEndRow, SCTA
for (; it != maTabs.end(); ++it)
if (*it)
(*it)->SetRelNameDirty();
+
+std::for_each(maTabs.begin(), maTabs.end(),
BroadcastRecalcOnRefMoveHandler());
}
SetAutoCalc( bOldAutoCalc );
commit 8edaa54f681a58f7266748437fa3c62dec8873cb
Author: Kohei Yoshida
Date: Tue Jul 23 16:48:56 2013 -0400
Add test for ROW function.
Change-Id: Ie918d3b9d635febe40ac974a37da0743830b65eb
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 71a3268..ac17bd9 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -90,6 +90,7 @@ public:
void testFormulaRefUpdateRange();
void testFormulaRefUpdateSheets();
void testFuncCOLUMN();
+void testFuncROW();
void testFuncSUM();
void testFuncPRODUCT();
void testFuncN();
@@ -280,6 +281,7 @@ public:
CPPUNIT_TEST(testFormulaRefUpdateRange);
CPPUNIT_TEST(testFormulaRefUpdateSheets);
CPPUNIT_TEST(testFuncCOLUMN);
+CPPUNIT_TEST(testFuncROW);
CPPUNIT_TEST(testFuncSUM);
CPPUNIT_TEST(testFuncPRODUCT);
CPPUNIT_TEST(testFuncN);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 0aee2eb..c651b6d 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -855,6 +855,43 @@ void Test::testFuncCOLUMN()
// The cell that references the moved cell should update its value as well.
CPPUNIT_ASSERT_EQUAL(7.0, m_pDoc->GetValue(ScAddress(0,1,0)));
+// Move the column in the other direction.
+m_pDoc->DeleteCol(ScRange(5,0,0,5,MAXROW,0));
+
+CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(ScAddress(5,10,0)));
+
+// The cell that references the moved cell should update its value as well.
+CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(ScAddress(0,1,0)));
+
+m_pDoc->DeleteTab(0);
+}
+
+void Test::testFuncROW()
+{
+m_pDoc->InsertTab(0, "Formula");
+sc::AutoCalcSwitch
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/ods/rich-text-cells.ods |binary
sc/qa/unit/subsequent_filters-test.cxx | 57 +++-
2 files changed, 49 insertions(+), 8 deletions(-)
New commits:
commit 038d162b175b62d67a94d4418b3a15a1a382419d
Author: Eike Rathke
Date: Tue Jul 23 22:58:25 2013 +0200
unit test for in and , fdo#67094
Change-Id: I033668dcdcdcc1a5710f2ddacadf9a1a5344638e
diff --git a/sc/qa/unit/data/ods/rich-text-cells.ods
b/sc/qa/unit/data/ods/rich-text-cells.ods
index da3a1ed..b039c37 100644
Binary files a/sc/qa/unit/data/ods/rich-text-cells.ods and
b/sc/qa/unit/data/ods/rich-text-cells.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 3ed4d6e..79d31c8 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1660,18 +1660,20 @@ void ScFiltersTest::testRichTextContentODS()
// first line is bold.
pEditText->GetCharAttribs(0, aAttribs);
-bool bHasBold = false;
-for (it = aAttribs.begin(), itEnd = aAttribs.end(); it != itEnd; ++it)
{
-if (it->pAttr->Which() == EE_CHAR_WEIGHT)
+bool bHasBold = false;
+for (it = aAttribs.begin(), itEnd = aAttribs.end(); it != itEnd; ++it)
{
-const SvxWeightItem& rItem = static_cast(*it->pAttr);
-bHasBold = (rItem.GetWeight() == WEIGHT_BOLD);
-if (bHasBold)
-break;
+if (it->pAttr->Which() == EE_CHAR_WEIGHT)
+{
+const SvxWeightItem& rItem = static_cast(*it->pAttr);
+bHasBold = (rItem.GetWeight() == WEIGHT_BOLD);
+if (bHasBold)
+break;
+}
}
+CPPUNIT_ASSERT_MESSAGE("First line should be bold.", bHasBold);
}
-CPPUNIT_ASSERT_MESSAGE("First line should be bold.", bHasBold);
// second line is italic.
pEditText->GetCharAttribs(1, aAttribs);
@@ -1738,6 +1740,45 @@ void ScFiltersTest::testRichTextContentODS()
const SvxURLField* pURLData = static_cast(pData);
CPPUNIT_ASSERT_MESSAGE("URL is not absolute with respect to the file
system.", pURLData->GetURL().startsWith("file:///"));
+// Embedded spaces as , normal text
+aPos.IncRow();
+CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
+CPPUNIT_ASSERT_EQUAL(OUString("one two"), pDoc->GetString(aPos.Col(),
aPos.Row(), aPos.Tab()));
+
+// Leading space as .
+aPos.IncRow();
+CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
+CPPUNIT_ASSERT_EQUAL(OUString(" =3+4"), pDoc->GetString(aPos.Col(),
aPos.Row(), aPos.Tab()));
+
+// Embedded spaces with inside a , text
+// partly bold.
+aPos.IncRow();
+CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, pDoc->GetCellType(aPos));
+pEditText = pDoc->GetEditText(aPos);
+CPPUNIT_ASSERT_MESSAGE("Failed to retrieve edit text object.", pEditText);
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
pEditText->GetParagraphCount());
+aParaText = pEditText->GetText(0);
+CPPUNIT_ASSERT_EQUAL(OUString("one two"), aParaText);
+pEditText->GetCharAttribs(0, aAttribs);
+{
+bool bHasBold = false;
+for (it = aAttribs.begin(), itEnd = aAttribs.end(); it != itEnd; ++it)
+{
+if (it->pAttr->Which() == EE_CHAR_WEIGHT)
+{
+const SvxWeightItem& rItem = static_cast(*it->pAttr);
+bHasBold = (rItem.GetWeight() == WEIGHT_BOLD);
+if (bHasBold)
+{
+OUString aSeg = aParaText.copy(it->nStart, it->nEnd -
it->nStart);
+CPPUNIT_ASSERT_EQUAL(OUString("e t"), aSeg);
+break;
+}
+}
+}
+CPPUNIT_ASSERT_MESSAGE("Expected a bold sequence.", bHasBold);
+}
+
xDocSh->DoClose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools sc/source svx/source
include/svtools/ruler.hxx |2 -
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx | 22 +++-
svx/source/dialog/svxruler.cxx |4 +-
3 files changed, 9 insertions(+), 19 deletions(-)
New commits:
commit 0153ea7e11e5e67d272dfb3630e3ea7cc4d99df9
Author: Tomaž Vajngerl
Date: Tue Jul 23 22:59:31 2013 +0200
Fix compiler errors and warnings..
Change-Id: Id35cdec02c7a5175e1b429b723679541292ddfb3
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 4c08745..04237df 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -693,7 +693,7 @@ private:
protected:
long GetRulerVirHeight() const;
-MapMode GetMapMode() const { return maMapMode; }
+MapMode GetCurrentMapMode() const { return maMapMode; }
RulerUnitData GetCurrentRulerUnit() const;
public:
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index cb00bac..2c7325a 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -35,14 +35,14 @@ static const char* lclBasicStatisticsLabels[] =
"Groups", "Count", "Sum", "Mean", "Variance", NULL
};
-static const char* lclAnovaLabels[] =
+static const char* lclBasicStatisticsFormula[] =
{
-"Source of Variation", "SS", "df", "MS", "F", "P-value", "F critical", NULL
+"=COUNT(%RANGE%)", "=SUM(%RANGE%)", "=AVERAGE(%RANGE%)", "=VAR(%RANGE%)",
NULL
};
-static const char* lclAnovaFormula[] =
+static const char* lclAnovaLabels[] =
{
-"=COUNT(%RANGE%)", "=SUM(%RANGE%)", "=AVERAGE(%RANGE%)", "=VAR(%RANGE%)",
NULL
+"Source of Variation", "SS", "df", "MS", "F", "P-value", "F critical", NULL
};
static const OUString lclWildcardRange("%RANGE%");
@@ -65,16 +65,6 @@ OUString lclCreateMultiParameterFormula(
return aResult;
}
-class CellAddressIterator
-{
-public:
-CellAddressIterator(ScAddress& aStartAddress)
-{}
-
-virtual ~CellAddressIterator()
-{}
-};
-
}
ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog(
@@ -147,10 +137,10 @@ void
ScAnalysisOfVarianceDialog::CalculateInputAndWriteToOutput( )
OUString aFormulaString;
OUString aFormulaTemplate;
-for(sal_Int32 i = 0; lclAnovaFormula[i] != NULL; i++)
+for(sal_Int32 i = 0; lclBasicStatisticsFormula[i] != NULL; i++)
{
aAddress = ScAddress(outCol, outRow, outTab);
-aFormulaTemplate =
OUString::createFromAscii(lclAnovaFormula[i]);
+aFormulaTemplate =
OUString::createFromAscii(lclBasicStatisticsFormula[i]);
aFormulaString = aFormulaTemplate.replaceAll(lclWildcardRange,
aReferenceString);
pDocShell->GetDocFunc().SetFormulaCell(aAddress, new
ScFormulaCell(mDocument, aAddress, aFormulaString), true);
outCol++;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index ff87c51..d5ab943 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -436,10 +436,10 @@ SvxRuler::~SvxRuler()
void SvxRuler::NormalizePosition(long& rValue) const
{
-long aNewPositionLogic = pEditWin->PixelToLogic(Size(0, rValue),
GetMapMode()).Height();
+long aNewPositionLogic = pEditWin->PixelToLogic(Size(0, rValue),
GetCurrentMapMode()).Height();
long aTickDivider = GetCurrentRulerUnit().nTick1;
aNewPositionLogic = (aNewPositionLogic / aTickDivider) * aTickDivider;
-rValue = pEditWin->LogicToPixel(Size(0, aNewPositionLogic),
GetMapMode()).Height();
+rValue = pEditWin->LogicToPixel(Size(0, aNewPositionLogic),
GetCurrentMapMode()).Height();
}
long SvxRuler::ConvertHPosPixel(long nVal) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/Library_basctl.mk basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk basic/source include/basi
basctl/Library_basctl.mk |1
basctl/UIConfig_basicide.mk |1
basctl/source/basicide/baside2.cxx| 13
basctl/source/basicide/codecompleteoptionsdlg.cxx | 74
+++
basctl/source/basicide/codecompleteoptionsdlg.hxx | 54 ++
basctl/uiconfig/basicide/menubar/menubar.xml |2
basctl/uiconfig/basicide/ui/codecompleteoptionsdlg.ui | 212
++
basic/source/classes/codecompletecache.cxx| 21
basic/source/classes/sbxmod.cxx |3
include/basic/codecompletecache.hxx |4
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |4
sfx2/sdi/sfx.sdi |4
12 files changed, 371 insertions(+), 22 deletions(-)
New commits:
commit c4373b6e3b07bbd0d633499da4e1afd692d03889
Author: Gergo Mocsi
Date: Tue Jul 23 23:00:55 2013 +0200
GSOC work, ModalDialog instead of menu entry
Created a ModalDialog named CodeCompleteOptionsDlg to edit options for code
completition/suggestion.
Unimplemented features in it are disabled.
The dialog window uses Glade .ui file.
Change-Id: I1b59f386a9575aa25b38c5a1d7d1f020498a69ab
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index c008ad6..b609aae 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -99,6 +99,7 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/basicide/linenumberwindow \
basctl/source/basicide/localizationmgr \
basctl/source/basicide/macrodlg \
+ basctl/source/basicide/codecompleteoptionsdlg \
basctl/source/basicide/moduldl2 \
basctl/source/basicide/moduldlg \
basctl/source/basicide/objdlg \
diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 013df6e..624f426 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
+ basctl/uiconfig/basicide/ui/codecompleteoptionsdlg \
))
# vim: set noet sw=4 ts=4:
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 1fff14a..bc24c57 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -54,6 +54,7 @@
#include
#include
#include
+#include "codecompleteoptionsdlg.hxx"
namespace basctl
{
@@ -1013,8 +1014,8 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
break;
case SID_BASICIDE_CODECOMPLETITION:
{
-SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot(), false);
-CodeCompleteOptions::SetCodeCompleteOn( pItem && pItem->GetValue()
);
+boost::scoped_ptr< CodeCompleteOptionsDlg > pDlg( new
CodeCompleteOptionsDlg( this ) );
+pDlg->Execute();
}
break;
case SID_CUT:
@@ -1166,15 +1167,9 @@ void ModulWindow::GetState( SfxItemSet &rSet )
case SID_BASICIDE_CODECOMPLETITION:
{
SvtMiscOptions aMiscOptions;
-if( aMiscOptions.IsExperimentalMode() )
-{
-rSet.Put(SfxBoolItem( nWh,
CodeCompleteOptions::IsCodeCompleteOn() ));
-std::cerr <<"code complete set to: " <<
CodeCompleteOptions::IsCodeCompleteOn() << std::endl;
-}
-else
+if( !aMiscOptions.IsExperimentalMode() )
{
rSet.Put( SfxVisibilityItem(nWh, false) );
-//CodeCompleteOptions::SetCodeCompleteOn( false );
}
}
break;
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx
b/basctl/source/basicide/codecompleteoptionsdlg.cxx
new file mode 100644
index 000..a948ab6
--- /dev/null
+++ b/basctl/source/basicide/codecompleteoptionsdlg.cxx
@@ -0,0 +1,74 @@
+/* -*- 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
+ * L
[Libreoffice-commits] core.git: slideshow/inc slideshow/source
slideshow/inc/pch/precompiled_slideshow.hxx |1 -
slideshow/source/engine/shapes/viewshape.cxx |9 -
2 files changed, 10 deletions(-)
New commits:
commit 689363662cc81fcf629850fa0b002577cc61e97d
Author: Jelle van der Waa
Date: Tue Jul 23 21:59:24 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: If2c1ce9ca27e27ed5ecc15a448b7332855e31309
Reviewed-on: https://gerrit.libreoffice.org/5058
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx
b/slideshow/inc/pch/precompiled_slideshow.hxx
index 6e3af46..0d1d283 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -194,7 +194,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/slideshow/source/engine/shapes/viewshape.cxx
b/slideshow/source/engine/shapes/viewshape.cxx
index 1b1a96c..6be622b 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -24,7 +24,6 @@
#include
-#include
#include
#include
@@ -66,7 +65,6 @@ namespace slideshow
const GDIMetaFileSharedPtr& rMtf,
const ShapeAttributeLayerSharedPtr& rAttr
) const
{
-RTL_LOGFILE_CONTEXT( aLog,
"::presentation::internal::ViewShape::prefetch()" );
ENSURE_OR_RETURN_FALSE( rMtf,
"ViewShape::prefetch(): no valid metafile!" );
@@ -188,8 +186,6 @@ namespace slideshow
const ::basegfx::B2DPolyPolygon* pClip,
const VectorOfDocTreeNodes& rSubsets )
const
{
-RTL_LOGFILE_CONTEXT( aLog,
"::presentation::internal::ViewShape::draw()" );
-
::cppcanvas::RendererSharedPtr pRenderer(
getRenderer( rDestinationCanvas, rMtf, rAttr ) );
@@ -305,8 +301,6 @@ namespace slideshow
double
nPrio,
bool
bIsVisible ) const
{
-RTL_LOGFILE_CONTEXT( aLog,
"::presentation::internal::ViewShape::renderSprite()" );
-
// TODO(P1): For multiple views, it might pay off to reorg Shape
and ViewShape,
// in that all the common setup steps here are refactored to Shape
(would then
// have to be performed only _once_ per Shape paint).
@@ -524,8 +518,6 @@ namespace slideshow
const VectorOfDocTreeNodes& rSubsets,
boolbIsVisible
) const
{
-RTL_LOGFILE_CONTEXT( aLog,
"::presentation::internal::ViewShape::render()" );
-
// TODO(P1): For multiple views, it might pay off to reorg Shape
and ViewShape,
// in that all the common setup steps here are refactored to Shape
(would then
// have to be performed only _once_ per Shape paint).
@@ -858,7 +850,6 @@ namespace slideshow
int nUpdateFlags,
boolbIsVisible ) const
{
-RTL_LOGFILE_CONTEXT( aLog,
"::presentation::internal::ViewShape::update()" );
ENSURE_OR_RETURN_FALSE( mpViewLayer->getCanvas(),
"ViewShape::update(): Invalid layer canvas" );
// Shall we render to a sprite, or to a plain canvas?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: package/source
package/source/zippackage/ZipPackage.cxx |9 -
1 file changed, 9 deletions(-)
New commits:
commit 7e3fdd1fdcd2dbcbd87a88d19a781e845f7d0fca
Author: Jelle van der Waa
Date: Tue Jul 23 22:26:05 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: I595c10b9c3df8ea487d9fde0a7910ba0bca0ab43
Reviewed-on: https://gerrit.libreoffice.org/5059
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/package/source/zippackage/ZipPackage.cxx
b/package/source/zippackage/ZipPackage.cxx
index db24748..5f42210 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -62,7 +62,6 @@
#include
#include
#include
-#include
#include
#include
#include "com/sun/star/io/XAsyncOutputMonitor.hpp"
@@ -580,7 +579,6 @@ void ZipPackage::getZipFileContents()
void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
throw( Exception, RuntimeException )
{
-RTL_LOGFILE_TRACE_AUTHOR ( "package", "mg115289", "{
ZipPackage::initialize" );
sal_Bool bHaveZipFile = sal_True;
uno::Reference< XProgressHandler > xProgressHandler;
beans::NamedValue aNamedValue;
@@ -785,8 +783,6 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence<
Any >& aArguments )
}
}
}
-
-RTL_LOGFILE_TRACE_AUTHOR ( "package", "mg115289", "}
ZipPackage::initialize" );
}
//
@@ -1371,9 +1367,6 @@ void SAL_CALL ZipPackage::commitChanges()
throw WrappedTargetException(OSL_LOG_PREFIX "This package is read
only!",
static_cast < OWeakObject * > ( this ), makeAny ( aException )
);
}
-
-RTL_LOGFILE_TRACE_AUTHOR ( "package", "mg115289", "{
ZipPackage::commitChanges" );
-
// first the writeTempFile is called, if it returns a stream the stream
should be written to the target
// if no stream was returned, the file was written directly, nothing
should be done
@@ -1527,8 +1520,6 @@ void SAL_CALL ZipPackage::commitChanges()
// after successful storing it can be set to false
m_bMediaTypeFallbackUsed = sal_False;
-
-RTL_LOGFILE_TRACE_AUTHOR ( "package", "mg115289", "}
ZipPackage::commitChanges" );
}
//
___
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' - reportbuilder/java reportdesign/source
reportbuilder/java/libformula.properties
|4
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
| 53 ++
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
|4
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
|2
reportdesign/source/core/sdr/RptObject.cxx
|4
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
|2
6 files changed, 23 insertions(+), 46 deletions(-)
New commits:
commit be945e8e54a93921a12597c7b3a5b012951600ac
Author: Lionel Elie Mamane
Date: Tue Jul 23 19:14:04 2013 +0200
fdo#67186 switch reporbuilder to null date == 1899-12-30
This brings it in line with the default for other LibreOffice
components (e.g. Calc), or with the only supported value (e.g. Writer
tables), respectively.
Configure Pentaho jfreereport to also take null date == 1899-12-30
This combined allows reportbuilder to make absolutely no fiddly
conversion itself, leaving them to jfreereport and Writer table
cell format.
Also:
- Make absolutely no conversion itself, also e.g. for booleans.
- ODF compliance: make the value-type match the set foo-value attribute.
- Use value-type="void" instead of empty value-type="string"
Conflicts:
reportdesign/source/core/sdr/RptObject.cxx
Change-Id: I67990232dbc9e86ac3fa37cd0c20edecb87cf8ee
Reviewed-on: https://gerrit.libreoffice.org/5054
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/reportbuilder/java/libformula.properties
b/reportbuilder/java/libformula.properties
index f903736..79022b6 100644
--- a/reportbuilder/java/libformula.properties
+++ b/reportbuilder/java/libformula.properties
@@ -19,8 +19,8 @@
##
# Any configuration will happen here.
-org.pentaho.reporting.libraries.formula.datesystem.StartYear=1930
-org.pentaho.reporting.libraries.formula.datesystem.ExcelHack=false
+org.pentaho.reporting.libraries.formula.ZeroDate=1899
+org.pentaho.reporting.libraries.formula.ExcelDateBugAware=false
#
# A list of all known functions.
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index 4c1b8dd..d4c86c6 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -85,7 +85,7 @@ public class FormatValueUtility
else if (value instanceof Date)
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "float");
-ret = HSSFDateUtil.getExcelDate((Date) value, false, 2).toString();
+ret = HSSFDateUtil.getExcelDate((Date) value).toString();
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE,
ret);
}
else if (value instanceof Number)
@@ -112,8 +112,7 @@ public class FormatValueUtility
}
else
{
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "string");
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, "");
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "void");
}
return ret;
}
@@ -122,61 +121,39 @@ public class FormatValueUtility
{
if (value instanceof Time)
{
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "time");
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
"time-value", formatTime((Time) value));
}
else if (value instanceof java.sql.Date)
{
-if ("float".equals(valueType) || valueType == null)
-{
-// This is to work around fdo#63478
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 0).toString());
-}
-else
-{
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
"date-value", formatDate((Date) value));
-}
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "date");
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
"date-value", formatDate((Date) value));
}
else if (value instanceof Date)
{
-// This is what we *should* do, but see fdo#63478
-// variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "date");
-// variableSection.setAttribute(O
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - reportbuilder/java reportdesign/source
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
| 53 ++
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
|4
reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
|2
reportbuilder/java/libformula.properties
|4
reportdesign/source/core/sdr/RptObject.cxx
|3
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
|2
6 files changed, 23 insertions(+), 45 deletions(-)
New commits:
commit ac2d93cca0791a728583a40dc379c89c22582855
Author: Lionel Elie Mamane
Date: Tue Jul 23 19:14:04 2013 +0200
fdo#67186 switch reporbuilder to null date == 1899-12-30
This brings it in line with the default for other LibreOffice
components (e.g. Calc), or with the only supported value (e.g. Writer
tables), respectively.
Configure Pentaho jfreereport to also take null date == 1899-12-30
This combined allows reportbuilder to make absolutely no fiddly
conversion itself, leaving them to jfreereport and Writer table
cell format.
Also:
- Make absolutely no conversion itself, also e.g. for booleans.
- ODF compliance: make the value-type match the set foo-value attribute.
- Use value-type="void" instead of empty value-type="string"
Conflicts:
reportdesign/source/core/sdr/RptObject.cxx
Conflicts:
reportdesign/source/core/sdr/RptObject.cxx
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
Change-Id: I67990232dbc9e86ac3fa37cd0c20edecb87cf8ee
Reviewed-on: https://gerrit.libreoffice.org/5055
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git
a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
index 8c9e986..a462cae 100644
---
a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -85,7 +85,7 @@ public class FormatValueUtility
else if (value instanceof Date)
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "float");
-ret = HSSFDateUtil.getExcelDate((Date) value, false, 2).toString();
+ret = HSSFDateUtil.getExcelDate((Date) value).toString();
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE,
ret);
}
else if (value instanceof Number)
@@ -112,8 +112,7 @@ public class FormatValueUtility
}
else
{
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "string");
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, "");
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "void");
}
return ret;
}
@@ -122,61 +121,39 @@ public class FormatValueUtility
{
if (value instanceof Time)
{
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "time");
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
"time-value", formatTime((Time) value));
}
else if (value instanceof java.sql.Date)
{
-if ("float".equals(valueType) || valueType == null)
-{
-// This is to work around fdo#63478
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 0).toString());
-}
-else
-{
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
"date-value", formatDate((Date) value));
-}
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "date");
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
"date-value", formatDate((Date) value));
}
else if (value instanceof Date)
{
-// This is what we *should* do, but see fdo#63478
-// variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "date");
-// variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
"date-value", formatDate((Date) value));
-// so we do that instead to work around:
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "float");
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE,
HSSFDateUtil.getExcelDate((Date) value, false, 0).toString());
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "date");
+variable
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |1 +
writerfilter/inc/pch/precompiled_writerfilter.hxx |1 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 21 ++---
3 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit 4231190ad3a4ee7e459f7e1a5e9fd85ca3dca124
Author: Julien Nabet
Date: Tue Jul 23 09:30:57 2013 +0200
fdo#46037: no more comphelper/configurationhelper.hxx in writerfilter
Change-Id: If2500bf09f8bb23f70d46d8dbef5d8bbf9fc3fb3
Reviewed-on: https://gerrit.libreoffice.org/5041
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 4fab4aa..aaa2969 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_Library_Library,writerfilter))
$(eval $(call gb_Library_use_custom_headers,writerfilter,\
+officecfg/registry \
oox/generated \
writerfilter/source \
))
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx
b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 641211a..899ca0e 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -152,7 +152,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7086c75..9427e60 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -67,33 +67,16 @@
#include
-#include
#include
#include
#include
+#include
using namespace ::com::sun::star;
using namespace ::rtl;
namespace writerfilter {
namespace dmapper{
-sal_Bool lcl_IsUsingEnhancedFields( const uno::Reference<
uno::XComponentContext >& rxContext )
-{
-bool bResult(sal_False);
-try
-{
-OUString writerConfig = "org.openoffice.Office.Common";
-
-uno::Reference< uno::XInterface > xCfgAccess =
::comphelper::ConfigurationHelper::openConfig( rxContext, writerConfig,
::comphelper::ConfigurationHelper::E_READONLY );
-::comphelper::ConfigurationHelper::readRelativeKey( xCfgAccess,
OUString( "Filter/Microsoft/Import" ), OUString(
"ImportWWFieldsAsEnhancedFields" ) ) >>= bResult;
-
-}
-catch( const uno::Exception& )
-{
-}
-return bResult;
-}
-
// Populate Dropdown Field properties from FFData structure
void lcl_handleDropdownField( const uno::Reference< beans::XPropertySet >&
rxFieldProps, FFDataHandler::Pointer_t pFFDataHandler )
{
@@ -206,7 +189,7 @@ DomainMapper_Impl::DomainMapper_Impl(
getTableManager( ).setHandler(m_pTableHandler);
getTableManager( ).startLevel();
-m_bUsingEnhancedFields = lcl_IsUsingEnhancedFields( m_xComponentContext );
+m_bUsingEnhancedFields =
officecfg::Office::Common::Filter::Microsoft::Import::ImportWWFieldsAsEnhancedFields::get();
m_pSdtHelper = new SdtHelper(*this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 19 ---
1 file changed, 8 insertions(+), 11 deletions(-)
New commits:
commit 7cbf9c9e0a34937783dfa7f78d460dcf70504841
Author: Julien Nabet
Date: Tue Jul 23 09:49:31 2013 +0200
fdo#46037: no more comphelper/configurationhelper.hxx in fpicker
Change-Id: I571e0271d9432118d886561e140d689b2d1b8713
Reviewed-on: https://gerrit.libreoffice.org/5042
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 2bf2e28..1f204d6 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -37,12 +37,12 @@
#include
#include
-#include
#include
#include
#include
#include
#include
+#include
#ifdef _MSC_VER
#pragma warning (push, 1)
@@ -215,18 +215,15 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const
OUString& sDirectory)
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
-const OUString aPackage("org.openoffice.Office.Common/");
-const OUString aRelPath("Path/Info");
-const OUString aKey("WorkPathChanged");
+bool bChanged =
officecfg::Office::Common::Path::Info::WorkPathChanged::get();
-css::uno::Any aValue = ::comphelper::ConfigurationHelper::readDirectKey(
-comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey,
::comphelper::ConfigurationHelper::E_READONLY);
-
-bool bChanged(false);
-if (( aValue >>= bChanged ) && bChanged )
+if (bChanged )
{
-::comphelper::ConfigurationHelper::writeDirectKey(
-comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath,
aKey, css::uno::makeAny(false), ::comphelper::ConfigurationHelper::E_STANDARD);
+boost::shared_ptr< comphelper::ConfigurationChanges > batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Common::Path::Info::WorkPathChanged::set(
+false, batch);
+batch->commit();
}
RequestRef rRequest(new Request());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/Library_fps.mk writerfilter/Library_writerfilter.mk
fpicker/Library_fps.mk |4 writerfilter/Library_writerfilter.mk |2 +- 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit d1f58e5ea695e823e931aad1bfb1d7b4bf17634c Author: Fridrich Å trba Date: Wed Jul 24 00:21:12 2013 +0200 Trying to fix the windows build Change-Id: I19d17a490c9af3d14a315a92ae2af86cc2e92d51 diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index c4b3e0e..4a1056a 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -10,6 +10,10 @@ $(eval $(call gb_Library_Library,fps)) +$(eval $(call gb_Library_use_custom_headers,fps,\ + officecfg/registry \ +)) + $(eval $(call gb_Library_add_nativeres,fps,fps/Fps)) $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps)) diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index aaa2969..0f3bdb1 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,writerfilter)) $(eval $(call gb_Library_use_custom_headers,writerfilter,\ -officecfg/registry \ + officecfg/registry \ oox/generated \ writerfilter/source \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/Library_fps.mk fpicker/source writerfilter/Library_writerfilter.mk
fpicker/Library_fps.mk |4
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 19 +++
writerfilter/Library_writerfilter.mk|2 +-
3 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 57ebb84c1fdfc868cc01bd4b12e95ca043cda718
Author: Fridrich Å trba
Date: Wed Jul 24 00:29:11 2013 +0200
Revert "fdo#46037: no more comphelper/configurationhelper.hxx in fpicker"
This reverts commit 7cbf9c9e0a34937783dfa7f78d460dcf70504841.
Revert "Trying to fix the windows build"
This reverts commit d1f58e5ea695e823e931aad1bfb1d7b4bf17634c.
Change-Id: I67d00ec010a834e27b0e79b0afd92c5a2e7d47d6
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 4a1056a..c4b3e0e 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -10,10 +10,6 @@
$(eval $(call gb_Library_Library,fps))
-$(eval $(call gb_Library_use_custom_headers,fps,\
- officecfg/registry \
-))
-
$(eval $(call gb_Library_add_nativeres,fps,fps/Fps))
$(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 1f204d6..2bf2e28 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -37,12 +37,12 @@
#include
#include
+#include
#include
#include
#include
#include
#include
-#include
#ifdef _MSC_VER
#pragma warning (push, 1)
@@ -215,15 +215,18 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const
OUString& sDirectory)
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
-bool bChanged =
officecfg::Office::Common::Path::Info::WorkPathChanged::get();
+const OUString aPackage("org.openoffice.Office.Common/");
+const OUString aRelPath("Path/Info");
+const OUString aKey("WorkPathChanged");
-if (bChanged )
+css::uno::Any aValue = ::comphelper::ConfigurationHelper::readDirectKey(
+comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey,
::comphelper::ConfigurationHelper::E_READONLY);
+
+bool bChanged(false);
+if (( aValue >>= bChanged ) && bChanged )
{
-boost::shared_ptr< comphelper::ConfigurationChanges > batch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Path::Info::WorkPathChanged::set(
-false, batch);
-batch->commit();
+::comphelper::ConfigurationHelper::writeDirectKey(
+comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath,
aKey, css::uno::makeAny(false), ::comphelper::ConfigurationHelper::E_STANDARD);
}
RequestRef rRequest(new Request());
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 0f3bdb1..aaa2969 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Library_Library,writerfilter))
$(eval $(call gb_Library_use_custom_headers,writerfilter,\
- officecfg/registry \
+officecfg/registry \
oox/generated \
writerfilter/source \
))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/Library_fps.mk fpicker/source writerfilter/Library_writerfilter.mk
fpicker/Library_fps.mk |4 +++
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 22 ++--
writerfilter/Library_writerfilter.mk|2 -
3 files changed, 16 insertions(+), 12 deletions(-)
New commits:
commit 75ef95ebc48517d228d369167f89424a72b320bf
Author: Julien Nabet
Date: Tue Jul 23 09:49:31 2013 +0200
fdo#46037: no more comphelper/configurationhelper.hxx in fpicker
Change-Id: I571e0271d9432118d886561e140d689b2d1b8713
Reviewed-on: https://gerrit.libreoffice.org/5042
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index c4b3e0e..4a1056a 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -10,6 +10,10 @@
$(eval $(call gb_Library_Library,fps))
+$(eval $(call gb_Library_use_custom_headers,fps,\
+ officecfg/registry \
+))
+
$(eval $(call gb_Library_add_nativeres,fps,fps/Fps))
$(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 2bf2e28..b7f7d83 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -37,12 +37,15 @@
#include
#include
-#include
#include
#include
#include
#include
#include
+#ifdef RGB
+#undef RGB
+#endif
+#include
#ifdef _MSC_VER
#pragma warning (push, 1)
@@ -215,18 +218,15 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const
OUString& sDirectory)
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
-const OUString aPackage("org.openoffice.Office.Common/");
-const OUString aRelPath("Path/Info");
-const OUString aKey("WorkPathChanged");
-
-css::uno::Any aValue = ::comphelper::ConfigurationHelper::readDirectKey(
-comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey,
::comphelper::ConfigurationHelper::E_READONLY);
+bool bChanged =
officecfg::Office::Common::Path::Info::WorkPathChanged::get();
-bool bChanged(false);
-if (( aValue >>= bChanged ) && bChanged )
+if (bChanged )
{
-::comphelper::ConfigurationHelper::writeDirectKey(
-comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath,
aKey, css::uno::makeAny(false), ::comphelper::ConfigurationHelper::E_STANDARD);
+boost::shared_ptr< comphelper::ConfigurationChanges > batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Common::Path::Info::WorkPathChanged::set(
+false, batch);
+batch->commit();
}
RequestRef rRequest(new Request());
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index aaa2969..0f3bdb1 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Library_Library,writerfilter))
$(eval $(call gb_Library_use_custom_headers,writerfilter,\
-officecfg/registry \
+ officecfg/registry \
oox/generated \
writerfilter/source \
))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit d6922c0c193eda5245f7088456973878d635f8a1
Author: Efe Gürkan YALAMAN
Date: Wed Jul 24 02:00:05 2013 +0300
Tabpage doesn't crash on load and traverses configurations
Tabpage now works without crashing. It also traverses configurations.
Traversed configurations doesn't display yet. But traversal can be seen
when debugging. Root of the traversal should be given as a until "/"
part. For example "org.openoffice" not accepted. But
"org.openoffice.Office.Canvas" accepted.
Change-Id: I2d3026781bfaafa0f721b317249c8879f103bd05
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index b7072c3..0b9eb61 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -89,7 +89,7 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet& )
Reference< XNameAccess > xConfigAccess = getConfigAccess();
- FillItems( xConfigAccess, OUString("org.openoffice") );
+ FillItems( xConfigAccess, OUString("org.openoffice.Office.Canvas") );
}
void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess,
OUString sPath)
@@ -102,13 +102,13 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
for( sal_Int16 i = 0; i < seqItems.getLength(); ++i )
{
Any aNode = xHierarchicalNameAccess->getByHierarchicalName(
seqItems[i] );
-Reference< XHierarchicalNameAccess >xNextHierarchicalNameAccess(
aNode, uno::UNO_QUERY_THROW );
-Reference< XNameAccess > xNextNameAccess( xNextHierarchicalNameAccess,
uno::UNO_QUERY_THROW );
bIsLeafNode = sal_True;
try
{
+Reference< XHierarchicalNameAccess >xNextHierarchicalNameAccess(
aNode, uno::UNO_QUERY_THROW );
+Reference< XNameAccess > xNextNameAccess(
xNextHierarchicalNameAccess, uno::UNO_QUERY_THROW );
uno::Sequence < OUString > seqNext =
xNextNameAccess->getElementNames();
FillItems( xNextNameAccess, sPath + OUString("/") + seqItems[i] );
bIsLeafNode = sal_False;
@@ -122,7 +122,7 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
{
//InsertEntry( sPath, "", "", "");
//Reference< beans::Property > aProperty =
xHierarchicalNameAccess->getAsProperty();//getPropertyValue( seqItems[ i ] );
-//InsertEntry( sPath + OUString("/") + seqItems[ i ],
OUString(""), OUString(""), xNameAccess->getPropertyValue( seqItems[ i ] ) );
+//InsertEntry( sPath + OUString("/") + seqItems[ i ],
OUString(""), OUString(""), xHierarchicalNameAccess->getByHierarchicalName(
seqItems[ i ] ).Value );
}
}
}
@@ -136,7 +136,7 @@ Reference< XNameAccess >
CuiAboutConfigTabPage::getConfigAccess()
beans::NamedValue aProperty;
aProperty.Name = "nodepath";
-aProperty.Value = uno::makeAny( OUString("org.openoffice") );
+aProperty.Value = uno::makeAny( OUString("org.openoffice.Office.Canvas") );
uno::Sequence< uno::Any > aArgumentList( 1 );
aArgumentList[0] = uno::makeAny( aProperty );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk scp2/source
Repository.mk | 30 --- scp2/source/ooo/file_library_ooo.scp | 133 -- scp2/source/ooo/module_hidden_ooo.scp | 12 --- 3 files changed, 16 insertions(+), 159 deletions(-) New commits: commit b0c43257d9db19ac45a93d8fb1e7648e82517289 Author: Marcos Paulo de Souza Date: Mon Jul 22 20:45:05 2013 -0300 fdo#60924 autoinstall - gbuild/scp2: still more libs to OOO Change-Id: I89a661908fe7d679aa68d5ba9ead41d6b0a0d6bf Reviewed-on: https://gerrit.libreoffice.org/5039 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/Repository.mk b/Repository.mk index 95ad515..cf98c411 100644 --- a/Repository.mk +++ b/Repository.mk @@ -358,9 +358,24 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ xsltfilter \ $(if $(filter $(OS),WNT), \ ado \ - $(if $(DISABLE_ATL),,oleautobridge) \ +dnd \ +dtrans \ +fps \ +ftransl \ +$(if $(SOLAR_JAVA),java_uno_accessbridge) \ +$(if $(DISABLE_ATL),,oleautobridge \ + inprocserv \ +) \ +$(if $(HAVE_WINDOWS_SDK),instooofiltmsi \ + qslnkmsi \ + reg4allmsdoc \ + sdqsmsi \ + sellangmsi \ + sn_tools \ +) \ smplmail \ wininetbe1 \ +xmlsec1 \ ) \ $(if $(filter $(OS),MACOSX), \ AppleRemote \ @@ -528,7 +543,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ bluez_bluetooth \ emboleobj \ - java_uno_accessbridge \ libreoffice \ macab1 \ macabdrv1 \ @@ -549,28 +563,17 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - dnd \ - dtrans \ fop \ - fps \ - ftransl \ - inprocserv \ - instooofiltmsi \ jfregca \ ooofilt \ ooofilt_x64 \ propertyhdl \ propertyhdl_x64 \ - qslnkmsi \ - reg4allmsdoc \ regactivex \ regpatchactivex \ - sdqsmsi \ - sellangmsi \ shlxthdl \ shlxthdl_x64 \ shlxtmsi \ - sn_tools \ so_activex \ so_activex_x64 \ sysdtrans \ @@ -613,7 +616,6 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - xmlsec1 \ xmlsec1-nss \ )) ifneq ($(CROSS_COMPILING),YES) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a710c7e..b92eaab 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -26,15 +26,6 @@ / #include "macros.inc" -#if defined SOLAR_JAVA && defined WNT -File gid_File_Lib_Accessbridge -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = "java_uno_accessbridge.dll"; -End -#endif - #ifndef SYSTEM_CLUCENE File gid_File_Lib_CLucene LIB_FILE_BODY; @@ -121,44 +112,11 @@ End #endif -#ifdef WNT - -File gid_File_Lib_Dnd -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = "dnd.dll"; -End - -#endif - -#ifdef WNT - -File gid_File_Lib_Dtrans -LIB_FILE_BODY; -Name = "dtrans.dll"; -Dir = SCP2_OOO_BIN_DIR; -Styles = (PACKED); -End - -#endif - /* fdo#60491 always need emboleobj library on non-WNT platforms */ #if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif -#if defined(WNT) && !defined(DISABLE_ATL) - -File gid_File_Lib_Inprocserv -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = "inprocserv.dll"; -End - -#endif - #ifdef UNX #ifdef MACOSX @@ -179,17 +137,6 @@ End #endif // #ifdef UNX -#ifdef WNT - -File gid_File_Lib_Fps -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = "fps.dll"; -End - -#endif - #if defined UNX && ! defined MACOSX #ifdef ENABLE_TDE File gid_File_Bin_TdeFilePicker @@ -284,17 +231,6 @@ End #endif -#ifdef WNT - -File gid_File_Lib_Ftransl -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = "ftransl.dll"; -End - -#endif - #ifndef SYSTEM_ICU File gid_File_Lib_Icudata @@ -344,17 +280,6 @@ End #endif -#if defined(WNT) && defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_sn_tools -LIB_FILE_BODY; -Styles = (PACKED, BINARYTABLE, BI
[ANN] LibreOffice 4.1.0 RC4 test builds available for smoketesting
Hi *, QA found a number of problems that were initially addressed via a hotfix for the Linux packages, but then resulted in a fully new build today - we're now uploading builds of LibreOffice 4.1.0 RC4 to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try & report *critical* bugs, especially regressions relative to prior RCs here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs vs. 4.1.0 RC3 is available here http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-1-0-release-4.1.0.4.log I'd like to especially ask QA volunteers from the following locales, to please verify the fix of fdo#67093: as bg br gl lt pt-BR pt ru sv te uk zh-CN zh-TW Thanks a lot for your help, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 3 commits - sc/inc sc/qa sc/source
sc/inc/tokenarray.hxx |3 +
sc/qa/unit/ucalc.hxx|2
sc/qa/unit/ucalc_formula.cxx| 73
sc/source/core/data/formulacell.cxx | 22 --
sc/source/core/tool/token.cxx | 52 +
5 files changed, 139 insertions(+), 13 deletions(-)
New commits:
commit a62b7f10ec1fddd7d2bd6517dec75a617aaa12be
Author: Kohei Yoshida
Date: Tue Jul 23 22:33:27 2013 -0400
Re-implement adjusting of references on move.
Change-Id: I52a8b78ed072eb6bcd86b4f80936a869046cbc4d
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 5ff7da0..2ae6c90 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -129,6 +129,9 @@ public:
*/
sc::RefUpdateResult AdjustReferenceOnShift( const sc::RefUpdateContext&
rCxt, const ScAddress& rOldPos );
+sc::RefUpdateResult AdjustReferenceOnMove(
+const sc::RefUpdateContext& rCxt, const ScAddress& rOldPos, const
ScAddress& rNewPos );
+
/**
* Adjust all references on sheet deletion.
*
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 63d2c9b..725c5d9 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2365,7 +2365,6 @@ bool ScFormulaCell::UpdateReferenceOnMove(
aOldPos.Set(aPos.Col() - rCxt.mnColDelta, aPos.Row() -
rCxt.mnRowDelta, aPos.Tab() - rCxt.mnTabDelta);
}
-
// Check presence of any references or column row names.
pCode->Reset();
bool bHasRefs = (pCode->GetNextReferenceRPN() != NULL);
@@ -2389,22 +2388,19 @@ bool ScFormulaCell::UpdateReferenceOnMove(
pOldCode.reset(pCode->Clone());
bool bValChanged = false;
-bool bRangeModified = false;// any range, not only shared formula
+bool bRefModified = false;
bool bRefSizeChanged = false;
if (bHasRefs)
{
// Update cell or range references.
-ScCompiler aComp(pDocument, aPos, *pCode);
-aComp.SetGrammar(pDocument->GetGrammar());
-aComp.UpdateReference(
-URM_MOVE, aOldPos, rCxt.maRange,
-rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta,
-bValChanged, bRefSizeChanged);
-bRangeModified = aComp.HasModifiedRange();
+sc::RefUpdateResult aRes = pCode->AdjustReferenceOnMove(rCxt, aOldPos,
aPos);
+bRefModified = aRes.mbReferenceModified;
+bValChanged = aRes.mbValueChanged;
}
-bCellStateChanged |= bValChanged;
+if (bValChanged || bRefModified)
+bCellStateChanged = true;
if (bOnRefMove)
// Cell may reference itself, e.g. ocColumn, ocRow without parameter
@@ -2429,7 +2425,7 @@ bool ScFormulaCell::UpdateReferenceOnMove(
bHasRelName = HasRelNameReference();
// Reference changed and new listening needed?
// Except in Insert/Delete without specialties.
-bNewListening = (bRangeModified || bColRowNameCompile
+bNewListening = (bRefModified || bColRowNameCompile
|| bValChanged || bHasRelName)
// #i36299# Don't duplicate action during cut&paste / drag&drop
// on a cell in the range moved, start/end listeners is done
@@ -2442,7 +2438,7 @@ bool ScFormulaCell::UpdateReferenceOnMove(
bool bNeedDirty = false;
// NeedDirty for changes except for Copy and Move/Insert without RelNames
-if ( bRangeModified || bColRowNameCompile ||
+if ( bRefModified || bColRowNameCompile ||
(bValChanged && bHasRelName && (bHasRelName || bInDeleteUndo ||
bRefSizeChanged)) || bOnRefMove)
bNeedDirty = true;
@@ -2451,7 +2447,7 @@ bool ScFormulaCell::UpdateReferenceOnMove(
bValChanged = false;
-if ( ( bCompile = (bCompile || bValChanged || bRangeModified ||
bColRowNameCompile) ) != 0 )
+if ( ( bCompile = (bCompile || bValChanged || bRefModified ||
bColRowNameCompile) ) != 0 )
{
CompileTokenArray( bNewListening ); // no Listening
bNeedDirty = true;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 64beedf..b783525 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2472,6 +2472,58 @@ sc::RefUpdateResult
ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon
return aRes;
}
+sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
+const sc::RefUpdateContext& rCxt, const ScAddress& rOldPos, const
ScAddress& rNewPos )
+{
+// When moving, the range is the destination range. We need to use the old
+// range prior to the move for hit analysis.
+ScRange aOldRange = rCxt.maRange;
+aOldRange.Move(-rCxt.mnColDelta, -rCxt.mnRowDelta, -rCxt.mnTabDelta);
+
+sc::RefUpdateResult aRes;
+
+FormulaToken** p = pCode;
+FormulaToken** pEnd = p + static_cast(nLen);
+for (; p != pEnd; ++p)
+{
+switch ((*p)->GetType())
+{
+case s
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa
sc/qa/unit/ucalc_formula.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit c92abf7e27ea8dc579e00b751648bf03e147f09f
Author: Kohei Yoshida
Date: Tue Jul 23 23:06:03 2013 -0400
Add test for partial move of referenced range.
Change-Id: I48d0a3ea631f26b779fd6faddeb30c30a831f493
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ebf74e7..ec6a6da 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -907,6 +907,28 @@ void Test::testFormulaRefUpdateMove()
if (!checkFormula(*m_pDoc, ScAddress(1,12,0), "$D$6"))
CPPUNIT_FAIL("Wrong formula.");
+// The value cells are in D4:D6. Push D4:D5 to the right but leave D6
+// where it is.
+m_pDoc->InsertCol(ScRange(3,0,0,3,4,0));
+
+// Only the values of B10 and B11 should be updated.
+CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(1,9,0));
+CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(1,10,0));
+CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(1,11,0));
+CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(1,12,0));
+
+if (!checkFormula(*m_pDoc, ScAddress(1,9,0), "SUM(D4:D6)"))
+CPPUNIT_FAIL("Wrong formula.");
+
+if (!checkFormula(*m_pDoc, ScAddress(1,10,0), "SUM($D$4:$D$6)"))
+CPPUNIT_FAIL("Wrong formula.");
+
+if (!checkFormula(*m_pDoc, ScAddress(1,11,0), "E5"))
+CPPUNIT_FAIL("Wrong formula.");
+
+if (!checkFormula(*m_pDoc, ScAddress(1,12,0), "$D$6"))
+CPPUNIT_FAIL("Wrong formula.");
+
m_pDoc->DeleteTab(0);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/qa sc/source
sc/qa/unit/ucalc_formula.cxx|5 +-
sc/source/core/data/formulacell.cxx | 65 +++-
2 files changed, 9 insertions(+), 61 deletions(-)
New commits:
commit e8b93b07408d437e04d00a4ff927b09184add57c
Author: Kohei Yoshida
Date: Wed Jul 24 00:00:16 2013 -0400
I'm supposed to move it, not shift it.
Change-Id: I3fe1f05a57089b42296e5758542772d69119c17a
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ec6a6da..af5f96c 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -907,9 +907,10 @@ void Test::testFormulaRefUpdateMove()
if (!checkFormula(*m_pDoc, ScAddress(1,12,0), "$D$6"))
CPPUNIT_FAIL("Wrong formula.");
-// The value cells are in D4:D6. Push D4:D5 to the right but leave D6
+// The value cells are in D4:D6. Move D4:D5 to the right but leave D6
// where it is.
-m_pDoc->InsertCol(ScRange(3,0,0,3,4,0));
+bMoved = rFunc.MoveBlock(ScRange(3,3,0,3,4,0), ScAddress(4,3,0), true,
false, false, false);
+CPPUNIT_ASSERT_MESSAGE("Failed to move D4:D5 to E4:E5", bMoved);
// Only the values of B10 and B11 should be updated.
CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(1,9,0));
commit 641280e198cdd416a365adef12be30e0ef7d0977
Author: Kohei Yoshida
Date: Tue Jul 23 23:58:11 2013 -0400
There isn't much we have to do for copy.
Change-Id: I4d297f15e8030fdf068c7e3102f9d03aff401cf9
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 725c5d9..158dc85 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2504,85 +2504,32 @@ bool ScFormulaCell::UpdateReferenceOnCopy(
// on reference update. Bail out.
return false;
-bool bCellStateChanged = false;
boost::scoped_ptr pOldCode;
if (pUndoDoc)
pOldCode.reset(pCode->Clone());
-bool bValChanged = false;
-bool bRangeModified = false;// any range, not only shared formula
-bool bRefSizeChanged = false;
-
-if (bHasRefs)
-{
-// Update cell or range references.
-ScCompiler aComp(pDocument, aPos, *pCode);
-aComp.SetGrammar(pDocument->GetGrammar());
-aComp.UpdateReference(
-URM_COPY, aOldPos, rCxt.maRange, rCxt.mnColDelta, rCxt.mnRowDelta,
rCxt.mnTabDelta,
-bValChanged, bRefSizeChanged);
-bRangeModified = aComp.HasModifiedRange();
-}
-
-bCellStateChanged |= bValChanged;
-
if (bOnRefMove)
// Cell may reference itself, e.g. ocColumn, ocRow without parameter
-bOnRefMove = (bValChanged || (aPos != aOldPos));
-
-bool bColRowNameCompile = false;
-bool bNewListening = false;
-bool bInDeleteUndo = false;
-
-if (bHasRefs)
-{
-// Upon Insert ColRowNames have to be recompiled in case the
-// insertion occurs right in front of the range.
-if (bHasColRowNames)
-bColRowNameCompile = checkCompileColRowName(rCxt, *pDocument,
*pCode, aOldPos, aPos, bValChanged);
-
-ScChangeTrack* pChangeTrack = pDocument->GetChangeTrack();
-bInDeleteUndo = (pChangeTrack && pChangeTrack->IsInDeleteUndo());
+bOnRefMove = (aPos != aOldPos);
-// Reference changed and new listening needed?
-// Except in Insert/Delete without specialties.
-bNewListening =
-(bRangeModified || bColRowNameCompile || (bValChanged &&
(bInDeleteUndo || bRefSizeChanged)));
+bool bNeedDirty = bOnRefMove;
-if ( bNewListening )
-EndListeningTo(pDocument, pOldCode.get(), aOldPos);
-}
-
-bool bNeedDirty = false;
-// NeedDirty for changes except for Copy and Move/Insert without RelNames
-if ( bRangeModified || bColRowNameCompile || bOnRefMove)
-bNeedDirty = true;
-
-if (pUndoDoc && (bValChanged || bOnRefMove))
+if (pUndoDoc && bOnRefMove)
setOldCodeToUndo(pUndoDoc, aUndoPos, pOldCode.get(), eTempGrammar,
cMatrixFlag);
-bValChanged = false;
-
-if ( ( bCompile = (bCompile || bValChanged || bRangeModified ||
bColRowNameCompile) ) != 0 )
+if (bCompile)
{
-CompileTokenArray( bNewListening ); // no Listening
+CompileTokenArray(false); // no Listening
bNeedDirty = true;
}
-if ( !bInDeleteUndo )
-{ // In ChangeTrack Delete-Reject listeners are established in
-// InsertCol/InsertRow
-if ( bNewListening )
-StartListeningTo( pDocument );
-}
-
if (bNeedDirty)
{ // Cut off references, invalid or similar?
sc::AutoCalcSwitch(*pDocument, false);
SetDirty();
}
-return bCellStateChanged;
+return false;
}
bool ScFormulaCell::UpdateReference(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk solenv/bin
instsetoo_native/CustomTarget_install.mk |5 +
solenv/bin/modules/installer/epmfile.pm |2 +-
solenv/bin/modules/installer/globals.pm |2 ++
solenv/bin/modules/installer/parameter.pm |5 +
4 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 8bae88b146529d469742b33ead50b3a01457e313
Author: David Tardon
Date: Wed Jul 24 08:50:45 2013 +0200
look for find-requires-gnome.sh in the right path
... and make sure it exists as well.
Change-Id: Ia895d93d2755a2b0b9d87601ace54ee47b5c1b80
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index e3a52f2..ffedb20 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -29,6 +29,11 @@ $(eval $(call
gb_CustomTarget_register_targets,instsetoo_native/install,\
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
$(SOLARENV)/bin/make_installer.pl \
$(foreach ulf,$(instsetoo_ULFLIST),$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
+ $(if $(filter-out WNT,$(OS)),\
+ $(addprefix $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
+ bin/find-requires-gnome.sh \
+ bin/find-requires-x11.sh) \
+ ) \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh:
$(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 4ea85b6..c1dd768 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1702,7 +1702,7 @@ sub prepare_packages
if ( $installer::globals::isrpmbuild )
{
set_topdir_in_specfile($changefile, $filename, $newepmdir);
-set_autoprovreq_in_specfile($changefile,
$onepackage->{'findrequires'}, "$installer::globals::unpackpath" . "/bin");
+set_autoprovreq_in_specfile($changefile,
$onepackage->{'findrequires'}, "$installer::globals::workpath" . "/bin");
set_packager_in_specfile($changefile);
if ( is_extension_package($changefile) ) {
set_prereq_in_specfile($changefile); }
set_license_in_specfile($changefile, $variableshashref);
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index cb58cdc0..2940407 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -59,6 +59,8 @@ BEGIN
$ismacbuild = 0;
$ismacdmgbuild = 0;
$unpackpath = "";
+$workpath = ""; # installation working dir; some helper scripts are
+# placed here by gbuild
$idttemplatepath = "";
$idtlanguagepath = "";
$buildid = "Not set";
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 4475ec4..0cc6e9e 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -349,6 +349,11 @@ sub setglobalvariables
$installer::globals::unpackpath = cwd();
}
+if ($installer::globals::workpath eq "") # workpath not set
+{
+$installer::globals::workpath = cwd();
+}
+
if ( $installer::globals::localunpackdir ne "" ) {
$installer::globals::unpackpath = $installer::globals::localunpackdir; }
if (!($installer::globals::unpackpath eq ""))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
