Re: [PUSHED] gbuildification of jpeg

[Jonathan Aquilina]

David why was this merged if you had an objection against the patch?

On Fri, Oct 12, 2012 at 6:40 AM, David Tardon (via Code Review) <
ger...@gerrit.libreoffice.org> wrote:

> Hi,
>
> Thank you for your patch! :-)  It has been merged to LibreOffice.
>
> If you are interested in details, please visit
>
> https://gerrit.libreoffice.org/856
>
> Objections:
>   David Tardon: Do not submit
>
>
> --
> To view, visit https://gerrit.libreoffice.org/856
> To unsubscribe, visit https://gerrit.libreoffice.org/settings
>
> Gerrit-MessageType: merged
> Gerrit-Change-Id: I466f13f1132103bc20b9918411a54fd3106f4553
> Gerrit-PatchSet: 4
> Gerrit-Project: core
> Gerrit-Branch: master
> Gerrit-Owner: David Ostrovsky 
> Gerrit-Reviewer: David Ostrovsky 
> Gerrit-Reviewer: David Tardon 
> Gerrit-Reviewer: Matúš Kukan 
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>



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

Re: Rebasing (Was: dbghelp.dll fails on rebase (on Windows))

[Andras Timar]

On Tue, Oct 9, 2012 at 10:56 AM, Tor Lillqvist  wrote:
>> Again, I wonder how essential / useful this whole rebasing thing is
>> any more in this day... But yeah, I know that suggesting we stop doing
>> it will bring up arguments that essentially say "if it might be useful
>> for even one percent of our userbase, we should keep doing it".
>
> After the recent changes for VS2012 and Windows 8 SDK support, where
> the rebase tool apparently is not so easily available any more, there
> were build problems with our "standard" toool-chain (VS2008 and
> Windows SDK 7.x), so Fridrich and I decided to kill all the rebasing
> stuff.

Now, when we do not tamper executables during install, it would make
sense to digitally sign them during the build. (In official builds
with TDF key).

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

[Libreoffice-commits] .: 5 commits - svtools/inc svtools/source

[Libreoffice Gerrit user]

 svtools/inc/svtools/treelist.hxx  |   13 ++---
 svtools/inc/svtools/treelistbox.hxx   |   17 ---
 svtools/source/contnr/treelist.cxx|   18 +++
 svtools/source/contnr/treelistbox.cxx |   77 ++
 4 files changed, 57 insertions(+), 68 deletions(-)

New commits:
commit 5c635140c7aa4b31d23ea96c8d10be3b3a44d8f7
Author: Kohei Yoshida 
Date:   Fri Oct 12 00:48:34 2012 -0400

Put typedef inside class scope.

Change-Id: Ied6b5c1714b23a7f64b5b8271979deb21350f76b

diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 702f249..2534052 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -211,13 +211,13 @@ struct SvSortData
 SvListEntry* pRight;
 };
 
-typedef ::std::vector< SvListView* > SvListView_impl;
-
 class SVT_DLLPUBLIC SvTreeList
 {
+typedef std::vector ListViewsType;
+
 friend classSvListView;
 
-SvListView_impl aViewList;
+ListViewsType   aViewList;
 sal_uLong   nEntryCount;
 
 LinkaCloneLink;
diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index 83bbd58..0f930f5 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -308,10 +308,12 @@ void SvTreeList::InsertView( SvListView* pView )
 
 void SvTreeList::RemoveView( SvListView* pView )
 {
-for ( SvListView_impl::iterator it = aViewList.begin(); it != 
aViewList.end(); ++it ) {
-if ( *it == pView ) {
+for ( ListViewsType::iterator it = aViewList.begin(); it != 
aViewList.end(); ++it )
+{
+if ( *it == pView )
+{
 aViewList.erase( it );
-nRefCount--;
+--nRefCount;
 break;
 }
 }
commit a19b6e4149cf264846d7c67f22f496619b70d65b
Author: Kohei Yoshida 
Date:   Fri Oct 12 00:44:24 2012 -0400

No need to keep this method.

Change-Id: I5152c6f2888919a6b495bdcf1da7d797d1b1232e

diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index aad8ee2..702f249 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -386,7 +386,6 @@ class SVT_DLLPUBLIC SvListView
 sal_BoolbVisPositionsValid;
 
 SVT_DLLPRIVATE void InitTable();
-SVT_DLLPRIVATE void ClearTable();
 SVT_DLLPRIVATE void RemoveViewData( SvListEntry* pParent );
 
 SvDataTable maDataTable;  // Mapping SvListEntry -> ViewData
diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index cb12059..83bbd58 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1526,7 +1526,7 @@ SvListView::SvListView()
 SvListView::~SvListView()
 {
 DBG_DTOR(SvListView,0);
-ClearTable();
+maDataTable.clear();
 }
 
 void SvListView::InitTable()
@@ -1570,15 +1570,9 @@ SvViewData* SvListView::CreateViewData( SvListEntry* )
 return new SvViewData;
 }
 
-void SvListView::ClearTable()
-{
-DBG_CHKTHIS(SvListView,0);
-maDataTable.clear();
-}
-
 void SvListView::Clear()
 {
-ClearTable();
+maDataTable.clear();
 nSelectionCount = 0;
 nVisibleCount = 0;
 bVisPositionsValid = sal_False;
commit d0f2185477af437cc7220e2a050bed4eb4a13665
Author: Kohei Yoshida 
Date:   Fri Oct 12 00:41:50 2012 -0400

These can be private.

Change-Id: I960477a220db813e86c40008bc9e3ed7ed460595

diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index bc0b683..aad8ee2 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -389,9 +389,7 @@ class SVT_DLLPUBLIC SvListView
 SVT_DLLPRIVATE void ClearTable();
 SVT_DLLPRIVATE void RemoveViewData( SvListEntry* pParent );
 
-protected:
 SvDataTable maDataTable;  // Mapping SvListEntry -> ViewData
-SvTreeList* pModel;
 
 voidActionMoving( SvListEntry* pEntry,SvListEntry* 
pTargetPrnt,sal_uLong nChildPos);
 voidActionMoved( SvListEntry* pEntry,SvListEntry* 
pTargetPrnt,sal_uLong nChildPos);
@@ -401,8 +399,10 @@ protected:
 voidActionRemoved( SvListEntry* pEntry );
 voidActionClear();
 
-public:
+protected:
+SvTreeList* pModel;
 
+public:
 SvListView();   // !!! setzt das Model auf 0
 virtual ~SvListView();
 voidClear();
commit 8f8212536f6c35546447f1254639d02572f68ecb
Author: Kohei Yoshida 
Date:   Fri Oct 12 00:33:09 2012 -0400

Less friends.

Change-Id: I40410e401d9edd23d62ee12a9b8076d473d5cd29

diff --git a/svtools/inc/svtools/treelistbox.hxx 
b/svtools/inc/svtools/treelistbox.hxx
index 4536075..6e2f278 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -301,9 +301,7 @@ class SVT_DLLPUBLIC SvTreeListBox
 ,public ::vcl::IMnemonicEntryList
 ,pub

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

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

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on|55786   |

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

[Libreoffice-commits] .: jpeg/ExternalPackage_jpeg.mk jpeg/Module_jpeg.mk jpeg/UnpackedTarball_jpeg.mk

[Libreoffice Gerrit user]

 jpeg/ExternalPackage_jpeg.mk |   19 +++
 jpeg/Module_jpeg.mk  |1 +
 jpeg/UnpackedTarball_jpeg.mk |7 ---
 3 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit df2ea4409945051733979b156f9cf9f52b35b0c5
Author: David Tardon 
Date:   Fri Oct 12 06:50:23 2012 +0200

deliver jpeg headers too

jpeg is used by dmake module gdk-pixbuf, so the delivery cannot be
bypassed yet.

Change-Id: I92d71c6807535b8f4fff75d62fc417d437792e33

diff --git a/jpeg/ExternalPackage_jpeg.mk b/jpeg/ExternalPackage_jpeg.mk
new file mode 100644
index 000..c451ed5
--- /dev/null
+++ b/jpeg/ExternalPackage_jpeg.mk
@@ -0,0 +1,19 @@
+# -*- 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_ExternalPackage_ExternalPackage,jpeg_inc,jpeg))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,jpeg_inc,inc/external/jpeg,\
+   jconfig.h \
+   jerror.h \
+   jmorecfg.h \
+   jpeglib.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jpeg/Module_jpeg.mk b/jpeg/Module_jpeg.mk
index fea0f0b..806d577 100644
--- a/jpeg/Module_jpeg.mk
+++ b/jpeg/Module_jpeg.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,jpeg))
 ifeq ($(SYSTEM_JPEG),NO)
 
 $(eval $(call gb_Module_add_targets,jpeg,\
+   ExternalPackage_jpeg \
 UnpackedTarball_jpeg \
 StaticLibrary_jpeg \
 ))
diff --git a/jpeg/UnpackedTarball_jpeg.mk b/jpeg/UnpackedTarball_jpeg.mk
index 2b504f6..19e4dd7 100644
--- a/jpeg/UnpackedTarball_jpeg.mk
+++ b/jpeg/UnpackedTarball_jpeg.mk
@@ -23,11 +23,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,jpeg,\
 ))
 endif
 
-$(eval $(call gb_UnpackedTarball_mark_output_files,jpeg,\
-   jconfig.h \
-   jerror.h \
-   jmorecfg.h \
-   jpeglib.h \
-))
-
 # 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] gbuildification of jpeg

[David Tardon (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/856

Objections:
  David Tardon: Do not submit


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I466f13f1132103bc20b9918411a54fd3106f4553
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 
Gerrit-Reviewer: David Ostrovsky 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: Matúš Kukan 

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

[Libreoffice-commits] .: config_host.mk.in configure.in jpeg/configs jpeg/jpeg-8c.patch jpeg/Makefile jpeg/makefile.mk jpeg/Module_jpeg.mk jpeg/patches jpeg/prj jpeg/StaticLibrary_jpeg.mk jpeg/struct_

[Libreoffice Gerrit user]

 Makefile.top|2 
 RepositoryModule_ooo.mk |1 
 config_host.mk.in   |1 
 configure.in|2 
 jpeg/Makefile   |7 +
 jpeg/Module_jpeg.mk |   21 
 jpeg/StaticLibrary_jpeg.mk  |   65 +
 jpeg/UnpackedTarball_jpeg.mk|   33 ++
 jpeg/configs/jconfig.h  |   60 
 jpeg/jpeg-8c.patch  |  174 
 jpeg/makefile.mk|   71 --
 jpeg/patches/jpeg-8c-jmorecfg.patch |   29 ++
 jpeg/patches/struct_alignment.patch |   48 +
 jpeg/prj/build.lst  |4 
 jpeg/prj/d.lst  |   12 --
 jpeg/struct_alignment.patch |   48 -
 ooo.lst.in  |2 
 17 files changed, 271 insertions(+), 309 deletions(-)

New commits:
commit de8808f03719f793da5452e2ccdabfbf81492ac8
Author: David Ostrovsky 
Date:   Thu Oct 11 09:32:36 2012 +0200

gbuildification of jpeg

Change-Id: I466f13f1132103bc20b9918411a54fd3106f4553

diff --git a/Makefile.top b/Makefile.top
index 5ee778d..9658703 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -90,6 +90,7 @@ idlc\
 io\
 javaunohelper\
 jfreereport\
+jpeg\
 jurt\
 jvmaccess\
 jvmfwk\
@@ -220,7 +221,6 @@ hunspell\
 hyphen\
 icu\
 instsetoo_native\
-jpeg\
 libcroco\
 libexttextcat\
 libgsf\
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 24d12fa..303a296 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 javaunohelper \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
 jurt \
+$(call gb_Helper_optional,JPEG,jpeg) \
 jvmaccess \
 jvmfwk \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
diff --git a/config_host.mk.in b/config_host.mk.in
index 9f4373c..2d431bf 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -284,6 +284,7 @@ export JDK=@JDK@
 @x_JDKLIB@ export JDKLIB=@JDKLIB@
 export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
+export JPEG_TARBALL=@JPEG_TARBALL@
 export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
 export TDE_CFLAGS=@TDE_CFLAGS@
 export TDE_LIBS=@TDE_LIBS@
diff --git a/configure.in b/configure.in
index fc90e66..f2eb784 100644
--- a/configure.in
+++ b/configure.in
@@ -6839,9 +6839,11 @@ if test "$with_system_jpeg" = "yes"; then
 else
 AC_MSG_RESULT([internal])
 SYSTEM_JPEG=NO
+JPEG_TARBALL="a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz"
 BUILD_TYPE="$BUILD_TYPE JPEG"
 fi
 AC_SUBST(SYSTEM_JPEG)
+AC_SUBST(JPEG_TARBALL)
 AC_SUBST([MINGW_JPEG_DLL])
 
 dnl ===
diff --git a/jpeg/Makefile b/jpeg/Makefile
new file mode 100644
index 000..ccb1c85
--- /dev/null
+++ b/jpeg/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/jpeg/Module_jpeg.mk b/jpeg/Module_jpeg.mk
new file mode 100644
index 000..fea0f0b
--- /dev/null
+++ b/jpeg/Module_jpeg.mk
@@ -0,0 +1,21 @@
+# -*- 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_Module_Module,jpeg))
+
+ifeq ($(SYSTEM_JPEG),NO)
+
+$(eval $(call gb_Module_add_targets,jpeg,\
+UnpackedTarball_jpeg \
+StaticLibrary_jpeg \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/jpeg/StaticLibrary_jpeg.mk b/jpeg/StaticLibrary_jpeg.mk
new file mode 100644
index 000..d4846e0
--- /dev/null
+++ b/jpeg/StaticLibrary_jpeg.mk
@@ -0,0 +1,65 @@
+# -*- 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,jpeglib))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeglib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,jpeglib,jpeg))
+
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeglib,\
+UnpackedTarball/jpeg/jaricom \
+UnpackedTarball/jpeg/jcapimin \
+UnpackedTarball/jpeg/jcapistd \
+UnpackedTarball/jpeg/jcarith \
+UnpackedTarball/jpeg/jccoefct \
+UnpackedTarball/jpeg/jccolor \
+UnpackedTarball/jpeg/jcdctmgr \
+UnpackedTarball/jpeg/jchuff \
+UnpackedTarball/jpeg/jcinit \
+UnpackedTarball/jpeg

[Libreoffice-commits] .: vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b19ff316441fb2d1f0537e008ea8b6fdec307224
Author: Ivan Timofeev 
Date:   Thu Oct 11 15:01:52 2012 +0400

fdo#45651: gtk: fix text color with dark themes

Change-Id: I959b7791151fd345c250016ae8ad315a4615a871

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index ce14634..6fd600b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3736,13 +3736,14 @@ void GtkSalGraphics::updateSettings( AllSettings& 
rSettings )
 // text colors
 Color aTextColor = getColor( pStyle->text[GTK_STATE_NORMAL] );
 aStyleSet.SetDialogTextColor( aTextColor );
+aStyleSet.SetWindowTextColor( aTextColor );
+aStyleSet.SetFieldTextColor( aTextColor );
+aTextColor = getColor( pStyle->fg[GTK_STATE_NORMAL] );
 aStyleSet.SetButtonTextColor( aTextColor );
 aStyleSet.SetRadioCheckTextColor( aTextColor );
 aStyleSet.SetGroupTextColor( aTextColor );
 aStyleSet.SetLabelTextColor( aTextColor );
 aStyleSet.SetInfoTextColor( aTextColor );
-aStyleSet.SetWindowTextColor( aTextColor );
-aStyleSet.SetFieldTextColor( aTextColor );
 
 // Tooltip colors
 GtkStyle* pTooltipStyle = gtk_widget_get_style( 
gWidgetData[m_nXScreen].gTooltipPopup );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

where to change the %version

[huqitu du]

I want to change the %version Variable, and whare to find the defination?

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

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

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

Horst  changed:

   What|Removed |Added

 Depends on||55786

-- 
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 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

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

--- Comment #388 from Horst  ---
Adding bug 55786 fileopen read error on older Lotus 123 files. Add it here
because already not working in 3.5.5.

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

Re: need help with unit test and process service factory

[Michael Meeks]

On Thu, 2012-10-11 at 20:05 +0200, Eike Rathke wrote:
> > It shouldn't be used in the real code - we should integrate with the
> > glib mainloop that is plugged into VCL :-)
> 
> AFAIK we do that for real code (if things didn't change).

Ho hum - ideally we should have everything nicely asynchronous and just
return to the VCL mainloop; but - I imagine the existing code structure
can make that hard.

> > The problem is a careless use of an iteration; if we ran the mainloop
> > until an asynchronous callback quit it - that would be -much- less of a
> > problem :-)
> 
> And we do that :-)

Nice :-)

> And we don't do it ;-)
> 
> while (!pImpl->mbAccountManagerReadyHandlerInvoked)
> g_main_context_iteration( NULL, TRUE);

Good; that looks safe enough :-) I forgot you'd cleaned all of that up.

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: codemaker/source framework/source

[Libreoffice Gerrit user]

 codemaker/source/javamaker/javatype.cxx |1 -
 framework/source/loadenv/loadenv.cxx|3 +--
 framework/source/services/modulemanager.cxx |6 ++
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 586895f8fa09e006a4cbef31f675585a5b6e42e9
Author: Caolán McNamara 
Date:   Thu Oct 11 17:36:33 2012 +0100

loplugin: more unused OUString and misleading indentation

Change-Id: Ic21ca9e14520f4f16c2d665a07a79ee1a46ab91d

diff --git a/codemaker/source/javamaker/javatype.cxx 
b/codemaker/source/javamaker/javatype.cxx
index b762823..b0edb7f 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -171,7 +171,6 @@ SpecialType translateUnoTypeToDescriptor(
 }
 if (sort == codemaker::UnoType::SORT_COMPLEX) {
 //TODO: check that nucleus is a valid (Java-modified UTF-8) identifier
-rtl::OString superClass;
 if (typeClass == RT_TYPE_INTERFACE
 && (nucleus
 == rtl::OString(
diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index b5dac0f..799a48d 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1141,8 +1141,7 @@ sal_Bool LoadEnv::impl_loadContent()
 
 return sal_True;
 }
-else
-if (xSyncLoader.is())
+else if (xSyncLoader.is())
 {
 sal_Bool bResult = xSyncLoader->load(lDescriptor, xTargetFrame);
 // react for the result here, so the outside waiting
diff --git a/framework/source/services/modulemanager.cxx 
b/framework/source/services/modulemanager.cxx
index 04158c0..8860f0d 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -153,11 +153,9 @@ css::uno::Sequence< rtl::OUString > 
ModuleManager::getSupportedServiceNames()
 ::rtl::OUString sModule;
 if (xModel.is())
 sModule = implts_identify(xModel);
-else
-if (xController.is())
+else if (xController.is())
 sModule = implts_identify(xController);
-else
-if (xWindow.is())
+else if (xWindow.is())
 sModule = implts_identify(xWindow);
 
 if (sModule.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e58a179e9059665c1d195635a0148ca7370bbc04
Author: Miklos Vajna 
Date:   Thu Oct 11 22:08:35 2012 +0200

fix sw_subsequent_ooxmlimport after df99bb3

Change-Id: Iffe97b25ad8714342a55bbe54909dd1a3d47bdec

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index c3a0bc5..ea6b667 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -814,7 +814,7 @@ void Test::testN777345()
 Graphic aGraphic(xGraphic);
 // If this changes later, feel free to update it, but make sure it's not
 // the checksum of a white/transparent placeholder rectangle.
-CPPUNIT_ASSERT_EQUAL(sal_uLong(2404338915U), aGraphic.GetChecksum());
+CPPUNIT_ASSERT_EQUAL(sal_uLong(3816010727U), aGraphic.GetChecksum());
 }
 
 void Test::testN777337()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Correct misnomer in vclmedit.hxx/.cxx

[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/859

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7693a33f59d9f31b00f368ad992f86b3fce3a984
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Caolán McNamara 

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

[Libreoffice-commits] .: vcl/inc vcl/source

[Libreoffice Gerrit user]

 vcl/inc/vcl/vclmedit.hxx |4 
 vcl/source/edit/vclmedit.cxx |  254 +--
 2 files changed, 129 insertions(+), 129 deletions(-)

New commits:
commit ec14fbd00bf39f26625b219781debaf98670c81c
Author: Zolnai Tamás 
Date:   Thu Oct 11 19:12:04 2012 +0200

Correct misnomer in vclmedit.hxx/.cxx

Originally vclmedit was in svtools and during
moving it down to vcl sv prefix was not removed
everywhere.

Change-Id: I7693a33f59d9f31b00f368ad992f86b3fce3a984
Reviewed-on: https://gerrit.libreoffice.org/859
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx
index 6287419..7ecb944 100644
--- a/vcl/inc/vcl/vclmedit.hxx
+++ b/vcl/inc/vcl/vclmedit.hxx
@@ -34,7 +34,7 @@
 #include 
 
 
-class ImpSvMEdit;
+class ImpVclMEdit;
 class Timer;
 class ExtTextEngine;
 class ExtTextView;
@@ -42,7 +42,7 @@ class ExtTextView;
 class VCL_DLLPUBLIC VclMultiLineEdit : public Edit
 {
 private:
-ImpSvMEdit* pImpSvMEdit;
+ImpVclMEdit*pImpVclMEdit;
 
 XubString   aSaveValue;
 LinkaModifyHdlLink;
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 696fe8b..fce3a0d 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -89,10 +89,10 @@ public:
 };
 
 
-class ImpSvMEdit : public SfxListener
+class ImpVclMEdit : public SfxListener
 {
 private:
-VclMultiLineEdit*   pSvVCLMultiLineEdit;
+VclMultiLineEdit*   pVclMultiLineEdit;
 
 TextWindow* mpTextWindow;
 ScrollBar*  mpHScrollBar;
@@ -112,8 +112,8 @@ protected:
 DECL_LINK(  ScrollHdl, ScrollBar* );
 
 public:
-ImpSvMEdit( VclMultiLineEdit* pSvVCLMultiLineEdit, WinBits 
nWinStyle );
-~ImpSvMEdit();
+ImpVclMEdit( VclMultiLineEdit* pVclMultiLineEdit, WinBits 
nWinStyle );
+~ImpVclMEdit();
 
 voidSetModified( sal_Bool bMod );
 sal_BoolIsModified() const;
@@ -162,12 +162,12 @@ public:
 ScrollBar*  GetVScrollBar() { return mpVScrollBar; }
 };
 
-ImpSvMEdit::ImpSvMEdit( VclMultiLineEdit* pEdt, WinBits nWinStyle )
+ImpVclMEdit::ImpVclMEdit( VclMultiLineEdit* pEdt, WinBits nWinStyle )
 :mpHScrollBar(NULL)
 ,mpVScrollBar(NULL)
 ,mpScrollBox(NULL)
 {
-pSvVCLMultiLineEdit = pEdt;
+pVclMultiLineEdit = pEdt;
 mnTextWidth = 0;
 mpTextWindow = new TextWindow( pEdt );
 mpTextWindow->Show();
@@ -175,7 +175,7 @@ ImpSvMEdit::ImpSvMEdit( VclMultiLineEdit* pEdt, WinBits 
nWinStyle )
 StartListening( *mpTextWindow->GetTextEngine() );
 }
 
-void ImpSvMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle )
+void ImpVclMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle )
 {
 const sal_Bool bHaveVScroll = (NULL != mpVScrollBar);
 const sal_Bool bHaveHScroll = (NULL != mpHScrollBar);
@@ -201,12 +201,12 @@ void ImpSvMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle )
 if ( bHaveVScroll != bNeedVScroll )
 {
 delete mpVScrollBar;
-mpVScrollBar = bNeedVScroll ? new ScrollBar( pSvVCLMultiLineEdit, 
WB_VSCROLL|WB_DRAG ) : NULL;
+mpVScrollBar = bNeedVScroll ? new ScrollBar( pVclMultiLineEdit, 
WB_VSCROLL|WB_DRAG ) : NULL;
 
 if ( bNeedVScroll )
 {
 mpVScrollBar->Show();
-mpVScrollBar->SetScrollHdl( LINK( this, ImpSvMEdit, ScrollHdl ) );
+mpVScrollBar->SetScrollHdl( LINK( this, ImpVclMEdit, ScrollHdl ) );
 }
 
 bScrollbarsChanged = sal_True;
@@ -215,12 +215,12 @@ void ImpSvMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle )
 if ( bHaveHScroll != bNeedHScroll )
 {
 delete mpHScrollBar;
-mpHScrollBar = bNeedHScroll ? new ScrollBar( pSvVCLMultiLineEdit, 
WB_HSCROLL|WB_DRAG ) : NULL;
+mpHScrollBar = bNeedHScroll ? new ScrollBar( pVclMultiLineEdit, 
WB_HSCROLL|WB_DRAG ) : NULL;
 
 if ( bNeedHScroll )
 {
 mpHScrollBar->Show();
-mpHScrollBar->SetScrollHdl( LINK( this, ImpSvMEdit, ScrollHdl ) );
+mpHScrollBar->SetScrollHdl( LINK( this, ImpVclMEdit, ScrollHdl ) );
 }
 
 bScrollbarsChanged = sal_True;
@@ -229,7 +229,7 @@ void ImpSvMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle )
 if ( bHaveScrollBox != bNeedScrollBox )
 {
 delete mpScrollBox;
-mpScrollBox = bNeedScrollBox ? new ScrollBarBox( pSvVCLMultiLineEdit, 
WB_SIZEABLE ) : NULL;
+mpScrollBox = bNeedScrollBox ? new ScrollBarBox( pVclMultiLineEdit, 
WB_SIZEABLE ) : NULL;
 
 if ( bNeedScrollBox )
 mpScrollBox->Show();
@@ -242,7 +242,7 @@ void ImpSvMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle )
 }
 }
 
-void ImpSvMEdit::InitFromStyle( WinBits nWinStyle )
+void ImpVclMEdit::InitFromStyle( WinBits nWinStyle )
 {
 ImpUpdateSrollBarVis( nWinStyle );
 SetAlign( nWinStyle );
@@ -271,7 +271,7 @@ void ImpSvMEdit::InitFromStyle( Win

[Libreoffice-commits] .: wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/text/TextDocument.py |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit c043062913167ef2dece0fc243a90bb86c32868e
Author: Xisco Fauli 
Date:   Thu Oct 11 21:36:00 2012 +0200

pywizards: This code does nothing but an exception. Delete it

Change-Id: If35b68073210d7da368a96623853c3d68d8425b5

diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py 
b/wizards/com/sun/star/wizards/text/TextDocument.py
index 2dea2ce..6570aa4 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@ -139,13 +139,6 @@ class TextDocument(object):
 'com.sun.star.beans.PropertyValue')
 loadValues[2].Name = "Preview"
 loadValues[2].Value = True
-'''set the preview document to non-modified
-mode in order to avoid the 'do u want to save' box'''
-if TextDocument.xTextDocument is not None:
-try:
-TextDocument.xTextDocument.Modified = False
-except PropertyVetoException, e1:
-traceback.print_exc()
 
 TextDocument.xTextDocument = OfficeDocument.load(
 self.xFrame, sDefaultTemplate, "_self", loadValues)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: drawinglayer/source

[Libreoffice Gerrit user]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |   20 -
 1 file changed, 20 deletions(-)

New commits:
commit df99bb3d0de567fa34f7f6edfca4f736abb0efa2
Author: Thorsten Behrens 
Date:   Thu Oct 11 21:21:40 2012 +0200

Fix fdo#35278 - don't generate hidden primitive rectangles

I'm really rather certain we don't need to generate those
non-stroked, non-filled rects in metafiles - at least not for the
slideshow. The comment states otherwise, alas, there's no further
explanation in any referenced bug etc.

Change-Id: If7040b46900ea32515f29cf371897a693858b100

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index b592284..5f7d8e7 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1704,26 +1704,6 @@ namespace drawinglayer
 RenderModifiedColorPrimitive2D(static_cast< const 
primitive2d::ModifiedColorPrimitive2D& >(rCandidate));
 break;
 }
-case PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D :
-{
-// HiddenGeometryPrimitive2D; to rebuilt the old MetaFile 
creation, it is necessary to
-// not ignore them (as it was thought), but to add a 
MetaFile entry for them.
-basegfx::B2DRange 
aInvisibleRange(rCandidate.getB2DRange(getViewInformation2D()));
-
-if(!aInvisibleRange.isEmpty())
-{
-aInvisibleRange.transform(maCurrentTransformation);
-const Rectangle aRectLogic(
-(sal_Int32)floor(aInvisibleRange.getMinX()), 
(sal_Int32)floor(aInvisibleRange.getMinY()),
-(sal_Int32)ceil(aInvisibleRange.getMaxX()), 
(sal_Int32)ceil(aInvisibleRange.getMaxY()));
-
-mpOutputDevice->SetFillColor();
-mpOutputDevice->SetLineColor();
-mpOutputDevice->DrawRect(aRectLogic);
-}
-
-break;
-}
 case PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D :
 {
 // for metafile: Need to examine what the pure vcl version 
is doing here actually
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-6]: fdo#55493 fix RTF import of specific PNG image

[Miklos Vajna (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/860

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/860/1

fdo#55493 fix RTF import of specific PNG image

The image was special in that the resulting Graphic's
GetPrefMapMode().GetMapUnit() wasn't MAP_PIXEL.

(cherry picked from commit 5ef0f1dc9a70c20fe6879832b782a0c34724353f)

Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx

Change-Id: I681e344a042721b99f6cb2e599f9c65156d219a4
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
1 file changed, 12 insertions(+), 6 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I681e344a042721b99f6cb2e599f9c65156d219a4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Miklos Vajna 

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

[Libreoffice-commits] .: sw/qa writerfilter/source

[Libreoffice Gerrit user]

 sw/qa/extras/rtfimport/data/fdo55493.rtf   |  142 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |   12 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 
 3 files changed, 158 insertions(+), 1 deletion(-)

New commits:
commit 5ef0f1dc9a70c20fe6879832b782a0c34724353f
Author: Miklos Vajna 
Date:   Thu Oct 11 16:48:55 2012 +0200

fdo#55493 fix RTF import of specific PNG image

The image was special in that the resulting Graphic's
GetPrefMapMode().GetMapUnit() wasn't MAP_PIXEL.

Change-Id: I681e344a042721b99f6cb2e599f9c65156d219a4

diff --git a/sw/qa/extras/rtfimport/data/fdo55493.rtf 
b/sw/qa/extras/rtfimport/data/fdo55493.rtf
new file mode 100644
index 000..22d8ca9
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo55493.rtf
@@ -0,0 +1,142 @@
+{\rtf1\ansi\deff0 
+{\pict\pngblip
+89504e470d0a1a0a000d49484452009600970804012a535a5a0009704859730ec40ec401952b0e1b03186943435050686f746f73686f70204943432070726f66696c6578da6360609ee0e8e2e4ca24c0c050505452e41ee418191119a5c07e9e818d819981818181812131b9b8c0
+3120c087818181212f3f2f9501153032307cbbc6c0c8c0c0c07059d7d1c5c9958134c09a5c5054c2c0c070808181c12825b538998181e10b0303437a794941090303630c03038348527641090303630103038348764890330303630b0303134f496a450903030383737e416551667a468982a1a5a5a582634a7e52aa42706571
+496a6eb182675e727e51417e5162496a0a030303d40e060606065e97fc1205f7c4cc3c05230355062a8388c82805080b113e083104482e2d2a83072503830083028301830343004322433dc30286a30c6f18c5195d184b195730de6312630a629ac07481599839927921f31b164b960e965bac7aacadacf7d82cd9a6b17d630f
+67dfcda1c4d1c5f1853391f3029723d7166e4dee053c523c5379857827f109f34de397e15f2ca023b043d055f08a50aad00fe15e111591bda2e1a25fc426891b895f91a89094933c26952f2d2d7d42a64c565df6965c9fbc8bfc1f85ad8a854a7a4a6f95d7aa14a89aa8fe543ba8dea511aaa9a4f941eb80f6249d545d2b3d41
+bd57fa470c1618d61ac518db9ac89b329bbe34bb60bed36289e504ab3aeb5c9b38db403b577b6b0763471d2735672517055779370577650f754f5d2f136f1b1f77df60bf04fffc80fac089414b8377855c0c7d19ce142117691515115d11764fdc8304b644dda4b0e4869435a937d339322c3233b3e6665fcc65cfb3cfaf
+28d854f8ae58bb24ab7455d99b0afdca92aa5d358cb55e7553eb1f36ea35d5349f6d956b2b6c3fda29dd55d47dba57b5afb1ffee449b49b327ff9d1a3fedf00c8d99fdb3becf49987b7abef982a58b4416b72ef9b62c73f9bd9521ab4eaf7159bb6fbde5866d9b4c366fd96ab26dfb0eab9dfb77bbee39bb2f6cff838339877e
+1e693f267e7cc549eb53e7ce249ffd757ed245ed4b47af245efd777dce4d9b5b77efd4df53be7fe261de63b127fb9f65be107979f075fe5bf977173e347d32fdfceaeb82efe13f057e9dfad3facff1ff7f000d000f34fa96f15d00206348524d7a258083f9ff80e97530ea603a98
+176f925fc54641b24944415478da8cd2414b95511006e0b11fe032c84dfe87e8579428d4c648855a14da5d048286186108610bb3281785b8507f418aab50244883d0854282a00821264a99b4f0fa3d2deeb9dffdae6e7a3733e79d77e6cc99330dc47fe052f1b011f72242447c8b88c16248c25b4738c386773294bc514e
+d124db71cb34e89739d687bf7868b6269bd76b2de50d39495e37b85d93ed8265e771045e5764a3ce12fdec82f091956ab5bd9c6c4bf6a79b3957b6a954b974d1533092073ffa52a8f955fc52c63e584874a5cb2930e1b31191e1bb63302bf32049d7937d8e75c10f0ce44368554a2d14d1c04e5ccdff643b86e3725c89c6e8cc
+b98ec822c8dc75ea45caeba9abd2e5c0cbea7827eb4237cc256f065dde5765e3fe38f0c4e33a798b558c17bfbedd165e61c97d772c60d94cde4abe487bfafc069f4ce210dbc597d676ef4374c65a8cc5f5688ae6b856d8d97f007c93c14b545114c67f3309b56ed15668114410f817b80e0adbb46a252e2643679828
+66d12c0251666328b808a396030503038222ba5144220a8316b568a50505ea625ad86b66decfc5bb3e9fcfe8aecebde73bf7dcfb9def2b9c17b914fe27f25dba6c84b84a33579baeb2da73d9d859557ffb23cda1fadd47ea07b5e4a1b1adf0fcf259d85b75d9c9a0afd3356fd94f27b0758fd491902ab9901b7ba41661901ad0
+0660871b1ce57ef91360d5927f32b5f7fc9ad93db1695de56518b1be52d7d48a1da314b8a9f6e5576a8d4567825a5e5bb31bce9f5a775bf6322df6d35ba63535cd9cdf24cac03a69b4e45ce0ad9210d2f6b3ef5d09e946cef1a3fef579c2dbd839834c65e2777613deaef10c38c8305507c601d8e20d0327427ac8552e311140
+111733255fb87eaa909e77d4967ad707563510520bad07929a0b0cb1434c87592ef302784ccc308d7fa9b74f91fb5ce1161fb9c9ed4ceb633ecb2624ca280ac3af3a23ed2a88689149514144ab7e162d83c24d2594200ed2229d8c20442c8d48c34091a232a210c1d414a1c2c08230c2c8d2fea09c129b45914a36884df8db38
+e3cc3c2de6cee7fce97bcef7de73cf77def79cb4e595bc5599ead31ebd9753a3ea528d025aaf11ed5e5ef09372c629f22963869fd42758c25c641c3fb54c26d99258baa0760de8b66ccad439add6766dd02eadb5ec41fd52483d3aa0adca50a1f66a870ea58ecc459111cae7040087396f8d8361a017801caa98231c
+4f3ee8a30e1f1855cb4f08bf33e9410b809720e06396bc58b037cc500af4338b13882dbf47dc6192693e25015e352de81847a98c82b979c69471288871fe0b4031904751ca5e8645ad31ce47c042dc22889fa73cb6ccbdc0a8958dcbc0777aac6896d66b8b322551b088f68778112384d0c249eb37d43300b88079236cd1350f
+d4e0e20ac328cc07824083496b94cbd584806b56baa30c7f888fdc983e5fcb2c8b94e0e12be9699a5086194daa4db95448daa8741dd1a024872ae59354a190a421add236ed5399d515db94a11b6ad54e099e7097265ed26f8d0dd17a8772a00b1806f3bc76c2d400cd3413a6cb7ce362225a1a11611aa33c4545412e2700f86c
+943cfe3ae82680

[Libreoffice-commits] .: configure.in

[Libreoffice Gerrit user]

 configure.in |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1d1d1b463dd324437f7dcadbcf8f69377ff3fede
Author: Matúš Kukan 
Date:   Thu Oct 11 21:07:22 2012 +0200

unowinreg.dll is needed on all platforms

Change-Id: I55771733baee432d2ccf75df012552eb2d035acd

diff --git a/configure.in b/configure.in
index f6b3c36..fc90e66 100644
--- a/configure.in
+++ b/configure.in
@@ -3302,9 +3302,13 @@ AC_SUBST(SHOWINCLUDES_PREFIX)
 #
 if test "$_os" == "WINNT"; then
 DBGHELP_DLL="13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll"
-UNOWINREG_DLL="185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 fi
 AC_SUBST(DBGHELP_DLL)
+
+#
+# unowinreg.dll
+#
+UNOWINREG_DLL="185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 AC_SUBST(UNOWINREG_DLL)
 
 #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6][PUSHED 3-6-3] fix for fdo#55734 , don't access index 0 in an empty vector

[Kohei Yoshida]

On 10/11/2012 02:17 PM, Eike Rathke wrote:

Hi,

On Thursday, 2012-10-11 15:37:52 +0100, Noel Power wrote:


On 11/10/12 15:03, Noel Power wrote:

On 11/10/12 14:35, Markus Mohrhard wrote:

[1] fixes a crash that happens when we try to access the first element
of an empty vector.

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=132740681c7412f4d678ff0768b9807502525f76


+1 for 3-6-3 ( I see that it is already committed to 3-6 )
Noel

actually I replied to the wrong bug here ( I meant to reply to ' fix
for rhbz#864858' ) but still +1 for this ( I just pushed it to 3.6 )


Another sign-off from me, one more needed for 3-6-3


Pushed to 3-6-3.

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/tool/dbdata.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4126a8e2244d0c320a53c5720c3d5664563c8acc
Author: Markus Mohrhard 
Date:   Thu Oct 11 09:16:55 2012 +0200

only access first element if vector is not empty, fdo#55734

Change-Id: I60db486195e7216968dc8c7c7c0c79fb7e8c1b88
Signed-off-by: Noel Power 
Signed-off-by: Eike Rathke 
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index bb5475c..a6e6364 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -455,7 +455,9 @@ bool ScDBData::HasQueryParam() const
 
 bool ScDBData::HasSortParam() const
 {
-return mpSortParam && mpSortParam->maKeyState[0].bDoSort;
+return mpSortParam &&
+!mpSortParam->maKeyState.empty() &&
+mpSortParam->maKeyState[0].bDoSort;
 }
 
 bool ScDBData::HasSubTotalParam() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6][PUSHED 3-6-3] fix for rhbz#864858, content after sheet 256 is not imported from xlsx

[Kohei Yoshida]

On 10/11/2012 02:21 PM, Eike Rathke wrote:

Hi,

On Thursday, 2012-10-11 15:33:06 +0100, Noel Power wrote:


On 11/10/12 14:48, Markus Mohrhard wrote:

[1] prevents the data loss during import from xlsx. After sheet 256 no
content is imported any more because sheet index is considered
invalid.

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=458d68fffa883bc706638299e5a5b2d1399beb0d


+1 for 3-6-3 ( I see that it is already committed to 3-6 )


The corresponding 3-6-3 patch lives at https://gerrit.libreoffice.org/857
(sorry, didn't see this was already on the mailing list)
and now needs just one more sign-off.


I pushed this via gerrit.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/inc/po.hxx   |2 +-
 l10ntools/source/merge.cxx |2 +-
 l10ntools/source/po.cxx|6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c6b26144c93aa5222e4260c5b0ef45ce5bdc18d2
Author: Zolnai Tamás 
Date:   Thu Oct 11 20:50:19 2012 +0200

Use isFuzzy() instead of getFuzzy()

to make more obvious its aim

Change-Id: Idc98ae8ce2218c9d387c4f2cb6e4d5603b56aab3

diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 060bb17..856c7bb 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -51,7 +51,7 @@ public:
 TYPEgetType() const;
 OString getMsgId() const;
 OString getMsgStr() const;
-boolgetFuzzy() const;
+boolisFuzzy() const;
 OString getKeyId() const;
 voidsetMsgId(const OString& rUnTransStr);
 voidsetMsgStr(const OString& rTransStr);
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index b47d556..80188f5 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -232,7 +232,7 @@ MergeDataFile::MergeDataFile(
 if( bInSameComp )
 aActPo = aNextPo;
 OString sTemp = aActPo.getMsgStr();
-if( aActPo.getFuzzy() || sTemp.isEmpty() )
+if( aActPo.isFuzzy() || sTemp.isEmpty() )
 sTemp = aActPo.getMsgId();
 switch( aActPo.getType() )
 {
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index bddf198..9dd6d6a 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -52,7 +52,7 @@ public:
 virtual OString getMsgCtxt() const  { return m_sMsgCtxt; }
 virtual OString getMsgId() const{ return m_sMsgId; }
 virtual OString getMsgStr() const   { return m_sMsgStr; }
-virtual boolgetFuzzy() const{ return m_bFuzzy; }
+virtual boolisFuzzy() const { return m_bFuzzy; }
 virtual boolisNull() const  { return m_bNull; }
 
 virtual voidsetExtractCom(const OString& rExtractCom);
@@ -567,10 +567,10 @@ PoEntry::TYPE PoEntry::getType() const
 }
 
 //Check wheather entry is fuzzy
-bool PoEntry::getFuzzy() const
+bool PoEntry::isFuzzy() const
 {
 assert( m_bIsInitialized );
-return m_pGenPo->getFuzzy();
+return m_pGenPo->isFuzzy();
 }
 
 //Get keyid
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6-3]: kill this hard coded sheet limit for xlsx import, rhbz#86485...

[Kohei Yoshida (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/857

Approvals:
  Kohei Yoshida: Verified; Looks good to me, approved
  Eike Rathke: Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49e12d97d1e17b0a63daf374e7ff4b4720129553
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-3
Gerrit-Owner: Eike Rathke 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: Kohei Yoshida 
Gerrit-Reviewer: Markus Mohrhard 

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/oox/addressconverter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b69fc5c2c85d06e89a43a07734f1b87c0c35f751
Author: Markus Mohrhard 
Date:   Thu Oct 11 14:32:49 2012 +0200

kill this hard coded sheet limit for xlsx import, rhbz#864858

(cherry picked from commit 458d68fffa883bc706638299e5a5b2d1399beb0d)

Signed-off-by: Eike Rathke 
(cherry picked from commit 0eee6469304ba15f42bcafb6707cc98bcbff9112)

Change-Id: I49e12d97d1e17b0a63daf374e7ff4b4720129553
Reviewed-on: https://gerrit.libreoffice.org/857
Reviewed-by: Eike Rathke 
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/filter/oox/addressconverter.cxx 
b/sc/source/filter/oox/addressconverter.cxx
index 52e74eb..1da3966 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -57,7 +57,7 @@ using ::rtl::OUStringToOString;
 namespace {
 
 //! TODO: this limit may change, is there a way to obtain it via API?
-const sal_Int16 API_MAXTAB  = 255;
+const sal_Int16 API_MAXTAB  = MAXTAB;
 
 const sal_Int32 OOX_MAXCOL  = static_cast< sal_Int32 >( (1 << 14) - 1 
);
 const sal_Int32 OOX_MAXROW  = static_cast< sal_Int32 >( (1 << 20) - 1 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/inc/po.hxx |8 +-
 l10ntools/source/merge.cxx   |   10 +-
 l10ntools/source/po.cxx  |  152 +--
 l10ntools/source/renewpo.cxx |2 
 4 files changed, 86 insertions(+), 86 deletions(-)

New commits:
commit 471f2fc3196be0e52ac4ac1ea49f760accd9d4d7
Author: Zolnai Tamás 
Date:   Thu Oct 11 20:26:36 2012 +0200

Use MsgCtxt, MsgId and MsgCtxt

which are fit better to concept of po.

Change-Id: I772e691465351b1492bdb756fc67e3a9de265c25

diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 2e371b4..060bb17 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -49,12 +49,12 @@ public:
 OString getLocalId() const;
 OString getResourceType() const;
 TYPEgetType() const;
-OString getUnTransStr() const;
-OString getTransStr() const;
+OString getMsgId() const;
+OString getMsgStr() const;
 boolgetFuzzy() const;
 OString getKeyId() const;
-voidsetUnTransStr(const OString& rUnTransStr);
-voidsetTransStr(const OString& rTransStr);
+voidsetMsgId(const OString& rUnTransStr);
+voidsetMsgStr(const OString& rTransStr);
 voidsetFuzzy(const bool bFuzzy);
 
 static bool IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2);
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 23609e0..b47d556 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -231,24 +231,24 @@ MergeDataFile::MergeDataFile(
 {
 if( bInSameComp )
 aActPo = aNextPo;
-OString sTemp = aActPo.getTransStr();
+OString sTemp = aActPo.getMsgStr();
 if( aActPo.getFuzzy() || sTemp.isEmpty() )
-sTemp = aActPo.getUnTransStr();
+sTemp = aActPo.getMsgId();
 switch( aActPo.getType() )
 {
 case PoEntry::TTEXT:
 sText = sTemp;
-sExText = aActPo.getUnTransStr();
+sExText = aActPo.getMsgId();
 sQTZText = aActPo.getKeyId();
 break;
 case PoEntry::TQUICKHELPTEXT:
 sQHText = sTemp;
-sExQHText = aActPo.getUnTransStr();
+sExQHText = aActPo.getMsgId();
 sQTZQHText = aActPo.getKeyId();
 break;
 case PoEntry::TTITLE:
 sTitle = sTemp;
-sExTitle = aActPo.getUnTransStr();
+sExTitle = aActPo.getMsgId();
 sQTZTitle = aActPo.getKeyId();
 break;
 }
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 59e206b..bddf198 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -35,9 +35,9 @@ private:
 
 OStringm_sExtractCom;
 OStringm_sReference;
-OStringm_sContext;
-OStringm_sUnTransStr;
-OStringm_sTransStr;
+OStringm_sMsgCtxt;
+OStringm_sMsgId;
+OStringm_sMsgStr;
 bool   m_bFuzzy;
 bool   m_bNull;
 
@@ -49,17 +49,17 @@ public:
 
 virtual OString getExtractCom() const   { return m_sExtractCom; }
 virtual OString getReference() const{ return m_sReference; }
-virtual OString getContext() const  { return m_sContext; }
-virtual OString getUnTransStr() const   { return m_sUnTransStr; }
-virtual OString getTransStr() const { return m_sTransStr; }
+virtual OString getMsgCtxt() const  { return m_sMsgCtxt; }
+virtual OString getMsgId() const{ return m_sMsgId; }
+virtual OString getMsgStr() const   { return m_sMsgStr; }
 virtual boolgetFuzzy() const{ return m_bFuzzy; }
 virtual boolisNull() const  { return m_bNull; }
 
 virtual voidsetExtractCom(const OString& rExtractCom);
 virtual voidsetReference(const OString& rReference);
-virtual voidsetContext(const OString& rContext);
-virtual voidsetUnTransStr(const OString& rUnTransStr);
-virtual voidsetTransStr(const OString& rTransStr);
+virtual voidsetMsgCtxt(const OString& rMsgCtxt);
+virtual voidsetMsgId(const OString& rMsgId);
+virtual voidsetMsgStr(const OString& rMsgStr);
 virtual voidsetFuzzy(const bool bFuzzy);
 
 virtual voidwriteToFile(std::ofstream& rOFStream) const;
@@ -139,9 +139,9 @@ namespace
 GenPoEntry::GenPoEntry()
 : m_sExtractCom( OString() )
 , m_sReference( OString() )
-, m_sContext( OString() )
-, m_sUnTransStr( OString() )
-,

Re: [PUSHED 3-6][REVIEW-3-6-3 2/3] fix for rhbz#864858, content after sheet 256 is not imported from xlsx

[Eike Rathke]

Hi,

On Thursday, 2012-10-11 15:33:06 +0100, Noel Power wrote:

> On 11/10/12 14:48, Markus Mohrhard wrote:
> >[1] prevents the data loss during import from xlsx. After sheet 256 no
> >content is imported any more because sheet index is considered
> >invalid.
> >
> >[1] 
> >http://cgit.freedesktop.org/libreoffice/core/commit/?id=458d68fffa883bc706638299e5a5b2d1399beb0d
> >
> +1 for 3-6-3 ( I see that it is already committed to 3-6 )

The corresponding 3-6-3 patch lives at https://gerrit.libreoffice.org/857
(sorry, didn't see this was already on the mailing list)
and now needs just one more sign-off.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpbATQDQTLWN.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Extension or script? Re: [libreoffice-accessibility] Latest Libo Won't Play Nice with myJRE

[Tom Davies]

Hi :)
I think that is a brilliant idea!  The great thing about hindsight is that 
things seem so obvious afterwards.  


Can you post a bug-report and make it into a feature request?  One of the 
drop-down menus is supposed to have "feature request" as one of the choices but 
it might be easier to just add
[feature request]

into the subject-line.  Someone on the User List said they couldn't find the 
option in any of the drop-downs and wanted me to post a screen-shot showing it 
but i'm no good at posting bug-reports and find their whole interface really 
difficult to work out.  So, i just advised putting the extra bit in the 
subject-line and let the devs sort the drop-downs.  I feel a bit bad and guilty 
because i know they are busy!

Regards from
Tom :)  






>
> From: Kevin Cussick 
>To: Tom Davies  
>Sent: Thursday, 11 October 2012, 19:00
>Subject: Re: [libreoffice-accessibility] Latest Libo Won't Play Nice with myJRE
> 
>Yes Stewart thanks for your hard work I did all you asked I still have 
>no access. It would maybe a nice idea if someone could write a batch 
>file that could sort out the java environment, and or maybe even if lo 
>cam with jre7 it would make it a rather large download but if it cam 
>with it maybe it could just install it all and just bloody work. what do 
>folks think? is this to daft this idea I am not a programer so I am just 
>putting the question out there again thanks for your work on this but it 
>didn't work for me.
>
>On 11/10/2012 18:09, Tom Davies wrote:
>> Hi :)
>> Blimey!!  Thanks for putting a lot of work into this!  It's amazing to feel 
>> that things are moving forwards after such a long time of what felt like 
>> inactivity.  I'm sure some devs have been working on things behind the 
>> scenes but we seldom hear about that side of things on this list.
>>
>> Many regards and thanks from
>> Tom :)
>>
>>
>>
>>
>>
>>
>>> 
>>> From: V Stuart Foote 
>>> To: David Goldfield ; 
>>> accessibil...@global.libreoffice.org; libreoffice@lists.freedesktop.org
>>> Sent: Tuesday, 9 October 2012, 16:25
>>> Subject: RE: [libreoffice-accessibility] Latest Libo Won't Play Nice with 
>>> myJRE
>>>
>>> David,
>>>
>>> I spent yesterday working through some of the permutations.
>>>
>>> I resolved a couple of my own questions.  First, that  Python based NVDA 
>>> functions independent of the Java Runtime Environment - Java Access Bridge.
>>>
>>> NVDA does require the JRE and Java Access Bridge to properly control 
>>> programs that are implemented with the Java Access Bridge API, 
>>> unfortunately that includes LibreOffice.
>>>
>>> But NVDA will remain functional with the JRE & JAB removed. NVDA only needs 
>>> to be momentarily shut down when uninstalling the JAB & JRE and can be 
>>> restarted as the uninstall completes.
>>>
>>> =-=-=
>>>
>>> Another issue, per-user LibreOffice profile from past installation attempts 
>>> or prior versions must be removed.
>>>
>>> Uninstallation of LibreOffice leaves the per-user configuration files 
>>> intact.
>>>
>>> This is intentional from the LibreOffice developers perspective--but it 
>>> adversely affects installation or re-installation of LibreOffice with 
>>> accessibility tools and needs to be rebuilt cleanly.
>>>
>>> The per-user configuration is located at:
>>>
>>> C:\Users\\AppData\Roaming\LibreOffice
>>>
>>> Simply delete the LibreOffice folder and subfolders. And proceed with 
>>> removal and reinstallation of the JRE, enabling the JAB, and lastly 
>>> installing LibreOffice with AT enabled.
>>>
>>> =-=-=
>>>
>>> Finally, I am curious as to how incomplete the Flat Review LibreOffice JAB 
>>> based Assistive Technology tools are compared to the Windows IAccessible2 
>>> based tools, or Linux AT-SPI based, or even the Apple Accessibility API 
>>> based renderings.
>>>
>>> Since IBM continues to develop and distribute the Lotus Symphony suite, 
>>> current release is 3.0.1 and is free to download and  use.
>>>
>>> http://symphony.lotus.com/software/lotus/symphony/home.nsf/home/ 
>>> 
>>>
>>> I grabbed a set of Windows installers (32-bit), and the FixPack1 for 3.0.1 
>>> from
>>>
>>> http://www.ibm.com/developerworks/downloads/ls/symphony/ 
>>> 
>>>
>>> In a side by side comparison using NVDA and the same .odt document -- the 
>>> IAccessible2 based Symphony clearly accessed more of the MSAA-IAccessible 
>>> roles than did the Java Access Bridge based LibreOffice.  Cursor 
>>> navigation, and object based mode functioned--as did reporting of font 
>>> changes, style and header levels and voicing of program annotations like 
>>> spelling errors. Clearly under NVDA Symphony Document is more useable as an 
>>> editor. Similar results in the Spreadsheet compared to Calc.
>>>
>>> =-=-=
>>>
>>> I'm going to press on and do the same comparison between a Linux 

Re: [PUSHED 3-6][REVIEW 3-6-3 2/3] fix for fdo#55734 , don't access index 0 in an empty vector

[Eike Rathke]

Hi,

On Thursday, 2012-10-11 15:37:52 +0100, Noel Power wrote:

> On 11/10/12 15:03, Noel Power wrote:
> >On 11/10/12 14:35, Markus Mohrhard wrote:
> >>[1] fixes a crash that happens when we try to access the first element
> >>of an empty vector.
> >>
> >>[1] 
> >>http://cgit.freedesktop.org/libreoffice/core/commit/?id=132740681c7412f4d678ff0768b9807502525f76
> >
> >+1 for 3-6-3 ( I see that it is already committed to 3-6 )
> >Noel
> actually I replied to the wrong bug here ( I meant to reply to ' fix
> for rhbz#864858' ) but still +1 for this ( I just pushed it to 3.6 )

Another sign-off from me, one more needed for 3-6-3

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpFJx6d2xfEN.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: need help with unit test and process service factory

[Eike Rathke]

Hi Michael,

On Wednesday, 2012-10-10 20:59:54 +0100, Michael Meeks wrote:

> > Do you mean g_main_context_iteration ?
> > It's used both in the real code and unit test.
> 
>   It shouldn't be used in the real code - we should integrate with the
> glib mainloop that is plugged into VCL :-)

AFAIK we do that for real code (if things didn't change).

> > From what I understood, it's how telepathy framework works and it
> > can't be avoided.

>   The problem is a careless use of an iteration; if we ran the mainloop
> until an asynchronous callback quit it - that would be -much- less of a
> problem :-)

And we do that :-)

> The root problem is trying to 2nd guess how many main-loop
> iterations to call - which is non documented, non deterministic and
> guarenteed to change between minor releases :-)

And we don't do it ;-)

while (!pImpl->mbAccountManagerReadyHandlerInvoked)
g_main_context_iteration( NULL, TRUE);

spins the main loop until the callback set
mbAccountManagerReadyHandlerInvoked=true

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpq3bCUuhh6J.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Correct misnomer in vclmedit.hxx/.cxx

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/859

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/859/1

Correct misnomer in vclmedit.hxx/.cxx

Originally vclmedit was in svtools and during
moving it down to vcl sv prefix was not removed
everywhere.

Change-Id: I7693a33f59d9f31b00f368ad992f86b3fce3a984
---
M vcl/inc/vcl/vclmedit.hxx
M vcl/source/edit/vclmedit.cxx
2 files changed, 129 insertions(+), 129 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7693a33f59d9f31b00f368ad992f86b3fce3a984
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Zolnai Tamás 

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

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in download odk/source ooo.lst.in

[Libreoffice Gerrit user]

 config_host.mk.in|2 
 configure.in |2 
 download |4 -
 odk/source/unowinreg/win/makefile.mk |2 
 ooo.lst.in   |  106 +--
 5 files changed, 60 insertions(+), 56 deletions(-)

New commits:
commit c5ac6a71f40a2dd75dde0ea63b08e4f698718a68
Author: Matúš Kukan 
Date:   Thu Oct 11 19:32:29 2012 +0200

sort ooo.lst.in

Change-Id: I1fc1908d188589e4437bd287967c6df9d402d17c

diff --git a/ooo.lst.in b/ooo.lst.in
index 5b483d7..b61839d 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -4,40 +4,23 @@ a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
 c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-@AFMS_TARBALL@
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-@TOMCAT_TARBALL@
-@APACHE_COMMONS_HTTPCLIENT_TARBALL@
-@APACHE_COMMONS_LANG_TARBALL@
-@FONT_LINLIBERTINEG_TARBALL@
-@FONT_LIBERATION_NARROW_TARBALL@
-@FONT_LIBERATION_TARBALL@
-@FONT_GENTIUM_TARBALL@
-@FONT_DEJAVU_TARBALL@
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-@JFREEREPORT_SAC_TARBALL@
 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-@APACHE_COMMONS_LOGGING_TARBALL@
 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
-@CLUCENE_TARBALL@
 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-@RHINO_TARBALL@
 3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
 fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
-@MOZ_TARBALL@
 a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
-@XSLTML_TARBALL@
-@SAXON_TARBALL@
-@APACHE_COMMONS_CODEC_TARBALL@
 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
 ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
@@ -46,25 +29,12 @@ d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
 e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
 e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
 e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
-@BSH_TARBALL@
-@VIGRA_TARBALL@
 dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
 fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2
 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
-@JFREEREPORT_LIBFORMULA_TARBALL@
-@JFREEREPORT_LIBFONTS_TARBALL@
-@JFREEREPORT_LIBREPOSITORY_TARBALL@
-@JFREEREPORT_LIBLOADER_TARBALL@
-@JFREEREPORT_LIBXML_TARBALL@
-@JFREEREPORT_FLUTE_TARBALL@
-@JFREEREPORT_LIBLAYOUT_TARBALL@
-@JFREEREPORT_LIBBASE_TARBALL@
-@JFREEREPORT_LIBSERIALIZER_TARBALL@
-@JFREEREPORT_FLOW_ENGINE_TARBALL@
-@NEON_TARBALL@
 3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
 9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
 a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
@@ -72,53 +42,83 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
 22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
 0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
 d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
-@PNG_TARBALL@
 a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-@LANGUAGETOOL_TARBALL@
 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
 a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
-@WPG_TARBALL@
-@WPD_TARBALL@
-@WPS_TARBALL@
-@MDDS_TARBALL@
-@BOOST_TARBALL@
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
-@VISIO_TARBALL@
-@CMIS_TARBALL@
-@CDR_TARBALL@
 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
-@MSPUB_TARBALL@
 fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-@GOOGLE_DOCS_EXTENSION_PACK@
-@FREETYPE_TARBALL@
+@AFMS_TARBALL@
+@APACHE_COMMONS_CODEC_TARBALL@
+@APACHE_COMMONS_HTTPCLIENT_TARBALL@
+@APACHE_COMMONS_LANG_TARBALL@
+@APACHE_COMMONS_LOGGING_TARBALL@
+@BOOST_TARBALL@
+@BSH_TARBALL@
+@CDR_TARBALL@
+@CLUCENE_TARBALL@
+@CMIS_TARBALL@
+@FONT_DEJAVU_TARBALL@
+@FONT_GENTIUM_TARBALL@
+@FONT_L

[PATCH] Change in core[master]: simplify pattern-target by using a simple recursion…

[Christian Lohmaier (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/858

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/858/1

simplify pattern-target by using a simple recursion…

…instead of using eval to process the same rule multiple times
Saves quoting, makes it more readable.
(% always matches whole sub-paths, not only on Mac, see
http://www.gnu.org/software/make/manual/html_node/Pattern-Match.html)

Change-Id: I80e481d4a7e1cd62ad9916257a75c77c87d3bbdd
---
M officecfg/CustomTarget_registry.mk
1 file changed, 10 insertions(+), 23 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80e481d4a7e1cd62ad9916257a75c77c87d3bbdd
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 

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

[Libreoffice-commits] .: vcl/inc vcl/source

[Libreoffice Gerrit user]

 vcl/inc/vcl/layout.hxx   |2 ++
 vcl/source/window/layout.cxx |   17 ++---
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit c08c67c8a02f88413deb78d7b136ec03cf0ef618
Author: Caolán McNamara 
Date:   Thu Oct 11 17:31:07 2012 +0100

add a get_label_widget to VclFrame

Change-Id: Ia0561a5f185878342b15be54c6147aa1c81fa9ef

diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 6aeefe7..29fa382 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -392,6 +392,8 @@ class VCL_DLLPUBLIC VclFrame : public VclBin
 public:
 VclFrame(Window *pParent) : VclBin(pParent) {}
 void set_label(const rtl::OUString &rLabel);
+Window *get_label_widget();
+const Window *get_label_widget() const;
 protected:
 virtual Size calculateRequisition() const;
 virtual void setAllocation(const Size &rAllocation);
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 1b4e252..836b6a8 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -912,12 +912,23 @@ void VclFrame::setAllocation(const Size &rAllocation)
 setLayoutAllocation(*pChild, aChildPos, aAllocation);
 }
 
+const Window *VclFrame::get_label_widget() const
+{
+//The label widget is the last (of two) children
+const Window *pChild = get_child();
+const WindowImpl* pWindowImpl = ImplGetWindowImpl();
+return pChild != pWindowImpl->mpLastChild ? pWindowImpl->mpLastChild : 
NULL;
+}
+
+Window *VclFrame::get_label_widget()
+{
+return const_cast(const_cast(this)->get_label_widget());
+}
+
 void VclFrame::set_label(const rtl::OUString &rLabel)
 {
 //The label widget is the last (of two) children
-Window *pChild = get_child();
-WindowImpl* pWindowImpl = ImplGetWindowImpl();
-Window *pLabel = pChild != pWindowImpl->mpLastChild ? 
pWindowImpl->mpLastChild : NULL;
+Window *pLabel = get_label_widget();
 assert(pLabel);
 pLabel->SetText(rLabel);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/orcus/orcusfiltersimpl.cxx |   20 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 94346b67249d9c6920c48a37c12115d82f06ec69
Author: Kohei Yoshida 
Date:   Thu Oct 11 12:23:28 2012 -0400

Disable update while populating the tree control.

Change-Id: Ic0f5822072a817addc7d296eceadf59467e5ba0f

diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx 
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 824eea9..31cd8ba 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -173,6 +173,8 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, const 
OUString& rPath) cons
 return true;
 }
 
+namespace {
+
 void populateTree(
SvTreeListBox& rTreeCtrl, orcus::xml_structure_tree::walker& rWalker,
const orcus::xml_structure_tree::entity_name& rElemName, bool bRepeat,
@@ -214,6 +216,23 @@ void populateTree(
 }
 }
 
+class TreeUpdateSwitch
+{
+SvTreeListBox& mrTreeCtrl;
+public:
+TreeUpdateSwitch(SvTreeListBox& rTreeCtrl) : mrTreeCtrl(rTreeCtrl)
+{
+mrTreeCtrl.SetUpdateMode(false);
+}
+
+~TreeUpdateSwitch()
+{
+mrTreeCtrl.SetUpdateMode(true);
+}
+};
+
+}
+
 bool ScOrcusFiltersImpl::loadXMLStructure(
SvTreeListBox& rTreeCtrl, const rtl::OUString& rPath,
const Image& rImgDefaultElem, const Image& rImgRepeatElem, const Image& 
rImgElemAttr) const
@@ -235,6 +254,7 @@ bool ScOrcusFiltersImpl::loadXMLStructure(
 {
 aXmlTree.parse(&aStrm[0], aStrm.size());
 
+TreeUpdateSwitch aSwitch(rTreeCtrl);
 rTreeCtrl.Clear();
 rTreeCtrl.SetDefaultCollapsedEntryBmp(rImgDefaultElem);
 rTreeCtrl.SetDefaultExpandedEntryBmp(rImgDefaultElem);
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index cc255b8..5f244f2 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -151,8 +151,8 @@ void ScXMLSourceDlg::SelectSourceFile()
 if (!aFiles.getLength())
 return;
 
-maSrcPath = aFiles[0];
 // There should only be one file returned from the file picker.
+maSrcPath = aFiles[0];
 maFtSourceFile.SetText(maSrcPath);
 
 LoadSourceFileStructure(maSrcPath);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile.top

[Libreoffice Gerrit user]

 Makefile.top |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f935d4b8bd9358dbe9160693622fb77e7b64d639
Author: Michael Stahl 
Date:   Thu Oct 11 18:09:42 2012 +0200

Makefile.top: move compilerplugins dependency to bootstrap

... as it was always causing ./bootstrap to be run on "make module".

Change-Id: If2b04ea415fd644c6a8ff9a3f712ff713d8b12ae

diff --git a/Makefile.top b/Makefile.top
index d8bde50..5ee778d 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -393,9 +393,9 @@ endif
 #
 # Bootstap
 #
-bootstrap: $(WORKDIR)/bootstrap
+bootstrap: $(WORKDIR)/bootstrap compilerplugins
 
-$(WORKDIR)/bootstrap: solenv/bin/concat-deps.c compilerplugins
+$(WORKDIR)/bootstrap: solenv/bin/concat-deps.c
@cd $(SRCDIR) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-6-3]: kill this hard coded sheet limit for xlsx import, rhbz#86485...

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/857

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/857/1

kill this hard coded sheet limit for xlsx import, rhbz#864858

(cherry picked from commit 458d68fffa883bc706638299e5a5b2d1399beb0d)

Signed-off-by: Eike Rathke 
(cherry picked from commit 0eee6469304ba15f42bcafb6707cc98bcbff9112)

Change-Id: I49e12d97d1e17b0a63daf374e7ff4b4720129553
---
M sc/source/filter/oox/addressconverter.cxx
1 file changed, 1 insertion(+), 1 deletion(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49e12d97d1e17b0a63daf374e7ff4b4720129553
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-3
Gerrit-Owner: Eike Rathke 
Gerrit-Reviewer: Markus Mohrhard 

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

[Libreoffice-commits] .: tools/inc

[Libreoffice Gerrit user]

 tools/inc/tools/gen.hxx|   12 ++--
 tools/inc/tools/string.hxx |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b66a72cba2f38c3ddc9e7c91a1afd5d8a2279ed8
Author: Caolán McNamara 
Date:   Thu Oct 11 15:14:35 2012 +0100

loplugin: markup the POD tools classes and UniString with SAL_WARN_UNUSED

Change-Id: Idb0636772e4c93d25259487a130720cb62cca5af

diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 9a45739..7c93792 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -28,7 +28,7 @@ class SvStream;
 
 // Pair
 
-class Pair
+class SAL_WARN_UNUSED Pair
 {
 public:
 longnA;
@@ -73,7 +73,7 @@ inline sal_Bool Pair::operator != ( const Pair& rPair ) const
 
 // Point
 
-class Point : public Pair
+class SAL_WARN_UNUSED Point : public Pair
 {
 public:
 Point();
@@ -191,7 +191,7 @@ inline Point operator/( const Point &rVal1, const long 
nVal2 )
 
 // Size
 
-class Size : public Pair
+class SAL_WARN_UNUSED Size : public Pair
 {
 public:
 Size();
@@ -222,7 +222,7 @@ inline Size::Size( long nWidth, long nHeight ) :
 
 #define RANGE_MAX   LONG_MAX
 
-class Range : public Pair
+class SAL_WARN_UNUSED Range : public Pair
 {
 public:
 Range();
@@ -268,7 +268,7 @@ inline void Range::Justify()
 #define SELECTION_MIN   LONG_MIN
 #define SELECTION_MAX   LONG_MAX
 
-class Selection : public Pair
+class SAL_WARN_UNUSED Selection : public Pair
 {
 public:
 Selection();
@@ -326,7 +326,7 @@ inline void Selection::Justify()
 
 #define RECT_EMPTY  ((short)-32767)
 
-class TOOLS_DLLPUBLIC Rectangle
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle
 {
 public:
 longnLeft;
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 9e2071c..7603b97 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -97,7 +97,7 @@ typedef struct _UniStringData
 
 // UniString
 
-class TOOLS_DLLPUBLIC UniString
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED UniString
 {
 private:
 UniStringData*  mpData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6][REVIEW 3-6-3] fix for fdo#55734 , don't access index 0 in an empty vector

[Noel Power]

On 11/10/12 15:03, Noel Power wrote:

On 11/10/12 14:35, Markus Mohrhard wrote:

Hey,

[1] fixes a crash that happens when we try to access the first element
of an empty vector.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=132740681c7412f4d678ff0768b9807502525f76

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



+1 for 3-6-3 ( I see that it is already committed to 3-6 )
Noel
actually I replied to the wrong bug here ( I meant to reply to ' fix for 
rhbz#864858' ) but still +1 for this ( I just pushed it to 3.6 )


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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/tool/dbdata.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 170521349f3d5e3b6cc16890d66d77121bfd0312
Author: Markus Mohrhard 
Date:   Thu Oct 11 09:16:55 2012 +0200

only access first element if vector is not empty, fdo#55734

Change-Id: I60db486195e7216968dc8c7c7c0c79fb7e8c1b88

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index bb5475c..a6e6364 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -455,7 +455,9 @@ bool ScDBData::HasQueryParam() const
 
 bool ScDBData::HasSortParam() const
 {
-return mpSortParam && mpSortParam->maKeyState[0].bDoSort;
+return mpSortParam &&
+!mpSortParam->maKeyState.empty() &&
+mpSortParam->maKeyState[0].bDoSort;
 }
 
 bool ScDBData::HasSubTotalParam() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW-3-6 3-6-3] fix for rhbz#864858, content after sheet 256 is not imported from xlsx

[Noel Power]

On 11/10/12 14:48, Markus Mohrhard wrote:

Hey,

[1] prevents the data loss during import from xlsx. After sheet 256 no
content is imported any more because sheet index is considered
invalid.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=458d68fffa883bc706638299e5a5b2d1399beb0d
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


+1 for 3-6-3 ( I see that it is already committed to 3-6 )
Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: On support for Ideographic Variation Sequences

[Takeshi Abe]

Hi Caolán,

On Wed, 10 Oct 2012 12:50:24 +0100, Caolán McNamara  wrote:
> On Wed, 2012-10-10 at 09:42 +0900, Takeshi Abe wrote:
>> Hi all,
>> 
>> I am now wondering how we can approach support for ideographic variation 
>> sequences
>> (IVS) in LibreOffice, which has been long requested as you can see at [1].
> 
> For our Linux story anyway I wonder why (these are new to me) icu
> doesn't know about these already and "do the right thing" at least for
> the purposes of rendering text. Maybe a dig into the icu trac on the ivs
> search terms might throw up some additional info ?
Thank you for your suggestion! Now I tried mining its trac and repository
with keyword 'variation sequence/selector', but got few relevant items.
Anyway I will continue exploring ICU for further information.

> 
>> So far, having read [2] about Mozilla's case, I think HarfBuzz looks 
>> promising for
>> the purpose. And employing the library has already been mentioned [3] in 
>> somewhat
>> different context in this list.
> 
> Yeah. FWIW it's also quite possible that icu might itself eventually end
> up sitting on top of harfbuzz.
That's great, even if it would take some time.

Cheers,
-- Takeshi Abe
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-6][REVIEW 3-6-3] fix for fdo#55734 , don't access index 0 in an empty vector

[Noel Power]

On 11/10/12 14:35, Markus Mohrhard wrote:

Hey,

[1] fixes a crash that happens when we try to access the first element
of an empty vector.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=132740681c7412f4d678ff0768b9807502525f76
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice



+1 for 3-6-3 ( I see that it is already committed to 3-6 )
Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: framework/source sal/qa

[Libreoffice Gerrit user]

 framework/source/layoutmanager/toolbarlayoutmanager.cxx |4 ---
 sal/qa/osl/file/osl_old_test_file.cxx   |   17 
 2 files changed, 21 deletions(-)

New commits:
commit 6f1bdda2d26dc26f91fd327c82bc7d4b9ee6ab92
Author: Caolán McNamara 
Date:   Thu Oct 11 15:01:47 2012 +0100

loplugin: more unused OUStrings and so forth

Change-Id: I4f3a51e1fd3ddca9442022a7134306fbf32e13ae

diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx 
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 3a490d4..179725a 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -783,9 +783,6 @@ bool ToolbarLayoutManager::dockAllToolbars()
 {
 std::vector< ::rtl::OUString > aToolBarNameVector;
 
-::rtl::OUString aElementType;
-::rtl::OUString aElementName;
-
 ReadGuard aReadLock( m_aLock );
 UIElementVector::iterator pIter;
 for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter 
)
@@ -981,7 +978,6 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
 if (isPreviewFrame())
 return; // no addon toolbars for preview frame!
 
-UIElementVector aUIElementVector;
 uno::Sequence< uno::Sequence< beans::PropertyValue > > aAddonToolBarData;
 uno::Reference< ui::XUIElement >   xUIElement;
 
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx 
b/sal/qa/osl/file/osl_old_test_file.cxx
index 0d2379e..13c46b4 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -26,12 +26,6 @@
  *
  /
 
-// LLA:
-// this file is converted to use with testshl2
-// original was placed in sal/test/textenc.cxx
-
-#include 
-
 #include 
 #include 
 #include 
@@ -119,20 +113,12 @@ void oldtestfile::test_file_001()
 OUString target;
 OUString rel = OUString::createFromAscii( aSource1[i] );
 oslFileError e = osl_getAbsoluteFileURL( base1.pData, rel.pData , 
&target.pData );
-//fprintf(stderr, "%d : %s -- %s -- %s\n", i, aSource1[i], 
aSource1[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr() 
);
 CPPUNIT_ASSERT_MESSAGE("failure #1",  osl_File_E_None == e );
 if( osl_File_E_None == e )
 {
 CPPUNIT_ASSERT_MESSAGE("failure #1.1",  target.equalsAscii( 
aSource1[i+1] ) );
 }
-OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US );
-OString obase = OUStringToOString( base1 , RTL_TEXTENCODING_ASCII_US );
-// fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), 
aSource1[i], o.pData->buffer );
 }
-
-OUString err1( RTL_CONSTASCII_USTRINGPARAM( "../.." ) );
-OUString target;
-// CPPUNIT_ASSERT_MESSAGE("failure #11",  osl_File_E_None != 
osl_getAbsoluteFileURL( base1.pData , err1.pData , &target.pData ) );
 #endif
 }
 
@@ -146,14 +132,11 @@ void oldtestfile::test_file_002()
 OUString target;
 OUString rel = OUString::createFromAscii( aSource2[i] );
 oslFileError e = osl_getAbsoluteFileURL( base2.pData, rel.pData , 
&target.pData );
-//fprintf(stderr, "%d : %s -- %s -- %s\n", i, aSource2[i], 
aSource2[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr() 
);
 CPPUNIT_ASSERT_MESSAGE("failure #2",  osl_File_E_None == e );
 if( osl_File_E_None == e )
 {
 CPPUNIT_ASSERT_MESSAGE("failure #2.1",  target.equalsAscii( 
aSource2[i+1] ) );
 }
-OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US );
-OString obase = OUStringToOString( base2 , RTL_TEXTENCODING_ASCII_US );
 }
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-6 3-6-3] fix for rhbz#864858, content after sheet 256 is not imported from xlsx

[Markus Mohrhard]

Hey,

[1] prevents the data loss during import from xlsx. After sheet 256 no
content is imported any more because sheet index is considered
invalid.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=458d68fffa883bc706638299e5a5b2d1399beb0d
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: bug 53673; writer hacker help requested ...

[Caolán McNamara]

On Thu, 2012-09-27 at 13:59 +0100, Michael Meeks wrote:
> Hi there,
> 
> On Wed, 2012-09-12 at 10:43 +0200, Winfried Donkers wrote:
> > My previous request on the list did not get any response and you seem
> > to remenber my label-work.
> 
>   Yes of course ! I see you knocked up a patch in:
> 
>   https://bugs.freedesktop.org/show_bug.cgi?id=53673
> 
>   Anyone on the writer / filter side that can help Winfried out ?

Cedric seems to have had a look and the bug is closed. Presumably it's
taken care of now.

C.

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

Re: spell checker issue

[Caolán McNamara]

On Sun, 2012-09-30 at 12:47 -0700, Steven Howe wrote:
> Who deals with spell checker dictionary issues?
> 
> I'm using the work " men's "; the spell checker thinks this is wrong,
> although spell checker for gmail does not. I've visited webster's
> dictionary online. "men's" appears to be the correct spelling.

English - US, right ? Best in general to submit a bug about these
things. But it does bring up the general case as to what's the
"canonical" upstream for the English dictionaries.

e.g. for Fedora I consider Kevin's wordlist at
http://wordlist.sourceforge.net/ as the upstream of the en-US dictionary
and in that light I've submitted
https://sourceforge.net/tracker/?func=detail&aid=3576342&group_id=10079&atid=1014602
which would allow men's, women's and other possessive of irregular
plural nouns.

I'm not entirely sure of the provenance of the en-US dictionaries we
have in LibreOffice. I mean, IIRC they are derived ultimately from
Kevin's list, but I don't know if they are resynced occasionally or if
Nemeth is maintaining them in some source format somewhere else. Or if
they have accidentally forked themselves over time.

They definitely appear to be at least affix compressed or something into
something sufficiently unreadable I can't trivially see the right way to
add men's, women's to the copies we have in our tree :-)

C.

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/oox/addressconverter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0eee6469304ba15f42bcafb6707cc98bcbff9112
Author: Markus Mohrhard 
Date:   Thu Oct 11 14:32:49 2012 +0200

kill this hard coded sheet limit for xlsx import, rhbz#864858

Change-Id: I8fe6523afb11e5b24b8c83784e1198e8c694922a
(cherry picked from commit 458d68fffa883bc706638299e5a5b2d1399beb0d)

Signed-off-by: Eike Rathke 

diff --git a/sc/source/filter/oox/addressconverter.cxx 
b/sc/source/filter/oox/addressconverter.cxx
index 52e74eb..1da3966 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -57,7 +57,7 @@ using ::rtl::OUStringToOString;
 namespace {
 
 //! TODO: this limit may change, is there a way to obtain it via API?
-const sal_Int16 API_MAXTAB  = 255;
+const sal_Int16 API_MAXTAB  = MAXTAB;
 
 const sal_Int32 OOX_MAXCOL  = static_cast< sal_Int32 >( (1 << 14) - 1 
);
 const sal_Int32 OOX_MAXROW  = static_cast< sal_Int32 >( (1 << 20) - 1 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-6 3-6-3] fix for fdo#55734 ,don't access index 0 in an empty vector

[Markus Mohrhard]

Hey,

[1] fixes a crash that happens when we try to access the first element
of an empty vector.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=132740681c7412f4d678ff0768b9807502525f76
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Fedora 17 users: upgrade to gcc 4.7.2 requires make clean

[Michael Stahl]

people building on Fedora 17 beware: when you upgrade you get gcc 4.7.2,
and that changes the ABI of libstdc++ back to what it was in gcc 4.6,
and this requires a "make clean" because otherwise things will crash
left and right on an incremental build.

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

[Libreoffice-commits] .: sc/qa

[Libreoffice Gerrit user]

 sc/qa/unit/ucalc.cxx |   67 +++
 1 file changed, 67 insertions(+)

New commits:
commit 71ada2fb20cdb1741767165948a2856b4198c700
Author: Noel Power 
Date:   Thu Oct 11 12:35:35 2012 +0100

regression test for fdo#53814

tests sorting when cells in sort range are referred to by other formula 
cells

Change-Id: Ic7b0d9e11193fc09d97aebd54cdd84210bd09061

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 1bcd5a8..8eef410 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -224,6 +224,7 @@ public:
 void testFindAreaPosRowDown();
 void testFindAreaPosColRight();
 void testSort();
+void testSortWithFormulaRefs();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testCollator);
@@ -273,6 +274,7 @@ public:
 CPPUNIT_TEST(testFindAreaPosRowDown);
 CPPUNIT_TEST(testFindAreaPosColRight);
 CPPUNIT_TEST(testSort);
+CPPUNIT_TEST(testSortWithFormulaRefs);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -4920,6 +4922,71 @@ void Test::testFindAreaPosColRight()
 pDoc->DeleteTab(0);
 }
 
+// regression test fo fdo#53814, sorting doens't work as expected
+// if cells in the sort are referenced by formulas
+void Test::testSortWithFormulaRefs()
+{
+ScDocument* pDoc = m_xDocShRef->GetDocument();
+rtl::OUString aTabName1("List1");
+rtl::OUString aTabName2("List2");
+pDoc->InsertTab(0, aTabName1);
+pDoc->InsertTab(1, aTabName2);
+
+const char* aFormulaData[6] = {
+"=IF($List1.A2<>\"\",$List1.A2,\"\")",
+"=IF($List1.A3<>\"\",$List1.A3,\"\")",
+"=IF($List1.A4<>\"\",$List1.A4,\"\")",
+"=IF($List1.A5<>\"\",$List1.A5,\"\")",
+"=IF($List1.A6<>\"\",$List1.A6,\"\")",
+"=IF($List1.A7<>\"\",$List1.A7,\"\")",
+};
+
+const char* aTextData[4] = {
+"bob",
+"tim",
+"brian",
+"larry",
+};
+
+const char* aResults[ 6 ] = {
+"bob",
+"brian",
+"larry",
+"tim",
+"",
+"",
+};
+// insert data to sort
+SCROW nStart = 1, nEnd = 4;
+for ( SCROW i = nStart; i <= nEnd; ++i )
+pDoc->SetString( 0, i, 0, 
rtl::OUString::createFromAscii(aTextData[i-1]) );
+// insert forumulas
+nStart = 0;
+nEnd = SAL_N_ELEMENTS(aFormulaData);
+for ( SCROW i = nStart; i < nEnd; ++i )
+pDoc->SetString( 0, i, 1, 
rtl::OUString::createFromAscii(aFormulaData[i]) );
+
+ScSortParam aSortData;
+aSortData.nCol1 = 0;
+aSortData.nCol2 = 0;
+aSortData.nRow1 = 1;
+aSortData.nRow2 = 7;
+aSortData.maKeyState[0].bDoSort = true;
+aSortData.maKeyState[0].nField = 0;
+
+pDoc->Sort(0, aSortData, false, NULL);
+
+nEnd = SAL_N_ELEMENTS( aResults );
+for ( SCROW i = nStart; i < nEnd; ++i )
+{
+rtl::OUString sResult;
+pDoc->GetString( 0, i + 1, 0, sResult );
+CPPUNIT_ASSERT_EQUAL( rtl::OUString::createFromAscii( aResults[ i ] ), 
sResult );
+}
+pDoc->DeleteTab(0);
+pDoc->DeleteTab(1);
+}
+
 void Test::testSort()
 {
 ScDocument* pDoc = m_xDocShRef->GetDocument();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/filter/oox/addressconverter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 458d68fffa883bc706638299e5a5b2d1399beb0d
Author: Markus Mohrhard 
Date:   Thu Oct 11 14:32:49 2012 +0200

kill this hard coded sheet limit for xlsx import, rhbz#864858

Change-Id: I8fe6523afb11e5b24b8c83784e1198e8c694922a

diff --git a/sc/source/filter/oox/addressconverter.cxx 
b/sc/source/filter/oox/addressconverter.cxx
index 52e74eb..1da3966 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -57,7 +57,7 @@ using ::rtl::OUStringToOString;
 namespace {
 
 //! TODO: this limit may change, is there a way to obtain it via API?
-const sal_Int16 API_MAXTAB  = 255;
+const sal_Int16 API_MAXTAB  = MAXTAB;
 
 const sal_Int32 OOX_MAXCOL  = static_cast< sal_Int32 >( (1 << 14) - 1 
);
 const sal_Int32 OOX_MAXROW  = static_cast< sal_Int32 >( (1 << 20) - 1 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

[Libreoffice Gerrit user]

 configure.in |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 9015ecfc1a9d05ac6d8917be7f9a2cb1d0b1126b
Author: Michael Stahl 
Date:   Thu Oct 11 14:27:19 2012 +0200

configure: blacklist gcc 4.7.[01] for -std=c++0x due to ABI break

Change-Id: Ibb1f0d61649fe6ebfe48a76177c207da6644cd84

diff --git a/configure.in b/configure.in
index c717881..ba01847 100644
--- a/configure.in
+++ b/configure.in
@@ -5386,11 +5386,14 @@ if test "$GCC" = "yes"; then
 fi
 
 AC_MSG_CHECKING([whether $CXX supports -std=gnu++0x without Language 
Defect 757])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS -std=gnu++0x"
-AC_LANG_PUSH([C++])
+if test "$GCCVER" -ge 040700 -a "$GCCVER" -lt 040702; then
+AC_MSG_NOTICE([Not using -std=gnu++0x on $CXX version 4.7.0/4.7.1 due 
to libstdc++ ABI breakage.])
+else
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+AC_LANG_PUSH([C++])
 
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include 
 
 #include 
@@ -5419,8 +5422,9 @@ size_t j = sizeof(sal_n_array_size(thingb));
 return !(i != 0 && j != 0);
 ]])],[HAVE_CXX0X=TRUE],[])
 
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+fi
 if test "$HAVE_CXX0X" = "TRUE"; then
 AC_MSG_RESULT([yes])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 55367, which changed state.

Bug 55367 Summary: CALC FUNCTION CONVERT_ADD wrong convertion factor for "tspm"
https://bugs.freedesktop.org/show_bug.cgi?id=55367

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

[PUSHED] Update graphite to 1.2.0

[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/780

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I768df17c12e918a39e2011e3ce639e0c4ac4d451
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Martin Hosken 
Gerrit-Reviewer: Caolán McNamara 

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

[Libreoffice-commits] .: graphite/graphite2.patch graphite/graphite_make.patch graphite/makefile.mk ooo.lst.in

[Libreoffice Gerrit user]

 graphite/graphite2.patch |   12 ++--
 graphite/graphite_make.patch |4 ++--
 graphite/makefile.mk |8 
 ooo.lst.in   |2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit f0d1a2e9927243bf650e280af9d9dcdaca8b603e
Author: Martin Hosken 
Date:   Sat Oct 6 22:08:10 2012 +0700

Update graphite to 1.2.0

Change-Id: I768df17c12e918a39e2011e3ce639e0c4ac4d451
Reviewed-on: https://gerrit.libreoffice.org/780
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch
index d5a9565..2b6f64b 100644
--- a/graphite/graphite2.patch
+++ b/graphite/graphite2.patch
@@ -1,12 +1,12 @@
 misc/graphite2-1.0.3/include/graphite2/Types.h 2011-02-12 
16:54:16.0 +0100
-+++ misc/build/graphite2-1.0.3/include/graphite2/Types.h   2011-03-15 
21:38:06.264788098 +0100
-@@ -36,7 +36,8 @@
+--- misc/graphite2-1.2.0/include/graphite2/Types.h 2011-02-12 
16:54:16.0 +0100
 misc/build/graphite2-1.2.0/include/graphite2/Types.h   2011-03-15 
21:38:06.264788098 +0100
+@@ -41,7 +41,8 @@
  };
  
  // Definitions for library publicly exported symbols
 -#if defined _WIN32 || defined __CYGWIN__
 +#define GR2_STATIC 1
 +#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC
-   #ifdef GR2_EXPORTING
- #ifdef __GNUC__
-   #define GR2_API__attribute__((dllexport))
+   #if defined GRAPHITE2_STATIC
+ #define GR2_API
+   #elif defined GRAPHITE2_EXPORTING
diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch
index 4532163..7b1339f 100644
--- a/graphite/graphite_make.patch
+++ b/graphite/graphite_make.patch
@@ -1,5 +1,5 @@
 misc/build/graphite2-1.0.3/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
-+++ misc/build/graphite2-1.0.3/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
+--- misc/build/graphite2-1.2.0/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
 misc/build/graphite2-1.2.0/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
 @@ -1,1 +1,38 @@
 -dummy
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 3793d6c..639f64b 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -39,14 +39,14 @@ TARGET=libgraphite
 
 .IF "$(SYSTEM_GRAPHITE)" == "YES"
 all:
-@echo "An already available installation of graphite2 should exist on your 
system."
-@echo "Therefore the version provided here does not need to be built in 
addition."
+   @echo "An already available installation of graphite2 should exist on 
your system."
+   @echo "Therefore the version provided here does not need to be built in 
addition."
 .ENDIF
 
 # --- Files 
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
-TARFILE_NAME=graphite2-1.0.3
-TARFILE_MD5=3bf481ca95109b14435125c0dd1f2217
+TARFILE_NAME=graphite2-1.2.0
+TARFILE_MD5=f5ef3f7f10fa8c3542c6a085a233080b
 PATCH_FILES= graphite2.patch \
 graphite_make.patch 
 
diff --git a/ooo.lst.in b/ooo.lst.in
index 06081e4..ff82e21 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -87,7 +87,7 @@ 
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 @MDDS_TARBALL@
 @BOOST_TARBALL@
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
-3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
+f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
 @VISIO_TARBALL@
 @CMIS_TARBALL@
 @CDR_TARBALL@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 48569, which changed state.

Bug 48569 Summary: LibreOffice crashes when saving frames anchored as-character 
to .docx format
https://bugs.freedesktop.org/show_bug.cgi?id=48569

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

[REVIEW 3-5][REVIEW 3-6] fdo#48569 crash on export to .docx of frame anchored as character

[Caolán McNamara]

We're taking a pointer to something on the stack, in the as-character
case, its been destroyed before we use it. So simply copy the titchy
frame-export helper instead

http://cgit.freedesktop.org/libreoffice/core/commit/?id=60a93729c95d31edab50a905236faa9e38a81556

C.

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

[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/docxattributeoutput.cxx |   16 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 60a93729c95d31edab50a905236faa9e38a81556
Author: Caolán McNamara 
Date:   Thu Oct 11 12:20:07 2012 +0100

Resolves: fdo#48569 crash on export to .docx of inline anchored frame

we're currently deferring to the end of the text node to export
the contents of frames. If its anchored as character then the
sw::Frame (which is allocated on stack) has gone out of scope
so this pointer points to junk. Copy it instead.

Sill need to export frames property at some stage.

Change-Id: Ib9f8c6857ce1afe6acba84986b692139e44a7aad

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 05a82bf..1fc4387 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -265,7 +265,10 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 // Write the anchored frame if any
 if ( m_pParentFrame )
 {
-const SwFrmFmt& rFrmFmt = m_pParentFrame->GetFrmFmt( );
+sw::Frame *pParentFrame = m_pParentFrame;
+m_pParentFrame = NULL;
+
+const SwFrmFmt& rFrmFmt = pParentFrame->GetFrmFmt( );
 const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
 
 sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1 
 : 0;
@@ -273,12 +276,13 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 
 m_rExport.SaveData( nStt, nEnd );
 
-m_rExport.mpParentFrame = m_pParentFrame;
-m_pParentFrame = NULL;
+m_rExport.mpParentFrame = pParentFrame;
 
 m_rExport.WriteText( );
 
 m_rExport.RestoreData();
+
+delete pParentFrame;
 }
 }
 
@@ -2430,8 +2434,8 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame &rFrame, const Po
 break;
 case sw::Frame::eTxtBox:
 {
-// The frame output is postponed at the end of the anchor 
paragraph
-m_pParentFrame = &rFrame;
+// The frame output is postponed to the end of the anchor 
paragraph
+m_pParentFrame = new sw::Frame(rFrame);
 }
 break;
 case sw::Frame::eOle:
@@ -4598,7 +4602,7 @@ DocxAttributeOutput::~DocxAttributeOutput()
 delete m_pEndnotesList, m_pEndnotesList = NULL;
 
 delete m_pTableWrt, m_pTableWrt = NULL;
-m_pParentFrame = NULL;
+delete m_pParentFrame;
 }
 
 DocxExport& DocxAttributeOutput::GetExport()
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index bae6944..be0c361 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -595,7 +595,7 @@ private:
 // beginning of the next paragraph
 DocxColBreakStatus m_nColBreakStatus;
 
-const sw::Frame *m_pParentFrame;
+sw::Frame *m_pParentFrame;
 // close of hyperlink needed
 bool m_closeHyperlinkInThisRun;
 bool m_closeHyperlinkInPreviousRun;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

[Libreoffice Gerrit user]

 oox/source/drawingml/textparagraphproperties.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8628e87e989668ade0045cfd219912c1579b27b
Author: Caolán McNamara 
Date:   Thu Oct 11 12:13:52 2012 +0100

we love you 32bit sal_Int32 as long

Change-Id: I006bceae3d05d2c014beae2127ad8a57c9bee353

diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index 350d09a..edf13fb 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -425,7 +425,7 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
 {
 // Force Paragraph property as zero - impress seems to use the 
value from previous
 // (non) bullet line if not set to zero explicitly :(
-aPropSet.setProperty( PROP_ParaFirstLineIndent, 0 );
+aPropSet.setProperty( PROP_ParaFirstLineIndent, static_cast< 
sal_Int32>(0) );
 rioBulletMap[ PROP_FirstLineOffset ] <<= static_cast< sal_Int32 >( 
*noFirstLineIndentation );
 noFirstLineIndentation = boost::none;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/inc

[Libreoffice Gerrit user]

 framework/inc/queries.h |  119 +++-
 1 file changed, 49 insertions(+), 70 deletions(-)

New commits:
commit 0ccf0b968d71c56fef9a848d541c42223db8f8b8
Author: Caolán McNamara 
Date:   Thu Oct 11 11:49:36 2012 +0100

loplugin: misleading alignment of else if

Change-Id: Id952fff88408bf47be9c255358a14c12c930abd5

diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 97d12fa..24e0a74 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -92,9 +92,9 @@ class QueryBuilder
 
//-
 // returns full query as copy of internal set values
 
//-
-::rtl::OUString getQuery()
+OUString getQuery()
 {
-::rtl::OUStringBuffer sCopy( m_sParams );
+OUStringBuffer sCopy( m_sParams );
 sCopy.insert( 0, m_sBase );
 return sCopy.makeStringAndClear();
 }
@@ -102,7 +102,7 @@ class QueryBuilder
 
//-
 // set new or change existing base query part
 
//-
-void setBase( const ::rtl::OUString& sBase )
+void setBase( const OUString& sBase )
 {
 m_sBase = sBase;
 }
@@ -110,7 +110,7 @@ class QueryBuilder
 
//-
 // add new parameter (with optional value) to param list
 
//-
-void addParam( const ::rtl::OUString& sParam, const ::rtl::OUString& 
sValue = ::rtl::OUString() )
+void addParam( const OUString& sParam, const OUString& sValue = 
OUString() )
 {
 m_sParams.append( SEPERATOR_QUERYPARAM );
 m_sParams.append( sParam   );
@@ -136,13 +136,13 @@ class QueryBuilder
 
//-
 void resetAll()
 {
-m_sBase = ::rtl::OUString();
+m_sBase = OUString();
 resetParams();
 }
 
 private:
-::rtl::OUString m_sBase ;
-::rtl::OUStringBuffer   m_sParams   ;
+OUString m_sBase ;
+OUStringBuffer   m_sParams   ;
 
 };  // class QueryBuilder
 
@@ -186,7 +186,7 @@ class QueryAnalyzer
 
//-
 // analyze given query and split it into his different parts; 
::...
 
//-
-QueryAnalyzer( const ::rtl::OUString& sQuery )
+QueryAnalyzer(const OUString& sQuery)
 // Don't forget to set default values for non given params!
 :   m_eQuery( E_ALL  )   // return ALL filter ...
 ,   m_nIFlags   ( 0  )   // which has set ANY flag ... 
(we remove all entries which match with these mask .. => 0!)
@@ -198,54 +198,39 @@ class QueryAnalyzer
 ,   m_bDefaultFirst ( sal_False  )   // and don't handle default 
entries in special case!
 {
 // Translate old query format to new one first!
-::rtl::OUString sNewQuery( sQuery );
-if( sQuery == 
DECLARE_ASCII("_filterquery_textdocument_withdefault") )
-
sNewQuery=DECLARE_ASCII("_query_writer:default_first:use_order:sort_prop=uiname");
-else
-if( sQuery == 
DECLARE_ASCII("_filterquery_webdocument_withdefault") )
-
sNewQuery=DECLARE_ASCII("_query_web:default_first:use_order:sort_prop=uiname");
-else
-if( sQuery == 
DECLARE_ASCII("_filterquery_globaldocument_withdefault") )
-
sNewQuery=DECLARE_ASCII("_query_global:default_first:use_order:sort_prop=uiname");
-else
-if( sQuery == 
DECLARE_ASCII("_filterquery_chartdocument_withdefault") )
-
sNewQuery=DECLARE_ASCII("_query_chart:default_first:use_order:sort_prop=uiname");
-else
-if( sQuery == 
DECLARE_ASCII("_filterquery_spreadsheetdocument_withdefault") )
-
sNewQuery=DECLARE_ASCII("_query_calc:default_first:use_order:sort_prop=uiname");
-else
-if( sQuery == 
DECLARE_ASCII("_filterquery_presentationdocument_withdefault") )
-
sNewQuery=DECLARE_ASCII("_query_impres

Re: [REVIEW-3-6] [PUSHED 3-6] fix for fdo#53814

[Noel Power]

On 10/10/12 21:28, Kohei Yoshida wrote:

On 10/10/2012 11:57 AM, Noel Power wrote:

I'm in two minds whether this should be a MAB, indeed it is annoying ;-)
in anycase I would recommend to please cherry-pick the following revert
http://cgit.freedesktop.org/libreoffice/core/commit/?id=44e8a8240a3a1cce747f1998e617f8dd4621a992 



Yup, makes sense. Pushed to 3-6 with my sign-off.

If people think it's worthy of 3-6-3, we need two more sign-offs to 
push this to 3-6-3.


BTW, we definitely need a test for this case

okay.. will do

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

[Libreoffice-commits] .: helpcontent2/source

[Libreoffice Gerrit user]

 helpcontent2/source/text/shared/01/password_dlg.xhp|7 +--
 helpcontent2/source/text/shared/explorer/database/0503.xhp |4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit c7f4084d3fed2752ca5f55ffecf5469934b3a713
Author: Caolán McNamara 
Date:   Thu Oct 11 11:42:46 2012 +0100

fix up password help ids

Change-Id: Iff652dc7e63eed43254f7e017f268ce9f3aca849

diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp 
b/helpcontent2/source/text/shared/01/password_dlg.xhp
index e988293..01d8ffe 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -39,6 +39,7 @@


   
+ 
  Password
  Assigns a password to prevent users from making 
unauthorized changes.
@@ -48,7 +49,8 @@
  The permission password must be entered to edit the 
document.
 
 
-
+
+
 
 
 
@@ -56,7 +58,8 @@
 Password
  Type a password. A 
password is case sensitive.
-
+
+
 
 
 
diff --git a/helpcontent2/source/text/shared/explorer/database/0503.xhp 
b/helpcontent2/source/text/shared/explorer/database/0503.xhp
index af38022..b93e601 100644
--- a/helpcontent2/source/text/shared/explorer/database/0503.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/0503.xhp
@@ -44,9 +44,9 @@
 
 Enter / change password
 Allows you to enter and confirm a new or changed password. If you 
have defined a new user, enter the user's name in this dialog.
-
+
 User
-Specifies the name of the new 
user. This field is only visible if you have defined a new 
user.
+Specifies the name of the new 
user. This field is only visible if you have defined a new 
user.
 
 Old password
 Enter the 
old password. This field is visible when you have started the dialog 
via Change password.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/inc/helpid.h|1 -
 sw/source/ui/dialog/uiregionsw.cxx |   16 +++-
 2 files changed, 3 insertions(+), 14 deletions(-)

New commits:
commit b5c3743c7b412bef17be019e39e3fb09e9b9cca3
Author: Caolán McNamara 
Date:   Thu Oct 11 11:43:12 2012 +0100

drop SwTestPasswdDlg in favour of SfxPasswordDialog

Change-Id: I05b44c23cb38d89c7997e06634651325301ffbd8

diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 246896a..a915108 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -330,7 +330,6 @@
 #define HID_LINGU_WORD_LANGUAGE 
"SW_HID_LINGU_WORD_LANGUAGE"
 #define HID_LINGU_PARA_LANGUAGE 
"SW_HID_LINGU_PARA_LANGUAGE"
 #define HID_MD_GLOS_DEFINE_TEXT 
"SW_HID_MD_GLOS_DEFINE_TEXT"
-#define HID_DLG_PASSWD_SECTION  
"SW_HID_DLG_PASSWD_SECTION"
 #define HID_MD_COPY_TO_CLIPBOARD
"SW_HID_MD_COPY_TO_CLIPBOARD"
 #define HID_MD_GLOS_IMPORT  
"SW_HID_MD_GLOS_IMPORT"
 #define HID_SMARTTAG_MAIN   
"SW_HID_SMARTTAG_MAIN"// SMARTTAGS
diff --git a/sw/source/ui/dialog/uiregionsw.cxx 
b/sw/source/ui/dialog/uiregionsw.cxx
index 87bf68e..2d1b6f4 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -136,16 +136,6 @@ void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& 
rSubRegions, ComboBox* pA
 }
 }
 
-class SwTestPasswdDlg : public SfxPasswordDialog
-{
-public:
-SwTestPasswdDlg(Window* pParent) :
-SfxPasswordDialog(pParent)
-{
-SetHelpId(HID_DLG_PASSWD_SECTION);
-}
-};
-
 /*
  Description: user data class for region information
 */
@@ -448,7 +438,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
 if (!pRepr->GetTempPasswd().getLength()
 && pRepr->GetSectionData().GetPassword().getLength())
 {
-SwTestPasswdDlg aPasswdDlg(this);
+SfxPasswordDialog aPasswdDlg(this);
 bRet = sal_False;
 if (aPasswdDlg.Execute())
 {
@@ -1327,7 +1317,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, 
pBox )
 {
 if(!pRepr->GetTempPasswd().getLength() || bChange)
 {
-SwTestPasswdDlg aPasswdDlg(this);
+SfxPasswordDialog aPasswdDlg(this);
 aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
 if(RET_OK == aPasswdDlg.Execute())
 {
@@ -1782,7 +1772,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, 
Button *, pButton )
 {
 if(!m_aNewPasswd.getLength() || bChange)
 {
-SwTestPasswdDlg aPasswdDlg(this);
+SfxPasswordDialog aPasswdDlg(this);
 aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
 if(RET_OK == aPasswdDlg.Execute())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: helpcontent2/helpers helpcontent2/source

[Libreoffice Gerrit user]

 helpcontent2/helpers/help_hid.lst   |4 
 helpcontent2/source/text/shared/01/04150200.xhp |   13 -
 2 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 4f6060c4ff1e96dea43ad7b2380e5fa47d1f00c0
Author: Caolán McNamara 
Date:   Thu Oct 11 10:00:34 2012 +0100

update helpids for insert->plugin .ui conversion

Change-Id: Ibe66851b2b81f7bb0cce88a7009303c5d2c6a4c6

diff --git a/helpcontent2/helpers/help_hid.lst 
b/helpcontent2/helpers/help_hid.lst
index cbf86cb..2be3dbd 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -8020,7 +8020,6 @@ svx_Edit_MD_INSERT_OBJECT_APPLET_ED_CLASSFILE,1598179339,
 svx_Edit_MD_INSERT_OBJECT_APPLET_ED_CLASSLOCATION,1598179340,
 svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_FRAMENAME,1598212100,
 svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_URL,1598212102,
-svx_Edit_MD_INSERT_OBJECT_PLUGIN_ED_FILEURL,1598162954,
 svx_Edit_MD_INSERT_OLEOBJECT_ED_FILEPATH,1598195722,
 svx_Edit_MD_LINKEDIT_ED_FULL_SOURCE_NAME,1598097409,
 svx_Edit_MD_MENU_ORGANISER_EDIT_MENU_NAME,1079953796,
@@ -8536,7 +8535,6 @@ svx_ModalDialog_DLG_INS_ROW_COL,1240137728,
 svx_ModalDialog_MD_ICONCHANGE,1080606720,
 svx_ModalDialog_MD_INSERT_OBJECT_APPLET,1598177280,
 svx_ModalDialog_MD_INSERT_OBJECT_IFRAME,1598210048,
-svx_ModalDialog_MD_INSERT_OBJECT_PLUGIN,1598160896,
 svx_ModalDialog_MD_INSERT_OLEOBJECT,1598193664,
 svx_ModalDialog_MD_LINKEDIT,1598095360,
 svx_ModalDialog_MD_NEW_TOOLBAR,1080311808,
@@ -8561,7 +8559,6 @@ svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448,
 svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE,2311664159,
 svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701,
 svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860,
-svx_MultiLineEdit_MD_INSERT_OBJECT_PLUGIN_ED_PLUGINS_OPTIONS,1598163476,
 svx_MultiLineEdit_RID_SVXDLG_ADD_CONDITION_ED_CONDITION,1368869387,
 svx_MultiLineEdit_RID_SVXDLG_IMAPURL_EDT_DESCRIPTION,1244989956,
 svx_MultiLineEdit_RID_SVXDLG_OBJECT_TITLE_DESC_NTD_EDT_DESC,1238682116,
@@ -8633,7 +8630,6 @@ svx_PushButton_MD_ICONSELECTOR_BTN_DELETE,1080136601,
 svx_PushButton_MD_ICONSELECTOR_BTN_IMPORT,1080136589,
 svx_PushButton_MD_INSERT_OBJECT_APPLET_BTN_CLASS,1598181901,
 svx_PushButton_MD_INSERT_OBJECT_IFRAME_BT_FILEOPEN,1598214663,
-svx_PushButton_MD_INSERT_OBJECT_PLUGIN_BTN_FILEURL,1598165515,
 svx_PushButton_MD_INSERT_OLEOBJECT_BTN_FILEPATH,1598198283,
 svx_PushButton_MD_PASTE_OBJECT_PB_CHANGE_ICON,1598050830,
 svx_PushButton_MD_UPDATE_BASELINKS_PB_BREAK_LINK,1598067238,
diff --git a/helpcontent2/source/text/shared/01/04150200.xhp 
b/helpcontent2/source/text/shared/01/04150200.xhp
index 4471530..f899ba8 100644
--- a/helpcontent2/source/text/shared/01/04150200.xhp
+++ b/helpcontent2/source/text/shared/01/04150200.xhp
@@ -48,9 +48,7 @@
 
   MW deleted "adding;"
   
-
-  
-
+
   
 
   Insert Plug-In
@@ -62,16 +60,13 @@

   
   
-
   File/URL
-  Enter the 
URL for the plug-in or click Browse, and then locate the plug-in 
that you want to insert.
+  Enter the URL for the plug-in 
or click Browse, and then locate the plug-in that you want to 
insert.
   
-
   Browse
-  Locate the plug-in 
that you want to insert, and then click Open.
+  Locate the plug-in that you 
want to insert, and then click Open.
   
-
   Options
-  Enter the 
parameters for the plug-in using the format parameter1="some 
text".
+  Enter the parameters 
for the plug-in using the format parameter1="some 
text".
  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - framework/source officecfg/registry sfx2/uiconfig svtools/inc svtools/source vcl/source

[Libreoffice Gerrit user]

 framework/source/loadenv/loadenv.cxx |6 
 framework/source/services/desktop.cxx|   18 +-
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 
 sfx2/uiconfig/ui/password.ui |8 -
 svtools/inc/svtools/ctrltool.hxx |   64 
-
 svtools/source/control/ctrlbox.cxx   |   10 -
 svtools/source/control/ctrltool.cxx  |   70 
--
 vcl/source/control/edit.cxx  |8 +
 8 files changed, 94 insertions(+), 92 deletions(-)

New commits:
commit 1a3a787766842751b1f9013ac7f0be3633284f75
Author: Caolán McNamara 
Date:   Thu Oct 11 10:58:16 2012 +0100

import password echo char setting

Change-Id: I36a82a8bb915e72a191787a2e44f9bd814271ea1

diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui
index 598535c..9316316 100644
--- a/sfx2/uiconfig/ui/password.ui
+++ b/sfx2/uiconfig/ui/password.ui
@@ -156,7 +156,7 @@
 True
 True
 True
-False
+False
 ●
 True
   
@@ -172,7 +172,7 @@
 True
 True
 True
-False
+False
 ●
 True
   
@@ -252,7 +252,7 @@
 True
 True
 True
-False
+False
 ●
 True
   
@@ -268,7 +268,7 @@
 True
 True
 True
-False
+False
 ●
 True
   
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d271051..962df08 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -234,6 +234,14 @@ bool Edit::set_property(const rtl::OString &rKey, const 
rtl::OString &rValue)
 SetMaxWidthInChars(rValue.toInt32());
 else if (rKey == "editable")
 SetReadOnly(!toBool(rValue));
+else if (rKey == "visibility")
+{
+WinBits nBits = GetStyle();
+nBits &= ~(WB_PASSWORD);
+if (!toBool(rValue))
+nBits |= WB_PASSWORD;
+SetStyle(nBits);
+}
 else
 return Control::set_property(rKey, rValue);
 return true;
commit f2734389f517c1f99eee2346ae9d2104cc7de842
Author: Caolán McNamara 
Date:   Thu Oct 11 10:30:47 2012 +0100

XubString->OUString

Change-Id: I15f229010254a51ee485479e8fb751375f288da8

diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx
index f7c4cc5..837c29d 100644
--- a/svtools/inc/svtools/ctrltool.hxx
+++ b/svtools/inc/svtools/ctrltool.hxx
@@ -32,7 +32,7 @@
 #include 
 
 #include "svtools/svtdllapi.h"
-
+#include 
 #include 
 #include 
 
@@ -147,27 +147,27 @@ von der FontList, sollte deshalb das Array nicht mehr 
referenziert werden.
 class SVT_DLLPUBLIC FontList
 {
 private:
-XubString   maMapBoth;
-XubString   maMapPrinterOnly;
-XubString   maMapScreenOnly;
-XubString   maMapSizeNotAvailable;
-XubString   maMapStyleNotAvailable;
-XubString   maMapNotAvailable;
-XubString   maLight;
-XubString   maLightItalic;
-XubString   maNormal;
-XubString   maNormalItalic;
-XubString   maBold;
-XubString   maBoldItalic;
-XubString   maBlack;
-XubString   maBlackItalic;
+OUStringmaMapBoth;
+OUStringmaMapPrinterOnly;
+OUStringmaMapScreenOnly;
+OUStringmaMapSizeNotAvailable;
+OUStringmaMapStyleNotAvailable;
+OUStringmaMapNotAvailable;
+OUStringmaLight;
+OUStringmaLightItalic;
+OUStringmaNormal;
+OUStringmaNormalItalic;
+OUStringmaBold;
+OUStringmaBoldItalic;
+OUStringmaBlack;
+OUStringmaBlackItalic;
 long*   mpSizeAry;
 OutputDevice*   mpDev;
 OutputDevice*   mpDev2;
 boost::ptr_vector maEntries;
 #ifdef CTRLTOOL_CXX
-SVT_DLLPRIVATE ImplFontListNameIn

[PUSHED] Change in core[libreoffice-3-6]: Resolves: fdo#55367 wrong convertion factor for "tspm"

[Eike Rathke (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/855

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80fd050e1bbdc0386c13e0afbeeb404e14b2694b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Eike Rathke 

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - scaddins/source

[Libreoffice Gerrit user]

 scaddins/source/analysis/analysishelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac49fba7abfa70c3c30314e09d2170218ff4e7b2
Author: Julien Nabet 
Date:   Tue Oct 9 20:57:40 2012 +0200

Resolves: fdo#55367 wrong convertion factor for "tspm"

Change-Id: I80fd050e1bbdc0386c13e0afbeeb404e14b2694b
Reviewed-on: https://gerrit.libreoffice.org/849
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
Reviewed-on: https://gerrit.libreoffice.org/855

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index a37632f..2347f53 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2546,7 +2546,7 @@ ConvertDataList::ConvertDataList( void )
 NEWD( "Humpen", 2.0,CDC_Volume ); // ***
 NEWD( "ly3",1.1810108125623799E-51, CDC_Volume ); // *** Cubic 
light-year
 NEWD( "MTON",   1.4125866688595436E00,  CDC_Volume ); // *** 
Measurement ton
-NEWD( "tspm",   5.E02,  CDC_Volume ); // *** Modern 
teaspoon
+NEWD( "tspm",   2.E02,  CDC_Volume ); // *** Modern 
teaspoon
 NEWD( "uk_gal", 2.1996924829908779E-01,  CDC_Volume ); // U.K. / 
Imperial gallon1/4.54609
 NEWD( "uk_qt",  8.7987699319635115E-01,  CDC_Volume ); // U.K. / 
Imperial quart 1/4 imperial gallon
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/GraphicImport.cxx |   28 +-
 1 file changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 3852f56ebc7f7ed26bcaf60474448ca4097c53d6
Author: Miklos Vajna 
Date:   Thu Oct 11 10:21:57 2012 +0200

n#783638 DOCX import of wp:inline's distT/B/L/R attributes

Change-Id: I181fcae021eed07608b06744b469628e4d78ccba
(cherry picked from commit 847c5c1339bf0cfd9f3e3c92e8d81ef32bee6c21)

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 18f65a4..90d8636 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -342,6 +342,15 @@ public:
 {
 return bYSizeValid;
 }
+
+void applyMargins(uno::Reference< beans::XPropertySet > 
xGraphicObjectProperties) const
+{
+PropertyNameSupplier& rPropNameSupplier = 
PropertyNameSupplier::GetPropertyNameSupplier();
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_LEFT_MARGIN ), uno::makeAny(nLeftMargin));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_RIGHT_MARGIN ), uno::makeAny(nRightMargin));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_TOP_MARGIN ), uno::makeAny(nTopMargin));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_BOTTOM_MARGIN ), uno::makeAny(nBottomMargin));
+}
 };
 
 
@@ -959,10 +968,17 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
 }
 break;
 case NS_ooxml::LN_CT_Inline_distT:
+m_pImpl->nTopMargin = 
ConversionHelper::convertTwipToMM100(nIntValue);
+break;
 case NS_ooxml::LN_CT_Inline_distB:
+m_pImpl->nBottomMargin = 
ConversionHelper::convertTwipToMM100(nIntValue);
+break;
 case NS_ooxml::LN_CT_Inline_distL:
+m_pImpl->nLeftMargin = 
ConversionHelper::convertTwipToMM100(nIntValue);
+break;
 case NS_ooxml::LN_CT_Inline_distR:
-//TODO: need to be handled
+m_pImpl->nRightMargin = 
ConversionHelper::convertTwipToMM100(nIntValue);
+break;
 break;
 case NS_ooxml::LN_CT_GraphicalObjectData_uri:
 val.getString();
@@ -1413,14 +1429,7 @@ uno::Reference< text::XTextContent > 
GraphicImport::createGraphicObject( const b
 uno::makeAny(m_pImpl->bContour));
 
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_CONTOUR_OUTSIDE ),
 uno::makeAny(m_pImpl->bContourOutside));
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_LEFT_MARGIN ),
-uno::makeAny(m_pImpl->nLeftMargin));
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_RIGHT_MARGIN ),
-uno::makeAny(m_pImpl->nRightMargin));
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_TOP_MARGIN ),
-uno::makeAny(m_pImpl->nTopMargin));
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_BOTTOM_MARGIN ),
-uno::makeAny(m_pImpl->nBottomMargin));
+m_pImpl->applyMargins(xGraphicObjectProperties);
 
 if( m_pImpl->eColorMode == drawing::ColorMode_STANDARD &&
 m_pImpl->nContrast == -70 &&
@@ -1510,6 +1519,7 @@ uno::Reference< text::XTextContent > 
GraphicImport::createGraphicObject( const b
 if( m_pImpl->getXSize() && m_pImpl->getYSize() )
 
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_SIZE),
 uno::makeAny( awt::Size( m_pImpl->getXSize(), 
m_pImpl->getYSize() )));
+m_pImpl->applyMargins(xGraphicObjectProperties);
 try
 {
 if( !m_pImpl->sName.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

[Libreoffice Gerrit user]

 oox/source/drawingml/textparagraph.cxx   |7 ---
 oox/source/drawingml/textparagraphproperties.cxx |   19 +--
 2 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit bb3540a7cb6866a7b6c36cd71ea4bb9b0609d1e8
Author: Muthu Subramanian 
Date:   Thu Oct 11 14:59:33 2012 +0530

n#778854: Fixes quite some issues with bullet points.

* Properties needs to be combined before applyed.
  Rather than applying them separately twice.
* ParaMargins set to zero wrongly rather than boost::none
  This caused its own set of problems.
* Hack: Push default zero to tabstops. This makes impress
  calculate proper values for tabstops using leftmargin.

diff --git a/oox/source/drawingml/textparagraph.cxx 
b/oox/source/drawingml/textparagraph.cxx
index 1b599a6..1119652 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -108,15 +108,16 @@ void TextParagraph::insertAt(
 float fCharacterSize = nCharHeight > 0 ? GetFontHeight( nCharHeight ) 
:  18;
 if ( pTextParagraphStyle.get() )
 {
-pTextParagraphStyle->pushToPropSet( &rFilterBase, xProps, 
aioBulletList, NULL, sal_True, fCharacterSize, true );
+TextParagraphProperties aParaProp;
+aParaProp.apply( *pTextParagraphStyle );
+aParaProp.apply( maProperties );
+aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, 
&pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true );
 fCharacterSize = pTextParagraphStyle->getCharHeightPoints( 
fCharacterSize );
 
 // bullets have same color as following texts by default
 if( !aioBulletList.hasProperty( PROP_BulletColor ) && 
maRuns.size() > 0
 && 
(*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() )
 aioBulletList[ PROP_BulletColor ] <<= 
(*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( 
rFilterBase.getGraphicHelper() );
-
-maProperties.pushToPropSet( &rFilterBase, xProps, aioBulletList, 
&pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize );
 }
 
 // empty paragraphs do not have bullets in ppt
diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index 3cd0bba..350d09a 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "oox/helper/helper.hxx"
 #include "oox/helper/propertyset.hxx"
@@ -418,12 +419,15 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
 if ( noParaLeftMargin )
 {
 rioBulletMap[ PROP_LeftMargin ] <<= static_cast< sal_Int32 >( 
*noParaLeftMargin );
-noParaLeftMargin = boost::optional< sal_Int32 >( 0 );
+noParaLeftMargin = boost::none;
 }
 if ( noFirstLineIndentation )
 {
+// Force Paragraph property as zero - impress seems to use the 
value from previous
+// (non) bullet line if not set to zero explicitly :(
+aPropSet.setProperty( PROP_ParaFirstLineIndent, 0 );
 rioBulletMap[ PROP_FirstLineOffset ] <<= static_cast< sal_Int32 >( 
*noFirstLineIndentation );
-noFirstLineIndentation = boost::optional< sal_Int32 >( 0 );
+noFirstLineIndentation = boost::none;
 }
 if ( nNumberingType != NumberingType::BITMAP && 
!rioBulletMap.hasProperty( PROP_BulletColor ) && pFilterBase )
 rioBulletMap[ PROP_BulletColor ] <<= static_cast< sal_Int32 >( 
maTextCharacterProperties.maCharColor.getColor( 
pFilterBase->getGraphicHelper()));
@@ -459,7 +463,18 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
 if ( noParaLeftMargin )
 aPropSet.setProperty( PROP_ParaLeftMargin, sal_Int32( 
*noParaLeftMargin ) );
 if ( noFirstLineIndentation )
+{
 aPropSet.setProperty( PROP_ParaFirstLineIndent, 
*noFirstLineIndentation );
+if( bPushDefaultValues )
+{
+// Reset TabStops - these would be auto calculated by Impress
+TabStop aTabStop;
+aTabStop.Position = 0;
+Sequence< TabStop > aSeq(1);
+aSeq[0] = aTabStop;
+aPropSet.setProperty( PROP_ParaTabStops, aSeq );
+}
+}
 }
 
 float TextParagraphProperties::getCharHeightPoints( float fDefault ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/table3.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit c450c73ab7c83a55209cc7de9381cc32eb6313ff
Author: Noel Power 
Date:   Wed Oct 10 16:49:35 2012 +0100

fix for fdo#53814 Revert "there should be no need any more for this check"

This reverts commit bea018a7040c36e91487b27c7b59c6c8a970bf5f.

Change-Id: Id554a8f05b82f146a505ac0a39afe14a3161291c
(cherry picked from commit cd9d51a36cc3106d4124855874af657615a93061)

Signed-off-by: Kohei Yoshida 
Signed-off-by: Jan Holesovsky 
Signed-off-by: Markus Mohrhard 

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 15087c5..7be749e 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -386,10 +386,14 @@ short ScTable::CompareCell( sal_uInt16 nSort,
 if (pCell1)
 {
 eType1 = pCell1->GetCellType();
+if (eType1 == CELLTYPE_NOTE)
+pCell1 = NULL;
 }
 if (pCell2)
 {
 eType2 = pCell2->GetCellType();
+if (eType2 == CELLTYPE_NOTE)
+pCell2 = NULL;
 }
 
 if (pCell1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3.6.3][PUSHED] Re: fix for fdo#53814

[Markus Mohrhard]

Hey

>
>> > I'm in two minds whether this should be a MAB, indeed it is annoying ;-)
>> > in anycase I would recommend to please cherry-pick the following revert
>> > http://cgit.freedesktop.org/libreoffice/core/commit/?id=44e8a8240a3a1cce747f1998e617f8dd4621a992
>>
>> Yup, makes sense. Pushed to 3-6 with my sign-off.
>>
>> If people think it's worthy of 3-6-3, we need two more sign-offs to push
>> this to 3-6-3.
>
> +1 from me, I'd like to have it in :-)  1 to go - Markus - OK for you,
> please?
>

Looks good to me. Pushed to 3-6-3 with my sign-off.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW 3.6.3 - 1 to go] Re: fix for fdo#53814

[Jan Holesovsky]

Hi Markus,

Kohei Yoshida píše v St 10. 10. 2012 v 16:28 -0400:

> > I'm in two minds whether this should be a MAB, indeed it is annoying ;-)
> > in anycase I would recommend to please cherry-pick the following revert
> > http://cgit.freedesktop.org/libreoffice/core/commit/?id=44e8a8240a3a1cce747f1998e617f8dd4621a992
> 
> Yup, makes sense. Pushed to 3-6 with my sign-off.
> 
> If people think it's worthy of 3-6-3, we need two more sign-offs to push 
> this to 3-6-3.

+1 from me, I'd like to have it in :-)  1 to go - Markus - OK for you,
please?

Thank you,
Kendy

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

[Libreoffice-commits] .: 2 commits - sw/qa writerfilter/source

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlimport/data/n783638.docx|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   13 
 writerfilter/source/dmapper/GraphicImport.cxx |   28 +-
 3 files changed, 32 insertions(+), 9 deletions(-)

New commits:
commit e2c481db7b905305128e733bb1fc8d0ad8cadbf5
Author: Miklos Vajna 
Date:   Thu Oct 11 10:48:16 2012 +0200

n#783638 testcase

Change-Id: I6b6093ba1e6961e421ac9754fdbdea9ba63eeda0

diff --git a/sw/qa/extras/ooxmlimport/data/n783638.docx 
b/sw/qa/extras/ooxmlimport/data/n783638.docx
new file mode 100644
index 000..93b587b
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n783638.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index acc2097..c3a0bc5 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -104,6 +104,7 @@ public:
 void testShadow();
 void testN782061();
 void testN782345();
+void testN783638();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -150,6 +151,7 @@ public:
 CPPUNIT_TEST(testShadow);
 CPPUNIT_TEST(testN782061);
 CPPUNIT_TEST(testN782345);
+CPPUNIT_TEST(testN783638);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -1077,6 +1079,17 @@ void Test::testN779957()
 }
 }
 
+void Test::testN783638()
+{
+// The problem was that the margins of inline images were not zero.
+load("n783638.docx");
+
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+uno::Reference xPropertySet(xDraws->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xPropertySet, 
"LeftMargin"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 3d7e168a2a43c2414b0633379102ddb29437e75b
Author: Miklos Vajna 
Date:   Thu Oct 11 10:21:57 2012 +0200

n#783638 DOCX import of wp:inline's distT/B/L/R attributes

Change-Id: I181fcae021eed07608b06744b469628e4d78ccba

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 9042f80..5709a17 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -339,6 +339,15 @@ public:
 {
 return bYSizeValid;
 }
+
+void applyMargins(uno::Reference< beans::XPropertySet > 
xGraphicObjectProperties) const
+{
+PropertyNameSupplier& rPropNameSupplier = 
PropertyNameSupplier::GetPropertyNameSupplier();
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_LEFT_MARGIN ), uno::makeAny(nLeftMargin));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_RIGHT_MARGIN ), uno::makeAny(nRightMargin));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_TOP_MARGIN ), uno::makeAny(nTopMargin));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_BOTTOM_MARGIN ), uno::makeAny(nBottomMargin));
+}
 };
 
 
@@ -969,10 +978,17 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
 }
 break;
 case NS_ooxml::LN_CT_Inline_distT:
+m_pImpl->nTopMargin = 
ConversionHelper::convertTwipToMM100(nIntValue);
+break;
 case NS_ooxml::LN_CT_Inline_distB:
+m_pImpl->nBottomMargin = 
ConversionHelper::convertTwipToMM100(nIntValue);
+break;
 case NS_ooxml::LN_CT_Inline_distL:
+m_pImpl->nLeftMargin = 
ConversionHelper::convertTwipToMM100(nIntValue);
+break;
 case NS_ooxml::LN_CT_Inline_distR:
-//TODO: need to be handled
+m_pImpl->nRightMargin = 
ConversionHelper::convertTwipToMM100(nIntValue);
+break;
 break;
 case NS_ooxml::LN_CT_GraphicalObjectData_uri:
 val.getString();
@@ -1453,14 +1469,7 @@ uno::Reference< text::XTextContent > 
GraphicImport::createGraphicObject( const b
 uno::makeAny(m_pImpl->bContour));
 
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_CONTOUR_OUTSIDE ),
 uno::makeAny(m_pImpl->bContourOutside));
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_LEFT_MARGIN ),
-uno::makeAny(m_pImpl->nLeftMargin));
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_RIGHT_MARGIN ),
-uno::makeAny(m_pImpl->nRightMargin));
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_TOP_MARGIN ),
-uno::makeAny(m_pImpl->nTopMargin));
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_BOTTOM_MARGIN ),
-uno::makeAny(m_pImpl->nBottomMar

[Libreoffice-commits] .: 5 commits - cui/source cui/uiconfig cui/UI_cui.mk oox/inc oox/source svtools/inc svtools/source tools/inc unusedcode.easy vcl/inc vcl/source

[Libreoffice Gerrit user]

 cui/UI_cui.mk  |1 
 cui/source/dialogs/insdlg.cxx  |   36 +++---
 cui/source/dialogs/svuidlg.hrc |7 -
 cui/source/dialogs/svuidlg.src |   60 --
 cui/source/inc/insdlg.hxx  |   32 ++---
 cui/uiconfig/ui/insertplugin.ui|  208 +
 oox/inc/oox/ole/axbinaryreader.hxx |6 -
 oox/source/ole/axbinaryreader.cxx  |9 -
 svtools/inc/svtools/svmedit.hxx|2 
 svtools/source/edit/svmedit.cxx|6 -
 tools/inc/tools/wintypes.hxx   |1 
 unusedcode.easy|6 +
 vcl/inc/vcl/builder.hxx|3 
 vcl/inc/vcl/msgbox.hxx |4 
 vcl/inc/vcl/vclmedit.hxx   |   10 -
 vcl/inc/vcl/window.hxx |3 
 vcl/source/edit/vclmedit.cxx   |  112 +--
 vcl/source/window/builder.cxx  |   70 +++-
 vcl/source/window/msgbox.cxx   |2 
 vcl/source/window/window.cxx   |5 
 vcl/source/window/window2.cxx  |   36 +-
 21 files changed, 428 insertions(+), 191 deletions(-)

New commits:
commit d7cdef2c49b9c13f8c726d1067ed5cf3cfd38746
Author: Caolán McNamara 
Date:   Wed Oct 10 23:57:22 2012 +0100

VCLMultiLineEdit->VclMultiLineEdit to align with other new widget names

Change-Id: I97b7459b9c5c680d624234e8c51a5997a02fd5f7

diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 79d4361..27ebff9 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -97,7 +97,7 @@ class SvInsertPlugInDialog : public InsertObjectDialog_Impl
 private:
 Edit* m_pEdFileurl;
 PushButton* m_pBtnFileurl;
-VCLMultiLineEdit* m_pEdPluginsOptions;
+VclMultiLineEdit* m_pEdPluginsOptions;
 INetURLObject* m_pURL;
 OUString m_aCommands;
 
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index 9085349..f32e0f4 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -37,7 +37,7 @@
 
 
 
-class SVT_DLLPUBLIC MultiLineEdit : public VCLMultiLineEdit
+class SVT_DLLPUBLIC MultiLineEdit : public VclMultiLineEdit
 {
 public:
 MultiLineEdit( Window* pParent, WinBits nWinStyle = 
WB_LEFT | WB_BORDER );
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 24e97ec..3e83d7a 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -34,11 +34,11 @@
 
 
 MultiLineEdit::MultiLineEdit( Window* pParent, WinBits nWinStyle )
-: VCLMultiLineEdit( pParent,nWinStyle )
+: VclMultiLineEdit( pParent,nWinStyle )
 {
 }
 MultiLineEdit::MultiLineEdit( Window* pParent, const ResId& rResId )
-: VCLMultiLineEdit( pParent,rResId )
+: VclMultiLineEdit( pParent,rResId )
 {
 }
 
@@ -49,7 +49,7 @@ namespace css = ::com::sun::star;
 MultiLineEdit::GetComponentInterface(sal_Bool bCreate)
 {
 ::css::uno::Reference< ::css::awt::XWindowPeer > xPeer(
-VCLMultiLineEdit::GetComponentInterface(false));
+VclMultiLineEdit::GetComponentInterface(false));
 if (!xPeer.is() && bCreate)
 {
 ::std::auto_ptr< VCLXMultiLineEdit > xVCLMEdit(new 
VCLXMultiLineEdit());
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index ef3e85c..8ef3327 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -112,6 +113,7 @@ private:
 std::vector m_aButtonImageWidgetMaps;
 StockMap m_aStockMap;
 Translations m_aTranslations;
+std::set m_aRedundantParentWidgets;
 };
 
 OString getTranslation(const OString &rId, const OString &rProperty) const;
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 2bb73ab..8a3fd1d 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -34,7 +34,7 @@
 #include 
 #include 
 #include 
-class VCLMultiLineEdit;
+class VclMultiLineEdit;
 class FixedImage;
 class CheckBox;
 
@@ -67,7 +67,7 @@ class CheckBox;
 class VCL_DLLPUBLIC MessBox : public ButtonDialog
 {
 protected:
-VCLMultiLineEdit*   mpVCLMultiLineEdit;
+VclMultiLineEdit*   mpVCLMultiLineEdit;
 FixedImage* mpFixedImage;
 XubString   maMessText;
 Image   maImage;
diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx
index 519cb0e..6287419 100644
--- a/vcl/inc/vcl/vclmedit.hxx
+++ b/vcl/inc/vcl/vclmedit.hxx
@@ -39,7 +39,7 @@ class Timer;
 class ExtTextEngine;
 class ExtTextView;
 
-class VCL_DLLPUBLIC VCLMultiLineEdit : public Edit
+class VCL_DLLPUBLIC VclMultiLineEdit : public Edit
 {
 private:
 ImpSvMEdit* pImpSvMEdit;
@@ -66,9 +66,9 @@ protected:
 ScrollBar*  GetVScrollBar() const;
 
 public:
-VCLMultiLineEdit( Window* pParent, WinBits nWinStyle = 
WB_LEFT | WB_BORDER );
-VCLMultiLineEdit( Window* pParent, const ResId& rResId );
-virtual ~VCLMultiLineEdit();
+ 

[Libreoffice-commits] .: 2 commits - sal/cppunittester

[Libreoffice Gerrit user]

 sal/cppunittester/cppunittester.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ef8b17930977c5a8141386839e9d4c1dfe3e2d65
Author: Tor Lillqvist 
Date:   Thu Oct 11 11:14:54 2012 +0300

Be consistent with surrounding code

Change-Id: Ice88c3912c2fd0d99156acaa8e15518acab3b55b

diff --git a/sal/cppunittester/cppunittester.cxx 
b/sal/cppunittester/cppunittester.cxx
index 3d4dadc..81cf9bf 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -231,8 +231,10 @@ SAL_IMPLEMENT_MAIN() {
 fn = (oslGenericFunction) unobootstrapprotector;
 else
 {
-fprintf(stderr, "Only unoexceptionprotector or 
unobootstrapprotector protectors allowed\n");
-assert(!"unrecognized protector");
+std::cerr
+<< "Only unoexceptionprotector or unobootstrapprotector 
protectors allowed"
+<< std::endl;
+std::exit(EXIT_FAILURE);
 }
 #endif
 CppUnit::Protector *protector = fn == 0
commit 62fddc0c00c8e960642d2c2a426852f77147ce2e
Author: Tor Lillqvist 
Date:   Thu Oct 11 11:13:03 2012 +0300

WaE: 'fn' may be used uninitialized in this function

Change-Id: Ib918bd537b30fe5dc48396fc7e952147003e3b19

diff --git a/sal/cppunittester/cppunittester.cxx 
b/sal/cppunittester/cppunittester.cxx
index 346373f..3d4dadc 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -224,7 +224,7 @@ SAL_IMPLEMENT_MAIN() {
 modules.push_back(new osl::Module(lib, SAL_LOADMODULE_GLOBAL));
 oslGenericFunction fn = modules.back().getFunctionSymbol(sym);
 #else
-oslGenericFunction fn;
+oslGenericFunction fn = 0;
 if (sym == "unoexceptionprotector")
 fn = (oslGenericFunction) unoexceptionprotector;
 else if (sym == "unobootstrapprotector")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] gbuildification of jpeg

[julien2412]

???
I don't understand this message, I don't even know how gbuildify a module.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-gbuildification-of-jpeg-tp4012630p4012631.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] gbuildification of jpeg

[David Ostrovsky (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/856

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/856/1

gbuildification of jpeg

Change-Id: I466f13f1132103bc20b9918411a54fd3106f4553
---
M Makefile.top
M RepositoryExternal.mk
M config_host.mk.in
M configure.in
A jpeg/Makefile
A jpeg/Module_jpeg.mk
A jpeg/StaticLibrary_jpeg.mk
A jpeg/UnpackedTarball_jpeg.mk
A jpeg/configs/jconfig.h
D jpeg/jpeg-8c.patch
D jpeg/makefile.mk
A jpeg/patches/jpeg-8c-jmorecfg.patch
R jpeg/patches/struct_alignment.patch
M jpeg/prj/build.lst
M jpeg/prj/d.lst
D jpeg/prj/dmake
16 files changed, 223 insertions(+), 261 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I466f13f1132103bc20b9918411a54fd3106f4553
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 

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

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/core/tool/dbdata.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 132740681c7412f4d678ff0768b9807502525f76
Author: Markus Mohrhard 
Date:   Thu Oct 11 09:16:55 2012 +0200

only access first element if vector is not empty, fdo#55734

Change-Id: I60db486195e7216968dc8c7c7c0c79fb7e8c1b88

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 3e6664d..7b142cc 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -455,7 +455,9 @@ bool ScDBData::HasQueryParam() const
 
 bool ScDBData::HasSortParam() const
 {
-return mpSortParam && mpSortParam->maKeyState[0].bDoSort;
+return mpSortParam &&
+!mpSortParam->maKeyState.empty() &&
+mpSortParam->maKeyState[0].bDoSort;
 }
 
 bool ScDBData::HasSubTotalParam() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits