[Libreoffice-commits] core.git: chart2/source

[Muthu Subramanian]

 chart2/source/view/charttypes/PieChart.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e581b9bd1cd06900efa27debbf073282b9d0908f
Author: Muthu Subramanian sumu...@suse.com
Date:   Thu Mar 14 12:54:28 2013 +0530

n#734735: Decrease pie chart's thickness.

diff --git a/chart2/source/view/charttypes/PieChart.cxx 
b/chart2/source/view/charttypes/PieChart.cxx
index 64b2f2b..03d5455 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -156,7 +156,7 @@ void PieChart::setScales( const std::vector 
ExplicitScaleData  rScales, bool
 drawing::Direction3D PieChart::getPreferredDiagramAspectRatio() const
 {
 if( m_nDimension == 3 )
-return drawing::Direction3D(1,1,0.25);
+return drawing::Direction3D(1,1,0.10);
 return drawing::Direction3D(1,1,1);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist]

 configure.ac |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1d559d9e386591551baec14ef5eae9bacf7a0d97
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Mar 14 09:29:20 2013 +0200

Add some comments

Change-Id: I3cc92e3fe471fa92a9de339c7677d866e46ab185

diff --git a/configure.ac b/configure.ac
index 61b92ad..175d894 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,12 @@ if test -n $with_android_ndk; then
 android_cpu=x86
 fi
 
-# Check if there is a (self-built) 64-bit tool-chain
+# Check if there is a (self-built) 64-bit tool-chain. Google does not 
provide 64-bit binaries of
+# the NDK tool-chain, sigh, but it is easy to build one yourself. Using a 
64-bit linker is
+# required if you compile everything with -g. A 32-bit linker just won't 
manage to link the
+# (app-specific) single huge .so that is built for the apps in 
android/experimental/*. (A 64-bit
+# ld.gold grows to over 10 gigabytes of virtual space when linking such a 
.so where all objects
+# have been built with debug information.)
 toolchain_system='*'
 if test $build_os = linux-gnu; then
 case $build_cpu in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - hunspell/hunspell.rhbz918938.patch hunspell/UnpackedTarball_hunspell.mk

[Caolán McNamara]

 hunspell/UnpackedTarball_hunspell.mk |1 
 hunspell/hunspell.rhbz918938.patch   |   72 +++
 2 files changed, 73 insertions(+)

New commits:
commit 4fa3396564fd349a355cc8805d220f8b5d85580f
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Mar 13 16:59:32 2013 +

Resolves: rhbz#918938 crash in danish thesaurus/spell interaction

Change-Id: I911fc382a8e4b895262dcd5ae5c67c4a81e6aad4
Reviewed-on: https://gerrit.libreoffice.org/2710
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/hunspell/UnpackedTarball_hunspell.mk 
b/hunspell/UnpackedTarball_hunspell.mk
index 9ba9dc3..1e0544a 100644
--- a/hunspell/UnpackedTarball_hunspell.mk
+++ b/hunspell/UnpackedTarball_hunspell.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
hunspell/hunspell-1.3.2-nullptr.patch \
hunspell/hunspell-1.3.2-literal.patch \
hunspell/hunspell-1.3.2-compound.patch \
+   hunspell/hunspell.rhbz918938.patch \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/hunspell/hunspell.rhbz918938.patch 
b/hunspell/hunspell.rhbz918938.patch
new file mode 100644
index 000..8d23503
--- /dev/null
+++ b/hunspell/hunspell.rhbz918938.patch
@@ -0,0 +1,72 @@
+--- misc/hunspell-1.3.2/src/hunspell/hunspell.cxx  2011-02-02 
12:04:29.0 +
 misc/build/hunspell-1.3.2/src/hunspell/hunspell.cxx2013-03-13 
16:50:50.667928521 +
+@@ -12,6 +12,8 @@
+ #endif
+ #include csutil.hxx
+ 
++#include string
++
+ Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key)
+ {
+ encoding = NULL;
+@@ -1710,6 +1712,19 @@
+ return n;
+ }
+ 
++namespace
++{
++void myrep(std::string str, const std::string search, const 
std::string replace)
++{
++size_t pos = 0;
++while ((pos = str.find(search, pos)) != std::string::npos)
++{
++   str.replace(pos, search.length(), replace);
++   pos += replace.length();
++}
++}
++}
++
+ int Hunspell::spellml(char*** slst, const char * word)
+ {
+   char *q, *q2;
+@@ -1721,26 +1736,26 @@
+   q2 = strstr(q2, word);
+   if (!q2) return 0; // bad XML input
+   if (check_xml_par(q, type=, analyze)) {
+-  int n = 0, s = 0;
++  int n = 0;
+   if (get_xml_par(cw, strchr(q2, ''), MAXWORDUTF8LEN - 10)) n = 
analyze(slst, cw);
+   if (n == 0) return 0;
+   // convert the result to codeaana1/aaana2/a/code format
+-  for (int i = 0; i  n; i++) s+= strlen((*slst)[i]);
+-  char * r = (char *) malloc(6 + 5 * s + 7 * n + 7 + 1); // XXX 
5*s--amp;
+-  if (!r) return 0;
+-  strcpy(r, code);
++  std::string r;
++  r.append(code);
+   for (int i = 0; i  n; i++) {
+-int l = strlen(r);
+-strcpy(r + l, a);
+-strcpy(r + l + 3, (*slst)[i]);
+-mystrrep(r + l + 3, \t,  );
+-mystrrep(r + l + 3, , lt;);
+-mystrrep(r + l + 3, , amp;);
+-strcat(r, /a);
++r.append(a);
++
++std::string entry((*slst)[i]);
+ free((*slst)[i]);
++myrep(entry, \t,  );
++myrep(entry, , lt;);
++myrep(entry, , amp;);
++r.append(entry);
++
++r.append(/a);
+   }
+-  strcat(r, /code);
+-  (*slst)[0] = r;
++  r.append(/code);
++  (*slst)[0] = mystrdup(r.c_str());
+   return 1;
+   } else if (check_xml_par(q, type=, stem)) {
+   if (get_xml_par(cw, strchr(q2, ''), MAXWORDUTF8LEN - 1)) return 
stem(slst, cw);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] Resolves: rhbz#918938 crash in danish thesaurus/spell intera...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2710

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2710
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I911fc382a8e4b895262dcd5ae5c67c4a81e6aad4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - basctl/source

[Noel Power]

 basctl/source/basicide/baside2b.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 00e80df8fa4e6ae9f473376aa83e282e0fb5dbb0
Author: Noel Power noel.po...@suse.com
Date:   Wed Mar 13 17:22:56 2013 +

make sure basic IDE cut/copy buttons on toolbar are refreshed fdo#30545

Change-Id: I483469f0b76ade7fb107c6f4ae5c28a4b03877b1
(cherry picked from commit 56f30adffa34e2f645646048747e3110a275b072)
Reviewed-on: https://gerrit.libreoffice.org/2708
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index ffa93e4..9bac160 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -745,6 +745,14 @@ void EditorWindow::Notify( SfxBroadcaster /*rBC*/, const 
SfxHint rHint )
 {
 DoDelayedSyntaxHighlight( rTextHint.GetValue() );
 }
+else if( rTextHint.GetId() == TEXT_HINT_VIEWSELECTIONCHANGED )
+{
+if (SfxBindings* pBindings = GetBindingsPtr())
+{
+pBindings-Invalidate( SID_CUT );
+pBindings-Invalidate( SID_COPY );
+}
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

[Julien Nabet]

 svx/source/svdraw/svdundo.cxx |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 28d2a0c162b477a013c7c51c19a94fb08b55b276
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Mar 13 21:20:13 2013 +0100

coverity#705733: Resource leak

+ Fix if format

Change-Id: Iafd46d21e5b9ed21d7c7c338502d780be9f0c222
Reviewed-on: https://gerrit.libreoffice.org/2711
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 7f310ee..19f6098 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1121,14 +1121,13 @@ void SdrUndoObjSetText::Undo()
 if (!bNewTextAvailable)
 AfterSetText();
 
-// copy text for Undo, because the original now belongs to 
SetOutlinerParaObject()
-OutlinerParaObject* pText1 = pOldText;
-if(pText1)
-pText1 = new OutlinerParaObject(*pText1);
-
 SdrText* pText = static_cast SdrTextObj*( pObj )-getText(mnText);
-if( pText )
+if (pText  pOldText)
+{
+// copy text for Undo, because the original now belongs to 
SetOutlinerParaObject()
+OutlinerParaObject* pText1 = new OutlinerParaObject(*pOldText);
 pText-SetOutlinerParaObject(pText1);
+}
 
 pObj-SetEmptyPresObj( bEmptyPresObj );
 pObj-ActionChanged();
@@ -1137,7 +1136,7 @@ void SdrUndoObjSetText::Undo()
 void SdrUndoObjSetText::Redo()
 {
 SdrText* pText = static_cast SdrTextObj*( pObj )-getText(mnText);
-if( pText  pNewText)
+if (pText  pNewText)
 {
 // copy text for Undo, because the original now belongs to 
SetOutlinerParaObject()
 OutlinerParaObject* pText1 = new OutlinerParaObject(*pNewText);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] make sure basic IDE cut/copy buttons on toolbar are refreshe...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2708

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2708
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I483469f0b76ade7fb107c6f4ae5c28a4b03877b1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] coverity#705733: Resource leak

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2711

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2711
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafd46d21e5b9ed21d7c7c338502d780be9f0c222
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: registry/Module_registry.mk

[Matúš Kukan]

 registry/Module_registry.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d4779887636fa9ab5b477f3436bcd3728a3e30ba
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Mar 14 09:01:45 2013 +0100

regmerge/regview seem to be part of ure, not odk

Change-Id: I30ab642d5597153f1700bcf6e1b7647a736a347e

diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 6aec72f..ed225c3 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -27,7 +27,10 @@
 $(eval $(call gb_Module_Module,registry))
 
 $(eval $(call gb_Module_add_targets,registry,\
+   Executable_regmerge \
+   Executable_regview \
Library_reg \
+   StaticLibrary_registry_helper \
ZipPackage_registry_odk_headers \
 ))
 
@@ -36,9 +39,6 @@ ifneq (,$(if $(CROSS_COMPILING),,T)$(filter 
ODK,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,registry,\
Executable_regcompare \
-   Executable_regmerge \
-   Executable_regview \
-   StaticLibrary_registry_helper \
 ))
 
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Wrapper around MSVC cl.exe for autoconf.

[Peter Foley]

Norbert,

I was thinking of gcc-wrapper more as a libreoffice-internal tool like
concat-deps than a external cygwin package.

The Microsoft linker is supported by autoconf so it is handled in
ExternalProject.mk.

Thanks,

Peter



On Wed, Mar 13, 2013 at 5:48 PM, Norbert Thiebaud nthieb...@gmail.comwrote:

 On Wed, Mar 13, 2013 at 4:37 PM, Peter Foley pefol...@verizon.net wrote:
  I've written a wrapper around MSVC cl.exe for autoconf (see
 
 https://wiki.documentfoundation.org/Development/Gsoc/Ideas#Gcc_like_wrapper_for_MSC_on_cygwin_and_autotools_compatibility
 ).
 
  The goal of the wrapper is to remove all the custom MSVC logic from the
  ExternalProject makefiles and let the packages just use autoconf.
 
  I've uploaded the gcc-wrapper patch to gerrit as well as two example
  implementations.
 
  The code was rather quickly hacked together so it may still be buggy.
 
  Is this something that should be integrated into libreoffice?

 The wrapper itself, probably not, otherwise you get the usual
 bootstrap problem...
 but a solution would be to make it avaiable as an external pre-req
 like the dozen that Windows already has...
 Ideally I suppose, in a cygwin-like package (rpm?) that one could
 install in cygwin... just like we already request for 2 dozen of
 packages to be installed in cygwin to be able to build...

 Norbert

 PS: make sure that the wrapper is 'versionable', since I suspect that
 some behaviors will depend on the underlying version of the MS
 compiler...
 PS2: how do you deal with the 'linker' aspect of things ?

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Bug 62303 - Enhancement request: Set default install folder under Windows to \LibreOffice\

[V Stuart Foote]

Bug fdo#62303 ( https://bugs.freedesktop.org/show_bug.cgi?id=62303 ) has been 
submitted as an enhancement request to adjust the installation folder on 
Windows to a non-versioned folder e.g. C:\Program Files\LibreOffice\

Brief discussion on Discuss ( 
http://nabble.documentfoundation.org/Install-path-for-LibreOffice-under-Windows-tp4041530.html
 ) but as we're asking to expedite this adjustment for a 4.0.3 build. solicit 
users and devs lists for any substantive reasons NOT to proceed.

Advantage of placing into a non-versioned installation folder for Windows OS is 
that established configurations and function of 3rd party extensions will 
remain intact across version upgrades.

Expect minimal impact on installation or bundled extensions and Windows 
registry and LibreOffice registry and user profile.  Potential impact on 
migrating user profiles during upgrade, and possibly on 3rd party extensions.

Comments? Substantive objections?


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: libmariadb/my_config.h mysqlc/Library_mysqlc.mk mysqlcppconn/Library_mysqlcppconn.mk

[Fridrich Štrba]

 libmariadb/my_config.h   |2 ++
 mysqlc/Library_mysqlc.mk |6 ++
 mysqlcppconn/Library_mysqlcppconn.mk |6 ++
 3 files changed, 14 insertions(+)

New commits:
commit 77cc0cb72f88806ee13682ac868b9e468a070400
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 14 09:18:37 2013 +0100

Build thread-enabled internal libmariadb on UNX

Change-Id: Ie0968b0802f5cbd9dc75906c4930586fb46d99ca

diff --git a/libmariadb/my_config.h b/libmariadb/my_config.h
index c026a27..ceed617 100644
--- a/libmariadb/my_config.h
+++ b/libmariadb/my_config.h
@@ -160,3 +160,5 @@
 
 #define RETSIGTYPE void
 #define RETQSORTTYPE void
+
+#define THREAD 1
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index d67d314..fd09ba1 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -36,6 +36,12 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\
cppuhelper \
 ))
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,mysqlc,\
+   -lpthread \
+))
+endif
+
 $(eval $(call gb_Library_add_defs,mysqlc,\
-DCPPDBC_EXPORTS \
-DCPPCONN_LIB_BUILD \
diff --git a/mysqlcppconn/Library_mysqlcppconn.mk 
b/mysqlcppconn/Library_mysqlcppconn.mk
index 6f52a26..611895b 100644
--- a/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/mysqlcppconn/Library_mysqlcppconn.mk
@@ -53,6 +53,12 @@ $(eval $(call gb_Library_set_include,mysqlcppconn,\
$(MARIADB_CFLAGS) \
 ))
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,mysqlcppconn,\
+   -lpthread \
+))
+endif
+
 $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
UnpackedTarball/mysqlcppconn/driver/mysql_art_resultset \
UnpackedTarball/mysqlcppconn/driver/mysql_art_rset_metadata \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] move liblangtag to gcc-wrapper

[Fridrich Strba (via Code Review)]

Fridrich Strba has created a new patch set by issuing a rebase in Gerrit (#3).

Change subject: move liblangtag to gcc-wrapper
..

move liblangtag to gcc-wrapper

Change-Id: I4aefdc9475b7fbd4206d8d9862ca8d399360a37e
---
M liblangtag/ExternalPackage_langtag.mk
M liblangtag/ExternalProject_langtag.mk
M liblangtag/Module_liblangtag.mk
D liblangtag/StaticLibrary_langtag.mk
M liblangtag/UnpackedTarball_langtag.mk
A liblangtag/ar-lib
A liblangtag/liblangtag-0.4.0-ar-lib.patch
7 files changed, 1,269 insertions(+), 84 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/2717/3
-- 
To view, visit https://gerrit.libreoffice.org/2717
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I4aefdc9475b7fbd4206d8d9862ca8d399360a37e
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley pefol...@verizon.net
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: there is linked error,please help me

[Tor Lillqvist]

 please give me some advise

Please email the LibreOffice development list (see
http://lists.freedesktop.org/mailman/listinfo/libreoffice for
infromation on how to subscribe, and archives), not me privately.
(Sending this email to that list, keeping you as Bcc to protect your
privacy. But please follow-up on the list, I won't reply to more
private email about this.)

The stuff in ios/qa/sc has bit-rotted for sure, I haven't tried
building that for ages. The only iOS executable that is currently
buildable is the one in ios/experimental/Viewer . (Note that this
Viewer is not a real app in any sense of the word (yet, if ever),
it currently just tests that the basic LibreOffice / UNO bootstrapping
mechanisms work and that a document is loadable using the UNO API.
Thus it also indirectly tests that the C++/UNO bridge works, if it
wouldn't none of that would work either. It has no UI.)

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: gcc wrapper for MSVC

[Tor Lillqvist]

By the way, ten years or so ago I was also hacking (occasionally) on a
MSVC wrapper that would emulate gcc's command line syntax and options.

I never got enthusiastic enough to get it working well enough to be
usable for what I intended. It used to live in GLib's sources, as
build/win32/cl-wrapper.c I think. it is no longer there, but googling
for cl-wrapper.c turns up various copies of various versions (and
perhaps with enhancements by others) that have been adopted by other
projects (which is nice, I didn't know that;).

So that might give some inspiration, although the basic working of
that cl-wrapper.c is probably totally different from what you are
planning.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Repository.mk solenv/Executable_gcc-wrapper.mk solenv/Executable_g++-wrapper.mk solenv/gbuild solenv/gcc-wrappers solenv/Module_solenv.mk solenv/StaticLibrary_wrapper.m

[Peter Foley]

 Repository.mk|3 
 solenv/Executable_g++-wrapper.mk |   20 
 solenv/Executable_gcc-wrapper.mk |   20 
 solenv/Module_solenv.mk  |   15 ++-
 solenv/StaticLibrary_wrapper.mk  |   16 +++
 solenv/gbuild/ExternalProject.mk |   21 
 solenv/gcc-wrappers/g++.cxx  |   25 +
 solenv/gcc-wrappers/gcc.cxx  |   25 +
 solenv/gcc-wrappers/wrapper.cxx  |  168 +++
 solenv/gcc-wrappers/wrapper.hxx  |   24 +
 10 files changed, 331 insertions(+), 6 deletions(-)

New commits:
commit 357ace566d4090b85c7c7b5d775c8b9eaaa76e5f
Author: Peter Foley pefol...@verizon.net
Date:   Tue Mar 12 20:03:14 2013 -0400

add gcc-wrapper

Change-Id: I961bd23d1ec382d247a489cda42194ce9f4fe1da
Reviewed-on: https://gerrit.libreoffice.org/2715
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/Repository.mk b/Repository.mk
index ffcf18c..6c7e971 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -110,6 +110,8 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_executables,OOO,\
crashrep_com \
gengal \
+   gcc-wrapper \
+   g++-wrapper \
guiloader \
guistdio \
langsupport \
@@ -138,6 +140,7 @@ $(eval $(call 
gb_Helper_register_static_libraries,PLAINLIBS, \
directxcanvas \
winextendloaderenv \
winlauncher \
+   wrapper \
 ))
 
 else
diff --git a/solenv/Executable_g++-wrapper.mk b/solenv/Executable_g++-wrapper.mk
new file mode 100755
index 000..526ff3a
--- /dev/null
+++ b/solenv/Executable_g++-wrapper.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,g++-wrapper))
+
+$(eval $(call gb_Executable_add_exception_objects,g++-wrapper,\
+   solenv/gcc-wrappers/g++ \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,g++-wrapper,\
+wrapper \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/solenv/Executable_gcc-wrapper.mk b/solenv/Executable_gcc-wrapper.mk
new file mode 100644
index 000..ae76a33
--- /dev/null
+++ b/solenv/Executable_gcc-wrapper.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,gcc-wrapper))
+
+$(eval $(call gb_Executable_add_exception_objects,gcc-wrapper,\
+   solenv/gcc-wrappers/gcc \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,gcc-wrapper,\
+wrapper \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 3edb91b..f0bb4c2 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -31,15 +31,20 @@ $(eval $(call gb_Module_add_targets_for_build,solenv,\
Executable_concat-deps \
 ))
 
-ifneq ($(OS),WNT)
-ifneq ($(OS),IOS)
-ifneq ($(OS),ANDROID)
+ifeq ($(COM),MSC)
+$(eval $(call gb_Module_add_targets,solenv,\
+   StaticLibrary_wrapper \
+   Executable_gcc-wrapper \
+   Executable_g++-wrapper \
+))
+endif
+
+
+ifneq ($(filter-out WNT IOS ANDROID,$(OS)),)
 $(eval $(call gb_Module_add_targets,solenv,\
CustomTarget_gdb \
Package_gdb \
 ))
 endif
-endif
-endif
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/StaticLibrary_wrapper.mk b/solenv/StaticLibrary_wrapper.mk
new file mode 100755
index 000..8fe81ef
--- /dev/null
+++ b/solenv/StaticLibrary_wrapper.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,wrapper))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,wrapper,\
+   solenv/gcc-wrappers/wrapper \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 20c0973..6443af3 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -180,6 +180,16 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : \
 
 endef
 
+# Use the gcc wrappers for a autoconf based project
+#
+# gb_ExternalProject_register_targets project state_target
+define gb_ExternalProject_use_autoconf
+ifeq ($(COM),MSC)
+$(call 

[Libreoffice-commits] core.git: libvisio/ExternalPackage_libvisio.mk libvisio/ExternalProject_libvisio.mk

[Peter Foley]

 libvisio/ExternalPackage_libvisio.mk |4 +--
 libvisio/ExternalProject_libvisio.mk |   40 +--
 2 files changed, 4 insertions(+), 40 deletions(-)

New commits:
commit e6a877f8fb8bd0410431ea15891cc09748bd6a3a
Author: Peter Foley pefol...@verizon.net
Date:   Tue Mar 12 20:04:14 2013 -0400

move libvisio to gcc-wrapper

Change-Id: Ia2efaa7d58fa2040f597e6a303a219892a710c1f
Reviewed-on: https://gerrit.libreoffice.org/2716
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/libvisio/ExternalPackage_libvisio.mk 
b/libvisio/ExternalPackage_libvisio.mk
index 76d573a..5838a13 100644
--- a/libvisio/ExternalPackage_libvisio.mk
+++ b/libvisio/ExternalPackage_libvisio.mk
@@ -17,8 +17,8 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libvisio,inc/external/libvis
 
 $(eval $(call gb_ExternalPackage_use_external_project,libvisio,libvisio))
 
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call 
gb_ExternalPackage_add_file,libvisio,lib/visio-0.0.lib,build/win32/Release/lib/libvisio-0.0.lib))
+ifeq ($(COM),MSC)
+$(eval $(call 
gb_ExternalPackage_add_file,libvisio,lib/visio-0.0.lib,src/lib/.libs/libvisio-0.0.lib))
 else
 $(eval $(call 
gb_ExternalPackage_add_file,libvisio,lib/libvisio-0.0.a,src/lib/.libs/libvisio-0.0.a))
 endif
diff --git a/libvisio/ExternalProject_libvisio.mk 
b/libvisio/ExternalProject_libvisio.mk
index dcd61a1..2095e61 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libvisio))
 
 $(eval $(call gb_ExternalProject_use_unpacked,libvisio,visio))
 
+$(eval $(call gb_ExternalProject_use_autoconf,libvisio,build))
+
 $(eval $(call gb_ExternalProject_register_targets,libvisio,\
build \
 ))
@@ -22,42 +24,6 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\
libxml2 \
 ))
 
-ifeq ($(OS)$(COM),WNTMSC)
-
-ifeq ($(VCVER),90)
-$(call gb_ExternalProject_get_state_target,libvisio,build) :
-   $(call gb_ExternalProject_run,build,\
-   export BOOST_INCLUDE_DIR=$(call 
gb_UnpackedTarball_get_dir,boost) \
-export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
-export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
-export LIBXML_INCLUDE_DIR=$(call 
gb_UnpackedTarball_get_dir,xml2)/include \
-export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
-$(COMPATH)/vcpackages/vcbuild.exe libvisio.vcproj 
Release|Win32 \
-   ,build/win32)
-else ifeq ($(VCVER),100)
-$(call gb_ExternalProject_get_state_target,libvisio,build) :
-   $(call gb_ExternalProject_run,build,\
-   export BOOST_INCLUDE_DIR=$(call 
gb_UnpackedTarball_get_dir,boost) \
-export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
-export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
-export LIBXML_INCLUDE_DIR=$(call 
gb_UnpackedTarball_get_dir,xml2)/include \
-export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
-msbuild.exe libvisio.vcxproj /p:Configuration=Release \
-   ,build/win32)
-else
-$(call gb_ExternalProject_get_state_target,libvisio,build) :
-   $(call gb_ExternalProject_run,build,\
-   export BOOST_INCLUDE_DIR=$(call 
gb_UnpackedTarball_get_dir,boost) \
-export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
-export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
-export LIBXML_INCLUDE_DIR=$(call 
gb_UnpackedTarball_get_dir,xml2)/include \
-export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
-msbuild.exe libvisio.vcxproj /p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0 /p:Configuration=Release \
-   ,build/win32)
-endif
-
-else
-
 $(call gb_ExternalProject_get_state_target,libvisio,build) :
$(call gb_ExternalProject_run,build,\
PKG_CONFIG= \
@@ -74,6 +40,4 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 (cd $(EXTERNAL_WORKDIR)/src/lib  $(MAKE)) \
)
 
-endif
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] add gcc-wrapper

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2715

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2715
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I961bd23d1ec382d247a489cda42194ce9f4fe1da
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley pefol...@verizon.net
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] move libvisio to gcc-wrapper

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2716

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2716
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2efaa7d58fa2040f597e6a303a219892a710c1f
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley pefol...@verizon.net
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: liblangtag/ar-lib liblangtag/ExternalPackage_langtag.mk liblangtag/ExternalProject_langtag.mk liblangtag/liblangtag-0.4.0-ar-lib.patch liblangtag/Module_liblangtag.mk l

[Peter Foley]

 liblangtag/ExternalPackage_langtag.mk|4 
 liblangtag/ExternalProject_langtag.mk|5 
 liblangtag/Module_liblangtag.mk  |   11 
 liblangtag/StaticLibrary_langtag.mk  |   73 --
 liblangtag/UnpackedTarball_langtag.mk|8 
 liblangtag/ar-lib|  270 
 liblangtag/liblangtag-0.4.0-ar-lib.patch |  982 +++
 7 files changed, 1269 insertions(+), 84 deletions(-)

New commits:
commit 83d61d9f1b0c95de2cd1199d3f60be70dfa92bec
Author: Peter Foley pefol...@verizon.net
Date:   Tue Mar 12 20:06:07 2013 -0400

move liblangtag to gcc-wrapper

Change-Id: I4aefdc9475b7fbd4206d8d9862ca8d399360a37e
Reviewed-on: https://gerrit.libreoffice.org/2717
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/liblangtag/ExternalPackage_langtag.mk 
b/liblangtag/ExternalPackage_langtag.mk
index a424f83..02816dd 100644
--- a/liblangtag/ExternalPackage_langtag.mk
+++ b/liblangtag/ExternalPackage_langtag.mk
@@ -11,6 +11,10 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,langtag,langtag))
 
 $(eval $(call gb_ExternalPackage_use_external_project,langtag,langtag))
 
+ifeq ($(COM),MSC)
+$(eval $(call 
gb_ExternalPackage_add_file,langtag,lib/langtag.lib,liblangtag/.libs/liblangtag.lib))
+else
 $(eval $(call 
gb_ExternalPackage_add_file,langtag,lib/liblangtag.a,liblangtag/.libs/liblangtag.a))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/liblangtag/ExternalProject_langtag.mk 
b/liblangtag/ExternalProject_langtag.mk
index 051e035..6f6923c 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -10,8 +10,11 @@
 $(eval $(call gb_ExternalProject_ExternalProject,langtag))
 
 $(eval $(call gb_ExternalProject_use_unpacked,langtag,langtag))
+
 $(eval $(call gb_ExternalProject_use_external,langtag,libxml2))
 
+$(eval $(call gb_ExternalProject_use_autoconf,langtag,build))
+
 $(eval $(call gb_ExternalProject_register_targets,langtag,\
build \
 ))
@@ -21,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
./configure --disable-modules --disable-test 
--disable-introspection --disable-shared --enable-static --with-pic \
$(if $(filter 
TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),lt_cv_has_atomic=yes,lt_cv_has_atomic=no) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
-   $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,xml2)/include,\
+   $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,xml2)/include LIBXML2_LIBS= ,\
$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS=$(LIBXML_CFLAGS) 
LIBXML2_LIBS=$(LIBXML_LIBS))) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(filter-out LINUX 
FREEBSD,$(OS)),,LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath,\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
diff --git a/liblangtag/Module_liblangtag.mk b/liblangtag/Module_liblangtag.mk
index 8d75f2d..b5e9cc3 100644
--- a/liblangtag/Module_liblangtag.mk
+++ b/liblangtag/Module_liblangtag.mk
@@ -15,20 +15,11 @@ ifeq ($(SYSTEM_LIBLANGTAG),NO)
 $(eval $(call gb_Module_add_targets,liblangtag,\
UnpackedTarball_langtag \
ExternalPackage_langtag_data \
-   Zip_liblangtag_data \
-))
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_Module_add_targets,liblangtag,\
-   StaticLibrary_langtag \
-))
-else
-$(eval $(call gb_Module_add_targets,liblangtag,\
ExternalPackage_langtag \
ExternalProject_langtag \
+   Zip_liblangtag_data \
 ))
 endif
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/liblangtag/StaticLibrary_langtag.mk 
b/liblangtag/StaticLibrary_langtag.mk
deleted file mode 100755
index fed7565..000
--- a/liblangtag/StaticLibrary_langtag.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,langtag))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,langtag))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,langtag,langtag))
-
-$(eval $(call gb_StaticLibrary_use_external,langtag,libxml2))
-
-$(eval $(call gb_StaticLibrary_set_include,langtag,\
-   $$(INCLUDE) \
-   -I$(call gb_UnpackedTarball_get_dir,langtag) \
-   -I$(call gb_UnpackedTarball_get_dir,langtag)/liblangtag \
-))
-
-# Hardcoded for MSVC
-$(eval $(call gb_StaticLibrary_add_defs,langtag,\
-   -D__LANGTAG_COMPILATION \
-   -DREGDATADIR \
-   

[PUSHED] move liblangtag to gcc-wrapper

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2717

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2717
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4aefdc9475b7fbd4206d8d9862ca8d399360a37e
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley pefol...@verizon.net
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/inc sw/source

[Jian Hong Cheng]

 sw/inc/IDocumentContentOperations.hxx |2 
 sw/inc/doc.hxx|3 -
 sw/inc/ndtxt.hxx  |1 
 sw/source/core/doc/docfmt.cxx |   54 ++--
 sw/source/core/txtnode/thints.cxx |   70 ++
 sw/source/filter/inc/fltshell.hxx |   25 -
 sw/source/filter/ww1/fltshell.cxx |   91 +++---
 sw/source/filter/ww8/ww8par.cxx   |   64 +++
 sw/source/filter/ww8/ww8par.hxx   |   16 +
 sw/source/filter/ww8/ww8par3.cxx  |   15 +
 10 files changed, 324 insertions(+), 17 deletions(-)

New commits:
commit 1c22545edf9085b9f2656ca92781158b6b123db3
Author: Jian Hong Cheng chen...@apache.org
Date:   Fri Aug 24 02:28:19 2012 +

Fix issue #i119405: Numbering text style changed after importing the *.doc

* main/sw/inc/doc.hxx
* main/sw/inc/IDocumentContentOperations.hxx
* main/sw/inc/ndtxt.hxx
* main/sw/source/core/doc/docfmt.cxx
* main/sw/source/core/txtnode/thints.cxx
* main/sw/source/filter/inc/fltshell.hxx
* main/sw/source/filter/ww1/fltshell.cxx
* main/sw/source/filter/ww8/ww8par.cxx
* main/sw/source/filter/ww8/ww8par.hxx
* main/sw/source/filter/ww8/ww8par3.cxx
MS Word Binary compatibility

Patch by: Fan Zheng,zheng.easy...@gmail.com
Found by: Jian Hong Cheng,chen...@apache.org
Review by: Jian Hong Cheng,chen...@apache.org
Conflicts:
sw/source/filter/inc/fltshell.hxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par.hxx

(cherry picked from commit ee3b12ab1d62faedcd2d62fcb8011b7454ea0474)

Change-Id: I2f72969a54db53e6a51edcf3a3216647cec9424c

diff --git a/sw/inc/IDocumentContentOperations.hxx 
b/sw/inc/IDocumentContentOperations.hxx
index e236102..998bf6f 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -165,7 +165,7 @@
 sal_False.
 */
 virtual bool InsertPoolItem(const SwPaM rRg, const SfxPoolItem,
-const sal_uInt16 nFlags) = 0;
+const sal_uInt16 nFlags,bool 
bExpandCharToPara=false) = 0;
 
 virtual bool InsertItemSet (const SwPaM rRg, const SfxItemSet,
 const sal_uInt16 nFlags) = 0;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 7f95945..a4bfb58 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -874,8 +874,9 @@ public:
 virtual SwDrawFrmFmt* Insert(const SwPaM rRg, SdrObject rDrawObj, const 
SfxItemSet* pFlyAttrSet, SwFrmFmt*);
 virtual SwFlyFrmFmt* Insert(const SwPaM rRg, const 
svt::EmbeddedObjectRef xObj, const SfxItemSet* pFlyAttrSet,
 const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
+//Add a para for the char attribute exp...
 virtual bool InsertPoolItem(const SwPaM rRg, const SfxPoolItem,
-const SetAttrMode nFlags);
+const SetAttrMode nFlags,bool 
bExpandCharToPara=false);
 virtual bool InsertItemSet (const SwPaM rRg, const SfxItemSet,
 const SetAttrMode nFlags);
 virtual void ReRead(SwPaM, const String rGrfName, const String 
rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj);
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index eba1e5d..e76eb69 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -206,6 +206,7 @@ public:
 /// SMARTTAGS
 void SetSmartTags( SwWrongList* pNew, bool bDelete = true );
 SwWrongList* GetSmartTags();
+bool TryCharSetExpandToNum(const SfxItemSet pCharSet);
 
 
 /// End: Data collected during idle time
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 9fcc618..582d52d 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -495,7 +495,7 @@ void SwDoc::ResetAttrs( const SwPaM rRg,
 
 static bool
 lcl_InsAttr(SwDoc *const pDoc, const SwPaM rRg, const SfxItemSet rChgSet,
-const SetAttrMode nFlags, SwUndoAttr *const pUndo)
+const SetAttrMode nFlags, SwUndoAttr *const pUndo,bool 
bExpandCharToPara=false)
 {
 // Divide the Sets (for selections in Nodes)
 const SfxItemSet* pCharSet = 0;
@@ -899,6 +899,24 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM rRg, const 
SfxItemSet rChgSet,
 // Only selection in a Node.
 if( pStt-nNode == pEnd-nNode )
 {
+//The data parameter flag: bExpandCharToPara, comes from the data 
member of SwDoc,
+//Which is set in SW MS word Binary filter WW8ImplRreader. With 
this flag on, means that
+//current setting attribute set is a character range properties 
set and comes from a MS word
+//binary file, And the setting range include a paragraph end 
position (0X0D);
+//More specifications, as such property inside the 

[PATCH] Change Impress remote client target SDK version.

[Artur Dryomov (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2719

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/2719/1

Change Impress remote client target SDK version.

This change should remove compatibility menu button for modern Android
versions.

See Android developers blog post for details:
http://android-developers.blogspot.com/2012/01/say-goodbye-to-menu-button.html

Change-Id: I9152fa06558eabd633ad0c19174f45ee2ee9
---
M android/sdremote/AndroidManifest.xml
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/android/sdremote/AndroidManifest.xml 
b/android/sdremote/AndroidManifest.xml
index 572c5abb9..f8729c0 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -10,7 +10,7 @@
 
 uses-sdk
 android:minSdkVersion=10
-android:targetSdkVersion=10 /
+android:targetSdkVersion=14 /
 
 application
 android:icon=@drawable/ic_launcher

-- 
To view, visit https://gerrit.libreoffice.org/2719
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9152fa06558eabd633ad0c19174f45ee2ee9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Artur Dryomov artur.dryo...@gmail.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ee/3b12ab1d62faedcd2d62fcb8011b7454ea0474

[Cédric Bosdonnat]

 ee/3b12ab1d62faedcd2d62fcb8011b7454ea0474 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3e01729422ce737d522b08be2124379496904241
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Mar 14 10:13:40 2013 +0100

Notes added by 'git notes add'

diff --git a/ee/3b12ab1d62faedcd2d62fcb8011b7454ea0474 
b/ee/3b12ab1d62faedcd2d62fcb8011b7454ea0474
new file mode 100644
index 000..b7241d1
--- /dev/null
+++ b/ee/3b12ab1d62faedcd2d62fcb8011b7454ea0474
@@ -0,0 +1 @@
+merged as: 1c22545edf9085b9f2656ca92781158b6b123db3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Noel Power]

 sc/source/filter/oox/stylesbuffer.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8a548d2332c162d8713d266ed15aa2ff6e6a2076
Author: Noel Power noel.po...@suse.com
Date:   Wed Mar 13 12:23:41 2013 +

fix fdo#38385 - accept as valid 'start' and 'end' tokens for lineborders

Change-Id: Ie092cc09c9c6e971c4f2020cb3b233ee350752ce
(cherry picked from commit 8b29f5cb0333c156154adc151a613a547fde4f8f)
Reviewed-on: https://gerrit.libreoffice.org/2709
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index b7cc8db..703fc8b 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -1782,7 +1782,9 @@ BorderLineModel* Border::getBorderLine( sal_Int32 
nElement )
 switch( nElement )
 {
 case XLS_TOKEN( left ): return maModel.maLeft;
+case XLS_TOKEN( start ): return maModel.maLeft;
 case XLS_TOKEN( right ):return maModel.maRight;
+case XLS_TOKEN( end ):return maModel.maRight;
 case XLS_TOKEN( top ):  return maModel.maTop;
 case XLS_TOKEN( bottom ):   return maModel.maBottom;
 case XLS_TOKEN( diagonal ): return maModel.maDiagonal;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fix fdo#38385 - accept as valid 'start' and 'end' tokens for...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2709

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2709
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie092cc09c9c6e971c4f2020cb3b233ee350752ce
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 2 commits - canvas/source vcl/inc vcl/source vcl/unx

[Radek Doulik]

 canvas/source/cairo/cairo_canvasbitmap.cxx |   30 +
 canvas/source/cairo/cairo_canvasbitmap.hxx |4 
 canvas/source/cairo/cairo_xlib_cairo.cxx   |7 +
 canvas/source/cairo/cairo_xlib_cairo.hxx   |1 
 vcl/inc/salbmp.hxx |2 
 vcl/inc/unx/salbmp.h   |7 +
 vcl/inc/unx/salgdi.h   |5 
 vcl/inc/vcl/bitmap.hxx |3 
 vcl/source/gdi/bitmap.cxx  |   13 ++
 vcl/source/gdi/gdimtf.cxx  |   10 -
 vcl/source/helper/canvastools.cxx  |   25 
 vcl/unx/generic/gdi/salbmp.cxx |   18 ++-
 vcl/unx/generic/gdi/salgdi2.cxx|  149 -
 13 files changed, 191 insertions(+), 83 deletions(-)

New commits:
commit c6c0e73e0fda18b7bb37685ab8f8630e15bb427a
Author: Radek Doulik r...@novell.com
Date:   Thu Mar 14 09:36:43 2013 +0100

pass argb32 pixmaps from vcl to canvas, avoiding costly x11 roundtrips

 - fixes also problem with emf+ rendering for slideshow

Change-Id: Icb894d3f37b29f23d3f267c944d827eefbf47fda

diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx 
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 1d62554..949a9ca 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -143,6 +143,30 @@ namespace cairocanvas
 return maCanvasHelper.repaint( pSurface, viewState, renderState );
 }
 
+void SAL_CALL CanvasBitmap::setFastPropertyValue( sal_Int32 nHandle, 
const ::com::sun::star::uno::Any rAny )  throw (uno::RuntimeException)
+{
+sal_Int64 nPointer;
+
+if ( nHandle == 0 )
+{
+rAny = nPointer;
+
+if ( nPointer )
+{
+::Bitmap *pBitmap = reinterpret_cast ::Bitmap* ( nPointer );
+
+mpBufferSurface = createSurface( *pBitmap );
+mpBufferCairo = mpBufferSurface-getCairo();
+
+::Size aSize( pBitmap-GetSizePixel() );
+maSize = ::basegfx::B2ISize( aSize.getWidth(), 
aSize.getHeight() );
+
+maCanvasHelper.setSize( maSize );
+maCanvasHelper.setSurface( mpBufferSurface, mbHasAlpha );
+}
+}
+}
+
 uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle )  
throw (uno::RuntimeException)
 {
 uno::Any aRV( sal_Int32(0) );
@@ -161,10 +185,11 @@ namespace cairocanvas
 #ifdef CAIRO_HAS_XLIB_SURFACE
 X11Surface* 
pXlibSurface=dynamic_castX11Surface*(mpBufferSurface.get());
 OSL_ASSERT(pXlibSurface);
-uno::Sequence uno::Any  args( 3 );
+uno::Sequence uno::Any  args( 4 );
 args[0] = uno::Any( false );  // do not call XFreePixmap on it
 args[1] = uno::Any( pXlibSurface-getPixmap()-mhDrawable );
 args[2] = uno::Any( sal_Int32( pXlibSurface-getDepth() ) );
+args[3] = uno::Any( sal_Int64( pXlibSurface-getVisual () ) );
 
 aRV = uno::Any( args );
 #elif defined CAIRO_HAS_QUARTZ_SURFACE
@@ -189,7 +214,7 @@ namespace cairocanvas
 case 2:
 {
 #ifdef CAIRO_HAS_XLIB_SURFACE
-uno::Sequence uno::Any  args( 3 );
+uno::Sequence uno::Any  args( 4 );
 SurfaceSharedPtr pAlphaSurface = 
mpSurfaceProvider-createSurface( maSize, CAIRO_CONTENT_COLOR );
 CairoSharedPtr   pAlphaCairo = pAlphaSurface-getCairo();
 X11Surface* 
pXlibSurface=dynamic_castX11Surface*(pAlphaSurface.get());
@@ -208,6 +233,7 @@ namespace cairocanvas
 args[0] = uno::Any( true );
 args[1] = ::com::sun::star::uno::Any( pPixmap-mhDrawable );
 args[2] = ::com::sun::star::uno::Any( sal_Int32( 
pXlibSurface-getDepth () ) );
+args[3] = ::com::sun::star::uno::Any( sal_Int64( 
pXlibSurface-getVisual () ) );
 pPixmap-clear(); // caller takes ownership of pixmap
 
 // return pixmap and alphachannel pixmap - it will be used in 
BitmapEx
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx 
b/canvas/source/cairo/cairo_canvasbitmap.hxx
index 1626c92..523228c 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -124,14 +124,14 @@ namespace cairocanvas
 // 2nd the pixmap handle
 // 3rd the pixmap depth
 virtual ::com::sun::star::uno::Any SAL_CALL 
getFastPropertyValue(sal_Int32 nHandle)  throw 
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setFastPropertyValue(sal_Int32, const 
::com::sun::star::uno::Any)  throw (::com::sun::star::uno::RuntimeException) {}
+virtual void SAL_CALL setFastPropertyValue(sal_Int32, const 
::com::sun::star::uno::Any)  throw (::com::sun::star::uno::RuntimeException);
 
 private:
 

Re: Pivot Table data provider extension framework (removal possibility)

[Lionel Elie Mamane]

On Wed, Mar 13, 2013 at 09:48:32PM +0100, Eike Rathke wrote:

 I believe the same functionality can be achieve via database
 connectivity, by having such external data provider register as a
 database, and use it to act as a data provider for pivot tables.
 So, I don't see a reason why we need to keep this as a separate data
 source category.

 IMHO the advantage of the data provider is that the actual data does not
 have to reside in the spreadsheet, allowing for massive amounts of data
 records but providing only the information necessary for the pivot
 table. This maybe could be accomplished as well using a registered data
 source, but currently we have no means to pull the data without actually
 storing it in the spreadsheet for further processing. Or isn't that the
 case?

Naively, I don't immediately see why when using database connectivity,
you'd have to store the data in the spreadsheet?

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: android/sdremote

[Artur Dryomov]

 android/sdremote/AndroidManifest.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ed6097396c6407840fc8b8a40b03f03e7573821
Author: Artur Dryomov artur.dryo...@gmail.com
Date:   Thu Mar 14 12:11:31 2013 +0300

Change Impress remote client target SDK version.

This change should remove compatibility menu button for modern Android
versions.

See Android developers blog post for details:

http://android-developers.blogspot.com/2012/01/say-goodbye-to-menu-button.html

Change-Id: I9152fa06558eabd633ad0c19174f45ee2ee9
Reviewed-on: https://gerrit.libreoffice.org/2719
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/android/sdremote/AndroidManifest.xml 
b/android/sdremote/AndroidManifest.xml
index 572c5abb9..f8729c0 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -10,7 +10,7 @@
 
 uses-sdk
 android:minSdkVersion=10
-android:targetSdkVersion=10 /
+android:targetSdkVersion=14 /
 
 application
 android:icon=@drawable/ic_launcher
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change Impress remote client target SDK version.

[Thorsten Behrens (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2719

Approvals:
  Thorsten Behrens: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2719
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9152fa06558eabd633ad0c19174f45ee2ee9
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Artur Dryomov artur.dryo...@gmail.com
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source

[Jian Hong Cheng]

 sw/inc/IDocumentContentOperations.hxx |2 
 sw/inc/doc.hxx|3 -
 sw/inc/ndtxt.hxx  |1 
 sw/source/core/doc/docfmt.cxx |   54 ++--
 sw/source/core/txtnode/thints.cxx |   70 ++
 sw/source/filter/inc/fltshell.hxx |   25 -
 sw/source/filter/ww1/fltshell.cxx |   91 +++---
 sw/source/filter/ww8/ww8par.cxx   |   64 +++
 sw/source/filter/ww8/ww8par.hxx   |   16 +
 sw/source/filter/ww8/ww8par3.cxx  |   15 +
 10 files changed, 324 insertions(+), 17 deletions(-)

New commits:
commit 8675c8de07255bb77d2191fa62285904aa536c4f
Author: Jian Hong Cheng chen...@apache.org
Date:   Fri Aug 24 02:28:19 2012 +

Fix issue #i119405: Numbering text style changed after importing the *.doc

* main/sw/inc/doc.hxx
* main/sw/inc/IDocumentContentOperations.hxx
* main/sw/inc/ndtxt.hxx
* main/sw/source/core/doc/docfmt.cxx
* main/sw/source/core/txtnode/thints.cxx
* main/sw/source/filter/inc/fltshell.hxx
* main/sw/source/filter/ww1/fltshell.cxx
* main/sw/source/filter/ww8/ww8par.cxx
* main/sw/source/filter/ww8/ww8par.hxx
* main/sw/source/filter/ww8/ww8par3.cxx
MS Word Binary compatibility

Patch by: Fan Zheng,zheng.easy...@gmail.com
Found by: Jian Hong Cheng,chen...@apache.org
Review by: Jian Hong Cheng,chen...@apache.org
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

Conflicts:
sw/source/filter/inc/fltshell.hxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par.hxx

(cherry picked from commit ee3b12ab1d62faedcd2d62fcb8011b7454ea0474)

Change-Id: I2f72969a54db53e6a51edcf3a3216647cec9424c
(cherry picked from commit 1c22545edf9085b9f2656ca92781158b6b123db3)

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/sw/inc/IDocumentContentOperations.hxx 
b/sw/inc/IDocumentContentOperations.hxx
index e236102..998bf6f 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -165,7 +165,7 @@
 sal_False.
 */
 virtual bool InsertPoolItem(const SwPaM rRg, const SfxPoolItem,
-const sal_uInt16 nFlags) = 0;
+const sal_uInt16 nFlags,bool 
bExpandCharToPara=false) = 0;
 
 virtual bool InsertItemSet (const SwPaM rRg, const SfxItemSet,
 const sal_uInt16 nFlags) = 0;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index d71ce52..ed16869 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -874,8 +874,9 @@ public:
 virtual SwDrawFrmFmt* Insert(const SwPaM rRg, SdrObject rDrawObj, const 
SfxItemSet* pFlyAttrSet, SwFrmFmt*);
 virtual SwFlyFrmFmt* Insert(const SwPaM rRg, const 
svt::EmbeddedObjectRef xObj, const SfxItemSet* pFlyAttrSet,
 const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
+//Add a para for the char attribute exp...
 virtual bool InsertPoolItem(const SwPaM rRg, const SfxPoolItem,
-const SetAttrMode nFlags);
+const SetAttrMode nFlags,bool 
bExpandCharToPara=false);
 virtual bool InsertItemSet (const SwPaM rRg, const SfxItemSet,
 const SetAttrMode nFlags);
 virtual void ReRead(SwPaM, const String rGrfName, const String 
rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj);
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 985e6e8..e3cc9d0 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -206,6 +206,7 @@ public:
 /// SMARTTAGS
 void SetSmartTags( SwWrongList* pNew, bool bDelete = true );
 SwWrongList* GetSmartTags();
+bool TryCharSetExpandToNum(const SfxItemSet pCharSet);
 
 
 /// End: Data collected during idle time
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 484c93c..352a451 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -495,7 +495,7 @@ void SwDoc::ResetAttrs( const SwPaM rRg,
 
 static bool
 lcl_InsAttr(SwDoc *const pDoc, const SwPaM rRg, const SfxItemSet rChgSet,
-const SetAttrMode nFlags, SwUndoAttr *const pUndo)
+const SetAttrMode nFlags, SwUndoAttr *const pUndo,bool 
bExpandCharToPara=false)
 {
 // Divide the Sets (for selections in Nodes)
 const SfxItemSet* pCharSet = 0;
@@ -899,6 +899,24 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM rRg, const 
SfxItemSet rChgSet,
 // Only selection in a Node.
 if( pStt-nNode == pEnd-nNode )
 {
+//The data parameter flag: bExpandCharToPara, comes from the data 
member of SwDoc,
+//Which is set in SW MS word Binary filter WW8ImplRreader. With 
this flag on, means that
+//current setting attribute set is a 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source

[Jian Hong Cheng]

 sw/inc/numrule.hxx   |7 +
 sw/source/core/doc/number.cxx|4 
 sw/source/filter/ww8/attributeoutputbase.hxx |3 
 sw/source/filter/ww8/docxattributeoutput.cxx |3 
 sw/source/filter/ww8/docxattributeoutput.hxx |3 
 sw/source/filter/ww8/docxexport.cxx  |5 
 sw/source/filter/ww8/docxexport.hxx  |2 
 sw/source/filter/ww8/escher.hxx  |2 
 sw/source/filter/ww8/rtfattributeoutput.cxx  |3 
 sw/source/filter/ww8/rtfattributeoutput.hxx  |3 
 sw/source/filter/ww8/rtfexport.cxx   |6 +
 sw/source/filter/ww8/rtfexport.hxx   |3 
 sw/source/filter/ww8/writerhelper.cxx|   30 +
 sw/source/filter/ww8/writerhelper.hxx|   15 ++
 sw/source/filter/ww8/wrtw8esh.cxx|   56 ++
 sw/source/filter/ww8/wrtw8nds.cxx|   24 
 sw/source/filter/ww8/wrtw8num.cxx|   18 +++
 sw/source/filter/ww8/wrtww8.cxx  |  123 +++
 sw/source/filter/ww8/wrtww8.hxx  |   16 +++
 sw/source/filter/ww8/wrtww8gr.cxx|  140 +++
 sw/source/filter/ww8/ww8attributeoutput.hxx  |3 
 sw/source/filter/ww8/ww8par.cxx  |   85 
 sw/source/filter/ww8/ww8par.hxx  |2 
 sw/source/filter/ww8/ww8par3.cxx |   42 
 sw/source/ui/wrtsh/wrtsh1.cxx|5 
 25 files changed, 587 insertions(+), 16 deletions(-)

New commits:
commit fe4e05f4d161e7366e251e3e6470af8967100ca6
Author: Jian Hong Cheng chen...@apache.org
Date:   Wed Nov 28 00:33:42 2012 +

Fix #i120928: Import Graphic Bullets of MS Word Document

* sw/inc/numrule.hxx
* sw/source/core/doc/number.cxx
* sw/source/filter/ww8/attributeoutputbase.hxx
* sw/source/filter/ww8/escher.hxx
* sw/source/filter/ww8/rtfattributeoutput.cxx
* sw/source/filter/ww8/rtfattributeoutput.hxx
* sw/source/filter/ww8/rtfexport.hxx
* sw/source/filter/ww8/rtfexport.cxx
* sw/source/filter/ww8/writerhelper.cxx
* sw/source/filter/ww8/writerhelper.hxx
* sw/source/filter/ww8/wrtw8esh.cxx
* sw/source/filter/ww8/wrtw8nds.cxx
* sw/source/filter/ww8/wrtw8num.cxx
* sw/source/filter/ww8/wrtww8.cxx
* sw/source/filter/ww8/wrtww8.hxx
* sw/source/filter/ww8/wrtww8gr.cxx
* sw/source/filter/ww8/ww8attributeoutput.hxx
* sw/source/filter/ww8/ww8par.cxx
* sw/source/filter/ww8/ww8par.hxx
* sw/source/filter/ww8/ww8par3.cxx
* sw/source/ui/wrtsh/wrtsh1.cxx

Graphic Bullets Fidelity

Patch by: chengjh,chen...@apache.org
Found by: chengjh,chen...@apache.org
Review by: Fan Zheng,zheng.easy...@gmail.com
Conflicts:
sw/inc/numrule.hxx
sw/source/filter/ww8/writerhelper.cxx
sw/source/filter/ww8/wrtw8nds.cxx

Change-Id: I7b00590a9f05da745678b5ba99b6f6f4e870d197
Signed-off-by: Cedric Bosdonnat cedric.bosdonnat@free.fr
Signed-off-by: Fridrich Strba fridrich.st...@bluewin.ch

diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 1fe43ba..6485c0c 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -48,7 +48,8 @@ const sal_Unicode cBulletChar = 0x2022; /// Character for 
lists.
 class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient
 {
 SwFmtVertOrient* pVertOrient;
-
+//For i120928,record the cp info of graphic within bullet
+sal_Unicode cGrfBulletCP;
 SW_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
 SW_DLLPRIVATE virtual void NotifyGraphicArrived();
 
@@ -77,6 +78,10 @@ public:
 virtual voidSetCharFmtName(const String rSet);
 virtual const String   GetCharFmtName()const;
 
+//For i120928,access the cp info of graphic within bullet
+voidSetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;}
+sal_Unicode GetGrfBulletCP()const {return cGrfBulletCP;}
+
 virtual voidSetGraphicBrush( const SvxBrushItem* pBrushItem, const 
Size* pSize = 0, const sal_Int16* pOrient = 0);
 
 virtual voidSetVertOrient(sal_Int16 eSet);
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 91b822b..839b9bb 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -178,6 +178,7 @@ SwNumFmt::SwNumFmt() :
 SvxNumberFormat(SVX_NUM_ARABIC),
 SwClient( 0 ),
 pVertOrient(new SwFmtVertOrient( 0, text::VertOrientation::NONE))
+,cGrfBulletCP(USHRT_MAX)//For i120928,record the cp info of graphic within 
bullet
 {
 }
 
@@ -185,6 +186,7 @@ SwNumFmt::SwNumFmt( const SwNumFmt rFmt) :
 SvxNumberFormat(rFmt),
 SwClient( rFmt.GetRegisteredInNonConst() ),
 pVertOrient(new SwFmtVertOrient( 0, rFmt.GetVertOrient()))
+,cGrfBulletCP(rFmt.cGrfBulletCP)//For i120928,record the cp info of 
graphic within bullet
 {
 sal_Int16 eMyVertOrient = rFmt.GetVertOrient();
 SetGraphicBrush( rFmt.GetBrush(), 

[Libreoffice-commits] core.git: ios/Executable_Viewer.mk

[Tor Lillqvist]

 ios/Executable_Viewer.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e86e7e5c4bb6c4b6d28cf72671e69f42257fb924
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Mar 14 12:02:11 2013 +0200

Add sdfilt

Change-Id: I992a563d3686e3c25ba7338fb7744ce9b5cf5859

diff --git a/ios/Executable_Viewer.mk b/ios/Executable_Viewer.mk
index c3a29cb..08302f5 100644
--- a/ios/Executable_Viewer.mk
+++ b/ios/Executable_Viewer.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_add_objcxxobjects,Viewer,\
 $(eval $(call gb_Executable_use_libraries,Viewer,\
msword \
scfilt \
+   sdfilt \
 ))
 
 # vim: set ts=4 sw=4 et:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] Change Impress remote client target SDK version.

[Thorsten Behrens]

Hi Artur,

thank you for the patch - since I don't find you on record with a
license statement at
https://wiki.documentfoundation.org/Development/Developers, and there
was no license included with your patch, would you mail a statement
like the below to this list please
(http://lists.freedesktop.org/archives/libreoffice/2013-February/045590.html
is a live example):

   All of my past  future contributions to LibreOffice may be
licensed under the MPL/LGPLv3+ dual license.

Thanks again,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Cédric Bosdonnat]

 sw/source/filter/ww8/docxexport.cxx   |5 +
 sw/source/filter/ww8/docxexport.hxx   |2 +-
 sw/source/filter/ww8/rtfexport.cxx|2 +-
 sw/source/filter/ww8/writerhelper.cxx |6 --
 sw/source/filter/ww8/writerhelper.hxx |   22 +++---
 sw/source/filter/ww8/wrtw8nds.cxx |   12 ++--
 sw/source/filter/ww8/wrtw8num.cxx |   22 +++---
 sw/source/filter/ww8/wrtww8.cxx   |6 +++---
 sw/source/filter/ww8/wrtww8.hxx   |3 +--
 sw/source/filter/ww8/wrtww8gr.cxx |   10 +-
 sw/source/filter/ww8/ww8par.cxx   |   16 +++-
 sw/source/filter/ww8/ww8par3.cxx  |   28 +++-
 sw/source/ui/wrtsh/wrtsh1.cxx |2 --
 13 files changed, 66 insertions(+), 70 deletions(-)

New commits:
commit 16384a53f7fb5b3eeaaa6e624c7416f7e13b17d2
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Mar 14 11:24:04 2013 +0100

Code cleanup for i#120928 patch

Change-Id: Ic46acc5207bab70f080c4eba5a8113de8376ad36

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 1b3c8f8..74854fa 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -152,6 +152,11 @@ void DocxExport::AppendBookmark( const OUString rName, 
bool /*bSkip*/ )
 m_pAttrOutput-WriteBookmarks_Impl( aStarts, aEnds );
 }
 
+void DocxExport::ExportGrfBullet(const SwTxtNode)
+{
+SAL_INFO(sw.docx, TODO:   OSL_THIS_FUNC);
+}
+
 ::rtl::OString DocxExport::AddRelation( const OUString rType, const OUString 
rTarget )
 {
 OUString sId = m_pFilter-addRelation( m_pDocumentFS-getOutputStream(),
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index 79ec117..203dbea 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -108,7 +108,7 @@ public:
 
 virtual void AppendBookmark( const rtl::OUString rName, bool bSkip = 
false );
 
-virtual void ExportGrfBullet(const SwTxtNode) {}
+virtual void ExportGrfBullet(const SwTxtNode);
 
 /// Returns the relationd id
 rtl::OString AddRelation( const rtl::OUString rType, const rtl::OUString 
rTarget );
diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index 0079fbe..3f413a5 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -171,7 +171,7 @@ void RtfExport::AppendBookmark( const OUString rName, bool 
/*bSkip*/ )
 //For i120928,to export graphic of bullet for RTF filter
 void RtfExport::ExportGrfBullet(const SwTxtNode)
 {
-//This is for RTF filter on the graphic bullets
+SAL_INFO(sw.rtf, TODO:   OSL_THIS_FUNC);
 }
 
 void RtfExport::WriteChar( sal_Unicode )
diff --git a/sw/source/filter/ww8/writerhelper.cxx 
b/sw/source/filter/ww8/writerhelper.cxx
index 32167e0..5c9e6ec 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -50,12 +50,6 @@
 #include unotools/streamwrap.hxx
 #include numrule.hxx
 #include vcl/svapp.hxx//For i120928
-#ifdef DEBUGDUMP
-#  include vcl/svapp.hxx
-#  include tools/urlobj.hxx
-#  include unotools/ucbstreamhelper.hxx
-#  include unotools/localfilehelper.hxx
-#endif
 
 using namespace com::sun::star;
 using namespace nsSwGetPoolIdFromName;
diff --git a/sw/source/filter/ww8/writerhelper.hxx 
b/sw/source/filter/ww8/writerhelper.hxx
index 266af14..3d45b43 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -95,7 +95,7 @@ namespace sw
 class Frame
 {
 public:
-enum WriterSource {eTxtBox, eGraphic, eOle, eDrawing, 
eFormControl,eBulletGrf};//For i120928,add Grf Bul Type
+enum WriterSource {eTxtBox, eGraphic, eOle, eDrawing, 
eFormControl,eBulletGrf};
 private:
 const SwFrmFmt* mpFlyFrm;
 SwPosition maPos;
@@ -112,8 +112,8 @@ namespace sw
 Graphic maGrf;
 public:
 Frame(const SwFrmFmt rFlyFrm, const SwPosition rPos);
-Frame(const Graphic, const SwPosition );
-//End
+Frame(const Graphic, const SwPosition );
+
 /** Get the writer SwFrmFmt that this object describes
 
 @return
@@ -167,8 +167,8 @@ namespace sw
  the first node of content in the frame, might not be any at all.
 */
 const SwNode *GetContent() const { return mpStartFrameContent; }
-const Graphic GetGraphic() const { return maGrf; }
-bool HasGraphic() const { return mbForBullet; }
+const Graphic GetGraphic() const { return maGrf; }
+bool HasGraphic() const { return mbForBullet; }
 
 
 /** Does this sw::Frame refer to the same writer content as another
@@ -178,12 +178,12 @@ namespace sw
 */
 bool RefersToSameFrameAs(const Frame rOther) const
 {
-if (mbForBullet  rOther.mbForBullet)
-return (maGrf == rOther.maGrf);
-else if ((!mbForBullet)  

[Libreoffice-commits] core.git: liblangtag/ExternalProject_langtag.mk

[Stephan Bergmann]

 liblangtag/ExternalProject_langtag.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c03448ddbb11d96e0c9985ddfaa4f2c5d6cd426e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 14 11:33:56 2013 +0100

Make liblangtag build for --without-system-libxml again, at least on Linux

...after 83d61d9f1b0c95de2cd1199d3f60be70dfa92bec move liblangtag to
gcc-wrapper.

Change-Id: I5c9321bf4cafb5e6c1a078162ce3cc5f73540ce5

diff --git a/liblangtag/ExternalProject_langtag.mk 
b/liblangtag/ExternalProject_langtag.mk
index 6f6923c..22e35c6 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
./configure --disable-modules --disable-test 
--disable-introspection --disable-shared --enable-static --with-pic \
$(if $(filter 
TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),lt_cv_has_atomic=yes,lt_cv_has_atomic=no) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
-   $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,xml2)/include LIBXML2_LIBS= ,\
+   $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,xml2)/include 
LIBXML2_LIBS=-L$(gb_Helper_OUTDIRLIBDIR) -lxml2,\
$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS=$(LIBXML_CFLAGS) 
LIBXML2_LIBS=$(LIBXML_LIBS))) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(filter-out LINUX 
FREEBSD,$(OS)),,LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath,\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: rsc/source sd/source svx/source

[Krisztian Pinter]

 rsc/source/rsc/rsc.cxx   |3 +--
 rsc/source/tools/rsctools.cxx|   13 ++---
 sd/source/filter/html/htmlex.cxx |   19 ---
 sd/source/filter/html/htmlex.hxx |2 +-
 svx/source/gengal/gengal.cxx |1 -
 5 files changed, 16 insertions(+), 22 deletions(-)

New commits:
commit de99bcde8a66a410287c7fb9c4ae6d6c9b7f05a6
Author: Krisztian Pinter pin.termina...@gmail.com
Date:   Wed Mar 6 20:30:30 2013 +0100

fdo#39445 writing out tools/fsys.hxx

removed unused tools/fsys.hxx include from gengal.cxx
changed file copying to sal version in htmlex.cxx
rewrote OutputFile in rsctools.cxx
very minor change in rsc.cxx - instead of creating an empty DirEntry
and getting its path, just used .

Change-Id: Ifd57d73847ff271bcb64b12a26a564acc051fcef
Reviewed-on: https://gerrit.libreoffice.org/2680
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 007f426..393e2e0 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -92,8 +92,7 @@ void RscCmdLine::Init()
 nCommands   = 0;
 nByteOrder  = RSC_BIGENDIAN;
 
-DirEntry aEntry;
-aPath = rtl::OUStringToOString(aEntry.GetFull(), 
RTL_TEXTENCODING_ASCII_US); //Immer im Aktuellen Pfad suchen
+aPath = OString(.);
 m_aOutputFiles.clear();
 m_aOutputFiles.push_back( OutputFile() );
 }
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 857f663..7e94c6e 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -28,8 +28,6 @@
 #include string.h
 #include ctype.h
 
-#include tools/fsys.hxx
-
 // Include
 #include rscdef.hxx
 #include rsctools.hxx
@@ -174,13 +172,14 @@ sal_Bool Append(const rtl::OString rOutputSrs, const 
rtl::OString rTmpFile)
 */
 rtl::OString OutputFile(const rtl::OString rInput, const char * pExt)
 {
-rtl::OUString aUniInput(rtl::OStringToOUString(rInput, 
RTL_TEXTENCODING_ASCII_US));
-DirEntry aFileName(aUniInput);
+sal_Int32 nSepInd = rInput.lastIndexOf(.);
 
-OUString aExt = OStringToOUString( pExt, RTL_TEXTENCODING_ASCII_US );
-aFileName.SetExtension( aExt );
+if( nSepInd != -1 )
+{
+return rInput.copy(0, rInput.getLength() - 
nSepInd).concat(OString(pExt));
+}
 
-return rtl::OUStringToOString(aFileName.GetFull(), 
RTL_TEXTENCODING_ASCII_US);
+return rInput.concat(OString(.)).concat(OString(pExt));
 }
 
 /*
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 9988797..92690d0 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -27,7 +27,6 @@
 #include rtl/uri.hxx
 #include comphelper/processfactory.hxx
 #include osl/file.hxx
-#include tools/fsys.hxx
 #include unotools/pathoptions.hxx
 #include vcl/FilterConfigItem.hxx
 #include unotools/ucbstreamhelper.hxx
@@ -3054,30 +3053,28 @@ String HtmlExport::InsertSound( const String 
rSoundFile )
 
 String  aStr( RTL_CONSTASCII_USTRINGPARAM(embed src=\) );
 INetURLObject   aURL( rSoundFile );
+String aSoundFileName = String(aURL.getName());
 
 DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, invalid URL );
 
-aStr += String(aURL.getName());
+aStr += aSoundFileName;
 aStr.AppendAscii( \ hidden=\true\ autostart=\true\ );
 
-CopyFile( rSoundFile, maExportPath );
+CopyFile( OUString(rSoundFile), OUString(maExportPath) + 
OUString(aSoundFileName) );
 
 return aStr;
 }
 
 // =
 
-bool HtmlExport::CopyFile( const String rSourceFile, const String rDestPath )
+bool HtmlExport::CopyFile( const OUString rSourceFile, const OUString 
rDestFile )
 {
-DirEntry aSourceEntry( rSourceFile );
-DirEntry aDestEntry( rDestPath );
+meEC.SetContext( STR_HTMLEXP_ERROR_COPY_FILE, rSourceFile, rDestFile );
+osl::FileBase::RC Error = osl::File::copy( rSourceFile, rDestFile );
 
-meEC.SetContext( STR_HTMLEXP_ERROR_COPY_FILE, aSourceEntry.GetName(), 
rDestPath );
-FSysError nError = aSourceEntry.CopyTo( aDestEntry, FSYS_ACTION_COPYFILE );
-
-if( nError != FSYS_ERR_OK )
+if( Error != osl::FileBase::E_None )
 {
-ErrorHandler::HandleError(nError);
+ErrorHandler::HandleError(Error);
 return false;
 }
 else
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 6993cdb..8d4a578 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -195,7 +195,7 @@ class HtmlExport
 String  CreatePageURL( sal_uInt16 nPgNum );
 
 String InsertSound( const String rSoundFile );
-bool CopyFile( const String rSourceFile, const String rDestPath );
+bool CopyFile( const 

[Libreoffice-commits] core.git: sd/inc

[Andras Timar]

 sd/inc/pch/precompiled_sd.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit ec67dd1db5eb718c9501d07719e533b8f5af8464
Author: Andras Timar ati...@suse.com
Date:   Thu Mar 14 11:41:49 2013 +0100

remove unused tools/fsys.hxx from pch

Change-Id: Icc9c46014d9663aaa96cd17c515a343959a3d47c

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index a03c43a..2690455 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -784,7 +784,6 @@
 #include tools/debug.hxx
 #include tools/diagnose_ex.h
 #include tools/errinf.hxx
-#include tools/fsys.hxx
 #include tools/gen.hxx
 #include tools/globname.hxx
 #include tools/helpers.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#39445 writing out tools/fsys.hxx

[Andras Timar (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2680

Approvals:
  Andras Timar: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2680
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd57d73847ff271bcb64b12a26a564acc051fcef
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com
Gerrit-Reviewer: Andras Timar ati...@suse.com
Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

--- Comment #123 from Pedro pedl...@gmail.com ---
Added Bug 58144. I know people are not supposed to uninstall LibreOffice :) but
it looks pretty bad that the uninstall dialog is filled with squares. This is a
regression from version 3.6

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Pedro pedl...@gmail.com changed:

   What|Removed |Added

 Depends on||58144

-- 
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

[ABANDONED] fdo#46808, Adapt UNO services to new style, Part 1

[Andras Timar (via Code Review)]

Andras Timar has abandoned this change.

Change subject: fdo#46808, Adapt UNO services to new style, Part 1
..


Patch Set 2: Abandoned

-- 
To view, visit https://gerrit.libreoffice.org/2132
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I4d512d74542285e0a7321f8251193bf33dfb878b
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/doc/docfmt.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit f42679fe7010284513cff3560d9aa47a49744ba8
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 14 10:44:59 2013 +

hackaround for assert

regression since 1c22545edf9085b9f2656ca92781158b6b123db3

Change-Id: Ia9aa06ed7fd0f31499226521fc5d6052b6d21704

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 582d52d..c855e90 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1035,15 +1035,15 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM rRg, const 
SfxItemSet rChgSet,
 if (aEndPos.nNode.GetNode().GetTxtNode()  aEndPos.nContent != 
aEndPos.nNode.GetNode().GetTxtNode()-Len())
 aEndPos.nNode--;
 
-for (;aStartPos=aEndPos;aStartPos.nNode++)
-{
-SwTxtNode* pCurrentNd = aStartPos.nNode.GetNode().GetTxtNode();
-
-if (pCurrentNd)
-{
- pCurrentNd-TryCharSetExpandToNum(*pCharSet);
-
-}
+sal_uLong nStart = aStartPos.nNode.GetIndex();
+sal_uLong nEnd = aEndPos.nNode.GetIndex();
+for(; nStart = nEnd; ++nStart)
+{
+SwNode* pNd = pDoc-GetNodes()[ nStart ];
+if (!pNd || !pNd-IsTxtNode())
+continue;
+SwTxtNode *pCurrentNd = (SwTxtNode*)pNd;
+pCurrentNd-TryCharSetExpandToNum(*pCharSet);
 
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0-2] Resolves: rhbz#918938 crash in danish thesaurus/spell intera...

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2720

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/2720/1

Resolves: rhbz#918938 crash in danish thesaurus/spell interaction

Change-Id: I911fc382a8e4b895262dcd5ae5c67c4a81e6aad4
Reviewed-on: https://gerrit.libreoffice.org/2710
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
---
M hunspell/UnpackedTarball_hunspell.mk
A hunspell/hunspell.rhbz918938.patch
2 files changed, 73 insertions(+), 0 deletions(-)



diff --git a/hunspell/UnpackedTarball_hunspell.mk 
b/hunspell/UnpackedTarball_hunspell.mk
index 9ba9dc3..1e0544a 100644
--- a/hunspell/UnpackedTarball_hunspell.mk
+++ b/hunspell/UnpackedTarball_hunspell.mk
@@ -19,6 +19,7 @@
hunspell/hunspell-1.3.2-nullptr.patch \
hunspell/hunspell-1.3.2-literal.patch \
hunspell/hunspell-1.3.2-compound.patch \
+   hunspell/hunspell.rhbz918938.patch \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/hunspell/hunspell.rhbz918938.patch 
b/hunspell/hunspell.rhbz918938.patch
new file mode 100644
index 000..8d23503
--- /dev/null
+++ b/hunspell/hunspell.rhbz918938.patch
@@ -0,0 +1,72 @@
+--- misc/hunspell-1.3.2/src/hunspell/hunspell.cxx  2011-02-02 
12:04:29.0 +
 misc/build/hunspell-1.3.2/src/hunspell/hunspell.cxx2013-03-13 
16:50:50.667928521 +
+@@ -12,6 +12,8 @@
+ #endif
+ #include csutil.hxx
+ 
++#include string
++
+ Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key)
+ {
+ encoding = NULL;
+@@ -1710,6 +1712,19 @@
+ return n;
+ }
+ 
++namespace
++{
++void myrep(std::string str, const std::string search, const 
std::string replace)
++{
++size_t pos = 0;
++while ((pos = str.find(search, pos)) != std::string::npos)
++{
++   str.replace(pos, search.length(), replace);
++   pos += replace.length();
++}
++}
++}
++
+ int Hunspell::spellml(char*** slst, const char * word)
+ {
+   char *q, *q2;
+@@ -1721,26 +1736,26 @@
+   q2 = strstr(q2, word);
+   if (!q2) return 0; // bad XML input
+   if (check_xml_par(q, type=, analyze)) {
+-  int n = 0, s = 0;
++  int n = 0;
+   if (get_xml_par(cw, strchr(q2, ''), MAXWORDUTF8LEN - 10)) n = 
analyze(slst, cw);
+   if (n == 0) return 0;
+   // convert the result to codeaana1/aaana2/a/code format
+-  for (int i = 0; i  n; i++) s+= strlen((*slst)[i]);
+-  char * r = (char *) malloc(6 + 5 * s + 7 * n + 7 + 1); // XXX 
5*s--amp;
+-  if (!r) return 0;
+-  strcpy(r, code);
++  std::string r;
++  r.append(code);
+   for (int i = 0; i  n; i++) {
+-int l = strlen(r);
+-strcpy(r + l, a);
+-strcpy(r + l + 3, (*slst)[i]);
+-mystrrep(r + l + 3, \t,  );
+-mystrrep(r + l + 3, , lt;);
+-mystrrep(r + l + 3, , amp;);
+-strcat(r, /a);
++r.append(a);
++
++std::string entry((*slst)[i]);
+ free((*slst)[i]);
++myrep(entry, \t,  );
++myrep(entry, , lt;);
++myrep(entry, , amp;);
++r.append(entry);
++
++r.append(/a);
+   }
+-  strcat(r, /code);
+-  (*slst)[0] = r;
++  r.append(/code);
++  (*slst)[0] = mystrdup(r.c_str());
+   return 1;
+   } else if (check_xml_par(q, type=, stem)) {
+   if (get_xml_par(cw, strchr(q2, ''), MAXWORDUTF8LEN - 1)) return 
stem(slst, cw);

-- 
To view, visit https://gerrit.libreoffice.org/2720
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I911fc382a8e4b895262dcd5ae5c67c4a81e6aad4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-2
Gerrit-Owner: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Licence Statement

[Artur Dryomov]

Hi,

Just a usual notice is here.

All of my past and future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.

Regards,
Artur.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: solenv/gbuild

[David Tardon]

 solenv/gbuild/ExternalProject.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46cef4f2fa797aade35ea48f3e46159c6141fcfc
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 14 11:56:26 2013 +0100

cygpath only exists in Windows build

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 6443af3..ff55c0e 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -200,7 +200,7 @@ endef
 # default log_filename is run_target.log
 #
 
-AUTOCONF_WRAPPERS := \
+AUTOCONF_WRAPPERS = \
REAL_CC=$(shell cygpath -w $(CC)) \
CC=$(call gb_Executable_get_target,gcc-wrapper) \
REAL_CXX=$(shell cygpath -w $(CXX)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: mysqlcppconn/binding_config.h mysqlcppconn/binding_dynamic.h mysqlcppconn/binding_static.h mysqlcppconn/patches mysqlcppconn/UnpackedTarball_mysqlcppconn.mk

[Fridrich Štrba]

 mysqlcppconn/UnpackedTarball_mysqlcppconn.mk   |   
 9 ---
 mysqlcppconn/binding_config.h  |   
 2 
 mysqlcppconn/binding_dynamic.h |   
 2 
 mysqlcppconn/binding_static.h  |   
 2 
 mysqlcppconn/patches/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch |   
11 ---
 mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch   |   
30 ++
 6 files changed, 34 insertions(+), 22 deletions(-)

New commits:
commit 95fe9541cabda703e56f2d36d2887d9c987cb197
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 14 12:12:31 2013 +0100

Use static binding to mariadb client library

Change-Id: Idece6e4fb6b806be7037d98c7d6ffe6a74f0b30e

diff --git a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk 
b/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index eeca11e..3f86236 100644
--- a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -13,15 +13,10 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,mysqlcppconn,$(MYSQLCPPCONN_TARBALL
 
 $(eval $(call 
gb_UnpackedTarball_add_file,mysqlcppconn,cppconn/config.h,mysqlcppconn/config.h))
 
-ifeq ($(SYSTEM_MARIADB),YES)
-$(eval $(call 
gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,mysqlcppconn/binding_static.h))
-else
-$(eval $(call 
gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,mysqlcppconn/binding_dynamic.h))
-endif
+$(eval $(call 
gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,mysqlcppconn/binding_config.h))
+
 $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
-   $(if $(filter NO,$(SYSTEM_MARIADB)), \
-   
mysqlcppconn/patches/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch) \
mysqlcppconn/patches/default_to_protocol_tcp.patch \
 ))
 
diff --git a/mysqlcppconn/binding_config.h b/mysqlcppconn/binding_config.h
new file mode 100644
index 000..85506c6
--- /dev/null
+++ b/mysqlcppconn/binding_config.h
@@ -0,0 +1,2 @@
+#define HAVE_DLFCN_H 1
+#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/binding_dynamic.h b/mysqlcppconn/binding_dynamic.h
deleted file mode 100644
index 1ee8e37..000
--- a/mysqlcppconn/binding_dynamic.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define HAVE_DLFCN_H 1
-//#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/binding_static.h b/mysqlcppconn/binding_static.h
deleted file mode 100644
index 85506c6..000
--- a/mysqlcppconn/binding_static.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define HAVE_DLFCN_H 1
-#define MYSQLCLIENT_STATIC_BINDING 1
diff --git 
a/mysqlcppconn/patches/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch 
b/mysqlcppconn/patches/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
deleted file mode 100644
index 0644dbb..000
--- a/mysqlcppconn/patches/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 misc/mysql-connector-c++-1.1.0/driver/nativeapi/mysql_client_api.h 
2010-09-10 11:47:47.0 +0200
-+++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/mysql_client_api.h   
2011-12-08 20:22:29.0 +0100
-@@ -107,6 +107,8 @@
- 
- typedef MYSQL_RES * (STDCALL *ptr2mysql_use_result)(MYSQL *);
- 
-+typedef unsigned long (STDCALL *ptr2mysql_realescapestring)(MYSQL *, char *, 
const char *, unsigned long);
-+
- /* Prepared Statement stmt_* functions */
- typedef my_ulonglong (STDCALL *ptr2mysql_stmt_affected_rows)(MYSQL_STMT *);
- 
diff --git a/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch 
b/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
index c7fd21b..8ddbd74 100644
--- a/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
+++ b/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
@@ -115,3 +115,33 @@
  namespace sql
  {
 
+--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_static_proxy.cpp  
2010-09-10 11:47:47.0 +0200
 
misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_static_proxy.cpp 
   2013-03-14 11:10:14.850848088 +0100
+@@ -213,7 +213,8 @@
+ int
+ LibmysqlStaticProxy::library_init(int argc,char **argv,char **groups)
+ {
+-  return ::mysql_library_init(argc, argv, groups);
++//return ::mysql_library_init(argc, argv, groups);
++   return 0;
+ }
+ /* }}} */
+ 
+@@ -222,7 +223,7 @@
+ void
+ LibmysqlStaticProxy::library_end()
+ {
+-  return ::mysql_library_end();
++//return ::mysql_library_end();
+ }
+ /* }}} */
+ 
+@@ -352,7 +353,7 @@
+   const char * capath,
+   const char * cipher)
+ {
+-  return ::mysql_ssl_set(mysql, key, cert, ca, capath, cipher);
++  return ::mysql_ssl_set(mysql, key, cert, ca, capath);
+ }
+ /* }}} */
+ 

[Libreoffice-commits] core.git: solenv/gbuild

[David Tardon]

 solenv/gbuild/ExternalProject.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b986c5076c0489e690b07e289b67f035b545d04e
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 14 12:10:05 2013 +0100

cygpath only exists in Windows build, 2nd try

Avoid the $(shell cygpath) calls when not on windows. The error message
is harmless, but it bothers me. I think gb_ExternalProject_use_autoconf
(and the AUTOCONF_WRAPPERS definition) should be moved to
gbuild/platform.

Change-Id: Ia537c5dac682f93ce5efe5c54b97b3a257cb6136

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index ff55c0e..e180014 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -200,12 +200,14 @@ endef
 # default log_filename is run_target.log
 #
 
-AUTOCONF_WRAPPERS = \
+ifeq ($(COM),MSC)
+AUTOCONF_WRAPPERS := \
REAL_CC=$(shell cygpath -w $(CC)) \
CC=$(call gb_Executable_get_target,gcc-wrapper) \
REAL_CXX=$(shell cygpath -w $(CXX)) \
CXX=$(call gb_Executable_get_target,g++-wrapper) \
 LD=$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo
+endif
 
 define gb_ExternalProject_run
 $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3)  \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/ExternalProject.mk|   26 +++---
 solenv/gbuild/platform/com_GCC_class.mk |4 
 solenv/gbuild/platform/com_MSC_class.mk |   18 ++
 3 files changed, 25 insertions(+), 23 deletions(-)

New commits:
commit 6594838457152b2fa53382ac11b383d2adc1f8da
Author: Michael Stahl mst...@redhat.com
Date:   Thu Mar 14 11:59:21 2013 +0100

gbuild: move MSC specific wrapper stuff to platform/

That's where code conditional on COM or OS belongs.

Change-Id: Id31378bcc840dc38aa4b64241f0d1ccc11a99792

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index e180014..811a5d3 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -180,38 +180,18 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : \
 
 endef
 
-# Use the gcc wrappers for a autoconf based project
-#
-# gb_ExternalProject_register_targets project state_target
-define gb_ExternalProject_use_autoconf
-ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call 
gb_Executable_get_runtime_dependencies,gcc-wrapper) \
-   $(call gb_Executable_get_runtime_dependencies,g++-wrapper)
-$(call gb_ExternalProject_get_state_target,$(1),$(2)): WRAPPERS := 
$(AUTOCONF_WRAPPERS)
-endif
-endef
-
 # Run a target command
 #
-# This provide a wrapper that cange to the right directory
-# touch the 'target' if sucessfull and also provide
+# This provides a wrapper that changes to the right directory,
+# touches the 'target' if sucessful and also provides
 # the ability to hide the output if there is no failure
 # 
gb_ExternalProject_run,run_target,command,optional_extra_sub_directory,optional_log_filename)
 # default log_filename is run_target.log
 #
 
-ifeq ($(COM),MSC)
-AUTOCONF_WRAPPERS := \
-   REAL_CC=$(shell cygpath -w $(CC)) \
-   CC=$(call gb_Executable_get_target,gcc-wrapper) \
-   REAL_CXX=$(shell cygpath -w $(CXX)) \
-   CXX=$(call gb_Executable_get_target,g++-wrapper) \
-LD=$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo
-endif
-
 define gb_ExternalProject_run
 $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3)  \
-   $(if $(filter MSC,$(COM)),$(if $(WRAPPERS),export $(WRAPPERS) )) \
+   $(if $(WRAPPERS),export $(WRAPPERS) ) \
$(2)  touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if 
$(4),$(4),$(1).log))
 endef
 
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index b177dae..6d068d7 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -268,4 +268,8 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 endif
 
+# ExternalProject class
+
+gb_ExternalProject_use_autoconf :=
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 99ac77c..27211ef 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -539,6 +539,24 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 
 endef
 
+# ExternalProject class
+
+# Use the gcc wrappers for a autoconf based project
+#
+# gb_ExternalProject_register_targets project state_target
+define gb_ExternalProject_use_autoconf
+$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call 
gb_Executable_get_runtime_dependencies,gcc-wrapper) \
+   $(call gb_Executable_get_runtime_dependencies,g++-wrapper)
+$(call gb_ExternalProject_get_state_target,$(1),$(2)): WRAPPERS := 
$(gb_AUTOCONF_WRAPPERS)
+endef
+
+gb_AUTOCONF_WRAPPERS := \
+   REAL_CC=$(shell cygpath -w $(CC)) \
+   CC=$(call gb_Executable_get_target,gcc-wrapper) \
+   REAL_CXX=$(shell cygpath -w $(CXX)) \
+   CXX=$(call gb_Executable_get_target,g++-wrapper) \
+LD=$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo
+
 # InstallScript class
 
 gb_InstallScript_EXT := .inf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: hunspell/hunspell.rhbz918938.patch

[Caolán McNamara]

 hunspell/hunspell.rhbz918938.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18c1fa36b642cb82b070239b18e937236212e816
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 14 11:26:26 2013 +

safer order of replacement

Change-Id: I912dbb6eddbb91bd9d5e18fb169f498df692d0e6

diff --git a/hunspell/hunspell.rhbz918938.patch 
b/hunspell/hunspell.rhbz918938.patch
index 8d23503..f1bdbd4 100644
--- a/hunspell/hunspell.rhbz918938.patch
+++ b/hunspell/hunspell.rhbz918938.patch
@@ -57,8 +57,8 @@
 +std::string entry((*slst)[i]);
  free((*slst)[i]);
 +myrep(entry, \t,  );
-+myrep(entry, , lt;);
 +myrep(entry, , amp;);
++myrep(entry, , lt;);
 +r.append(entry);
 +
 +r.append(/a);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] safer order of replacement

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2721

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/2721/1

safer order of replacement

Change-Id: I912dbb6eddbb91bd9d5e18fb169f498df692d0e6
---
M hunspell/hunspell.rhbz918938.patch
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/hunspell/hunspell.rhbz918938.patch 
b/hunspell/hunspell.rhbz918938.patch
index 8d23503..f1bdbd4 100644
--- a/hunspell/hunspell.rhbz918938.patch
+++ b/hunspell/hunspell.rhbz918938.patch
@@ -57,8 +57,8 @@
 +std::string entry((*slst)[i]);
  free((*slst)[i]);
 +myrep(entry, \t,  );
-+myrep(entry, , lt;);
 +myrep(entry, , amp;);
++myrep(entry, , lt;);
 +r.append(entry);
 +
 +r.append(/a);

-- 
To view, visit https://gerrit.libreoffice.org/2721
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I912dbb6eddbb91bd9d5e18fb169f498df692d0e6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] hackaround for assert

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2722

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/2722/1

hackaround for assert

regression since 1c22545edf9085b9f2656ca92781158b6b123db3

Change-Id: Ia9aa06ed7fd0f31499226521fc5d6052b6d21704
(cherry picked from commit f42679fe7010284513cff3560d9aa47a49744ba8)
---
M sw/source/core/doc/docfmt.cxx
1 file changed, 8 insertions(+), 8 deletions(-)



diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 352a451..4341aa9 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1035,15 +1035,15 @@
 if (aEndPos.nNode.GetNode().GetTxtNode()  aEndPos.nContent != 
aEndPos.nNode.GetNode().GetTxtNode()-Len())
 aEndPos.nNode--;
 
-for (;aStartPos=aEndPos;aStartPos.nNode++)
+sal_uLong nStart = aStartPos.nNode.GetIndex();
+sal_uLong nEnd = aEndPos.nNode.GetIndex();
+for(; nStart = nEnd; ++nStart)
 {
-SwTxtNode* pCurrentNd = aStartPos.nNode.GetNode().GetTxtNode();
-
-if (pCurrentNd)
-{
- pCurrentNd-TryCharSetExpandToNum(*pCharSet);
-
-}
+SwNode* pNd = pDoc-GetNodes()[ nStart ];
+if (!pNd || !pNd-IsTxtNode())
+continue;
+SwTxtNode *pCurrentNd = (SwTxtNode*)pNd;
+pCurrentNd-TryCharSetExpandToNum(*pCharSet);
 
 }
 }

-- 
To view, visit https://gerrit.libreoffice.org/2722
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9aa06ed7fd0f31499226521fc5d6052b6d21704
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#60604 - fix Impress remote client speaker notes encoding

[Artur Dryomov (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2723

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/2723/1

fdo#60604 - fix Impress remote client speaker notes encoding

There is nothing wrong with the current code, it is the Android’s
problem.

Issue was reported upstream:
https://code.google.com/p/android/issues/detail?id=1733#c23

Tested on Jelly Bean 4.2 and russian speaker notes.

Change-Id: I85414abac233186484078637073b97562b81aad2
---
M android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
1 file changed, 5 insertions(+), 5 deletions(-)



diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 60e16a3..0aab5a6 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -100,7 +100,7 @@
 mNotes = (WebView) v.findViewById(R.id.presentation_notes);
 
 String summary = htmlbodyThis is just a testbr/ulliAnd 
item/liliAnd again/li/ulMore 
textbr/Blablabr/Blablabr/blablabr/Blabla/body/html;
-mNotes.loadData(summary, text/html, UTF-8);
+mNotes.loadDataWithBaseURL(null, summary, text/html, UTF-8, null);
 mNotes.setBackgroundColor(Color.TRANSPARENT);
 
 mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow);
@@ -156,8 +156,8 @@
 //int aSlide = 
mCommunicationService.getSlideShow().getCurrentSlide();
 mNumberText.setText((aPosition + 1) + /
 + mCommunicationService.getSlideShow().getSize());
-mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html, UTF-8);
+mNotes.loadDataWithBaseURL(null, mCommunicationService.getSlideShow()
+.getNotes(aPosition), text/html, UTF-8, null);
 }
 
 // -- RESIZING LISTENER 

@@ -281,8 +281,8 @@
 CommunicationService.MSG_SLIDE_NOTES)) {
 int aPosition = aIntent.getExtras().getInt(slide_number);
 if ( aPosition == mTopView.getSelectedItemPosition() ) {
-mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html, 
UTF-8);
+mNotes.loadDataWithBaseURL(null, 
mCommunicationService.getSlideShow()
+.getNotes(aPosition), text/html, 
UTF-8, null);
 }
 }
 

-- 
To view, visit https://gerrit.libreoffice.org/2723
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85414abac233186484078637073b97562b81aad2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Artur Dryomov artur.dryo...@gmail.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - ucb/source

[Michael Stahl]

 ucb/source/ucp/gvfs/gvfs_provider.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 10253a3d6b452e7043519949948fc65efe6914e0
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jan 21 12:15:25 2013 +0100

gvfs UCP: silence -Werror=deprecated-declarations

Seems to me there's no point to that since GVFS itself is deprecated
anyway.

Change-Id: Ibceba3bbe33a3a37dd088d0f24bfdd4211095589
(cherry picked from commit ee860cbfc74f86ff3b7a9625997048f3357bb221)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx 
b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index cb4f3ae..9df3964 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -150,8 +150,10 @@ extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL 
component_getFactory( const sal_
 osl::Guard osl::Mutex  aGuard( osl::Mutex::getGlobalMutex() );
 if (!gnome_vfs_initialized ())
 gnome_vfs_init ();
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 if (!auth_queue)
 auth_queue = g_private_new( auth_queue_destroy );
+SAL_WNODEPRECATED_DECLARATIONS_POP
 }
 
 uno::Reference lang::XMultiServiceFactory  xSMgr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-users] Hyperlink Bug in calc - bug 62289

[Tanstaafl]

Hi Dave,

Cross-posting this to the dev list in hopes someone will see it and pick 
this bug up...


Would appreciate if you would comment in the bug and confirm that you 
see the same problem.


This is a big problem for us - we have a LOT of worksheets with sheets 
named for years (ie, 2010, 2011, 2012, 2013...), and this makes it very 
very difficult to navigate these workbooks...


Thanks,

Charles

On 2013-03-13 9:24 AM, Dave Barton d...@tasit.net wrote:

Tanstaafl wrote:

Hi everyone,

Would appreciate if some of you could confirm this bug for me.

I'm on Windows XP sp3, with LibreOffice 4.0.1 release...

https://bugs.freedesktop.org/show_bug.cgi?id=62289

Bug report:

A hyperlink defined on one worksheet that is linked to another sheet/tab
in the same workbook that is named only with a number, when clicked,
takes you to the ROW NUMBER in the same sheet, instead of the desired
sheet.

Steps to reproduce:

1. Create a new/blank worksheet

2. Create an additional sheet

3. Rename the sheet to any number

4. Add a hyperlink in sheet1, and make the target the other sheet that
has a number for the name

5. Click the hyperlink

6. Instead of taking you to the desired sheet, you go to the ROW that
has the same number as the sheet you are trying to go to.



Confirmed.
Version 4.0.1.2 (Build ID: 84102822e3d61eb989ddd325abf1ac077904985)

Dave




___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ANN] LibreOffice 4.0.2 RC1 test builds available

[Fridrich Strba]

Hi *,

for the upcoming new version 4.0.2, the RC1 builds now start to be
available on pre-releases. This build is slated to be first release
candidate build on the way towards 4.0.2, please refer to our release
plan timings here:

 http://wiki.documentfoundation.org/ReleasePlan#4.0.2_release

Builds are now being uploaded 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 not yet in bugzilla 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.

NOTE: This build is in a release configuration and _will_ replace your
existing LibreOffice install on Windows.

The list of fixed bugs relative to 4.0.1 release is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-0-2-release-4.0.2.1.log

So playing with the areas touched there also greatly appreciated - and
validation that those bugs are really fixed.

... | --- | ...

People with an *android* device are encouraged to smoke-test the updated
Impress Remote App, available here

 
http://dev-builds.libreoffice.org/pre-releases/sdremote-1.0.5/playstore/ImpressRemote.apk

NOTE: This package will replace your already-installed version. For how
to use it, see:

 https://wiki.documentfoundation.org/Development/Impress/RemoteHowTo

... | --- | ...

Thanks a lot for your help,
Fridrich
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: libcdr/ExternalProject_libcdr.mk libvisio/ExternalProject_libvisio.mk RepositoryExternal.mk

[Fridrich Štrba]

 RepositoryExternal.mk|8 
 libcdr/ExternalProject_libcdr.mk |1 +
 libvisio/ExternalProject_libvisio.mk |1 +
 3 files changed, 10 insertions(+)

New commits:
commit 2f4d160bd6f4730c1597c11757efffc4173a17bf
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 14 12:45:24 2013 +0100

Libcdr and libvisio need zlib

Change-Id: Ie48c7305e7acca17d3c488a76e8fc47984c51679

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6a15af5..a7042b1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -298,6 +298,8 @@ define gb_LinkTarget__use_zlib_x64
 
 endef
 
+gb_ExternalProject__use_zlib :=
+
 else # !SYSTEM_ZLIB
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
@@ -333,6 +335,12 @@ $(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64)
 
 endef
 
+define gb_ExternalProject__use_zlib
+$(call gb_ExternalProject_use_package,$(1),zlib_inc)
+$(call gb_ExternalProject_use_static_libraries,$(1),zlib)
+
+endef
+
 endif # SYSTEM_ZLIB
 
 
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 9bd0cea..431b9b4 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\
lcms2 \
wpd \
wpg \
+   zlib \
 ))
 
 ifeq ($(OS)$(COM),WNTMSC)
diff --git a/libvisio/ExternalProject_libvisio.mk 
b/libvisio/ExternalProject_libvisio.mk
index 2095e61..30cffae 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\
wpd \
wpg \
libxml2 \
+   zlib \
 ))
 
 $(call gb_ExternalProject_get_state_target,libvisio,build) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

[Caolán McNamara]

 sw/source/core/doc/docfmt.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 1525a2ca952d04e331c13f85bfdb16d89116ae6b
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 14 10:44:59 2013 +

hackaround for assert

regression since 1c22545edf9085b9f2656ca92781158b6b123db3

Change-Id: Ia9aa06ed7fd0f31499226521fc5d6052b6d21704
(cherry picked from commit f42679fe7010284513cff3560d9aa47a49744ba8)
Reviewed-on: https://gerrit.libreoffice.org/2722
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 352a451..4341aa9 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1035,15 +1035,15 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM rRg, const 
SfxItemSet rChgSet,
 if (aEndPos.nNode.GetNode().GetTxtNode()  aEndPos.nContent != 
aEndPos.nNode.GetNode().GetTxtNode()-Len())
 aEndPos.nNode--;
 
-for (;aStartPos=aEndPos;aStartPos.nNode++)
-{
-SwTxtNode* pCurrentNd = aStartPos.nNode.GetNode().GetTxtNode();
-
-if (pCurrentNd)
-{
- pCurrentNd-TryCharSetExpandToNum(*pCharSet);
-
-}
+sal_uLong nStart = aStartPos.nNode.GetIndex();
+sal_uLong nEnd = aEndPos.nNode.GetIndex();
+for(; nStart = nEnd; ++nStart)
+{
+SwNode* pNd = pDoc-GetNodes()[ nStart ];
+if (!pNd || !pNd-IsTxtNode())
+continue;
+SwTxtNode *pCurrentNd = (SwTxtNode*)pNd;
+pCurrentNd-TryCharSetExpandToNum(*pCharSet);
 
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 80/f6af4a536a78f1dc86b4ff3d86d50191e30331

[Eike Rathke]

 80/f6af4a536a78f1dc86b4ff3d86d50191e30331 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f285e992e3b7c3d9787b20fa4344ec40996b7a02
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 14 12:57:14 2013 +0100

Notes added by 'git notes add'
commit 2a8746773f56423ddc6b74575c50f0e6a14e71d7
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 14 12:53:21 2013 +0100

Notes added by 'git notes add'

diff --git a/80/f6af4a536a78f1dc86b4ff3d86d50191e30331 
b/80/f6af4a536a78f1dc86b4ff3d86d50191e30331
new file mode 100644
index 000..db7ce66
--- /dev/null
+++ b/80/f6af4a536a78f1dc86b4ff3d86d50191e30331
@@ -0,0 +1 @@
+prefer: ee38b167c86c8f96aa41dca861cae327c6df5915
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - hunspell/hunspell.rhbz918938.patch

[Caolán McNamara]

 hunspell/hunspell.rhbz918938.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e021eb1e73da8f008e8f35eaa01efbcddfbdaa7
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 14 11:26:26 2013 +

safer order of replacement

Change-Id: I912dbb6eddbb91bd9d5e18fb169f498df692d0e6
Reviewed-on: https://gerrit.libreoffice.org/2721
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/hunspell/hunspell.rhbz918938.patch 
b/hunspell/hunspell.rhbz918938.patch
index 8d23503..f1bdbd4 100644
--- a/hunspell/hunspell.rhbz918938.patch
+++ b/hunspell/hunspell.rhbz918938.patch
@@ -57,8 +57,8 @@
 +std::string entry((*slst)[i]);
  free((*slst)[i]);
 +myrep(entry, \t,  );
-+myrep(entry, , lt;);
 +myrep(entry, , amp;);
++myrep(entry, , lt;);
 +r.append(entry);
 +
 +r.append(/a);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] safer order of replacement

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2721

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2721
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I912dbb6eddbb91bd9d5e18fb169f498df692d0e6
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] hackaround for assert

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2722

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2722
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9aa06ed7fd0f31499226521fc5d6052b6d21704
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Show LibreOffice controls in Glade's tool palette

[Mathias Hasselmann (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2724

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/2724/1

Show LibreOffice controls in Glade's tool palette

Glade didn't show any LibreOffice controls in its tool palette
because the catalog didn't have any glade-widget-group element.
This adds a XSLT script to automatically generate such element.

A better version of the script would create separate groups for
each module/namespace, but currently I have no idea how to do
this with libxslt, as it doesn't provide fn::distinct-values().

Change-Id: Iaa3e4b0471b58c48838e000e6d78a73b0c6a4bd3
---
A extras/CustomTarget_glade.mk
M extras/Module_extras.mk
M extras/Package_glade.mk
R extras/source/glade/libreoffice-catalog.xml.in
A extras/source/glade/makewidgetgroup.xslt
5 files changed, 78 insertions(+), 1 deletion(-)



diff --git a/extras/CustomTarget_glade.mk b/extras/CustomTarget_glade.mk
new file mode 100644
index 000..89d452e
--- /dev/null
+++ b/extras/CustomTarget_glade.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,extras/glade))
+
+#
+# Rules
+#
+
+$(call 
gb_CustomTarget_get_workdir,extras/source/glade)/libreoffice-catalog.xml : \
+$(SRCDIR)/extras/source/glade/libreoffice-catalog.xml.in \
+$(SRCDIR)/extras/source/glade/makewidgetgroup.xslt \
+| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSLT,4)
+   $(call gb_Helper_abbreviate_dirs, \
+   $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
+   -o $@ $(SRCDIR)/extras/source/glade/makewidgetgroup.xslt $ \
+   )
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 7144265..c3cb14b 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -12,6 +12,7 @@
 $(eval $(call gb_Module_add_targets,extras,\
AllLangZip_autotextshare \
CustomTarget_autocorr \
+   CustomTarget_glade \
Package_fonts \
Package_glade \
Package_labels \
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
index 9621aa9..1ac1f69 100644
--- a/extras/Package_glade.mk
+++ b/extras/Package_glade.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_glade,$(SRCDIR)/extras/source/glade))
+$(eval $(call gb_Package_Package,extras_glade,$(call 
gb_CustomTarget_get_workdir,extras/source/glade)))
 
 $(eval $(call 
gb_Package_add_file,extras_glade,pck/libreoffice-catalog.xml,libreoffice-catalog.xml))
 
diff --git a/extras/source/glade/libreoffice-catalog.xml 
b/extras/source/glade/libreoffice-catalog.xml.in
similarity index 100%
rename from extras/source/glade/libreoffice-catalog.xml
rename to extras/source/glade/libreoffice-catalog.xml.in
diff --git a/extras/source/glade/makewidgetgroup.xslt 
b/extras/source/glade/makewidgetgroup.xslt
new file mode 100644
index 000..c7d97d7
--- /dev/null
+++ b/extras/source/glade/makewidgetgroup.xslt
@@ -0,0 +1,50 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+--
+xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
+  xsl:output method=xml version=1.0 encoding=UTF-8/
+
+  !-- work arround apparently broken output indenting in libxslt --
+  xsl:param name=indent select='  '/
+
+  xsl:template match=/glade-catalog
+xsl:copy
+  xsl:apply-templates select=@*|node()/
+
+  xsl:text#10;/xsl:text
+  xsl:value-of select=$indent/
+  glade-widget-group name=libreoffice title=LibreOffice
+  xsl:text#10;/xsl:text
+
+xsl:for-each select=//glade-widget-class
+  xsl:value-of select=concat($indent,$indent)/
+  glade-widget-class-ref name={@name}/
+  

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - sd/source sw/source

[Caolán McNamara]

 sd/source/filter/eppt/pptx-text.cxx |8 ++---
 sw/source/filter/ww8/rtfattributeoutput.cxx |2 -
 sw/source/filter/ww8/rtfexport.cxx  |2 -
 sw/source/filter/ww8/writerhelper.cxx   |   42 ++--
 sw/source/filter/ww8/wrtww8gr.cxx   |5 +--
 sw/source/filter/ww8/ww8par.cxx |4 +-
 sw/source/filter/ww8/ww8par.hxx |4 +-
 sw/source/filter/ww8/ww8par3.cxx|4 +-
 8 files changed, 35 insertions(+), 36 deletions(-)

New commits:
commit c388bdf4d29e282f3ba8152c581a9c8670d7b33d
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Mar 13 13:06:13 2013 +

WaE: various warngs, e.g. unused argument, variables, ordering

Change-Id: I551ccf9b098d7f916bd889dbc82d22c0dc5c63f3
(cherry picked from commit ed740489ed39e0fc3ec43e3f3a1e6e9e366a2c5e)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9673396..36dc481 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1326,7 +1326,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
 sal_Int16 nFirstLineIndex,
 sal_Int16 /*nListTabPos*/,
 const String rNumberingString,
-const SvxBrushItem* pBrush)
+const SvxBrushItem* /*pBrush*/)
 {
 SAL_INFO(sw.rtf, OSL_THIS_FUNC);
 
diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index 687ae55..97f9b73 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -168,7 +168,7 @@ void RtfExport::AppendBookmark( const OUString rName, bool 
/*bSkip*/ )
 }
 
 //For i120928,to export graphic of bullet for RTF filter
-void RtfExport::ExportGrfBullet(const SwTxtNode rNd)
+void RtfExport::ExportGrfBullet(const SwTxtNode)
 {
 SAL_INFO(sw.rtf, TODO:   OSL_THIS_FUNC);
 }
diff --git a/sw/source/filter/ww8/writerhelper.cxx 
b/sw/source/filter/ww8/writerhelper.cxx
index ddd9e5a..b540868 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -151,16 +151,16 @@ namespace
 namespace sw
 {
 //For i120928,size conversion before exporting graphic of bullet
-Frame::Frame(const GraphicrGrf, const SwPosition rPos)
-:mpFlyFrm(NULL),
-maPos(rPos),
-maSize(),
-maLayoutSize(),
-mpStartFrameContent(0),
-mbIsInline(true),
-meWriterType(eBulletGrf),
-maGrf(rGrf),
-mbForBullet(true)
+Frame::Frame(const Graphic rGrf, const SwPosition rPos)
+: mpFlyFrm(NULL)
+, maPos(rPos)
+, maSize()
+, maLayoutSize()
+, meWriterType(eBulletGrf)
+, mpStartFrameContent(0)
+, mbIsInline(true)
+, mbForBullet(true)
+, maGrf(rGrf)
 {
 const MapMode aMap100mm( MAP_100TH_MM );
 SizeaSize( rGrf.GetPrefSize() );
@@ -177,17 +177,17 @@ namespace sw
 }
 
 Frame::Frame(const SwFrmFmt rFmt, const SwPosition rPos)
-: mpFlyFrm(rFmt),
-  maPos(rPos),
-  maSize(),
-  maLayoutSize(), // #i43447#
-  meWriterType(eTxtBox),
-  mpStartFrameContent(0),
-  // #i43447# - move to initialization list
-  mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
-  // #i120928# - handle graphic of bullet within existing 
implementation
-  ,maGrf()
-  ,mbForBullet(false)
+: mpFlyFrm(rFmt)
+, maPos(rPos)
+, maSize()
+, maLayoutSize() // #i43447#
+, meWriterType(eTxtBox)
+, mpStartFrameContent(0)
+// #i43447# - move to initialization list
+, mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
+// #i120928# - handle graphic of bullet within existing implementation
+, mbForBullet(false)
+, maGrf()
 {
 switch (rFmt.Which())
 {
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx 
b/sw/source/filter/ww8/wrtww8gr.cxx
index 69fa966..e3facdf 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -809,7 +809,8 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream rStrm, 
const Graphic rGrf,
 
 rStrm.Write( aArr, nHdrLen );
 }
-void SwWW8WrGrf::WriteGrfForBullet(SvStream rStrm,  const Graphic rGrf, 
sal_uInt16 nWidth, sal_uInt16 nHeight)
+
+void SwWW8WrGrf::WriteGrfForBullet(SvStream rStrm, const Graphic rGrf, 
sal_uInt16 nWidth, sal_uInt16 nHeight)
 {
 if (rWrt.bWrtWW8)
 {
@@ -820,8 +821,6 @@ void SwWW8WrGrf::WriteGrfForBullet(SvStream rStrm,  const 
Graphic rGrf, sal_uI
 }
 else
 {
-bool bSwapped = rGrf.IsSwapOut() ? true : false;
-
 GDIMetaFile aMeta;
 switch (rGrf.GetType())
 {
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 35220f6..26cfd3e 100644
--- 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/1e2f97cbef743008b98126dbcd005838250f92

[Eike Rathke]

 69/1e2f97cbef743008b98126dbcd005838250f92 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2dee371c28d8f4edbbfdfd1f7b3186f3143e1886
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 14 13:04:29 2013 +0100

Notes added by 'git notes add'

diff --git a/69/1e2f97cbef743008b98126dbcd005838250f92 
b/69/1e2f97cbef743008b98126dbcd005838250f92
new file mode 100644
index 000..04020c4
--- /dev/null
+++ b/69/1e2f97cbef743008b98126dbcd005838250f92
@@ -0,0 +1 @@
+prefer: ab9b5639b23ab5db93357bd076b65adea1b6e8b6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/sdremote

[Artur Dryomov]

 android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java | 
  10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 04ab54f0c74ef0edcdd3ede3a5046a02f4bc90b1
Author: Artur Dryomov artur.dryo...@gmail.com
Date:   Thu Mar 14 14:25:55 2013 +0300

fdo#60604 - fix Impress remote client speaker notes encoding

There is nothing wrong with the current code, it is the Android’s
problem.

Issue was reported upstream:
https://code.google.com/p/android/issues/detail?id=1733#c23

Tested on Jelly Bean 4.2 and russian speaker notes.

Change-Id: I85414abac233186484078637073b97562b81aad2
Reviewed-on: https://gerrit.libreoffice.org/2723
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 60e16a3..0aab5a6 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -100,7 +100,7 @@ public class PresentationFragment extends SherlockFragment {
 mNotes = (WebView) v.findViewById(R.id.presentation_notes);
 
 String summary = htmlbodyThis is just a testbr/ulliAnd 
item/liliAnd again/li/ulMore 
textbr/Blablabr/Blablabr/blablabr/Blabla/body/html;
-mNotes.loadData(summary, text/html, UTF-8);
+mNotes.loadDataWithBaseURL(null, summary, text/html, UTF-8, null);
 mNotes.setBackgroundColor(Color.TRANSPARENT);
 
 mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow);
@@ -156,8 +156,8 @@ public class PresentationFragment extends SherlockFragment {
 //int aSlide = 
mCommunicationService.getSlideShow().getCurrentSlide();
 mNumberText.setText((aPosition + 1) + /
 + mCommunicationService.getSlideShow().getSize());
-mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html, UTF-8);
+mNotes.loadDataWithBaseURL(null, mCommunicationService.getSlideShow()
+.getNotes(aPosition), text/html, UTF-8, null);
 }
 
 // -- RESIZING LISTENER 

@@ -281,8 +281,8 @@ public class PresentationFragment extends SherlockFragment {
 CommunicationService.MSG_SLIDE_NOTES)) {
 int aPosition = aIntent.getExtras().getInt(slide_number);
 if ( aPosition == mTopView.getSelectedItemPosition() ) {
-mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html, 
UTF-8);
+mNotes.loadDataWithBaseURL(null, 
mCommunicationService.getSlideShow()
+.getNotes(aPosition), text/html, 
UTF-8, null);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#60604 - fix Impress remote client speaker notes encoding

[Thorsten Behrens (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2723

Approvals:
  Thorsten Behrens: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2723
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I85414abac233186484078637073b97562b81aad2
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Artur Dryomov artur.dryo...@gmail.com
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-2' - hunspell/hunspell.rhbz918938.patch hunspell/UnpackedTarball_hunspell.mk

[Caolán McNamara]

 hunspell/UnpackedTarball_hunspell.mk |1 
 hunspell/hunspell.rhbz918938.patch   |   72 +++
 2 files changed, 73 insertions(+)

New commits:
commit 71c439a6604c242339141df28f6082d8f78eb2e8
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Mar 13 16:59:32 2013 +

Resolves: rhbz#918938 crash in danish thesaurus/spell interaction

Change-Id: I911fc382a8e4b895262dcd5ae5c67c4a81e6aad4
Reviewed-on: https://gerrit.libreoffice.org/2710
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-on: https://gerrit.libreoffice.org/2720
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/hunspell/UnpackedTarball_hunspell.mk 
b/hunspell/UnpackedTarball_hunspell.mk
index 9ba9dc3..1e0544a 100644
--- a/hunspell/UnpackedTarball_hunspell.mk
+++ b/hunspell/UnpackedTarball_hunspell.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
hunspell/hunspell-1.3.2-nullptr.patch \
hunspell/hunspell-1.3.2-literal.patch \
hunspell/hunspell-1.3.2-compound.patch \
+   hunspell/hunspell.rhbz918938.patch \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/hunspell/hunspell.rhbz918938.patch 
b/hunspell/hunspell.rhbz918938.patch
new file mode 100644
index 000..f1bdbd4
--- /dev/null
+++ b/hunspell/hunspell.rhbz918938.patch
@@ -0,0 +1,72 @@
+--- misc/hunspell-1.3.2/src/hunspell/hunspell.cxx  2011-02-02 
12:04:29.0 +
 misc/build/hunspell-1.3.2/src/hunspell/hunspell.cxx2013-03-13 
16:50:50.667928521 +
+@@ -12,6 +12,8 @@
+ #endif
+ #include csutil.hxx
+ 
++#include string
++
+ Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key)
+ {
+ encoding = NULL;
+@@ -1710,6 +1712,19 @@
+ return n;
+ }
+ 
++namespace
++{
++void myrep(std::string str, const std::string search, const 
std::string replace)
++{
++size_t pos = 0;
++while ((pos = str.find(search, pos)) != std::string::npos)
++{
++   str.replace(pos, search.length(), replace);
++   pos += replace.length();
++}
++}
++}
++
+ int Hunspell::spellml(char*** slst, const char * word)
+ {
+   char *q, *q2;
+@@ -1721,26 +1736,26 @@
+   q2 = strstr(q2, word);
+   if (!q2) return 0; // bad XML input
+   if (check_xml_par(q, type=, analyze)) {
+-  int n = 0, s = 0;
++  int n = 0;
+   if (get_xml_par(cw, strchr(q2, ''), MAXWORDUTF8LEN - 10)) n = 
analyze(slst, cw);
+   if (n == 0) return 0;
+   // convert the result to codeaana1/aaana2/a/code format
+-  for (int i = 0; i  n; i++) s+= strlen((*slst)[i]);
+-  char * r = (char *) malloc(6 + 5 * s + 7 * n + 7 + 1); // XXX 
5*s--amp;
+-  if (!r) return 0;
+-  strcpy(r, code);
++  std::string r;
++  r.append(code);
+   for (int i = 0; i  n; i++) {
+-int l = strlen(r);
+-strcpy(r + l, a);
+-strcpy(r + l + 3, (*slst)[i]);
+-mystrrep(r + l + 3, \t,  );
+-mystrrep(r + l + 3, , lt;);
+-mystrrep(r + l + 3, , amp;);
+-strcat(r, /a);
++r.append(a);
++
++std::string entry((*slst)[i]);
+ free((*slst)[i]);
++myrep(entry, \t,  );
++myrep(entry, , amp;);
++myrep(entry, , lt;);
++r.append(entry);
++
++r.append(/a);
+   }
+-  strcat(r, /code);
+-  (*slst)[0] = r;
++  r.append(/code);
++  (*slst)[0] = mystrdup(r.c_str());
+   return 1;
+   } else if (check_xml_par(q, type=, stem)) {
+   if (get_xml_par(cw, strchr(q2, ''), MAXWORDUTF8LEN - 1)) return 
stem(slst, cw);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0-2] Resolves: rhbz#918938 crash in danish thesaurus/spell intera...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2720

Approvals:
  Michael Stahl: Looks good to me, but someone else must approve
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2720
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I911fc382a8e4b895262dcd5ae5c67c4a81e6aad4
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-2
Gerrit-Owner: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: filter/source

[Andre Fischer]

 filter/source/msfilter/svdfppt.cxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 87354e7fc1f63480bdef092047f912682bc7ac58
Author: Andre Fischer a...@apache.org
Date:   Thu Jun 7 10:42:10 2012 +

i#119478# Fixed application of transparency to table cells.

Patch by: Lei Debin

Change-Id: I3bdd190c40e2e58f53b7b4f58e99a1f9f19bf580

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 94bf34b..113d912 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7336,12 +7336,8 @@ void ApplyCellAttributes( const SdrObject* pObj, 
Reference XCell  xCell )
 if ( eFillStyle != XFILL_NONE )
 {
 sal_Int16 nFillTransparence( ( (const 
XFillTransparenceItem)pObj-GetMergedItem( XATTR_FILLTRANSPARENCE ) 
).GetValue() );
-if ( nFillTransparence != 100 )
-{
-nFillTransparence *= 100;
-static const rtl::OUString sFillTransparence( String( 
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
-xPropSet-setPropertyValue( sFillTransparence, Any( 
nFillTransparence ) );
-}
+static const rtl::OUString sFillTransparence( String( 
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
+xPropSet-setPropertyValue( sFillTransparence, Any( 
nFillTransparence ) );
 }
 }
 catch( const Exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 94/c9b8000518ac0e3be0396fec9d5544d51d1002

[Eike Rathke]

 94/c9b8000518ac0e3be0396fec9d5544d51d1002 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ec003f1ed9f75055fc0db39a43f0eb8a4f6817ed
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 14 13:22:58 2013 +0100

Notes added by 'git notes add'

diff --git a/94/c9b8000518ac0e3be0396fec9d5544d51d1002 
b/94/c9b8000518ac0e3be0396fec9d5544d51d1002
new file mode 100644
index 000..6187c2e
--- /dev/null
+++ b/94/c9b8000518ac0e3be0396fec9d5544d51d1002
@@ -0,0 +1 @@
+merged as: 87354e7fc1f63480bdef092047f912682bc7ac58
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] i#119478# Fixed application of transparency to table cells.

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2725

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/2725/1

i#119478# Fixed application of transparency to table cells.

Patch by: Lei Debin

Change-Id: I3bdd190c40e2e58f53b7b4f58e99a1f9f19bf580
(cherry picked from commit 87354e7fc1f63480bdef092047f912682bc7ac58)
---
M filter/source/msfilter/svdfppt.cxx
1 file changed, 2 insertions(+), 6 deletions(-)



diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index b44fe62..306309d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7329,12 +7329,8 @@
 if ( eFillStyle != XFILL_NONE )
 {
 sal_Int16 nFillTransparence( ( (const 
XFillTransparenceItem)pObj-GetMergedItem( XATTR_FILLTRANSPARENCE ) 
).GetValue() );
-if ( nFillTransparence != 100 )
-{
-nFillTransparence *= 100;
-static const rtl::OUString sFillTransparence( String( 
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
-xPropSet-setPropertyValue( sFillTransparence, Any( 
nFillTransparence ) );
-}
+static const rtl::OUString sFillTransparence( String( 
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
+xPropSet-setPropertyValue( sFillTransparence, Any( 
nFillTransparence ) );
 }
 }
 catch( const Exception )

-- 
To view, visit https://gerrit.libreoffice.org/2725
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bdd190c40e2e58f53b7b4f58e99a1f9f19bf580
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke er...@redhat.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Remove rtl:: namespace, fix minor spelling error in comment

[Chris Sherlock (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2726

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/2726/1

Remove rtl:: namespace, fix minor spelling error in comment

Change-Id: Icd04bfa61209277c57afe313d679b253aa241b7d
---
M vcl/inc/salframe.hxx
M vcl/inc/salinst.hxx
M vcl/inc/salsys.hxx
M vcl/unx/gtk/app/gtkdata.cxx
M vcl/win/source/window/salframe.cxx
5 files changed, 18 insertions(+), 21 deletions(-)



diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 63096e0..2ae11216 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -143,9 +143,9 @@
 // When Event is called, SalInstance::Yield() must be returned
 virtual sal_BoolPostEvent( void* pData ) = 0;
 
-virtual voidSetTitle( const rtl::OUString rTitle ) = 0;
+virtual voidSetTitle( const OUString rTitle ) = 0;
 virtual voidSetIcon( sal_uInt16 nIcon ) = 0;
-virtual voidSetRepresentedURL( const rtl::OUString );
+virtual voidSetRepresentedURL( const OUString );
 virtual voidSetMenu( SalMenu *pSalMenu ) = 0;
 virtual voidDrawMenuBar() = 0;
 
@@ -192,7 +192,7 @@
 virtual voidSetInputContext( SalInputContext* pContext ) = 
0;
 virtual voidEndExtTextInput( sal_uInt16 nFlags ) = 0;
 
-virtual rtl::OUString  GetKeyName( sal_uInt16 nKeyCode ) = 0;
+virtual OUString  GetKeyName( sal_uInt16 nKeyCode ) = 0;
 
 // returns in 'rKeyCode' the single keycode that translates to the given 
unicode when using a keyboard layout of language 'aLangType'
 // returns sal_False if no mapping exists or function not supported
@@ -236,7 +236,7 @@
 // move the frame to a new screen
 virtual voidSetScreenNumber( unsigned int nScreen ) = 0;
 
-virtual voidSetApplicationID( const rtl::OUString 
rApplicationID) = 0;
+virtual voidSetApplicationID( const OUString 
rApplicationID) = 0;
 
 // shaped system windows
 // set clip region to none (- rectangular windows, normal state)
@@ -257,7 +257,7 @@
 Window*   GetWindow() const { return m_pWindow; }
 
 // Call the callback set; this sometimes necessary for implementation 
classes
-// that should not now more than necessary about the SalFrame 
implementation
+// that should not know more than necessary about the SalFrame 
implementation
 // (e.g. input methods, printer update handlers).
 longCallCallback( sal_uInt16 nEvent, const void* 
pEvent ) const
 { return m_pProc ? m_pProc( m_pWindow, const_castSalFrame*(this), 
nEvent, pEvent ) : 0; }
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 2c41bc8..19b5ec6 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -105,7 +105,7 @@
 virtual voidGetPrinterQueueInfo( ImplPrnQueueList* pList ) 
= 0;
 virtual voidGetPrinterQueueState( SalPrinterQueueInfo* 
pInfo ) = 0;
 virtual voidDeletePrinterQueueInfo( SalPrinterQueueInfo* 
pInfo ) = 0;
-virtual rtl::OUString  GetDefaultPrinter() = 0;
+virtual OUString  GetDefaultPrinter() = 0;
 
 // SalTimer
 virtual SalTimer*   CreateSalTimer() = 0;
@@ -160,7 +160,7 @@
 CreateClipboard( const com::sun::star::uno::Sequence 
com::sun::star::uno::Any  i_rArguments );
 virtual com::sun::star::uno::Reference com::sun::star::uno::XInterface  
CreateDragSource();
 virtual com::sun::star::uno::Reference com::sun::star::uno::XInterface  
CreateDropTarget();
-virtual voidAddToRecentDocumentList(const rtl::OUString rFileUrl, 
const rtl::OUString rMimeType) = 0;
+virtual voidAddToRecentDocumentList(const OUString rFileUrl, 
const OUString rMimeType) = 0;
 
 virtual bool hasNativeFileSelection() const { return false; }
 
@@ -187,9 +187,9 @@
 // - SalInstance-Functions -
 // -
 
-void SalAbort( const rtl::OUString rErrorText, bool bDumpCore );
+void SalAbort( const OUString rErrorText, bool bDumpCore );
 
-VCL_PLUGIN_PUBLIC const ::rtl::OUString SalGetDesktopEnvironment();
+VCL_PLUGIN_PUBLIC const OUString SalGetDesktopEnvironment();
 
 // ---
 // - SalData -
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 5a5580d..308c65e 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -22,11 +22,7 @@
 
 #include tools/gen.hxx
 #include vcl/dllapi.h
-
-namespace rtl
-{
-class OUString;
-}
+#include rtl/ustring.hxx
 
 /* Button combinations for ShowNativeMessageBox
 */
@@ -103,7 +99,7 @@
 
@returns the name of the screen
 */
-virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ) = 0;
+virtual OUString GetDisplayScreenName( unsigned int nScreen ) = 

[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Chris]

 vcl/inc/salframe.hxx|   10 +-
 vcl/inc/salinst.hxx |8 
 vcl/inc/salsys.hxx  |   13 +
 vcl/unx/gtk/app/gtkdata.cxx |4 ++--
 4 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit d7093ec5942c0c40ac34e3b48bd12ca003ecc876
Author: Chris chris.sherloc...@gmail.com
Date:   Wed Mar 13 22:13:03 2013 +1100

Remove rtl:: namespace, fix minor spelling error in comment

Change-Id: Icd04bfa61209277c57afe313d679b253aa241b7d
Reviewed-on: https://gerrit.libreoffice.org/2726
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 63096e0..2ae11216 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -143,9 +143,9 @@ public:
 // When Event is called, SalInstance::Yield() must be returned
 virtual sal_BoolPostEvent( void* pData ) = 0;
 
-virtual voidSetTitle( const rtl::OUString rTitle ) = 0;
+virtual voidSetTitle( const OUString rTitle ) = 0;
 virtual voidSetIcon( sal_uInt16 nIcon ) = 0;
-virtual voidSetRepresentedURL( const rtl::OUString );
+virtual voidSetRepresentedURL( const OUString );
 virtual voidSetMenu( SalMenu *pSalMenu ) = 0;
 virtual voidDrawMenuBar() = 0;
 
@@ -192,7 +192,7 @@ public:
 virtual voidSetInputContext( SalInputContext* pContext ) = 
0;
 virtual voidEndExtTextInput( sal_uInt16 nFlags ) = 0;
 
-virtual rtl::OUString  GetKeyName( sal_uInt16 nKeyCode ) = 0;
+virtual OUString  GetKeyName( sal_uInt16 nKeyCode ) = 0;
 
 // returns in 'rKeyCode' the single keycode that translates to the given 
unicode when using a keyboard layout of language 'aLangType'
 // returns sal_False if no mapping exists or function not supported
@@ -236,7 +236,7 @@ public:
 // move the frame to a new screen
 virtual voidSetScreenNumber( unsigned int nScreen ) = 0;
 
-virtual voidSetApplicationID( const rtl::OUString 
rApplicationID) = 0;
+virtual voidSetApplicationID( const OUString 
rApplicationID) = 0;
 
 // shaped system windows
 // set clip region to none (- rectangular windows, normal state)
@@ -257,7 +257,7 @@ public:
 Window*   GetWindow() const { return m_pWindow; }
 
 // Call the callback set; this sometimes necessary for implementation 
classes
-// that should not now more than necessary about the SalFrame 
implementation
+// that should not know more than necessary about the SalFrame 
implementation
 // (e.g. input methods, printer update handlers).
 longCallCallback( sal_uInt16 nEvent, const void* 
pEvent ) const
 { return m_pProc ? m_pProc( m_pWindow, const_castSalFrame*(this), 
nEvent, pEvent ) : 0; }
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 2c41bc8..19b5ec6 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -105,7 +105,7 @@ public:
 virtual voidGetPrinterQueueInfo( ImplPrnQueueList* pList ) 
= 0;
 virtual voidGetPrinterQueueState( SalPrinterQueueInfo* 
pInfo ) = 0;
 virtual voidDeletePrinterQueueInfo( SalPrinterQueueInfo* 
pInfo ) = 0;
-virtual rtl::OUString  GetDefaultPrinter() = 0;
+virtual OUString  GetDefaultPrinter() = 0;
 
 // SalTimer
 virtual SalTimer*   CreateSalTimer() = 0;
@@ -160,7 +160,7 @@ public:
 CreateClipboard( const com::sun::star::uno::Sequence 
com::sun::star::uno::Any  i_rArguments );
 virtual com::sun::star::uno::Reference com::sun::star::uno::XInterface  
CreateDragSource();
 virtual com::sun::star::uno::Reference com::sun::star::uno::XInterface  
CreateDropTarget();
-virtual voidAddToRecentDocumentList(const rtl::OUString rFileUrl, 
const rtl::OUString rMimeType) = 0;
+virtual voidAddToRecentDocumentList(const OUString rFileUrl, 
const OUString rMimeType) = 0;
 
 virtual bool hasNativeFileSelection() const { return false; }
 
@@ -187,9 +187,9 @@ void DestroySalInstance( SalInstance* pInst );
 // - SalInstance-Functions -
 // -
 
-void SalAbort( const rtl::OUString rErrorText, bool bDumpCore );
+void SalAbort( const OUString rErrorText, bool bDumpCore );
 
-VCL_PLUGIN_PUBLIC const ::rtl::OUString SalGetDesktopEnvironment();
+VCL_PLUGIN_PUBLIC const OUString SalGetDesktopEnvironment();
 
 // ---
 // - SalData -
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 5a5580d..308c65e 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -22,11 +22,7 @@
 
 #include tools/gen.hxx
 #include vcl/dllapi.h
-
-namespace rtl
-{
-class OUString;
-}
+#include 

[PUSHED] Remove rtl:: namespace, fix minor spelling error in comment

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2726

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2726
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd04bfa61209277c57afe313d679b253aa241b7d
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com
Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: oox/inc oox/Library_oox.mk oox/source

[Thorsten Behrens]

 oox/Library_oox.mk   |1 
 oox/inc/oox/ppt/comments.hxx |   72 ---
 oox/source/ppt/comments.cxx  |   65 ++
 3 files changed, 74 insertions(+), 64 deletions(-)

New commits:
commit 42f9c7f8364818e91c95cf3dae8ab9ae6f1b561e
Author: Thorsten Behrens tbehr...@suse.com
Date:   Thu Mar 14 12:52:03 2013 +0100

More cleanup of pptx comment import code.

- moved non-trivial code out of header file
- replaced all std::string occurences with OUString
- binned boost/atoi string parsing in favour of builtins.

Change-Id: I872e18e33ae9b997e041b4ccc26f80e79b54052b

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 303b21f..e468256 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -253,6 +253,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/ppt/animvariantcontext \
 oox/source/ppt/backgroundproperties \
 oox/source/ppt/buildlistcontext \
+oox/source/ppt/comments \
 oox/source/ppt/commonbehaviorcontext \
 oox/source/ppt/commontimenodecontext \
 oox/source/ppt/conditioncontext \
diff --git a/oox/inc/oox/ppt/comments.hxx b/oox/inc/oox/ppt/comments.hxx
index 81bcb78..fe718db 100644
--- a/oox/inc/oox/ppt/comments.hxx
+++ b/oox/inc/oox/ppt/comments.hxx
@@ -12,10 +12,7 @@
 #define OOX_PPT_COMMENTS_HXX
 
 #include vector
-#include boost/algorithm/string.hpp //split function to tokenize for date 
time
-
 #include com/sun/star/util/DateTime.hpp
-#include com/sun/star/lang/IllegalArgumentException.hpp
 
 namespace oox { namespace ppt {
 
@@ -34,20 +31,7 @@ class CommentAuthorList
 std::vectorCommentAuthor cmAuthorLst;
 
 public:
-void setValues(const CommentAuthorList list)
-{
-std::vectorCommentAuthor::const_iterator it;
-for(it = list.cmAuthorLst.begin(); it != list.cmAuthorLst.end(); 
++it)
-{
-CommentAuthor temp;
-cmAuthorLst.push_back(temp);
-cmAuthorLst.back().clrIdx = it-clrIdx;
-cmAuthorLst.back().id = it-id;
-cmAuthorLst.back().initials = it-initials;
-cmAuthorLst.back().lastIdx = it-lastIdx;
-cmAuthorLst.back().name = it-name;
-}
-}
+void setValues(const CommentAuthorList list);
 
 const std::vectorCommentAuthor getCmAuthorLst() const
 {
@@ -73,20 +57,7 @@ class Comment
 ::rtl::OUString text;
 ::com::sun::star::util::DateTime aDateTime;
 
-//DateTime is saved as : 2013-01-10T15:53:26.000
-void setDateTime (::rtl::OUString datetime)
-{
-std::string _datetime = rtl::OUStringToOString(datetime, 
RTL_TEXTENCODING_UTF8).getStr();
-std::vectorstd::string _dt;
-boost::split( _dt, _datetime, boost::is_any_of( -:T ) );
-aDateTime.Year = atoi(_dt.at(0).c_str());
-aDateTime.Month = atoi(_dt.at(1).c_str());
-aDateTime.Day = atoi(_dt.at(2).c_str());
-aDateTime.Hours = atoi(_dt.at(3).c_str());
-aDateTime.Minutes = atoi(_dt.at(4).c_str());
-aDateTime.HundredthSeconds = atoi(_dt.at(5).c_str());
-std::vectorstd::string::iterator i;
-}
+void setDateTime (::rtl::OUString datetime);
 
 public:
 void setAuthorId(const ::rtl::OUString _aId)
@@ -107,10 +78,6 @@ class Comment
 x=_x;
 y=_y;
 }
-void setText(std::string _text)
-{
-text = rtl::OUString::createFromAscii (  _text.c_str() );
-}
 void setText(const rtl::OUString _text)
 {
 text = _text;
@@ -143,32 +110,15 @@ class Comment
 {
 return aDateTime;
 }
-int getIntX()
-{
-std::string temp = rtl::OUStringToOString(get_X(), 
RTL_TEXTENCODING_UTF8).getStr();
-return atoi(temp.c_str());
-}
-int getIntY()
+sal_Int32 getIntX()
 {
-std::string temp = rtl::OUStringToOString(get_Y(), 
RTL_TEXTENCODING_UTF8).getStr();
-return atoi(temp.c_str());
+return x.toInt32();
 }
-OUString getAuthor ( const CommentAuthorList list )
+sal_Int32 getIntY()
 {
-std::string temp = rtl::OUStringToOString(authorId, 
RTL_TEXTENCODING_UTF8).getStr();
-int aId = atoi(temp.c_str());
-std::vectorCommentAuthor::const_iterator it;
-for(it = list.cmAuthorLst.begin(); it != list.cmAuthorLst.end(); 
++it)
-{
-temp = rtl::OUStringToOString(it-id, 
RTL_TEXTENCODING_UTF8).getStr();
-
-int list_aId = atoi(temp.c_str());
-std::string temp_a =rtl::OUStringToOString(it-name, 
RTL_TEXTENCODING_UTF8).getStr();
-if(list_aId == aId)
-return it-name;
-

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a0/c83c1cf1b6ec8c3f0116315c8ab978ecf6b66f

[Eike Rathke]

 a0/c83c1cf1b6ec8c3f0116315c8ab978ecf6b66f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8e7ba337be37769c2b82992fd2817766419858f5
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 14 13:52:29 2013 +0100

Notes added by 'git notes add'

diff --git a/a0/c83c1cf1b6ec8c3f0116315c8ab978ecf6b66f 
b/a0/c83c1cf1b6ec8c3f0116315c8ab978ecf6b66f
new file mode 100644
index 000..ef54584
--- /dev/null
+++ b/a0/c83c1cf1b6ec8c3f0116315c8ab978ecf6b66f
@@ -0,0 +1 @@
+prefer: ecbcaca7f3f61d621ead45c5b63562772aaa452a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk

[Fridrich Štrba]

 mysqlc/Library_mysqlc.mk |8 
 1 file changed, 8 deletions(-)

New commits:
commit eaa76b5b0a60548951d2e8428a5e1d18c17720a7
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 14 13:59:18 2013 +0100

Link only what one needs

Change-Id: I953ee0e96f704e3900238751b29fa2ed6f4482e9

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index fd09ba1..72787fc 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -15,9 +15,7 @@ $(eval $(call 
gb_Library_add_cxxflags,mysqlc,-DRTL_DISABLE_FAST_STRING))
 
 $(eval $(call gb_Library_use_externals,mysqlc,\
boost_headers \
-   mysql \
mysqlcppconn \
-   mariadb \
 ))
 
 ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
@@ -36,12 +34,6 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\
cppuhelper \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,mysqlc,\
-   -lpthread \
-))
-endif
-
 $(eval $(call gb_Library_add_defs,mysqlc,\
-DCPPDBC_EXPORTS \
-DCPPCONN_LIB_BUILD \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/control/field2.cxx |   19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 533be98148ff40f6205e2ac3b489748cae14ef0d
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 14 13:06:34 2013 +

restore incrementing time fields by area cursor is in

regression from String-OUString conversion with
tricky unsigned xub_StrLen of 0x for not-found
 any found position, vs -1 for OUString for not-found

Change-Id: I4a2babae085916a86cd1e60b74b4ea839dd8b87a

diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 49ad88e..b988cb8 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -2492,20 +2492,27 @@ void TimeField::ImplTimeSpinArea( sal_Bool bUp )
 {
 if ( GetField() )
 {
-xub_StrLen nTimeArea = 0;
+sal_Int32 nTimeArea = 0;
 Time aTime( GetTime() );
 OUString aText( GetText() );
 Selection aSelection( GetField()-GetSelection() );
 
-// Area suchen
+// Area search
 if ( GetFormat() != TIMEF_SEC_CS )
 {
-for ( xub_StrLen i = 1, nPos = 0; i = 4; i++ )
+//Which area is the cursor in of HH:MM:SS.TT
+for ( sal_Int32 i = 1, nPos = 0; i = 4; i++ )
 {
 sal_Int32 nPos1 = aText.indexOf( 
ImplGetLocaleDataWrapper().getTimeSep(), nPos );
 sal_Int32 nPos2 = aText.indexOf( 
ImplGetLocaleDataWrapper().getTime100SecSep(), nPos );
-nPos = nPos1  nPos2 ? nPos1 : nPos2;
-if ( nPos = (xub_StrLen)aSelection.Max() )
+//which ever comes first, bearing in mind that one might not 
be there
+if (nPos1 = 0  nPos2 = 0)
+nPos = nPos1  nPos2 ? nPos1 : nPos2;
+else if (nPos1 = 0)
+nPos = nPos1;
+else
+nPos = nPos2;
+if ( nPos  0 || nPos = aSelection.Max() )
 {
 nTimeArea = i;
 break;
@@ -2517,7 +2524,7 @@ void TimeField::ImplTimeSpinArea( sal_Bool bUp )
 else
 {
 sal_Int32 nPos = aText.indexOf( 
ImplGetLocaleDataWrapper().getTime100SecSep() );
-if ( nPos  0 || nPos = (xub_StrLen)aSelection.Max() )
+if ( nPos  0 || nPos = aSelection.Max() )
 nTimeArea = 3;
 else
 nTimeArea = 4;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 4 commits - editeng/inc editeng/source sd/source svx/source

[navin patidar]

 editeng/inc/editeng/outliner.hxx |2 -
 editeng/source/outliner/outliner.cxx |   38 ++-
 sd/source/core/sdpage.cxx|2 -
 svx/source/table/tablelayouter.cxx   |2 -
 4 files changed, 6 insertions(+), 38 deletions(-)

New commits:
commit b6b0e5527cce681fe157b2f091b67a7ae8cf9aa2
Author: navin patidar pati...@kacst.edu.sa
Date:   Mon Mar 11 09:06:45 2013 +0300

fix fdo#62143: set TEXT_LAYOUT_BIDI_STRONG flag.

Change-Id: I19ed1874ff73c3a8002934fa3456d718e383c5d6
Reviewed-on: https://gerrit.libreoffice.org/2664
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 68c3dfc3119a50ee9c9c6d65f4c656637152bbad)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 9688e89..6ddec87 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -984,7 +984,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point 
rStartPos,
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
 nLayoutMode = 
~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
 if ( bRightToLeftPara )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT;
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT | TEXT_LAYOUT_BIDI_STRONG;
 pOutDev-SetLayoutMode( nLayoutMode );
 
 if(bStrippingPortions)
commit 4c13903e61017b3d7869882aac1ec272a2c4474c
Author: K_Karthikeyan karthike...@kacst.edu.sa
Date:   Mon Feb 25 11:01:46 2013 +0300

Resolves fdo#60554

Resolves fdo#60554 borders disappear while merging cells

Change-Id: I3d3464e8b75cc9b72a1592d8ef276243202e68b8
Reviewed-on: https://gerrit.libreoffice.org/2375
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 45a5dad0460a1a7d1a44716968b8c9ff4a23e04b)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/svx/source/table/tablelayouter.cxx 
b/svx/source/table/tablelayouter.cxx
index 15d85e9..b581d8f 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -1024,7 +1024,7 @@ void TableLayouter::UpdateBorderLayout()
 for( aPos.mnCol = 0; aPos.mnCol  nColCount; aPos.mnCol++ )
 {
 CellRef xCell( getCell( aPos ) );
-if( !xCell.is() || xCell-isMerged() )
+if( !xCell.is() )
 continue;
 
 const SvxBoxItem* pThisAttr = (const 
SvxBoxItem*)xCell-GetItemSet().GetItem( SDRATTR_TABLE_BORDER );
commit cbfcc02027b64f71b2d888e438a2e964d9da0f50
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Sun Feb 24 14:26:17 2013 +0300

Fix fdo#60855 RTL UI: handout show boxes out of page border

Change-Id: Ie0103d7c2911dcf184d39b5c394cffae4dbe122f
Reviewed-on: https://gerrit.libreoffice.org/2356
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 12de9b3361236e1d6c931409cf0ad0d4f9924008)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 7e1bf02..ecc38f4 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2989,7 +2989,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument 
rModel, AutoLayout eLayout,
 
 const long nOffsetX = (aPartArea.Width() + nGapW) * (bRTL ? -1 : 1);
 const long nOffsetY = aPartArea.Height() + nGapH;
-const long nStartX = bRTL ? nOffsetX*(1 - nColCnt) - nX : nX;
+const long nStartX = bRTL ? nOffsetX*(1 - nColCnt) + nX : nX;
 
 for(sal_uInt16 nRow = 0; nRow  nRowCnt; nRow++)
 {
commit c1ab08f2559d3996ba595cfbdad287e5a7038f81
Author: navin pati...@kacst.edu.sa
Date:   Sat Feb 23 17:58:11 2013 +0300

fix fdo#38951, use paragraph’s writing direction.

In case of RTL, we want bullet text e.g. “1. ,1)” to be reversed
e.g. “.1,(1”, so we need to check only paragraph’s writing direction
and pass that direction to DrawingText().
and fix drawing position calculation logic.

Change-Id: I303dc1b04ae5e66b1b5d25a40794be308f36668b
Reviewed-on: https://gerrit.libreoffice.org/2348
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 2738fa9fdc3aec9a64f2eab1d9d48942218c199e)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index fcc90bb..61e6a41 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -389,7 +389,7 

Re: Pivot Table data provider extension framework (removal possibility)

[Kohei Yoshida]

Hi Eike,

Thanks for your reply.

On Wed, Mar 13, 2013 at 4:48 PM, Eike Rathke er...@redhat.com wrote:
 Hi Kohei,

 On Tuesday, 2013-03-12 11:41:32 -0400, Kohei Yoshida wrote:

 I'd like to ask whether someone actually uses this Pivot Table data
 provider extension framework, because I'd like to remove this if
 nobody is using it, or only few people are using it.

 From what I remember that can be used to populate pivot tables with data
 obtained from external resources like databases. Unfortunately you'll
 hardly find such extensions in the wild but more within enterprises and
 corporate users, so determining whether it's actually used or not is
 nearly impossible unless someone knows who those customers are.

Understood. I imagined it would be used only in such enterprise
setting, by someone with enough resources to develop the major part of
the pivot engine as an extension.


 I believe the same functionality can be achieve via database
 connectivity, by having such external data provider register as a
 database, and use it to act as a data provider for pivot tables.
 So, I don't see a reason why we need to keep this as a separate data
 source category.

 IMHO the advantage of the data provider is that the actual data does not
 have to reside in the spreadsheet, allowing for massive amounts of data
 records but providing only the information necessary for the pivot
 table. This maybe could be accomplished as well using a registered data
 source, but currently we have no means to pull the data without actually
 storing it in the spreadsheet for further processing. Or isn't that the
 case?

Well, that would depend on what you actually mean by storing (the
data) in the spreadsheet. When pulling data via database
connectivity, we don't actually copy the data in the spreadsheet
document, but generate the pivot table output directly from it. But we
*do* first populate the pivot cache from the database internally, so a
copy of the data will sit in memory while the document is open.  I
consider the pivot cache part an implementation detail, so I'm not
sure if that's what you meant by storing it in the spreadsheet...

 The way it is currently implemented also makes it *extremely*
 difficult for us to optimize the pivot table engine, because all its
 functionality has to go through the UNO API which forces us to do
 data conversion *twice* for every single transaction.  That's very
 very expensive especially as the data size grows (and it always
 does).

 Seconded.

And this to me is a considerable disadvantage on further speeding up
the engine and reducing its memory usage.

 So, I'd *love* to get rid of this sooner rather than later, and I'd
 like to know whether there are people who would absolutely need this
 functionality, and if so why.  As I said above, I believe the same
 functionality could be achieved via the database connectivity
 backend even if we remove the extension backend.

 I think there work needs to be done to pull the data and provide it in
 a form that pivot tables can actually process. It may be viable, but I'm
 really not familiar with pivot table topics.

Yes. So, anyone who currently use this data provider extension backend
would change the way the data is connected to Calc's pivot table;
which will require *some* work. But, considering that developing such
an extension requires a non-trivial resource (it's almost half o the
whole pivot table engine), I would imagine they could spare a bit of
their resource to set up database connectivity to achieve what they
need...  At least that's what I'm hoping.

Kohei
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - xmloff/CppunitTest_xmloff_uxmloff.mk xmloff/Module_xmloff.mk xmloff/qa xmloff/source

[Michael Meeks]

 xmloff/CppunitTest_xmloff_uxmloff.mk |   70 ++
 xmloff/Module_xmloff.mk  |4 +
 xmloff/qa/unit/uxmloff.cxx   |   71 +++
 xmloff/source/chart/SchXMLExport.cxx |   12 -
 xmloff/source/style/impastp4.cxx |   15 +++
 xmloff/source/style/impastpl.hxx |1 
 6 files changed, 163 insertions(+), 10 deletions(-)

New commits:
commit b6e60d3eb5c21a98dfa86fde0bb695986058f463
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Mar 14 13:25:05 2013 +

remove redundant property handler factory.

Change-Id: I458f8f4a9575c2afddcd4f4d2f9494bffd5ff127

diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 2e39f93..c3c38ec 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -261,7 +261,6 @@ private:
 public:
 SvXMLExport mrExport;
 SvXMLAutoStylePoolP mrAutoStylePool;
-UniReference XMLPropertyHandlerFactory  mxPropertyHandlerFactory;
 UniReference XMLPropertySetMapper  mxPropertySetMapper;
 UniReference XMLChartExportPropertyMapper  mxExpPropMapper;
 
@@ -1083,15 +1082,8 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
 {
 msTableName = OUString( local-table );
 
-// create factory
-mxPropertyHandlerFactory = new XMLChartPropHdlFactory;
-
-if( mxPropertyHandlerFactory.is() )
-{
-// create property set mapper
-mxPropertySetMapper = new XMLChartPropertySetMapper;
-}
-
+// create property set mapper
+mxPropertySetMapper = new XMLChartPropertySetMapper;
 mxExpPropMapper = new XMLChartExportPropertyMapper( mxPropertySetMapper, 
rExport );
 
 // register chart auto-style family
commit 678e35c4ac17219556ce0426043bd4ad905d5cee
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Mar 14 12:08:28 2013 +

xmloff: native code unit testing harness.

Change-Id: I5b9133deea2aa7630752128128f1a222bef99eb1

diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk 
b/xmloff/CppunitTest_xmloff_uxmloff.mk
new file mode 100644
index 000..37959ad
--- /dev/null
+++ b/xmloff/CppunitTest_xmloff_uxmloff.mk
@@ -0,0 +1,70 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,xmloff_uxmloff))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,xmloff_uxmloff, \
+xmloff/qa/unit/uxmloff \
+))
+
+
+$(eval $(call gb_CppunitTest_set_include,xmloff_uxmloff,\
+-I$(SRCDIR)/xmloff/inc \
+-I$(SRCDIR)/xmloff/source/style \
+-I$(SRCDIR)/xmloff/source/chart \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,xmloff_uxmloff,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,xmloff_uxmloff))
+
+$(eval $(call gb_CppunitTest_use_library_objects,xmloff_uxmloff,xo))
+
+$(eval $(call gb_CppunitTest_use_externals,xmloff_uxmloff,\
+   boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,xmloff_uxmloff, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+i18nisolang1 \
+sal \
+salhelper \
+   sax \
+svl \
+   test \
+tl \
+utl \
+vcl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_components,xmloff_uxmloff,\
+configmgr/source/configmgr \
+fileaccess/source/fileacc \
+i18npool/util/i18npool \
+sax/source/expatwrap/expwrap \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unoxml/source/service/unoxml \
+))
+
+#uui/util/uui \
+#sfx2/util/sfx \
+#framework/util/fwk \
+
+$(eval $(call gb_CppunitTest_use_configuration,xmloff_uxmloff))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
index cd294ee..886dac6 100644
--- a/xmloff/Module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -26,6 +26,10 @@ $(eval $(call gb_Module_add_targets,xmloff,\
 Package_inc \
 ))
 
+$(eval $(call gb_Module_add_check_targets,xmloff,\
+CppunitTest_xmloff_uxmloff \
+))
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
 JunitTest_xmloff_unoapi \
 ))
diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx
new file mode 100644
index 000..7e04437
--- /dev/null
+++ b/xmloff/qa/unit/uxmloff.cxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include sal/config.h
+#include test/bootstrapfixture.hxx
+
+#include 

[Libreoffice-commits] core.git: animations/source svx/inc svx/source

[Jian Fang Zhang]

 animations/source/animcore/animcore.cxx |   13 -
 svx/inc/svx/svdobj.hxx  |2 +-
 svx/source/svdraw/svdobj.cxx|5 -
 3 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit d6e752d5ebfaf66d1c9b0694f9c8582311d6151a
Author: Jian Fang Zhang zhan...@apache.org
Date:   Mon Jun 18 12:26:30 2012 +

i#113608#, memory leak in animations: newly exposed crashed problem

Patch by: zhangjf
Review by: Andre Fischer

Conflicts:
animations/source/animcore/animcore.cxx
svx/source/svdraw/svdobj.cxx

Change-Id: I305d5d92d064265edf108a5a34c948c610b4fdc1

diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index 6307f30..a503097 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -46,6 +46,8 @@
 #include com/sun/star/lang/XUnoTunnel.hpp
 #include comphelper/servicehelper.hxx
 #include cppuhelper/interfacecontainer.hxx
+#include cppuhelper/weakref.hxx
+
 #include cppuhelper/implbase1.hxx
 #include rtl/uuid.h
 
@@ -64,6 +66,7 @@ using ::com::sun::star::uno::XInterface;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::WeakReference;
 using ::com::sun::star::uno::XComponentContext;
 using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::XWeak;
@@ -300,7 +303,7 @@ private:
 Sequence NamedValue  maUserData;
 
 // parent interface for XChild interface implementation
-ReferenceXInterface   mxParent;
+WeakReferenceXInterface   mxParent;
 AnimationNode*  mpParent;
 
 // attributes for XAnimate
@@ -1134,7 +1137,7 @@ void SAL_CALL AnimationNode::setUserData( const Sequence 
NamedValue  _userdat
 Reference XInterface  SAL_CALL AnimationNode::getParent() throw 
(RuntimeException)
 {
 Guard Mutex  aGuard( maMutex );
-return mxParent;
+return mxParent.get();
 }
 
 // 
@@ -1143,12 +1146,12 @@ Reference XInterface  SAL_CALL 
AnimationNode::getParent() throw (RuntimeExcept
 void SAL_CALL AnimationNode::setParent( const Reference XInterface  Parent 
) throw (NoSupportException, RuntimeException)
 {
 Guard Mutex  aGuard( maMutex );
-if( Parent != mxParent )
+if( Parent != mxParent.get() )
 {
 mxParent = Parent;
 
 mpParent = 0;
-Reference XUnoTunnel  xTunnel( mxParent, UNO_QUERY );
+Reference XUnoTunnel  xTunnel( mxParent.get(), UNO_QUERY );
 if( xTunnel.is() )
 mpParent = reinterpret_cast AnimationNode* ( 
sal::static_int_cast sal_IntPtr (xTunnel-getSomething( getUnoTunnelId() )));
 
@@ -2050,7 +2053,7 @@ void AnimationNode::fireChangeListener()
 {
 Reference XInterface  xSource( static_castOWeakObject*(this), 
UNO_QUERY );
 Sequence ElementChange  aChanges;
-const ChangesEvent aEvent( xSource, makeAny( mxParent ), aChanges );
+const ChangesEvent aEvent( xSource, makeAny( mxParent.get() ), 
aChanges );
 while( aIterator.hasMoreElements() )
 {
 Reference XChangesListener  xListener( aIterator.next(), 
UNO_QUERY );
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 75cc0e4..27a4568 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -1072,7 +1072,7 @@ protected:
 private:
 /** only for internal use!
 */
-SvxShape* getSvxShape() const;
+SvxShape* getSvxShape();
 
 /** do not use directly, always use getSvxShape() if you have to! */
 SvxShape*   mpSvxShape;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index e35c994..1e52b4f 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2963,7 +2963,7 @@ void SdrObject::impl_setUnoShape( const uno::Reference 
uno::XInterface  _rxUn
 }
 
 /** only for internal use! */
-SvxShape* SdrObject::getSvxShape() const
+SvxShape* SdrObject::getSvxShape()
 {
 DBG_TESTSOLARMUTEX();
 // retrieving the impl pointer and subsequently using it is not 
thread-safe, of course, so it needs to be
@@ -2974,6 +2974,9 @@ SvxShape* SdrObject::getSvxShape() const
 OSL_ENSURE( !( !xShape.is()  mpSvxShape ),
 SdrObject::getSvxShape: still having IMPL-Pointer to dead object! );
 #endif
+//#113608#, make sure mpSvxShape is always synchronized with maWeakUnoShape
+if ( mpSvxShape  !xShape.is() )
+mpSvxShape = NULL;
 
 return mpSvxShape;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d5/55b32ce5aff591537ef877b78e3db99c64812a

[Eike Rathke]

 d5/55b32ce5aff591537ef877b78e3db99c64812a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ed43cb09c5b1fdee4d55866c6c2adb74c73769f9
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 14 14:36:31 2013 +0100

Notes added by 'git notes add'

diff --git a/d5/55b32ce5aff591537ef877b78e3db99c64812a 
b/d5/55b32ce5aff591537ef877b78e3db99c64812a
new file mode 100644
index 000..738d10f
--- /dev/null
+++ b/d5/55b32ce5aff591537ef877b78e3db99c64812a
@@ -0,0 +1 @@
+merged as: d6e752d5ebfaf66d1c9b0694f9c8582311d6151a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - filter/source

[Andre Fischer]

 filter/source/msfilter/svdfppt.cxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 0bd9229fdeb4bcf3023bef65257ff8317590455a
Author: Andre Fischer a...@apache.org
Date:   Thu Jun 7 10:42:10 2012 +

i#119478# Fixed application of transparency to table cells.

Patch by: Lei Debin

Change-Id: I3bdd190c40e2e58f53b7b4f58e99a1f9f19bf580
(cherry picked from commit 87354e7fc1f63480bdef092047f912682bc7ac58)
Reviewed-on: https://gerrit.libreoffice.org/2725
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index b44fe62..306309d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7329,12 +7329,8 @@ void ApplyCellAttributes( const SdrObject* pObj, 
Reference XCell  xCell )
 if ( eFillStyle != XFILL_NONE )
 {
 sal_Int16 nFillTransparence( ( (const 
XFillTransparenceItem)pObj-GetMergedItem( XATTR_FILLTRANSPARENCE ) 
).GetValue() );
-if ( nFillTransparence != 100 )
-{
-nFillTransparence *= 100;
-static const rtl::OUString sFillTransparence( String( 
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
-xPropSet-setPropertyValue( sFillTransparence, Any( 
nFillTransparence ) );
-}
+static const rtl::OUString sFillTransparence( String( 
RTL_CONSTASCII_USTRINGPARAM( FillTransparence ) ) );
+xPropSet-setPropertyValue( sFillTransparence, Any( 
nFillTransparence ) );
 }
 }
 catch( const Exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] i#119478# Fixed application of transparency to table cells.

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2725

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2725
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3bdd190c40e2e58f53b7b4f58e99a1f9f19bf580
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - android/sdremote

[Artur Dryomov]

 android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java | 
  10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 61686edf7074ab72d03ca2f73022797443a61fa9
Author: Artur Dryomov artur.dryo...@gmail.com
Date:   Thu Mar 14 14:25:55 2013 +0300

fdo#60604 - fix Impress remote client speaker notes encoding

There is nothing wrong with the current code, it is the Android’s
problem.

Issue was reported upstream:
https://code.google.com/p/android/issues/detail?id=1733#c23

Tested on Jelly Bean 4.2 and russian speaker notes.

Reviewed-on: https://gerrit.libreoffice.org/2723
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

Conflicts:


android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java

Change-Id: I85414abac233186484078637073b97562b81aad2
Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index bb24d40a7..0aab5a6 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -100,7 +100,7 @@ public class PresentationFragment extends SherlockFragment {
 mNotes = (WebView) v.findViewById(R.id.presentation_notes);
 
 String summary = htmlbodyThis is just a testbr/ulliAnd 
item/liliAnd again/li/ulMore 
textbr/Blablabr/Blablabr/blablabr/Blabla/body/html;
-mNotes.loadData(summary, text/html, null);
+mNotes.loadDataWithBaseURL(null, summary, text/html, UTF-8, null);
 mNotes.setBackgroundColor(Color.TRANSPARENT);
 
 mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow);
@@ -156,8 +156,8 @@ public class PresentationFragment extends SherlockFragment {
 //int aSlide = 
mCommunicationService.getSlideShow().getCurrentSlide();
 mNumberText.setText((aPosition + 1) + /
 + mCommunicationService.getSlideShow().getSize());
-mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html, null);
+mNotes.loadDataWithBaseURL(null, mCommunicationService.getSlideShow()
+.getNotes(aPosition), text/html, UTF-8, null);
 }
 
 // -- RESIZING LISTENER 

@@ -281,8 +281,8 @@ public class PresentationFragment extends SherlockFragment {
 CommunicationService.MSG_SLIDE_NOTES)) {
 int aPosition = aIntent.getExtras().getInt(slide_number);
 if ( aPosition == mTopView.getSelectedItemPosition() ) {
-mNotes.loadData(mCommunicationService.getSlideShow()
-.getNotes(aPosition), text/html, null);
+mNotes.loadDataWithBaseURL(null, 
mCommunicationService.getSlideShow()
+.getNotes(aPosition), text/html, 
UTF-8, null);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-ux-advise] Pivot Table data provider extension framework (removal possibility)

[Kohei Yoshida]

Hi Astron,

On Wed, Mar 13, 2013 at 6:12 PM, Stefan Knorr heinzless...@gmail.com wrote:
 Hi Kohei, Eike,

 I'd like to ask whether someone actually uses this Pivot Table data
 provider extension framework, because I'd like to remove this if
 nobody is using it, or only few people are using it.

 Hm, a list that is decidedly low-volume is probably the wrong list
 here... I don't know, maybe the users list is a better fit..?

Well, that may be a good idea  But I didn't want to post it there
first because I wanted to actually reach out to enterprise users who
might actually use the functionality (if they still do),  or any
developers who serviced such users.  I didn't think non-enterprise
users, or those who casually use it without investing lots of
development resources would use this particular functionality since
the extension itself constitutes almost half of the whole pivot table
engine (i.e. the custom data connectivity part as well as the result
calculation engine part). So, unless there is a read-made extension
that provides such functionality already in the wild (which Eike said
is very unlikely), any user of this backend would have to have enough
resource to develop the extension.

Kohei
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: extras/CustomTarget_glade.mk extras/Module_extras.mk extras/Package_glade.mk extras/source

[Mathias Hasselmann]

 extras/CustomTarget_glade.mk   |   26 +
 extras/Module_extras.mk|1 
 extras/Package_glade.mk|2 
 extras/source/glade/libreoffice-catalog.xml|  124 -
 extras/source/glade/libreoffice-catalog.xml.in |  124 +
 extras/source/glade/makewidgetgroup.xslt   |   50 ++
 6 files changed, 202 insertions(+), 125 deletions(-)

New commits:
commit 0f972e94a2fcbc6b227a2ae7b5d435438f6dbdc1
Author: Mathias Hasselmann math...@openismus.com
Date:   Thu Mar 14 12:54:17 2013 +0100

Show LibreOffice controls in Glade's tool palette

Glade didn't show any LibreOffice controls in its tool palette
because the catalog didn't have any glade-widget-group element.
This adds a XSLT script to automatically generate such element.

A better version of the script would create separate groups for
each module/namespace, but currently I have no idea how to do
this with libxslt, as it doesn't provide fn::distinct-values().

Change-Id: Iaa3e4b0471b58c48838e000e6d78a73b0c6a4bd3
Reviewed-on: https://gerrit.libreoffice.org/2724
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/extras/CustomTarget_glade.mk b/extras/CustomTarget_glade.mk
new file mode 100644
index 000..89d452e
--- /dev/null
+++ b/extras/CustomTarget_glade.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,extras/glade))
+
+#
+# Rules
+#
+
+$(call 
gb_CustomTarget_get_workdir,extras/source/glade)/libreoffice-catalog.xml : \
+$(SRCDIR)/extras/source/glade/libreoffice-catalog.xml.in \
+$(SRCDIR)/extras/source/glade/makewidgetgroup.xslt \
+| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSLT,4)
+   $(call gb_Helper_abbreviate_dirs, \
+   $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
+   -o $@ $(SRCDIR)/extras/source/glade/makewidgetgroup.xslt $ \
+   )
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 7144265..c3cb14b 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,extras))
 $(eval $(call gb_Module_add_targets,extras,\
AllLangZip_autotextshare \
CustomTarget_autocorr \
+   CustomTarget_glade \
Package_fonts \
Package_glade \
Package_labels \
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
index 9621aa9..1ac1f69 100644
--- a/extras/Package_glade.mk
+++ b/extras/Package_glade.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_glade,$(SRCDIR)/extras/source/glade))
+$(eval $(call gb_Package_Package,extras_glade,$(call 
gb_CustomTarget_get_workdir,extras/source/glade)))
 
 $(eval $(call 
gb_Package_add_file,extras_glade,pck/libreoffice-catalog.xml,libreoffice-catalog.xml))
 
diff --git a/extras/source/glade/libreoffice-catalog.xml 
b/extras/source/glade/libreoffice-catalog.xml
deleted file mode 100644
index 435449c..000
--- a/extras/source/glade/libreoffice-catalog.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!--
- * 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/.
- *
---
-!--
- * To get glade to use this, put this .xml into a dir e.g. ~/glade
- * and
- * export GLADE_CATALOG_SEARCH_PATH=~/glade
- * for system-wide installation copy into /usr/share/glade/catalogs/
---
-glade-catalog name=LibreOffice domain=glade-3 depends=gtk+ 
version=1.0
-  glade-widget-classes
-glade-widget-class title=Thesaurus View 
name=cuilo-ThesaurusAlternativesCtrl
-generic-name=ThesaurusAlternativesCtrl 
parent=GtkTextView
-icon-name=widget-gtk-textview/
-glade-widget-class title=Thesaurus Edit name=cuilo-ReplaceEdit
-generic-name=ReplaceEdit parent=GtkEntry
-icon-name=widget-gtk-textentry/
-glade-widget-class title=Thesaurus Lookup name=cuilo-LookUpComboBox
-generic-name=LookUpComboBox parent=GtkEntry
-icon-name=widget-gtk-comboboxtext/
-glade-widget-class title=Hyphen Edit name=cuilo-HyphenEdit
-generic-name=ReplaceEdit 

[PUSHED] Show LibreOffice controls in Glade's tool palette

[via Code Review]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2724

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2724
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa3e4b0471b58c48838e000e6d78a73b0c6a4bd3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Mathias Hasselmann math...@openismus.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: svx/source

[Noel Power]

 svx/source/svdraw/svdobj.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 31305fe1288146bc17735f00dd16daf131afd475
Author: Noel Power noel.po...@suse.com
Date:   Thu Mar 14 14:17:11 2013 +

move xShape def outside debug ifdef to fix build failure

Change-Id: Ibfc75eade6982bd5375beea2ea2e282bd27d91ed

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 1e52b4f..d12d56b 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2969,8 +2969,8 @@ SvxShape* SdrObject::getSvxShape()
 // retrieving the impl pointer and subsequently using it is not 
thread-safe, of course, so it needs to be
 // guarded by the SolarMutex
 
-#if OSL_DEBUG_LEVEL  0
 uno::Reference uno::XInterface  xShape( maWeakUnoShape );
+#if OSL_DEBUG_LEVEL  0
 OSL_ENSURE( !( !xShape.is()  mpSvxShape ),
 SdrObject::getSvxShape: still having IMPL-Pointer to dead object! );
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/qa vcl/qa

[Caolán McNamara]

 svtools/qa/cppunit/data/gif/fail/EDB-23279-1.gif   |1 -
 vcl/qa/cppunit/graphicfilter/data/gif/fail/EDB-23279-1.gif |1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ece1cd6d5cbc11759f62301de0ab800f0aa39d0
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 14 14:18:06 2013 +

stray test .png left behind

Change-Id: If0a0d61b58ecc46d5ba04951cd278d275fdf25e7

diff --git a/svtools/qa/cppunit/data/gif/fail/EDB-23279-1.gif 
b/svtools/qa/cppunit/data/gif/fail/EDB-23279-1.gif
deleted file mode 100644
index d81d3b0..000
--- a/svtools/qa/cppunit/data/gif/fail/EDB-23279-1.gif
+++ /dev/null
@@ -1 +0,0 @@
-””H©1ŠÎ؝'[ek2ΐ™~Ømé®ß1L-h£a[^¦Î.Þð!7¢/»VOÊ»·BB^ïuËÃî±³È2k]YnEåG)qâ¿
\ No newline at end of file
diff --git a/vcl/qa/cppunit/graphicfilter/data/gif/fail/EDB-23279-1.gif 
b/vcl/qa/cppunit/graphicfilter/data/gif/fail/EDB-23279-1.gif
new file mode 100644
index 000..d81d3b0
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/gif/fail/EDB-23279-1.gif
@@ -0,0 +1 @@
+””H©1ŠÎ؝'[ek2ΐ™~Ømé®ß1L-h£a[^¦Î.Þð!7¢/»VOÊ»·BB^ïuËÃî±³È2k]YnEåG)qâ¿
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/qa vcl/qa

[Caolán McNamara]

 filter/qa/cppunit/data/tiff/fail/EDB-24743-5.tiff  |binary
 vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-1.bmp |binary
 vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-4.bmp |binary
 vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-2.jpg |binary
 vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-3.jpg |binary
 5 files changed

New commits:
commit 4cb17e88587cd303f60040a2c03cfd66d744a63e
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 14 14:29:17 2013 +

tests cases for EDB-24743

Change-Id: Iac75be70adbf611980605ef599d1c9ea9772eb2d

diff --git a/filter/qa/cppunit/data/tiff/fail/EDB-24743-5.tiff 
b/filter/qa/cppunit/data/tiff/fail/EDB-24743-5.tiff
new file mode 100644
index 000..5f5feed
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/EDB-24743-5.tiff 
differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-1.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-1.bmp
new file mode 100644
index 000..2b58d10
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-1.bmp differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-4.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-4.bmp
new file mode 100644
index 000..cfe7e40
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-24743-4.bmp differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-2.jpg 
b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-2.jpg
new file mode 100644
index 000..01e7fe1
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-2.jpg differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-3.jpg 
b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-3.jpg
new file mode 100644
index 000..4753ed8
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-3.jpg differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gdb support for exceptions (Re: using backtrace() in exception throwing?)

[Tom Tromey]

Tom I think it isn't possible in general.  When an exception is thrown, I
Tom think all that can really be determined is the next catch point.

Michael This would be perfect. Explicit rethrows are relatively rare in
Michael our code, however it is completely normal to have code that we
Michael simply don't understand and/or follow - whereby we do:

Unfortunately, it is even worse than I made it out to be.  The next
catch point also includes the spots where unwinding pauses to invoke
destructors.  So, at the lowest level you can't easily associate a
throw with a catch that you would see in the source.  You can only
see to spot that calls the next destructor.

If you're interested you can see this in action by breaking at the
libgcc:unwind probe point (or equivalently _Unwind_DebugHook but then
you have to do argument decoding by hand), then disassem $_probe_arg1.
That will show you the assembly for where you're about to unwind to.

(catch catch and catch throw hook into somewhat higher-level
exception functions in libstdc++, which is why they don't stop at
destructors; but this code doesn't know about the details and just
defers to the lower-level unwinder.)

I thought a bit about whether we could fix the lower levels to expose
the information we'd like, but I couldn't think of a good way.

Tom catch catch [REGEXP]
Tom catch throw [REGEXP]
Tom catch rethrow [REGEXP]

Michael This is really nice; the ability to hide many of the two
Michael dozen+ expected exceptions in some way be really
Michael useful. Unfortunately these are often of quite generic types
Michael :-)

Yeah, that makes it harder.

If they carry any identifying markers, you can use two of the features
in tandem to filter.  For example:

catch throw TheExceptionType if $_exception.field == 23

This would filter by type and then do some additional checking of the
identity of the exception.

If they don't carry identifying markers -- if it were me, I guess I
would add something to make debugging simpler.

Michael Tor suggested on IRC some way of ignoring specific exception throwing
Michael sites which tend to creep into the code over time and need tackling.

Michael Being able to say: catch throw ignore - which would ignore the last
Michael thrown exception site would be really lovely ;-)

This sort of thing is reasonably easy to do in Python.

Fedora has had a $_caller_is function in its gdb for a while (not sure
why we haven't upstreamed this yet, probably just nobody got around to
it yet).  This function was actually my motivation for getting into gdb
hacking and working on Python in gdb -- I wanted to be able to filter
breakpoints according to caller, without a lot of hassle.

I've appended it for convenience.  I'll file a bug to remind us to
upstream this.

You would use it like:

  catch throw if !$_caller_is('some_thrower_to_ignore')

You could wrap this up in a Python command to add  !$_caller_is...
to existing breakpoint conditions, or a LibreOffice-specific catch
throw-like command which pre-ignores uninteresting call sites, or etc.

Michael Is any of that useful ? - really looking forward to getting a
Michael new libstdc++ etc. with your fixes in a few months :-)

An optimist, I see :)
Actually, I assume all the patches will go in reasonably soon, but
there's a pretty long lag until the new stuff is deployed all over,
unless you're willing to build your gcc.

Please feel free to CC me on gdb questions and suggestions.
I'm very interested in your feedback.

Tom


# Caller-is functions.

# Copyright (C) 2008 Free Software Foundation, Inc.

# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program.  If not, see http://www.gnu.org/licenses/.

import gdb
import re

class CallerIs (gdb.Function):
Return True if the calling function's name is equal to a string.
This function takes one or two arguments.
The first argument is the name of a function; if the calling function's
name is equal to this argument, this function returns True.
The optional second argument tells this function how many stack frames
to traverse to find the calling function.  The default is 1.

def __init__ (self):
super (CallerIs, self).__init__ (caller_is)

def invoke (self, name, nframes = 1):
frame = gdb.selected_frame ()
while nframes  0:
frame = frame.older ()
nframes = nframes - 1
return frame.name () == name.string ()

class CallerMatches (gdb.Function):
Return True if 

Re: TestExtension.oxt: What is its purpose?

[Caolán McNamara]

On Wed, 2013-03-13 at 11:02 -0400, Dan Lewis wrote:
  I recently built LibreOffice on 4.0 while also building a
 mysql-connector-ooo. In the same folder as this one I found two other
 extensions: reportbuilder.oxt and TestExtension.oxt. What purpose does
 the latter serve, and how should it be used? I have searched for
 information about it, but found nothing.

The TestExtension.oxt is used by the smoketest as a test extension to
confirm that installing and deinstalling extensions still works.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basic/CppunitTest_basic_vba.mk

[Stephan Bergmann]

 basic/CppunitTest_basic_vba.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b0bcadf62a631b6cce5a5188f8018f266e1b99ee
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 14 15:44:31 2013 +0100

Windows oleautobridge depends on ATL

Change-Id: I94b43b03f742da7c6c8cf2e6a60ed305c1395fa7

diff --git a/basic/CppunitTest_basic_vba.mk b/basic/CppunitTest_basic_vba.mk
index 8b8d7ad..25f41f3 100644
--- a/basic/CppunitTest_basic_vba.mk
+++ b/basic/CppunitTest_basic_vba.mk
@@ -60,8 +60,8 @@ $(eval $(call gb_CppunitTest_use_ure,basic_vba))
 $(eval $(call gb_CppunitTest_use_components,basic_vba,\
configmgr/source/configmgr \
i18npool/util/i18npool \
-   $(if $(filter $(OS),WNT), \
-   extensions/source/ole/oleautobridge) \
+   $(if $(DISABLE_ATL),,$(if $(filter $(OS),WNT), \
+   extensions/source/ole/oleautobridge)) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,basic_vba))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/CustomTarget_glade.mk

[Stephan Bergmann]

 extras/CustomTarget_glade.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 082bdb41882533dd7bc2a20597d203c2ab8c0cfb
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 14 15:45:51 2013 +0100

Make sure output dir exsits for xsltproc

Change-Id: I79822e46a56b8ff65e3c806462fa1d93688c39d1

diff --git a/extras/CustomTarget_glade.mk b/extras/CustomTarget_glade.mk
index 89d452e..8cb04dc 100644
--- a/extras/CustomTarget_glade.mk
+++ b/extras/CustomTarget_glade.mk
@@ -19,6 +19,7 @@ $(call 
gb_CustomTarget_get_workdir,extras/source/glade)/libreoffice-catalog.xml
 | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSLT,4)
$(call gb_Helper_abbreviate_dirs, \
+   mkdir -p $(dir $@)  \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-o $@ $(SRCDIR)/extras/source/glade/makewidgetgroup.xslt $ \
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source vcl/win

[Stephan Bergmann]

 vcl/source/app/dbggui.cxx  |2 +-
 vcl/win/source/gdi/salgdi3.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8daca4f4a35649a179f0f28457cae9850cacf6f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 14 15:46:26 2013 +0100

Missing WNT --enable-debug String - OUString conversion parts

Change-Id: Ica20eacd95538fe37d08bf76c7b5a6717a7e8422

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 7a2b99b..0161df6 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1608,7 +1608,7 @@ long SolarMessageBoxExecutor::doIt()
 #ifdef WNT
 sal_Bool bOldCallTimer = pSVData-mbNoCallTimer;
 pSVData-mbNoCallTimer = sal_True;
-nResult = MessageBoxW( 0, (LPWSTR)m_sDebugMessage.GetBuffer(), LDebug 
Output,
+nResult = MessageBoxW( 0, (LPWSTR)m_sDebugMessage.getStr(), LDebug 
Output,
  MB_TASKMODAL | MB_YESNOCANCEL | 
MB_DEFBUTTON2 | MB_ICONSTOP );
 pSVData-mbNoCallTimer = bOldCallTimer;
 switch ( nResult )
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index cfcf9d6..9ebacbf 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -231,7 +231,7 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const 
String rFontFileNam
 
 void ImplFontAttrCache::AddFontAttr( const String rFontFileName, const 
ImplDevFontAttributes rDFA )
 {
-DBG_ASSERT( rFontFileName.Len()  rDFA.GetFamilyName().Len(), 
ImplFontNameCache::AddFontName - invalid data! );
+DBG_ASSERT( rFontFileName.Len()  !rDFA.GetFamilyName().isEmpty(), 
ImplFontNameCache::AddFontName - invalid data! );
 if ( rFontFileName.Len()  !rDFA.GetFamilyName().isEmpty() )
 {
 aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL( 
rFontFileName ), rDFA ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/win

[Michael Stahl]

 vcl/win/source/gdi/salgdi3.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3dd2eafcab221b4c0ceea00a14745a7a57d01580
Author: Michael Stahl mst...@redhat.com
Date:   Thu Mar 14 15:41:22 2013 +0100

vcl: fix WNT only debug code OUStrings

Change-Id: Ie864629499806d798ce4a4525c385bf1617b0160

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 9ebacbf..31992b8 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -231,7 +231,8 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const 
String rFontFileNam
 
 void ImplFontAttrCache::AddFontAttr( const String rFontFileName, const 
ImplDevFontAttributes rDFA )
 {
-DBG_ASSERT( rFontFileName.Len()  !rDFA.GetFamilyName().isEmpty(), 
ImplFontNameCache::AddFontName - invalid data! );
+SAL_WARN_IF(!rFontFileName.Len() || rDFA.GetFamilyName().isEmpty(),
+vcl.gdi, ImplFontNameCache::AddFontName - invalid data!);
 if ( rFontFileName.Len()  !rDFA.GetFamilyName().isEmpty() )
 {
 aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL( 
rFontFileName ), rDFA ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source

[Andre Fischer]

 editeng/source/uno/unonrule.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 8569f74b898f3c82f338ee151d49ff30ad1e3035
Author: Andre Fischer a...@apache.org
Date:   Fri Jun 8 10:36:51 2012 +

i#119907# Numbering type now applied (almost) unconditionally.

Patch by: Steve Yin
Cleanup: af

Change-Id: Iccf48a24cc947115524b1d92874386c1e2e0aecf

diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 4e6a414..d8937a7 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -286,18 +286,9 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const 
Sequence beans::Prope
 sal_Int16 nSet = sal_Int16();
 aVal = nSet;
 
-switch(nSet)
+// There is no reason to limit numbering types.
+if ( nSet=0 )
 {
-case SVX_NUM_BITMAP:
-case SVX_NUM_CHAR_SPECIAL:
-case SVX_NUM_ROMAN_UPPER:
-case SVX_NUM_ROMAN_LOWER:
-case SVX_NUM_CHARS_UPPER_LETTER:
-case SVX_NUM_CHARS_LOWER_LETTER:
-case SVX_NUM_ARABIC:
-case SVX_NUM_NUMBER_NONE:
-case SVX_NUM_CHARS_UPPER_LETTER_N:
-case SVX_NUM_CHARS_LOWER_LETTER_N:
 aFmt.SetNumberingType(nSet);
 continue;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits