[Libreoffice-commits] core.git: distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf

[Stephan Bergmann]

 distro-configs/LibreOfficeWin32.conf |1 -
 distro-configs/LibreOfficeWin64.conf |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 0789ee23ae6a417d141098c411224a8af9f626d0
Author: Stephan Bergmann 
Date:   Wed Apr 17 09:06:00 2013 +0200

--without-agfa-monotype-fonts is gone

...since 62bf424fa84b0ccd0828a474a1351b0134f27eab "remove dead code."

Change-Id: Idfe58e53232c6cef755f4f7e4d572f7cac3efc6a

diff --git a/distro-configs/LibreOfficeWin32.conf 
b/distro-configs/LibreOfficeWin32.conf
index f83712a..3e99f74 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -3,7 +3,6 @@
 --without-system-postgresql
 --without-junit
 --without-helppack-integration
---without-agfa-monotype-fonts
 --enable-extension-integration
 --disable-gtk
 --enable-scripting-beanshell
diff --git a/distro-configs/LibreOfficeWin64.conf 
b/distro-configs/LibreOfficeWin64.conf
index ee6386e..0c17d07 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -1,5 +1,4 @@
 --with-vendor=The Document Foundation
---without-agfa-monotype-fonts
 --enable-cl-x64
 --disable-gtk
 --enable-scripting-beanshell
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: graphite/StaticLibrary_graphite.mk

[Tor Lillqvist]

 graphite/StaticLibrary_graphite.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 37ec420f8f93e5af6a05a48d619bee06b64dfa69
Author: Tor Lillqvist 
Date:   Wed Apr 17 10:24:03 2013 +0300

Clang does not have -fpermissive

Change-Id: I24ae2f661a379d00ada9d1f288a702559719696c

diff --git a/graphite/StaticLibrary_graphite.mk 
b/graphite/StaticLibrary_graphite.mk
index e02272c..de3950f 100644
--- a/graphite/StaticLibrary_graphite.mk
+++ b/graphite/StaticLibrary_graphite.mk
@@ -24,10 +24,12 @@ $(eval $(call gb_StaticLibrary_add_defs,graphite,\
 ))
 
 ifeq ($(COM),GCC)
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
 $(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\
 -fpermissive \
 ))
 endif
+endif
 
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: patch for postgresql driver

[Wols Lists]

On 17/04/13 02:10, Lionel Elie Mamane wrote:
> On Tue, Apr 16, 2013 at 09:24:03PM +0100, Wols Lists wrote:
>> On 16/04/13 20:28, Lionel Elie Mamane wrote:
>>> On Tue, Apr 16, 2013 at 03:16:25PM +0100, Wols Lists wrote:
> 
 I can't get my argument casting right - in the original
 code, matchIgnoreAsciiCaseAsciiL wraps its argument in
 RTL_CONSTASCII_STRINGPARAM.
> 
>>> RTL_CONSTASCII_STRINGPARAM is a hack/optimisation specific to
>>> compile-time constants. With your change, the string is not anymore
>>> a compile-time constant, so just use
> 
>>>  equalsIgnoreAsciiCaseAscii()
> 
>> I'm puzzled that it's not a compile-time constant
> 
> Well, it is not even a run-time constant: at each iteration of the
> loop, it is a different value.

Yes, the value passed changes each time, but the array itself is a
constant array of constant strings ...

Probably something to do with how the compiler manages "an array of
pointers to strings" - I know that's a weirdo in C, so probably also in C++.
> 
>> As soon as LO has built successfully, I'll sort out the patch and ask
>> someone to test it :-)
> 
> The PostgreSQL driver is (particularly) my area, so keep me in CC.
> 
> If you are interested in working on the Postgres driver, have a look
> at https://bugs.freedesktop.org/show_bug.cgi?id=43369
> 
> There are also a few bugs I didn't have time to look at.
> 
I'll tackle stuff as I see it - I remember being told to look at the
postgres driver to help me with the mariadb driver and this has been a
good learning experience. I couldn't see the wood for the trees, so I
thought I'd attack that todo, and hey presto things got a *bit* clearer.

Now to tidy up that patch and post a working example...

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

Re: [ANN] --enable-dbgutil: everyone gets a Debug STL!

[Stephan Bergmann]

On 04/15/2013 03:34 PM, Michael Stahl wrote:

with commit f14f7a2e4568e3e85a0c8860beebd0376c5a8b51 MSVC builds will
link everything against the debug runtimes (MSVCRTD etc.), which enables
debug STL and other things.

[...]

the MSVC one is tested on MSVC 2008 only, where "make check" passes
successfully; it's possible that i've overlooked something in the
makefiles where different MSVC versions use different rules, so it needs
somebody to try it out in an --enable-dbgutil build with 2010 and 2012.


You probably did that "make check" on a build without any bundled Python 
extensions, right?  In my heavily --enable-ext-* configured build, 
starting soffice instantly fails with



Fatal Python error: Invalid thread state for this thread

Current thread 0x0260:

Thread 0x0260:


on stdout/err and a "Microsoft Visual C++ Debug Library" message box


Debug Assertion Failed!

Program: C:\lo\core\solver\wntmsci12\installation\opt\program\soffice.bin
File: f:\dd\vctools\crt_bld\self_x86\crt\src\dbgdel.cpp
Line: 52

Expression: _BLOCK_TYPE_IS_VALID(pHead->nBlockUse)

For information on how your program can cause an assertion failure, see the 
Visual C++ documentation on asserts.

(Press Retry to debug the application)


(It would go away if I move 
solver/wntmsci12/installation/opt/share/extensions away and start afresh.)


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

[Libreoffice-commits] core.git: scp2/macros scp2/source

[Thomas Arnhold]

 scp2/macros/macro.pl  |   11 -
 scp2/source/ooo/directory_ooo.scp |  303 --
 2 files changed, 314 deletions(-)

New commits:
commit e70ea92b3632c376975dd85dbcb26e7ca6b95498
Author: Thomas Arnhold 
Date:   Mon Apr 15 03:53:39 2013 +0200

scp: remove unused macros

Change-Id: I48ac97bd6ac8cbd534e50c617f3d54ff10bd2908
Reviewed-on: https://gerrit.libreoffice.org/3410
Reviewed-by: Matúš Kukan 
Tested-by: Matúš Kukan 

diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 2ad3fad..4580874 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -61,7 +61,6 @@ write_OTHER_LANGS();
 write_DIR_ISOLANGUAGE_ALL_LANG_2();
 write_DIR_ISOLANGUAGE_ALL_LANG();
 write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
-write_DIR_IDENT_ALL_LANG();
 write_EXTRA_ALL_LANG();
 write_EXTRA_ALL_LANG_BUT_EN_US();
 write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
@@ -126,16 +125,6 @@ sub write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ
 print OUTFILE "\n\n";
 }
 
-sub write_DIR_IDENT_ALL_LANG
-{
-print OUTFILE "#define DIR_IDENT_ALL_LANG(name) ";
-foreach $lang (@completelangiso) {
-print OUTFILE "\\\n\tDosName ($lang) = STRING(name)";
-print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-}
-print OUTFILE "\n\n";
-}
-
 sub write_EXTRA_ALL_LANG
 {
 print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 6012032..f1b412d 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -69,22 +69,6 @@ Directory 
gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents
 End
 #endif
 
-#if defined MACOSX
-Unixlink gid_Unixlink_Applications
-BIN_FILE_BODY;
-Styles = ();
-Dir = PD_PROGDIR;
-Name = "Applications";
-Target = "/Applications";
-End
-#endif
-
-Directory gid_Dir_Addin
-Styles = (CREATE);
-ParentID = gid_Brand_Dir_Program;
-DosName = "addin";
-End
-
 Directory gid_Dir_Wizards
 Styles = (CREATE);
 ParentID = gid_Brand_Dir_Program;
@@ -97,30 +81,6 @@ Directory gid_Dir_Wizards_Ui
 DosName = "ui";
 End
 
-Directory gid_Dir_Wizards_Ui_Event
-Styles = (CREATE);
-ParentID = gid_Dir_Wizards_Ui;
-DosName = "event";
-End
-
-Directory gid_Dir_Wizards_Fax
-Styles = (CREATE);
-ParentID = gid_Dir_Wizards;
-DosName = "fax";
-End
-
-Directory gid_Dir_Wizards_Letter
-Styles = (CREATE);
-ParentID = gid_Dir_Wizards;
-DosName = "letter";
-End
-
-Directory gid_Dir_Wizards_Agenda
-Styles = (CREATE);
-ParentID = gid_Dir_Wizards;
-DosName = "agenda";
-End
-
 Directory gid_Dir_Resource
 ParentID = gid_Brand_Dir_Program;
 DosName = "resource";
@@ -149,54 +109,12 @@ Directory gid_Dir_User
 DosName = "presets";
 End
 
-Directory gid_Dir_User_Autotext
-ParentID = gid_Dir_User;
-DosName = "autotext";
-Styles = (WORKSTATION, CREATE);
-End
-
 Directory gid_Dir_User_Uno_Packages
 ParentID = gid_Dir_User;
 DosName = "uno_packages";
 Styles = (CREATE);
 End
 
-Directory gid_Dir_User_Uno_Packages_Cache
-ParentID = gid_Dir_User_Uno_Packages;
-DosName = "cache";
-Styles = (CREATE);
-End
-
-Directory gid_Dir_User_Temp
-ParentID = gid_Dir_User;
-DosName = "temp";
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Autocorr
-ParentID = gid_Dir_User;
-DosName = "autocorr";
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Bookmark
-ParentID = gid_Dir_User;
-DosName = "bookmark";
-Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Scripts
-ParentID = gid_Dir_User;
-DosName = "Scripts";
-Styles = (WORKSTATION,CREATE);
-End
-
-Directory gid_Dir_Backup
-ParentID = gid_Dir_User;
-DosName = "backup";
-Styles = (WORKSTATION, CREATE);
-End
-
 Directory gid_Dir_User_Basic
 ParentID = gid_Dir_User;
 DosName = "basic";
@@ -214,54 +132,6 @@ Directory gid_Dir_User_Config
 Styles = (WORKSTATION, CREATE);
 End
 
-Directory gid_Dir_User_Config_Sofficecfg
-ParentID = gid_Dir_User_Config;
-DosName = "soffice.cfg";
-Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Template
-ParentID = gid_Dir_User;
-DosName = "template";
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Database
-ParentID = gid_Dir_User;
-DosName = "database";
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Database_Biblio
-ParentID = gid_Dir_Database;
-DosName = "biblio";
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Gallery
-ParentID = gid_Dir_User;
-DosName = "gallery";
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Wordbook
-ParentID = gid_Dir_User;
-DosName = "wordbook";
-Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Store
-ParentID = gid_Dir_User;
-DosName = "store";
-Styles = (WORKSTATION, CREAT

[Libreoffice-commits] core.git: solenv/Package_gdb.mk

[Miklos Vajna]

 solenv/Package_gdb.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7de8db6a95d644c175b77a132c49cdc1eead1eac
Author: Miklos Vajna 
Date:   Wed Apr 17 09:38:39 2013 +0200

solenv: fix packaging of gdb pretty-printers in the non-libmerged case

Change-Id: Ia6241674c8a262965025df7800d106747f7575fd

diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk
index 1f2f5b8..680daa1 100644
--- a/solenv/Package_gdb.mk
+++ b/solenv/Package_gdb.mk
@@ -36,7 +36,10 @@ $(eval $(call gb_Package_add_files,solenv_gdb,lib,\
$(call gb_Library_get_runtime_filename,sw)-gdb.py \
) \
$(call gb_Library_get_runtime_filename,merged)-gdb.py, \
+   $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \
+   $(call gb_Library_get_runtime_filename,sal).3-gdb.py \
$(call gb_Library_get_runtime_filename,svl)-gdb.py \
+   $(call gb_Library_get_runtime_filename,sw)-gdb.py \
$(call gb_Library_get_runtime_filename,tl)-gdb.py) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] scp: remove unused macros

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

Approvals:
  Matúš Kukan: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48ac97bd6ac8cbd534e50c617f3d54ff10bd2908
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: Matúš Kukan 
Gerrit-Reviewer: Thomas Arnhold 

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

Re: [Libreoffice-commits] core.git: 7 commits - liborcus/ExternalProject_liborcus.mk Library_merged.mk RepositoryModule_host.mk sd/source solenv/bin solenv/gbuild solenv/gdb solenv/Package_gdb.mk

[Miklos Vajna]

Hi Peter,

On Tue, Apr 16, 2013 at 09:10:53PM -0400, Peter Foley  
wrote:
> Sorry, should be fixed now.

Yes, you fixed svl and tl, but cppu, sal and sw printers were still
missing.

I fixed those for the non-libmerged case with
7de8db6a95d644c175b77a132c49cdc1eead1eac, I hope I didn't break anything
for libmerged/libmerged=all. :)

Miklos


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

[PATCH] fdo#63290 related: cleanup stings defines due to removal

[Lior Kaplan (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3425

To pull it, you can do:

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

fdo#63290 related: cleanup stings defines due to removal

follow up to commit af4a947174aafe669c129c54c304caa43d90eac7

Change-Id: Ifaee6d61fada21705574e5ad6bf0fa32957fe75c
---
M sc/inc/globstr.hrc
1 file changed, 0 insertions(+), 2 deletions(-)



diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 6392110..987b45f 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -79,8 +79,6 @@
 #define STR_MSSG_SOLVE_258
 #define STR_MSSG_SOLVE_359
 #define STR_MSSG_SOLVE_460
-#define STR_MSSG_SOLVE_561
-#define STR_MSSG_SOLVE_662
 
 #define STR_TABLE_GESAMTERGEBNIS64
 #define STR_TABLE_ERGEBNIS  65

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifaee6d61fada21705574e5ad6bf0fa32957fe75c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Lior Kaplan 

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

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

[Kohei Yoshida]

 sc/source/ui/dbgui/dapitype.cxx |4 
 sc/source/ui/dbgui/dapitype.src |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1d933d4533c9eb10f4456ec8a8a8468e6ff086d5
Author: Kohei Yoshida 
Date:   Mon Apr 15 21:30:18 2013 -0400

Remove the 4th option from the pivot table source selection dialog.

Change-Id: I39ed1a9fd0476506cac0852af63182075f433ffd
Reviewed-on: https://gerrit.libreoffice.org/3402
Reviewed-by: Petr Mladek 
Tested-by: Petr Mladek 
Reviewed-on: https://gerrit.libreoffice.org/3419
Reviewed-by: Eike Rathke 
Reviewed-by: Fridrich Strba 

diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index cad3532..e17d1e0 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -62,6 +62,10 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg( Window* 
pParent, sal_Bool bE
 aBtnNamedRange.Disable();
 
 FreeResource();
+
+ // Intentionally hide this to see if someone complains. Eventually we'll
+ // remove this option.
+aBtnExternal.Show(false);
 }
 
 ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src
index 569023d..4a388d6 100644
--- a/sc/source/ui/dbgui/dapitype.src
+++ b/sc/source/ui/dbgui/dapitype.src
@@ -26,7 +26,7 @@ ModalDialog RID_SCDLG_DAPITYPE
 OutputSize = TRUE ;
 HelpId = HID_DATAPILOT_TYPE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 241 , 76 ) ;
+Size = MAP_APPFONT ( 241 , 63 ) ;
 Moveable = TRUE ;
 Closeable = FALSE ;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0-3] Remove the 4th option from the pivot table source selection ...

[Petr Mladek (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/3419

Approvals:
  Petr Mladek: Verified; Looks good to me, approved
  Eike Rathke: Looks good to me, but someone else must approve
  Fridrich Strba: Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39ed1a9fd0476506cac0852af63182075f433ffd
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-3
Gerrit-Owner: Petr Mladek 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Kohei Yoshida 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Petr Mladek 

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

Builing libreoffice Difficulty

[Jayant Sable]

Hey.
Can you please tell me how can i build libreoffice using bundles.
I tried 4 times to build libreoffice using git clone but it's not working
for me.
So, Can you tell me the steps to build libreoffice using
http://dev-www.libreoffice.org/bundles/ this.
It will be really helpful if you reply with step by step procedure. So that
i can quickly build it and get started to work on it. Since i know i am
very late for it because of my college schedule. But once I get started I
will give my best to LIBREOFFICE. So Please help me to sort these things
out.
Thank You.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Need help

[Miklos Vajna]

Hi Anurag,

On Wed, Apr 17, 2013 at 01:03:20AM +0530, Anurag Kanungo 
 wrote:
> Finally i was able to build the libre office using the clang compiler on
> master branch and i built it on open suse . But my compiler plugings are
> not working as it says compiler headers missing .

Did you use the home:llunak:clang repo, as suggested by
?
If not, I would recommend doing so, the clang tinderbox uses those
packages, so surely they should work. Otherwise, did you look into
exactly what header is missing?

> Please guide me how to proceed in an easy hack... I have removed some of
> the warnings , like invalid arguments , unused macros and invalid data type
> conversions using a simple text editor , but i don't know .. How to proceed
> further . Please guide.

If you mean that you got a warning, and you just removed the assert to
avoid the warning, that does not look like a good solution to me in
general. :-)

Miklos


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

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

[Miklos Vajna]

Hi Noel,

On Tue, Apr 16, 2013 at 01:04:46PM -0700, Noel Grandin  wrote:
>  sfx2/inc/sfx2/dispatch.hxx   |4 +
>  sfx2/source/control/dispatch.cxx |   99 
> ++-
>  2 files changed, 49 insertions(+), 54 deletions(-)
> 
> New commits:
> commit 7e4db91a3900fd0bbce0f0592a045458a37862b3
> Author: Noel Grandin 
> Date:   Mon Apr 15 11:21:16 2013 +0200
> 
> Convert SfxShellStack_Impl from SfxPtrArr to std::vector
> 
> Change-Id: I1ffd615a505029242a87337c9ef42c8156c42d70
> Reviewed-on: https://gerrit.libreoffice.org/3394

After this commit, I see some new warnings on startup:

warn:legacy.tools:27529:1:sfx2/source/control/dispatch.cxx:1592: pushed 
SfxShell already on stack

Reverting this commit (to test, you need to also revert
187a592df9bc9c1ef4b53fe6dce40a3c74f6bb67 and
e2ce3538943c510efa8041fca3c83728acf3a155, but they are unlikely to be
reason for this) makes the warning go away. I did not look into this
deeply, is it possible that the old container checked if the given
SfxShell is already on the stack, and if so, it didn't add it?

Miklos


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

Re: patch for postgresql driver

[Lionel Elie Mamane]

On Wed, Apr 17, 2013 at 08:28:21AM +0100, Wols Lists wrote:
> On 17/04/13 02:10, Lionel Elie Mamane wrote:
>> On Tue, Apr 16, 2013 at 09:24:03PM +0100, Wols Lists wrote:
>>> On 16/04/13 20:28, Lionel Elie Mamane wrote:

 RTL_CONSTASCII_STRINGPARAM is a hack/optimisation specific to
 compile-time constants. With your change, the string is not anymore
 a compile-time constant

>>> I'm puzzled that it's not a compile-time constant

>> Well, it is not even a run-time constant: at each iteration of the
>> loop, it is a different value.

> Yes, the value passed changes each time, but the array itself is a
> constant array of constant strings ...

If you want to exploit that fact, you could do something like that:

  static std::vector< std::pair< char*, sal_Int32 > > keyword_list =
boost::assign::list_of(::std::pair(RTL_CONSTASCII_STRINGPARAM( "password" 
)))
  (::std::pair(RTL_CONSTASCII_STRINGPARAM( "user" )))
  (etc)
  (etc)
  (etc).to_adapter()

  

  if( args[i].Name.matchIgnoreAsciiCaseAsciiL( keyword_list[j].first, 
keyword_list[j].second ))

(or for more C++-y style, use an iterator instead of indexed access)

Yes, C++03 makes this *much* harder than it could be (C++11 has a
better solution: http://en.wikipedia.org/wiki/C++11#Initializer_lists )

IMHO it is *far* more trouble than it is worth.

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

incompatible (date)time uno struct change coming up in master

[Lionel Elie Mamane]

Hi,

https://gerrit.libreoffice.org/2783/ now compiles on the three buildbot
platforms. If you want to weigh in before I push, now is the time.

It expands precision of time, datetime and duration UNO structs to
nanosecond (from centisecond or millisecond, respectively), and of
LibreOffice time-related structures in general.

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

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

[Noel Grandin]

 sfx2/source/control/dispatch.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3b1ce2097ea3b43234be3dfb1d529335b980ff8
Author: Noel Grandin 
Date:   Wed Apr 17 10:18:33 2013 +0200

Fix assert statement

which I messed up in 7e4db91a3900fd0bbce0f0592a045458a37862b3
  "Convert SfxShellStack_Impl from SfxPtrArr to std::vector"

Change-Id: I177972fddb8a0f2237085fdc2892d6992c5fc746

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 26fd6f0..3ba81de 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1588,7 +1588,7 @@ void SfxDispatcher::FlushImpl()
 if(i->bPush)
 {
 // Actually push
-DBG_ASSERT( std::find(pImp->aStack.begin(), pImp->aStack.end(), 
i->pCluster) != pImp->aStack.end(),
+DBG_ASSERT( std::find(pImp->aStack.begin(), pImp->aStack.end(), 
i->pCluster) == pImp->aStack.end(),
"pushed SfxShell already on stack" );
 pImp->aStack.push_back(i->pCluster);
 i->pCluster->SetDisableFlags(pImp->nDisableFlags);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

On 2013-04-17 10:06, Miklos Vajna wrote:

On Tue, Apr 16, 2013 at 01:04:46PM -0700, Noel Grandin  wrote:

  sfx2/inc/sfx2/dispatch.hxx   |4 +
  sfx2/source/control/dispatch.cxx |   99 
++-
  2 files changed, 49 insertions(+), 54 deletions(-)

New commits:
commit 7e4db91a3900fd0bbce0f0592a045458a37862b3
Author: Noel Grandin 
Date:   Mon Apr 15 11:21:16 2013 +0200

 Convert SfxShellStack_Impl from SfxPtrArr to std::vector
 
 Change-Id: I1ffd615a505029242a87337c9ef42c8156c42d70

 Reviewed-on: https://gerrit.libreoffice.org/3394

After this commit, I see some new warnings on startup:

warn:legacy.tools:27529:1:sfx2/source/control/dispatch.cxx:1592: pushed 
SfxShell already on stack

Reverting this commit (to test, you need to also revert
187a592df9bc9c1ef4b53fe6dce40a3c74f6bb67 and
e2ce3538943c510efa8041fca3c83728acf3a155, but they are unlikely to be
reason for this) makes the warning go away. I did not look into this
deeply, is it possible that the old container checked if the given
SfxShell is already on the stack, and if so, it didn't add it?




Aaah, sorry about that, I got the DBG_ASSERT the wrong way around.
Pushed a fix - c3b1ce2097ea3b43234be3dfb1d529335b980ff8



Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: [ANN] --enable-dbgutil: everyone gets a Debug STL!

[Stephan Bergmann]

On 04/17/2013 08:56 AM, Tor Lillqvist wrote:

Why _GLIBCXX_DEBUG causes this problem on Mac OS X now, and how to solve it,
is still unclear to me.


I guess -D_GLIBCXX_FULLY_DYNAMIC_STRING did not do anything to improve
this? Some other magic _GLIBCXX_FOO that needs to be defined perhaps?


No, _GLIBCXX_FULLY_DYNAMIC_STRING did not help (I only noticed the 
problem once your fix to set that was in and I had done a from-scratch 
build).


I looked at "grep -r _GLIBCXX_ /usr/include/c++/4.2.1" output, but 
nothing apparent caught my eye.


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

Re: Need help

[Tor Lillqvist]

Actually, based on what Anurag said on IRC, I think his eagerness to
use Clang plug-ins was based on a misunderstanding.

(There are quite few warnings generated by Clang plug-ins any more,
and those we have currently are either from 3rd-party code, or
otherwise perhaps not suitable as "Easy Hacks", at least not in the
sense of qualifying for GSoC.)

Anyway, the Clang plug-in builds fine and works for me on openSUSE
12.3 without that home:llunak:clang repo ?

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

Re: Builing libreoffice Difficulty

[Jan Holesovsky]

Hi Jayant,

Jayant Sable píše v St 17. 04. 2013 v 13:26 +0530:

> Can you please tell me how can i build libreoffice using bundles.

Please - is there any reason why do you prefer the bundles over git
checkout?  It is much easier with git, you will be downloading about the
same amount of data is with the bundles, and additionally you'll have
the history :-)

Failing that, would be great to have a log of your failur.

Either way - thank you for you interest in hacking LibreOffice! :-)

All the best,
Kendy


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

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

[Jan Holesovsky]

 sw/source/core/layout/layact.cxx |   26 ++
 1 file changed, 26 insertions(+)

New commits:
commit 09f50c017fe106b7bf94f60933667b55130ea1b5
Author: Jan Holesovsky 
Date:   Wed Apr 17 10:30:28 2013 +0200

Reintroduce unlockPositionOfObjects().

This unlocking code was accidentally removed in commit
120922361a5928ea4437ffe253ce209abd7060b0.  Not sure if it is still 
necessary,
but I am at the moment unable to prove it is not, so better to be safe :-)

Change-Id: I20a7cf3299de75182f890efb0d192e54c1b2543d

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index bb46900..71659ce 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -498,6 +498,24 @@ SwPageFrm* SwLayAction::CheckFirstVisPage( SwPageFrm 
*pPage )
 return pPage;
 }
 
+// #114798# - unlock position on start and end of page
+// layout process.
+static void unlockPositionOfObjects( SwPageFrm *pPageFrm )
+{
+assert( pPageFrm );
+
+SwSortedObjs* pObjs = pPageFrm->GetSortedObjs();
+if ( pObjs )
+{
+sal_uInt32 i = 0;
+for ( ; i < pObjs->Count(); ++i )
+{
+SwAnchoredObject* pObj = (*pObjs)[i];
+pObj->UnlockPosition();
+}
+}
+}
+
 void SwLayAction::InternalAction()
 {
 OSL_ENSURE( pRoot->Lower()->IsPageFrm(), ":-( No page below the root.");
@@ -597,6 +615,8 @@ void SwLayAction::InternalAction()
 while ( !IsInterrupt() && !IsNextCycle() &&
 ((IS_FLYS && IS_INVAFLY) || pPage->IsInvalid()) )
 {
+unlockPositionOfObjects( pPage );
+
 // #i28701#
 SwObjectFormatter::FormatObjsAtFrm( *pPage, *pPage, this );
 if ( !IS_FLYS )
@@ -655,6 +675,8 @@ void SwLayAction::InternalAction()
 if( bNoLoop )
 pLayoutAccess->GetLayouter()->LoopControl( pPage, 
LOOP_PAGE );
 }
+
+unlockPositionOfObjects( pPage );
 }
 
 // A previous page may be invalid again.
@@ -769,6 +791,8 @@ void SwLayAction::InternalAction()
 while ( pPg && ( pPg->Frm().Top() < nBottom ||
  ( IsIdle() && pPg == pPage ) ) )
 {
+unlockPositionOfObjects( pPg );
+
 XCHECKPAGE;
 
 // #i81146# new loop control
@@ -843,6 +867,8 @@ void SwLayAction::InternalAction()
 }
 }
 }
+
+unlockPositionOfObjects( pPg );
 pPg = (SwPageFrm*)pPg->GetNext();
 }
 // reset flag for special interrupt content formatting.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Builing libreoffice Difficulty

[Miklos Vajna]

Hi,

On Wed, Apr 17, 2013 at 10:26:27AM +0200, Jan Holesovsky  wrote:
> Please - is there any reason why do you prefer the bundles over git
> checkout?  It is much easier with git, you will be downloading about the
> same amount of data is with the bundles, and additionally you'll have
> the history :-)

The bundle also contains a full git repo, just git clone can't resume
after a network error, while wget'ing the bundle can. That can be
helpful in case of crappy network or so.

Jayant, here is how it works for me:

wget http://dev-www.libreoffice.org/bundles/libo_git_from_tar.sh
sh libo_git_from_tar.sh core

Then you have a git checkout of core.git in ./libo. (Probably the first
thing you want to do in that repo is to run 'git pull -r'.)

HTH,

Miklos


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

[Libreoffice-commits] core.git: bean/qa

[Noel Grandin]

 bean/qa/complex/bean/OOoBeanTest.java |8 
 bean/qa/complex/bean/WriterFrame.java |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit cb6b6e286cf4664c0036560908ec28f3bba3aaa6
Author: Noel Grandin 
Date:   Wed Apr 17 10:49:20 2013 +0200

Fix for method name change

In commit
  43debfae8326ad98f9d130aa450f59ad49577d55
  "General cleanup of OfficeBeans"
In class
   com.sun.star.comp.beans.OOoBean,
the method
   aquireSystemWindow
changed name to
   acquireSystemWindow

Change-Id: I5a9a16c1374d7dbc828ee2fa76c193b207881415

diff --git a/bean/qa/complex/bean/OOoBeanTest.java 
b/bean/qa/complex/bean/OOoBeanTest.java
index ae256dd..c72e18e 100644
--- a/bean/qa/complex/bean/OOoBeanTest.java
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -302,7 +302,7 @@ public class OOoBeanTest
 }
 }
 
-/** Test repeated OOoBean.aquireSystemWindow and 
OOoBean.releaseSystemWindow
+/** Test repeated OOoBean.acquireSystemWindow and 
OOoBean.releaseSystemWindow
  * calls.
  * @throws Exception
  */
@@ -316,7 +316,7 @@ public class OOoBeanTest
 for (int i = 0; i < 100; i++)
 {
 b.releaseSystemWindow();
-b.aquireSystemWindow();
+b.acquireSystemWindow();
 }
 if (!f.checkUnoFramePosition())
 {
@@ -419,7 +419,7 @@ public class OOoBeanTest
 bean.releaseSystemWindow();
 frame.remove(bean);
 frame.add(bean, BorderLayout.CENTER);
-bean.aquireSystemWindow();
+bean.acquireSystemWindow();
 }
 
 if (!isWindows())
@@ -504,7 +504,7 @@ public class OOoBeanTest
 try {
 
 frame.add(bean, BorderLayout.CENTER);
-bean.aquireSystemWindow();
+bean.acquireSystemWindow();
 frame.validate();
 } catch (Exception e) {
 e.printStackTrace();
diff --git a/bean/qa/complex/bean/WriterFrame.java 
b/bean/qa/complex/bean/WriterFrame.java
index 525ddf7..3162646 100644
--- a/bean/qa/complex/bean/WriterFrame.java
+++ b/bean/qa/complex/bean/WriterFrame.java
@@ -61,7 +61,7 @@ class WriterFrame extends java.awt.Frame
 pack();
 setBounds(x, y, width, height);
 setVisible(true);
-m_bean.aquireSystemWindow();
+m_bean.acquireSystemWindow();
 }
 }
 catch (Exception e)
@@ -193,7 +193,7 @@ class WriterFrame extends java.awt.Frame
 public void addOOoBean() throws Exception
 {
 add(m_bean, BorderLayout.CENTER);
-m_bean.aquireSystemWindow();
+m_bean.acquireSystemWindow();
 validate();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matúš Kukan]

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

New commits:
commit a59565f855cb30fff56eb3d889376bfd27dc728f
Author: Matúš Kukan 
Date:   Wed Apr 17 10:43:28 2013 +0200

workaround problems with LTO for some libraries (disable for them)

Currently enabling lto fails for scfilt frm and wpftdraw which should be
fixed and this commit reverted.

Change-Id: I73b1846458dd7830425279328dd4e652269afc1a

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a327593..0bcd366 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -185,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-   $(gb_LTOFLAGS) \
+   $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call 
gb_Library_get_linktargetname,$(lib))),$*),$(gb_LTOFLAGS)) \
$(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir 
$(1)).$(SOVERSION)) \
$(if 
$(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\
$(subst \d,$$,$(RPATH)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Create Photo Album fix

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3426

To pull it, you can do:

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

Create Photo Album fix

Fixed some pointer issues in CreateHdl function.
Removed the creation of title slide.
Added an enum to access the image layout option from the code.

Change-Id: Ib91fbbf3b068453c8e66b8df1ce32e24c3828bc0
---
M sd/source/ui/app/strings.src
M sd/source/ui/dlg/PhotoAlbumDialog.cxx
M sd/source/ui/dlg/PhotoAlbumDialog.hxx
M sd/source/ui/inc/strings.hrc
4 files changed, 43 insertions(+), 64 deletions(-)



diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index a91003d..928e03e 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1268,19 +1268,14 @@
  Text [ en-US ] = "Drag and Drop Slides" ;
 };
 
-String STR_PHOTO_ALBUM_TITLE
-{
- Text [ en-US ] = "Photo Album" ;
-};
-
-String STR_PHOTO_ALBUM_AUTHOR
-{
- Text [ en-US ] = "Author:" ;
-};
-
 String STR_PHOTO_ALBUM_EMPTY_WARNING
 {
  Text [ en-US ] = "Please add images to the album." ;
 };
 
+String STR_PHOTO_ALBUM_TEXTBOX
+{
+Text [ en-US ] = "Text Box";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 4beabeb..5d6ba1e 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -101,33 +101,12 @@
 Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(), 
uno::UNO_QUERY );
 Reference< lang::XMultiServiceFactory > xShapeFactory( 
pDoc->getUnoModel(), uno::UNO_QUERY  );
 
-// Create the title slide
-const sal_Int32 nSlideCount = pDoc->GetSdPageCount(PK_STANDARD);
-
-if(nSlideCount == 1)
-{
-// we have created an empty presentation (probably)
-Reference< drawing::XDrawPage > xTitleSlide = 
appendNewSlide(AUTOLAYOUT_TITLE, xDrawPages);
-
-SdPage* pFirstSlide = pDoc->GetSdPage( 
pDoc->GetSdPageCount(PK_STANDARD)-1, PK_STANDARD);
-SvtUserOptions aUserOptions;
-SdrObject* pTitleObj = pFirstSlide->GetPresObj(PRESOBJ_TITLE, 0);
-SvxShapeText* pTitleText = new SvxShapeText(pTitleObj);
-
pTitleText->SetShapeType("com.sun.star.presentation.TitleTextShape");
-pTitleText->setString(SD_RESSTR(STR_PHOTO_ALBUM_TITLE));
-
-SdrObject* pTextObj = pFirstSlide->GetPresObj(PRESOBJ_TEXT, 0);
-SvxShapeText* pTextShape = new SvxShapeText(pTextObj);
-pTextShape->SetShapeType("com.sun.star.presentation.TextShape");
-pTextShape->setString(SD_RESSTR(STR_PHOTO_ALBUM_AUTHOR) + " " + 
aUserOptions.GetFullName());
-}
-
 Reference< XComponentContext > 
xContext(::comphelper::getProcessComponentContext());
 Reference< graphic::XGraphicProvider> 
xProvider(graphic::GraphicProvider::create(xContext));
 
 // get the option
-OUString sOpt = 
pInsTypeCombo->GetEntry(pInsTypeCombo->GetSelectEntryPos());
-if ( sOpt == "Fit to slide")
+sal_uInt16 nOpt = pInsTypeCombo->GetSelectEntryPos();
+if ( nOpt == FIT_TO_SLIDE )
 {
 OUString sUrl;
 
@@ -184,11 +163,9 @@
 {
 appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages);
 }
-delete pData;
-pData = NULL;
 }
 }
-else if( sOpt == "1 image with title" )
+else if( nOpt == TITLE_ONE_IMAGE )
 {
 OUString sUrl;
 
@@ -196,7 +173,7 @@
 {
 OUString* pData = (OUString*) pImagesLst->GetEntryData(i);
 sUrl = *pData;
-if ( sUrl != "Text Box" )
+if ( sUrl != SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX) )
 {
 
 Reference< drawing::XDrawPage > xSlide = 
appendNewSlide(AUTOLAYOUT_NONE, xDrawPages);
@@ -227,11 +204,9 @@
 {
 appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages);
 }
-delete pData;
-pData = NULL;
 }
 }
-else if( sOpt == "2 images" )
+else if( nOpt == TWO_IMAGES )
 {
 OUString sUrl1("");
 OUString sUrl2("");
@@ -252,13 +227,15 @@
 OUString("Height")) >>= aPageSize.Height;
 
 // grab the left one
-pData = (OUString*) pImagesLst->GetEntryData(i);
+void* pD1 = pImagesLst->GetEntryData(i);
+pData = (OUString*) pD1;
 sUrl1 = pData ? OUString(*pData) : "";
 // grab the right one
-pData = (OUString*) pImagesLst->GetEntryData(i+1);
+void* pD2 = pImagesLst->GetEntryData(i+1);
+pData = (OUString*) pD2;
 sUrl2 = pData ? OUStrin

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/util solenv/inc

[Petr Mladek]

 instsetoo_native/util/openoffice.lst |   46 +--
 solenv/inc/minor.mk  |6 ++--
 2 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit e0f25870cd41637d6705fb497f6e3327517b92d0
Author: Petr Mladek 
Date:   Wed Apr 17 11:22:06 2013 +0200

set version for SUSE 4.0-rc1

+ version 4.0
+ version suffix to -1
+ micro version to 10
+ buildid to 201

Change-Id: I4f741a38666a277ea332e7d65e9e0e72afbbe551

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index b08c40e..0ae22b0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 4.0.2.2
+UREPACKAGEVERSION 4.0
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 UNIXBASISROOTNAME libreoffice4.0
@@ -50,13 +50,13 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.2
+PRODUCTEXTENSION -1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.2.2
-ABOUTBOXPRODUCTVERSIONSUFFIX
+ABOUTBOXPRODUCTVERSION 4.0
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-201
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -65,7 +65,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.2.2
+PACKAGEVERSION 4.0
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,14 +100,14 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.2
+PRODUCTEXTENSION -1
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.2.2
-ABOUTBOXPRODUCTVERSIONSUFFIX
+ABOUTBOXPRODUCTVERSION 4.0
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-201
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -121,7 +121,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.2.2
+PACKAGEVERSION 4.0
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
 {
 PRODUCTNAME URE
 PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.2.2
+PACKAGEVERSION 4.0
 PACKAGEREVISION 1
-PRODUCTEXTENSION .2.2
+PRODUCTEXTENSION -1
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.2
+PRODUCTEXTENSION -1
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.2.2
+PACKAGEVERSION 4.0
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.2
+PRODUCTEXTENSION -1
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.2.2
+PACKAGEVERSION 4.0
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.2
+PRODUCTEXTENSION -1
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.2.2
+PACKAGEVERSION 4.0
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.2
+ 

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

[Caolán McNamara]

 formula/inc/formula/funcutl.hxx|   17 
 formula/source/ui/dlg/formula.cxx  |4 +-
 formula/source/ui/dlg/funcutl.cxx  |   28 +++---
 formula/source/ui/dlg/parawin.cxx  |4 +-
 sc/source/ui/condformat/condformatdlg.cxx  |4 +-
 sc/source/ui/condformat/condformatdlgentry.cxx |6 +--
 sc/source/ui/dbgui/consdlg.cxx |8 ++--
 sc/source/ui/dbgui/dbnamdlg.cxx|4 +-
 sc/source/ui/dbgui/filtdlg.cxx |4 +-
 sc/source/ui/dbgui/pvlaydlg.cxx|8 ++--
 sc/source/ui/dbgui/sfiltdlg.cxx|8 ++--
 sc/source/ui/dbgui/validate.cxx|   12 +++---
 sc/source/ui/inc/optsolver.hxx |2 -
 sc/source/ui/inc/validate.hxx  |4 +-
 sc/source/ui/miscdlgs/anyrefdg.cxx |   17 +++-
 sc/source/ui/miscdlgs/crnrdlg.cxx  |8 ++--
 sc/source/ui/miscdlgs/highred.cxx  |4 +-
 sc/source/ui/miscdlgs/optsolver.cxx|   48 -
 sc/source/ui/miscdlgs/simpref.cxx  |4 +-
 sc/source/ui/miscdlgs/solvrdlg.cxx |8 ++--
 sc/source/ui/miscdlgs/tabopdlg.cxx |   12 +++---
 sc/source/ui/namedlg/namedefdlg.cxx|3 +
 sc/source/ui/namedlg/namedlg.cxx   |3 +
 sc/source/ui/pagedlg/areasdlg.cxx  |   12 +++---
 sc/source/ui/xmlsource/xmlsourcedlg.cxx|4 +-
 25 files changed, 118 insertions(+), 118 deletions(-)

New commits:
commit 02179ab7e771fae9d012724b8ff1397f4265cfc1
Author: Caolán McNamara 
Date:   Tue Apr 16 20:41:34 2013 +0100

stash the label widget for shrink mode in the edit, not the button

because we always have we a refedit, but sometimes not a refbutton, so set 
the
label widget to use for the dialog shrink mode on the refedit instead of the
refbutton. This way we get the shrunken dialog title bar updated with the 
label
contents regardless of using the shrink button or clicking in the editbox 
and
dragging the mouse around the spreadsheet triggering the shrink mode

Change-Id: Ifdff01a30d5c65aa964d4bf544017a2927757d67

diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index 76a2287..6676117 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -34,6 +34,7 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit
 private:
 Timer   aTimer;
 IControlReferenceHandler*  pAnyRefDlg; // parent dialog
+Window* pLabelWidget;
 
 DECL_LINK( UpdateHdl, void* );
 
@@ -43,8 +44,10 @@ protected:
 virtual voidLoseFocus();
 
 public:
-RefEdit( Window* _pParent,IControlReferenceHandler* 
pParent, const ResId& rResId );
-RefEdit( Window* _pParent, WinBits nStyle = WB_BORDER 
);
+RefEdit( Window* _pParent,IControlReferenceHandler* 
pParent,
+Window* pShrinkModeLabel, const ResId& rResId );
+RefEdit( Window* _pParent, Window* pShrinkModeLabel,
+WinBits nStyle = WB_BORDER );
 virtual ~RefEdit();
 
 voidSetRefString( const XubString& rStr );
@@ -61,8 +64,9 @@ public:
 
 voidStartUpdateData();
 
-voidSetRefDialog( IControlReferenceHandler* pDlg );
+voidSetReferences( IControlReferenceHandler* pDlg, Window 
*pLabelWidget );
 IControlReferenceHandler* GetRefDialog() { return pAnyRefDlg; }
+Window* GetLabelWidgetForShrinkMode() { return pLabelWidget; }
 };
 
 
@@ -77,7 +81,6 @@ private:
 OUStringaExpandQuickHelp;
 IControlReferenceHandler*  pAnyRefDlg; // parent dialog
 RefEdit*pRefEdit;   // zugeordnetes Edit-Control
-Window* pLabelWidget;
 
 protected:
 virtual voidClick();
@@ -89,16 +92,14 @@ public:
 RefButton(Window* _pParent, const ResId& rResId);
 RefButton(Window* _pParent, WinBits nStyle = 0);
 RefButton(Window* _pParent, const ResId& rResId,
-  RefEdit* pEdit, Window* pShrinkModeLabel,
-  IControlReferenceHandler* pDlg);
+  RefEdit* pEdit, IControlReferenceHandler* 
pDlg);
 
 voidSetReferences( IControlReferenceHandler* pDlg,
-   RefEdit* pEdit, Window* 
pShrinkModeLabel );
+   RefEdit* pEdit );
 
 voidSetStartImage();
 voidSetEndImage();
 voidDoRef() { Click(); }
-Window* GetLabelWidgetForShrinkMode() { return pLabelWidget; }
 };
 
 } // formula
diff --g

[PATCH] Update pch

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3427

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/3427/1

Update pch

Change-Id: Ice80350184f7a514d5beab0a5e1da5b98d5733e4
---
M dbaccess/inc/pch/precompiled_dbu.hxx
M dictionaries
M oox/inc/pch/precompiled_oox.hxx
M sal/inc/pch/precompiled_sal.hxx
M sc/inc/pch/precompiled_sc.hxx
M sd/inc/pch/precompiled_sd.hxx
M svtools/inc/pch/precompiled_svt.hxx
M sw/inc/pch/precompiled_sw.hxx
M vcl/inc/pch/precompiled_vcl.hxx
M writerfilter/inc/pch/precompiled_writerfilter.hxx
10 files changed, 14 insertions(+), 14 deletions(-)



diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx 
b/dbaccess/inc/pch/precompiled_dbu.hxx
index 4826fec..3573e6b 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -108,6 +108,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -333,7 +334,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/dictionaries b/dictionaries
index faf63ac..b32611e 16
--- a/dictionaries
+++ b/dictionaries
-Subproject commit faf63ac08a9f3f1463a7f119083964f76b71141c
+Subproject commit b32611e23a1f35f16f4c37bbbdc02027157424d1
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 674f9f9..5818c074 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -278,6 +278,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -318,6 +319,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -332,7 +334,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index 24ff7af..5e89b28 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -24,9 +24,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 857dcfd..deefbe6 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -210,6 +210,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 113c2bd..0094aca 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -188,6 +188,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -411,6 +412,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/svtools/inc/pch/precompiled_svt.hxx 
b/svtools/inc/pch/precompiled_svt.hxx
index 6159679..4252097 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -139,6 +139,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -146,7 +147,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -170,11 +170,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -204,10 +199,7 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -302,7 +294,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 104df5b..4957e1a 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -157,6 +157,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -426,6 +427,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index e259a58..475a1de 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -289,6 +289,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx 
b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index b277bdf..6e840a6 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -176,12 +176,16 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice80350184f7a514d5beab0a5e1da5b98d5733e4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aurimas Fišeras 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://li

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-1'

[Petr Mladek]

Tag 'suse-4.0-1' created by Petr Mladek  at 2013-04-17 10:33 
-0700

Tag suse-4.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlFubHwACgkQKZC06p8y5oPtPgCePRg/25CKXH5WwCZK87mZMZQC
tzsAnRt7c02ary14B3P5hc4IdCDbwGCU
=Js51
-END PGP SIGNATURE-

Changes since libreoffice-4.0.2.2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-1'

[Petr Mladek]

Tag 'suse-4.0-1' created by Petr Mladek  at 2013-04-17 10:33 
-0700

Tag suse-4.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlFubHwACgkQKZC06p8y5oMyEQCdF2YkES+QaYataY4zdADE3onU
gDwAn2ba4cWpc1y+I09eXEPYQwvcYpt+
=kYHI
-END PGP SIGNATURE-

Changes since libreoffice-4.0.2.2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-1'

[Petr Mladek]

Tag 'suse-4.0-1' created by Petr Mladek  at 2013-04-17 10:33 
-0700

Tag suse-4.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlFubH0ACgkQKZC06p8y5oMVfACZAUElNzf/ncx4/0ZExc8KzT3p
sGEAn2thdU0Qo/DoZVtju9odrA0j/IY1
=RGPA
-END PGP SIGNATURE-

Changes since libreoffice-4.0.2.2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-1'

[Petr Mladek]

Tag 'suse-4.0-1' created by Petr Mladek  at 2013-04-17 10:33 
-0700

Tag suse-4.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlFubH0ACgkQKZC06p8y5oM1cACfW3Np4NnFjUOQMAPANHHP7yCA
4PAAn083TgWerxjMacoZqZOb7VOB9xXQ
=Dy9B
-END PGP SIGNATURE-

Changes since libreoffice-4.0.2.2-58:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 21 commits - basic/source dtrans/source extensions/source filter/source jvmfwk/plugins jvmfwk/source np_sdk/inc sal/cpprt sal/osl sfx2/source shell/source svtools/sourc

[Stephan Bergmann]

 basic/source/runtime/methods.cxx|1 
 dtrans/source/win32/dtobj/DOTransferable.cxx|8 ---
 extensions/source/nsplugin/source/npshell.cxx   |   11 --
 extensions/source/nsplugin/source/nsp_func.hxx  |3 --
 extensions/source/nsplugin/source/so_env.cxx|4 ---
 extensions/source/plugin/inc/plugin/win/sysplug.hxx |   10 -
 extensions/source/plugin/win/sysplug.cxx|   21 +---
 extensions/source/plugin/win/winmgr.cxx |   10 +
 extensions/source/scanner/scanwin.cxx   |4 ---
 filter/source/placeware/tempfile.cxx|4 ---
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |4 ---
 jvmfwk/source/framework.cxx |7 --
 np_sdk/inc/npapi.h  |4 +--
 sal/cpprt/operators_new_delete.cxx  |4 +--
 sal/osl/w32/file.cxx|3 --
 sal/osl/w32/file_dirvol.cxx |1 
 sal/osl/w32/file_url.cxx|2 -
 sal/osl/w32/profile.cxx |6 -
 sal/osl/w32/security.c  |1 
 sal/osl/w32/socket.cxx  |6 -
 sal/osl/w32/thread.c|2 -
 sfx2/source/appl/shutdowniconw32.cxx|8 ---
 shell/source/win32/simplemail/senddoc.cxx   |8 ---
 svtools/source/config/apearcfg.cxx  |2 +
 twain/inc/twain.h   |4 +--
 vcl/win/source/app/salinst.cxx  |7 --
 vcl/win/source/gdi/salgdi_gdiplus.cxx   |7 --
 vcl/win/source/window/salframe.cxx  |2 -
 28 files changed, 50 insertions(+), 104 deletions(-)

New commits:
commit aae91941bfb0ec60e8703cff3d685c4a8dc7c301
Author: Stephan Bergmann 
Date:   Wed Apr 17 11:49:08 2013 +0200

-Werror=unused-macros (MinGW, shell)

Change-Id: I19a346a35eef403a7f831299e42655b9761f2c43

diff --git a/shell/source/win32/simplemail/senddoc.cxx 
b/shell/source/win32/simplemail/senddoc.cxx
index 869a683..f06b1b9 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -26,14 +26,6 @@
 
 #include "simplemapi.hxx"
 
-#define WIN32_LEAN_AND_MEAN
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include 
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #include 
 
 #include 
commit a93abb0fa4598b49b786b6936e4d25f21f6187a7
Author: Stephan Bergmann 
Date:   Wed Apr 17 11:40:05 2013 +0200

-Werror=unused-macros (MinGW, filter)

Change-Id: Ic2f743643f8a825a8f485b68025717e09f3d8c2f

diff --git a/filter/source/placeware/tempfile.cxx 
b/filter/source/placeware/tempfile.cxx
index d4c4c50..7df4cf6 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -55,10 +55,6 @@ oslFileError SAL_CALL my_getTempDirURL( rtl_uString** 
pustrTempDir )
 }
 #else
 
-#ifdef NDEBUG
-#define NO_DEBUG_CRT
-#endif
-
 #ifndef _WIN32_WINNT
 #   define _WIN32_WINNT 0x0400
 #   define _CTYPE_DISABLE_MACROS /* wg. dynamischer C-Runtime MH */
commit c86b0e0d1257a304ff39aedf45e292b5e462545f
Author: Stephan Bergmann 
Date:   Wed Apr 17 11:33:27 2013 +0200

-Werror=unused-macros (MinGW, dtrans)

Change-Id: Ie32b2b1283b54719f4c9525105d534fce70219af

diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx 
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index b3910af..30d887d 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -31,10 +31,6 @@
 #include 
 #include 
 
-#define STR2(x) #x
-#define STR(x) STR2(x)
-#define PRAGMA_MSG( msg ) message( __FILE__ "(" STR(__LINE__) "): " #msg )
-
 //
 // namespace directives
 //
@@ -427,9 +423,7 @@ void CDOTransferable::clipDataToByteStream( CLIPFORMAT cf, 
STGMEDIUM stgmedium,
 break;
 
 case TYMED_ISTREAM:
-#ifdef _MSC_VER
-#pragma PRAGMA_MSG( Has to be implemented )
-#endif
+//TODO: Has to be implemented
 break;
 
 default:
commit 8e08a416209bf86cbe5223e6d6980cf935da596e
Author: Stephan Bergmann 
Date:   Wed Apr 17 11:22:25 2013 +0200

-Werror=int-to-pointer-cast (MinGW, extensions)

Change-Id: I16db60c861ef7ac0a2a9076fde1996a7b7b0e991

diff --git a/extensions/source/plugin/win/sysplug.cxx 
b/extensions/source/plugin/win/sysplug.cxx
index c8b8747..f50bc30 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -304,7 +304,7 @@ NPError PluginComm_Impl::NPP_DestroyStream( NPP instance, 
NPStream* stream, NPEr
 m_eCall = eNPP_DestroyStream;
 m_aArgs[0] = (void*)instance;

[Libreoffice-commits] core.git: dbaccess/inc dictionaries oox/inc sal/inc sc/inc sd/inc svtools/inc sw/inc vcl/inc writerfilter/inc

[Aurimas Fišeras]

 dbaccess/inc/pch/precompiled_dbu.hxx  |2 +-
 dictionaries  |2 +-
 oox/inc/pch/precompiled_oox.hxx   |3 ++-
 sal/inc/pch/precompiled_sal.hxx   |2 --
 sc/inc/pch/precompiled_sc.hxx |1 +
 sd/inc/pch/precompiled_sd.hxx |2 ++
 svtools/inc/pch/precompiled_svt.hxx   |   11 +--
 sw/inc/pch/precompiled_sw.hxx |2 ++
 vcl/inc/pch/precompiled_vcl.hxx   |1 +
 writerfilter/inc/pch/precompiled_writerfilter.hxx |4 
 10 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c75eeddfb892918c13a19f7c534b73e423ff8d89
Author: Aurimas Fišeras 
Date:   Tue Apr 16 17:26:06 2013 +0300

Update pch

Change-Id: Ice80350184f7a514d5beab0a5e1da5b98d5733e4
Reviewed-on: https://gerrit.libreoffice.org/3427
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx 
b/dbaccess/inc/pch/precompiled_dbu.hxx
index 4826fec..3573e6b 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -108,6 +108,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -333,7 +334,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/dictionaries b/dictionaries
index faf63ac..b32611e 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit faf63ac08a9f3f1463a7f119083964f76b71141c
+Subproject commit b32611e23a1f35f16f4c37bbbdc02027157424d1
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 674f9f9..5818c074 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -278,6 +278,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -318,6 +319,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -332,7 +334,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index 24ff7af..5e89b28 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -24,9 +24,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 857dcfd..deefbe6 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -210,6 +210,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 113c2bd..0094aca 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -188,6 +188,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -411,6 +412,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/svtools/inc/pch/precompiled_svt.hxx 
b/svtools/inc/pch/precompiled_svt.hxx
index 6159679..4252097 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -139,6 +139,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -146,7 +147,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -170,11 +170,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -204,10 +199,7 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -302,7 +294,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 104df5b..4957e1a 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -157,6 +157,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -426,6 +427,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index e259a58..475a1de 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -289,6 +289,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx 
b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index b277bdf..6e840a6 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -176,12 +176,16 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-com

[Libreoffice-commits] core.git: package/source sal/workben sdext/source sd/source sfx2/source sot/source svtools/source svx/source swext/mediawiki vcl/generic vcl/unx

[Artur Dryomov]

 package/source/xstor/xfactory.cxx |2 +-
 package/source/zippackage/zipfileaccess.cxx   |2 +-
 sal/workben/testfile.cxx  |2 +-
 sd/source/ui/remotecontrol/DiscoveryService.cxx   |2 +-
 sdext/source/pdfimport/wrapper/wrapper.cxx|   12 ++--
 sfx2/source/appl/xpackcreator.cxx |2 +-
 sfx2/source/doc/ownsubfilterservice.cxx   |2 +-
 sot/source/unoolestorage/xolesimplestorage.cxx|2 +-
 svtools/source/hatchwindow/documentcloser.cxx |2 +-
 svtools/source/hatchwindow/hatchwindowfactory.cxx |2 +-
 svx/source/form/datanavi.cxx  |8 
 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java |4 ++--
 vcl/generic/fontmanager/fontcache.cxx |8 
 vcl/unx/generic/dtrans/X11_clipboard.cxx  |2 +-
 vcl/unx/generic/dtrans/X11_droptarget.cxx |2 +-
 vcl/unx/generic/dtrans/X11_selection.cxx  |2 +-
 vcl/unx/kde/UnxFilePicker.cxx |2 +-
 vcl/unx/kde4/KDE4FilePicker.cxx   |2 +-
 18 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit b80d8c695e6b6ded231e67ed9a80bcd1f1250c03
Author: Artur Dryomov 
Date:   Tue Apr 16 19:33:24 2013 +0300

fdo#62096 - replace some O(U)String compareTo with ==

Change-Id: I98d04d7da4c2b7ea0b769df9c2bfa8c1ad86bf2d
Reviewed-on: https://gerrit.libreoffice.org/3422
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/package/source/xstor/xfactory.cxx 
b/package/source/xstor/xfactory.cxx
index 8cf91ed..11fb074 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -294,7 +294,7 @@ sal_Bool SAL_CALL OStorageFactory::supportsService( const 
OUString& ServiceName
 uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames();
 
 for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
-if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
+if ( ServiceName == aSeq[nInd] )
 return sal_True;
 
 return sal_False;
diff --git a/package/source/zippackage/zipfileaccess.cxx 
b/package/source/zippackage/zipfileaccess.cxx
index 09a6e89..4365482 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -469,7 +469,7 @@ sal_Bool SAL_CALL OZipFileAccess::supportsService( const 
OUString& ServiceName )
 uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames();
 
 for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
-if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
+if ( ServiceName == aSeq[nInd] )
 return sal_True;
 
 return sal_False;
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index 473e25a..f4b1df9 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -1760,7 +1760,7 @@ void DirectoryItemTest( void )
 }
 
 
-if ( str1[0].compareTo(str1[1]) == 0 )
+if ( str1[0] == str1[1] )
 print_error( rtl::OString( "Reset" ),FileBase::E_None );
 else
 print_error( rtl::OString( "Reset" ),FileBase::E_invalidError );
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx 
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index a19cb32..e18b89f 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -93,7 +93,7 @@ void SAL_CALL DiscoveryService::run()
 socklen_t aLen = sizeof( aAddr );
 recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) &aAddr, &aLen 
);
 OString aString( aBuffer, strlen( "LOREMOTE_SEARCH" ) );
-if ( aString.compareTo( "LOREMOTE_SEARCH" ) == 0 )
+if ( aString == "LOREMOTE_SEARCH" )
 {
 OStringBuffer aStringBuffer("LOREMOTE_ADVERTISE\n");
 aStringBuffer.append( OUStringToOString(
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx 
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 87f2b85..35766d4 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -297,7 +297,7 @@ uno::Reference Parser::readPath( 
double* pArea = NULL
 {
 const OString aSubPathMarker( "subpath" );
 
-if( 0 != readNextToken().compareTo( aSubPathMarker ) )
+if( readNextToken() != aSubPathMarker )
 OSL_PRECOND(false, "broken path");
 
 basegfx::B2DPolyPolygon aResult;
@@ -313,7 +313,7 @@ uno::Reference Parser::readPath( 
double* pArea = NULL
 sal_Int32 nDummy=m_nCharIndex;
 OString aCurrToken( m_aLine.getToken(m_nNextToken,' ',nDummy) );
 
-while( m_nCharIndex != -1 && 0 != aCurrToken.compareTo(aSubPathMarker) 
)
+while( m_nCharIndex != -1 && aCurrToken != aSubPathMarke

[PUSHED] Update pch

[Thomas Arnhold (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/3427

Approvals:
  Thomas Arnhold: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice80350184f7a514d5beab0a5e1da5b98d5733e4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aurimas Fišeras 
Gerrit-Reviewer: Thomas Arnhold 

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

[PUSHED] fdo#62096 - replace some O(U)String compareTo with ==

[Thomas Arnhold (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/3422

Approvals:
  Thomas Arnhold: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98d04d7da4c2b7ea0b769df9c2bfa8c1ad86bf2d
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Artur Dryomov 
Gerrit-Reviewer: Artur Dryomov 
Gerrit-Reviewer: Marcos Souza 
Gerrit-Reviewer: Thomas Arnhold 

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

Re: [Libreoffice-commits] core.git: dbaccess/inc dictionaries oox/inc sal/inc sc/inc sd/inc svtools/inc sw/inc vcl/inc writerfilter/inc

[Thomas Arnhold]

Hrm, I accidentally committed the directories subproject.

Can't we do anything to ignore directories and helpcontent2 in core commits?

Thomas

On 17.04.2013 12:00, Aurimas Fišeras wrote:

  dbaccess/inc/pch/precompiled_dbu.hxx  |2 +-
  dictionaries  |2 +-
  oox/inc/pch/precompiled_oox.hxx   |3 ++-
  sal/inc/pch/precompiled_sal.hxx   |2 --
  sc/inc/pch/precompiled_sc.hxx |1 +
  sd/inc/pch/precompiled_sd.hxx |2 ++
  svtools/inc/pch/precompiled_svt.hxx   |   11 +--
  sw/inc/pch/precompiled_sw.hxx |2 ++
  vcl/inc/pch/precompiled_vcl.hxx   |1 +
  writerfilter/inc/pch/precompiled_writerfilter.hxx |4 
  10 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c75eeddfb892918c13a19f7c534b73e423ff8d89
Author: Aurimas Fišeras 
Date:   Tue Apr 16 17:26:06 2013 +0300

 Update pch

 Change-Id: Ice80350184f7a514d5beab0a5e1da5b98d5733e4
 Reviewed-on: https://gerrit.libreoffice.org/3427
 Reviewed-by: Thomas Arnhold 
 Tested-by: Thomas Arnhold 



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

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

[Tor Lillqvist]

 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx|7 ---
 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx |8 
 2 files changed, 15 deletions(-)

New commits:
commit e79b387e03ff80927f0b15b5f43366e06d3a48a8
Author: Tor Lillqvist 
Date:   Wed Apr 17 13:13:29 2013 +0300

It is very wrong to #undef _DEBUG in some source files of a library

Nowadays in a dbgutil build with MSVC, the debugging runtime (C++
library) is used. Just like with the GNU libstdc++, it is not binary
compatible with the non-debugging variant.

All sources that go into one DLL or EXE must be compiled with the same
_DEBUG settings (unless one is extremely careful and knows exactly
what one is doing, which presumably is not the case with this code).

With previous compilers this has gone undetected, but with MSVC2012 at
least, you get link-time errors, which is a good thing:

nssinitializer.o : error LNK2038: mismatch detected for 
'_ITERATOR_DEBUG_LEVEL': value '0' doesn't match value '2' in biginteger.o

nssinitializer.o : error LNK2038: mismatch detected for 'RuntimeLibrary': 
value 'MD_DynamicRelease' doesn't match value 'MDd_DynamicDebug' in biginteger.o

Whether this actually has caused run-time erroneous behaviour or
not in a dbgutil build is another thing...

Change-Id: I0c42161f00a0e37b438e3b911e3c0058edadd800

diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx 
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 3ec0106..b91e1db 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -19,13 +19,6 @@
 
 
 /*
- * Turn off DEBUG Assertions
- */
-#ifdef _DEBUG
-#undef _DEBUG
-#endif
-
-/*
  * and turn off the additional virtual methods which are part of some 
interfaces when compiled
  * with debug
  */
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 740b02f..aaa2129 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -17,14 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-/*
- * Turn off DEBUG Assertions
- */
-#ifdef _DEBUG
-#undef _DEBUG
-#endif
-
 /*
  * and turn off the additional virtual methods which are part of some 
interfaces when compiled
  * with debug
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fix Serbian dictionary makefile

[Thomas Arnhold (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3428

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/dictionaries 
refs/changes/28/3428/1

fix Serbian dictionary makefile

Change-Id: I49e678fc586c2352e9df805e8e32e645605144da
---
M Dictionary_sr.mk
1 file changed, 3 insertions(+), 3 deletions(-)



diff --git a/Dictionary_sr.mk b/Dictionary_sr.mk
index 93a530f..b506f2f 100644
--- a/Dictionary_sr.mk
+++ b/Dictionary_sr.mk
@@ -10,11 +10,11 @@
 $(eval $(call gb_Dictionary_Dictionary,dict-sr,dictionaries/sr))
 
 $(eval $(call gb_Dictionary_add_root_files,dict-sr,\
-   dictionaries/sr/hyph_sh.dic \
+   dictionaries/sr/hyph_sr-Latn.dic \
dictionaries/sr/hyph_sr.dic \
dictionaries/sr/README.txt \
-   dictionaries/sr/sh.aff \
-   dictionaries/sr/sh.dic \
+   dictionaries/sr/sr-Latn.aff \
+   dictionaries/sr/sr-Latn.dic \
dictionaries/sr/sr.aff \
dictionaries/sr/sr.dic \
 ))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49e678fc586c2352e9df805e8e32e645605144da
Gerrit-PatchSet: 1
Gerrit-Project: dictionaries
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold 
Gerrit-Reviewer: Andras Timar 

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

[ABANDONED] fix Serbian dictionary makefile

[Thomas Arnhold (via Code Review)]

Thomas Arnhold has abandoned this change.

Change subject: fix Serbian dictionary makefile
..


Patch Set 1: Abandoned

hrm...

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I49e678fc586c2352e9df805e8e32e645605144da
Gerrit-PatchSet: 1
Gerrit-Project: dictionaries
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold 
Gerrit-Reviewer: Andras Timar 

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

[PATCH] update dictionaries

[Thomas Arnhold (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3429

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3429/1

update dictionaries

Change-Id: I0f693266b7c3621f885acbe450f4faead3d8284f
---
M dictionaries
1 file changed, 0 insertions(+), 0 deletions(-)



diff --git a/dictionaries b/dictionaries
index b32611e..66a5a2e 16
--- a/dictionaries
+++ b/dictionaries
-Subproject commit b32611e23a1f35f16f4c37bbbdc02027157424d1
+Subproject commit 66a5a2e03573ab1862db1965f7b9c5419db3decd

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f693266b7c3621f885acbe450f4faead3d8284f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold 

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

[Libreoffice-commits] core.git: dictionaries

[Thomas Arnhold]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4b7fa5cdb670359ee967f38bd71fa9a8e5eb8d4
Author: Thomas Arnhold 
Date:   Wed Apr 17 12:21:42 2013 +0200

update dictionaries

Change-Id: I0f693266b7c3621f885acbe450f4faead3d8284f
Reviewed-on: https://gerrit.libreoffice.org/3429
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/dictionaries b/dictionaries
index b32611e..faf63ac 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b32611e23a1f35f16f4c37bbbdc02027157424d1
+Subproject commit faf63ac08a9f3f1463a7f119083964f76b71141c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] update dictionaries

[Thomas Arnhold (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/3429

Approvals:
  Thomas Arnhold: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f693266b7c3621f885acbe450f4faead3d8284f
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold 
Gerrit-Reviewer: Thomas Arnhold 

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

[Libreoffice-commits] core.git: odk/examples

[Noel Grandin]

 odk/examples/java/Inspector/ProtocolHandlerAddon.java |   50 --
 1 file changed, 23 insertions(+), 27 deletions(-)

New commits:
commit bea18dd581ac9341a19e757a72662ab7a2e34b0a
Author: Noel Grandin 
Date:   Wed Apr 17 12:57:16 2013 +0200

fix compile error in unused Java file.

"exception not thrown in catch block"

Change-Id: I13f8be9913f655ab1633b29e9fe686a41c2c0fcb

diff --git a/odk/examples/java/Inspector/ProtocolHandlerAddon.java 
b/odk/examples/java/Inspector/ProtocolHandlerAddon.java
index 86d03ad..e20d3a2 100644
--- a/odk/examples/java/Inspector/ProtocolHandlerAddon.java
+++ b/odk/examples/java/Inspector/ProtocolHandlerAddon.java
@@ -204,35 +204,31 @@ public class ProtocolHandlerAddon {
 }
 
 public void showMessageBox(String sTitle, String sMessage) {
-try {
-if ( null != m_xFrame && null != m_xToolkit ) {
-
-// describe window properties.
-WindowDescriptor aDescriptor = new WindowDescriptor();
-aDescriptor.Type  = WindowClass.MODALTOP;
-aDescriptor.WindowServiceName = new String( "infobox" );
-aDescriptor.ParentIndex   = -1;
-aDescriptor.Parent= 
(XWindowPeer)UnoRuntime.queryInterface(
-XWindowPeer.class, m_xFrame.getContainerWindow());
-aDescriptor.Bounds= new Rectangle(0,0,300,200);
-aDescriptor.WindowAttributes  = WindowAttribute.BORDER |
-WindowAttribute.MOVEABLE |
-WindowAttribute.CLOSEABLE;
-
-XWindowPeer xPeer = m_xToolkit.createWindow( aDescriptor );
-if ( null != xPeer ) {
-XMessageBox xMsgBox = 
(XMessageBox)UnoRuntime.queryInterface(
-XMessageBox.class, xPeer);
-if ( null != xMsgBox )
-{
-xMsgBox.setCaptionText( sTitle );
-xMsgBox.setMessageText( sMessage );
-xMsgBox.execute();
-}
+if ( null != m_xFrame && null != m_xToolkit ) {
+
+// describe window properties.
+WindowDescriptor aDescriptor = new WindowDescriptor();
+aDescriptor.Type  = WindowClass.MODALTOP;
+aDescriptor.WindowServiceName = new String( "infobox" );
+aDescriptor.ParentIndex   = -1;
+aDescriptor.Parent= 
(XWindowPeer)UnoRuntime.queryInterface(
+XWindowPeer.class, m_xFrame.getContainerWindow());
+aDescriptor.Bounds= new Rectangle(0,0,300,200);
+aDescriptor.WindowAttributes  = WindowAttribute.BORDER |
+WindowAttribute.MOVEABLE |
+WindowAttribute.CLOSEABLE;
+
+XWindowPeer xPeer = m_xToolkit.createWindow( aDescriptor );
+if ( null != xPeer ) {
+XMessageBox xMsgBox = 
(XMessageBox)UnoRuntime.queryInterface(
+XMessageBox.class, xPeer);
+if ( null != xMsgBox )
+{
+xMsgBox.setCaptionText( sTitle );
+xMsgBox.setMessageText( sMessage );
+xMsgBox.execute();
 }
 }
-} catch ( com.sun.star.uno.Exception e) {
-// do your error handling
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: officecfg: reformat using xmllint

[Stephan Bergmann]

On 04/17/2013 03:20 AM, Thomas Arnhold wrote:

does anyone have objections against running xmllint on officecfg like
fe4260c53e7df91a4d2dad06104d7979a212de29 did?


Isn't xmllint --fromat, without access to a DTD, fundamentally flawed, 
in that it cannot decide whether an element has mixed content and all 
whitespace would need to be left unchanged?  In principle, this could 
affect .xcu file content like


   

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ce/ad0080e9fbec9d9087ad05fe20b216020486a9

[Stephan Bergmann]

 ce/ad0080e9fbec9d9087ad05fe20b216020486a9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bed4af63ec1afd30061e951c094ecc61ecef97c6
Author: Stephan Bergmann 
Date:   Wed Apr 17 13:26:01 2013 +0200

Notes added by 'git notes add'

diff --git a/ce/ad0080e9fbec9d9087ad05fe20b216020486a9 
b/ce/ad0080e9fbec9d9087ad05fe20b216020486a9
new file mode 100644
index 000..230aa7c
--- /dev/null
+++ b/ce/ad0080e9fbec9d9087ad05fe20b216020486a9
@@ -0,0 +1 @@
+reject: unclear what problem exactly this allegedly fixes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e8/c13442bf24de7d79a6450acf80a6d0ce6a5a9e

[Stephan Bergmann]

 e8/c13442bf24de7d79a6450acf80a6d0ce6a5a9e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d9000b5d490e7214a671c577b1a37cfcdb93ae6a
Author: Stephan Bergmann 
Date:   Wed Apr 17 13:30:38 2013 +0200

Notes added by 'git notes add'

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

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

[Stephan Bergmann]

 vcl/win/source/app/salinst.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit adae41c0ed01ff7476acb584ddf636f1162e68ea
Author: Stephan Bergmann 
Date:   Wed Apr 17 13:38:19 2013 +0200

MSC needs those min/max macros after all

...otherwise, it will fail with "c:\program files\microsoft
sdks\windows\v7.1\include\GdiplusTypes.h(470) : error C3861: 'min': 
identifier
not found" errors.

Change-Id: Ie58a5e85e6712e4244ce4799c203b31a717a91e6

diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 40edba1..ef43804 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -44,6 +44,15 @@
 #include 
 
 #if defined _MSC_VER
+#ifndef min
+#define min(a,b)(((a) < (b)) ? (a) : (b))
+#endif
+#ifndef max
+#define max(a,b)(((a) > (b)) ? (a) : (b))
+#endif
+#endif
+
+#if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning( disable: 4917 )
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

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

New commits:
commit fb3bec7b3dd9b00600d5b0ef9e8ee0052f7fa248
Author: Michael Stahl 
Date:   Wed Apr 17 13:37:26 2013 +0200

gbuild: fix gb_Dictionary_add_localized_xcu_file

... clearly David should have reverted my commit since it didn't
actually work :-/

Change-Id: Ib34e540e247f1082bc9d155cd011eb31cd33048e

diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index f525ba1..0bb75b4 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -291,7 +291,7 @@ endef
 # gb_Dictionary_add_localized_xcu_file dictionary destdir file
 define gb_Dictionary_add_localized_xcu_file
 ifeq ($(gb_WITH_LANG),)
-$(call gb_Dictionary__add_file,$(1),$(1),$(2),$(strip $(3)))
+$(call gb_Dictionary__add_file,$(1),$(1),$(2)/$(notdir $(3)),$(strip $(3)))
 else
 $(call gb_Dictionary__add_file,$(1),$(1)_generated,$(2),$(subst 
$(WORKDIR)/,,$(call gb_XcuFile_for_extension,$(strip $(3)
 $(call gb_PackageSet_add_package,$(call 
gb_Dictionary_get_packagesetname,$(1)),$(call 
gb_Dictionary_get_packagename,$(1)_generated))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: cherry-pick across renames [was: minutes of ESC call ...]

[Michael Meeks]

On Tue, 2013-04-16 at 10:19 +0200, Miklos Vajna wrote:
> I tried that on a sample repo, so thanks for bringing this up. It seems
> the git rename detection is O(N^2), so the default number of renamed
> files is limited to avoid long merges.

Presumably it would be possible to cache rename information trawled
from the history at great cost, so a second time a cherry-pick is done,
things are much harder ? (at least locally that is).

ATB,

Michael.

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

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

[PATCH] Java cleanup in mediawiki extension

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3430

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/3430/1

Java cleanup in mediawiki extension

- remove unnecessary casts
- convert Hashtable->Map and Vector->ArrayList
- remove dead fields

Change-Id: Id85abee74857325a113133bf61474b962256489c
---
M swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
M swext/mediawiki/src/com/sun/star/wiki/Helper.java
M swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
M swext/mediawiki/src/com/sun/star/wiki/Settings.java
M swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
M swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
M swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
M swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
M swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
M swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
10 files changed, 168 insertions(+), 192 deletions(-)



diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java 
b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
index 3967710..7500be6 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
@@ -29,7 +29,6 @@
 protected String m_sLoginToken = "";
 protected String m_sMainURL = "";
 
-private int m_nWikiArticleHash = 0;
 private boolean m_bHTMLStartFound = false;
 private boolean m_bInHead = false;
 
@@ -138,7 +137,6 @@
 {
 if ( sName.equalsIgnoreCase( "wpTextbox1" ) )
 {
-m_nWikiArticleHash = t.hashCode();
 m_nWikiArticleStart = pos;
 }
 }
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java 
b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 9601579..345be2c 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -55,8 +55,6 @@
 import com.sun.star.util.XChangesBatch;
 import java.net.*;
 import java.io.*;
-import java.util.Hashtable;
-import java.util.Random;
 import javax.net.ssl.SSLException;
 import javax.swing.text.html.HTMLEditorKit;
 
@@ -149,11 +147,9 @@
 private static final String sHTMLHeader = "";
 private static final String sHTMLFooter = "";
 
-private static Random m_aRandom;
 private static MultiThreadedHttpConnectionManager m_aConnectionManager;
 private static HttpClient m_aClient;
 private static boolean m_bAllowConnection = true;
-private static Hashtable m_aAcceptedUnknownCerts;
 
 private static Boolean m_bShowInBrowser = null;
 
@@ -245,7 +241,7 @@
 
 XPropertySet xProps = Helper.GetConfigProps( xContext, 
"org.openoffice.Office.Custom.WikiExtension/Settings" );
 xProps.setPropertyValue( "PreselectShowBrowser", new Boolean( 
bValue ) );
-XChangesBatch xBatch = ( XChangesBatch ) 
UnoRuntime.queryInterface( XChangesBatch.class, xProps );
+XChangesBatch xBatch = UnoRuntime.queryInterface( 
XChangesBatch.class, xProps );
 if ( xBatch != null )
 xBatch.commitChanges();
 }
@@ -262,7 +258,7 @@
 {
 XMultiComponentFactory xFactory = xContext.getServiceManager();
 if ( xFactory != null )
-m_xPasswordContainer = 
(XPasswordContainer)UnoRuntime.queryInterface(
+m_xPasswordContainer = UnoRuntime.queryInterface(
 XPasswordContainer.class,
 xFactory.createInstanceWithContext( 
"com.sun.star.task.PasswordContainer", xContext ) );
 }
@@ -280,7 +276,7 @@
 {
 XMultiComponentFactory xFactory = xContext.getServiceManager();
 if ( xFactory != null )
-m_xInteractionHandler = ( XInteractionHandler 
)UnoRuntime.queryInterface(
+m_xInteractionHandler = UnoRuntime.queryInterface(
 XInteractionHandler.class,
 xFactory.createInstanceWithContext( 
"com.sun.star.task.InteractionHandler", xContext ) );
 }
@@ -384,8 +380,8 @@
 try
 {
 Object oTempFile = 
xContext.getServiceManager().createInstanceWithContext( 
"com.sun.star.io.TempFile", xContext );
-XStream xStream = ( XStream ) UnoRuntime.queryInterface( 
XStream.class, oTempFile );
-XSeekable xSeekable = ( XSeekable ) UnoRuntime.queryInterface( 
XSeekable.class, oTempFile );
+XStream xStream = UnoRuntime.queryInterface( XStream.class, 
oTempFile );
+XSeekable xSeekable = UnoRuntime.queryInterface( 
XSeekable.class, oTempFile );
 if ( xStream != null && xSeekable != null )
 {
 

[PATCH] Java cleanup, remove unnecessary casts

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3431

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/3431/1

Java cleanup, remove unnecessary casts

Change-Id: Id12089bc7df16631737e6acaee0973fb91dd953f
---
M bridges/test/java_uno/acquire/TestAcquire.java
M bridges/test/testclient.java
M chart2/qa/TestCaseOldAPI.java
M connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
M dbaccess/qa/complex/dbaccess/PropertyBag.java
M dbaccess/qa/complex/dbaccess/UISettings.java
M 
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
M extensions/qa/integration/extensions/ConsoleWait.java
M extensions/qa/integration/extensions/Frame.java
M extensions/qa/integration/extensions/MethodHandler.java
M extensions/qa/integration/extensions/ObjectInspector.java
M extensions/qa/integration/extensions/ServicesHandler.java
M extensions/test/pgp/TestPGP.java
M forms/qa/integration/forms/CellBinding.java
M forms/qa/integration/forms/ControlValidation.java
M forms/qa/integration/forms/DocumentHelper.java
M forms/qa/integration/forms/DocumentViewHelper.java
M forms/qa/integration/forms/FormComponent.java
M forms/qa/integration/forms/FormControlTest.java
M forms/qa/integration/forms/FormLayer.java
M forms/qa/integration/forms/ListSelection.java
M forms/qa/integration/forms/RadioButtons.java
M forms/qa/integration/forms/SingleControlValidation.java
M forms/qa/integration/forms/SpreadsheetDocument.java
M forms/qa/integration/forms/SpreadsheetView.java
M forms/qa/integration/forms/TableCellTextBinding.java
M forms/qa/integration/forms/ValueBinding.java
M forms/qa/integration/forms/XMLFormSettings.java
M forms/qa/org/openoffice/complex/forms/tools/ResultSet.java
M forms/qa/org/openoffice/xforms/Model.java
M forms/qa/org/openoffice/xforms/XMLDocument.java
M nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
M nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/ResourceManager.java
M nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
M 
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java
M 
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java
M nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Button.java
M 
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/ProgressBar.java
M odk/examples/DevelopersGuide/Charts/CalcHelper.java
M odk/examples/DevelopersGuide/Charts/ChartHelper.java
M odk/examples/DevelopersGuide/Charts/ChartInCalc.java
M odk/examples/DevelopersGuide/Charts/ChartInDraw.java
M odk/examples/DevelopersGuide/Charts/ChartInWriter.java
M odk/examples/DevelopersGuide/Charts/Helper.java
M odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java
M odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
M odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
M odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
48 files changed, 373 insertions(+), 379 deletions(-)




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id12089bc7df16631737e6acaee0973fb91dd953f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin 

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

Re: extracting extended tooltips from the help texts

[Andras Timar]

Hi Markus,

On Wed, Apr 17, 2013 at 12:31 AM, Markus Mohrhard
 wrote:
>
> attached you'll find the initial work on extracting the tooltips from the
> help texts.
>

I tried your patch and it works. I don't have strong opinion about the
actual place of these files in install set. help/tooltips is fine for
me.

I have some concerns, however.

* This patch and follow-ups will suddenly add ~7 new words to
translate to UI, effectively doubling the translatable wordcount. Old
help translations can be migrated, but for those, who don't have help
translations these strings will be new. Now, without local help,
extended tips show normal tooltips - which are localized. After the
patch English strings will appear in localized UI until teams complete
translation of this huge amount.

* Your work is part of the plan of getting rid of current help system
(https://wiki.documentfoundation.org/Development/Wikihelp). But
developments related to this happen on different time scales. You have
a 80% ready patch, while other related tasks are only in planning
phase. I don't see the advantage of integrating your patch into master
(-> 4.1) now.

* Huge properties files will be converted to huge po files. From the
translators' and translation tools' point of view, it would be better
to have more, smaller files.

* Originally (very long time ago) these extended tips were next to the
resource, there was a HelpText field. Later HelpText became deprecated
and these strings were shared with help, in order to reduce the amount
of duplication. Now you restore the duplication, but strings are still
out of context. Ideally the text of a control, its short tooltip
(QuickHelpText) and its extended tip (HelpText) should be together. It
would help translators a lot.

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

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

[Michael Stahl]

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

New commits:
commit ffcdefe83ab043edef943657d5dedef75faaa5b0
Author: Michael Stahl 
Date:   Wed Apr 17 14:25:19 2013 +0200

gbuild: UnpackedTarball: do not query for input on "reversed" patch

This can apparently happen when interrupting a build; reproducible with
"touch workdir/*/UnpackedTarget/*openssl* && make openssl".

The -f parameter would apparently silently ignore some mal-formed
patches but at least it rejects potentially reversed ones,
which causes the "error handler" in gb_UnpackedTarball__command
to touch the "prepare" target so the next make is successful.

Change-Id: I7bbd7d9385d990a69214a3a2d9bb20b5a7173748

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index dd47a35..2342dc9 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -140,7 +140,7 @@ $(call gb_Helper_abbreviate_dirs,\
for p in $(UNPACKED_PATCHES); do \
pl=$(UNPACKED_PATCHLEVEL); \
s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) 
pl="$$s"; ;; esac ; \
-   $(GNUPATCH) -s "-p$$pl" < "$$p"; \
+   $(GNUPATCH) -f -s "-p$$pl" < "$$p"; \
if test "$$?" -ne 0; then echo "Patch FAILED: 
$$p"; exit 1; fi;\
done && \
) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] Really use 'nCategoriesLength'

[Julien Nabet (via Code Review)]

Julien Nabet has abandoned this change.

Change subject: Really use 'nCategoriesLength'
..


Patch Set 1: Abandoned

Let's drop it.

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I455661ccd97be6ea54d00201fda2906cfbd6f819
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Julien Nabet 
Gerrit-Reviewer: Markus Mohrhard 

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

Empty Advanced options page on Windows

[Kohei Yoshida]

Hi there,

I just completed my Windows build of the master branch and noticed that,
the Advanced options page is for some reason totally blank.  If my
attachment goes through, you can see it in the attached screenshot.

Does this ring any bell to anyone?

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

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

[Stephan Bergmann]

 vcl/win/source/gdi/salgdi_gdiplus.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 7828f4377033f8dcceb8ff9368b6d613a1dd7b2b
Author: Stephan Bergmann 
Date:   Wed Apr 17 14:54:06 2013 +0200

MSC needs those min/max macros after all

...otherwise, it will fail with "c:\program files\microsoft
sdks\windows\v7.1\include\GdiplusTypes.h(470) : error C3861: 'min': 
identifier
not found" errors.

Change-Id: Ib81ab7f5357b1f980202b63b144296fa252b71b1

diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx 
b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index f26ccaa..d1b9d0a 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -27,6 +27,15 @@
 #include 
 
 #if defined _MSC_VER
+#ifndef min
+#define min(a,b)(((a) < (b)) ? (a) : (b))
+#endif
+#ifndef max
+#define max(a,b)(((a) > (b)) ? (a) : (b))
+#endif
+#endif
+
+#if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Windows build with --with-lang="en-US ja de fr" broken

[Kohei Yoshida]

Another thing I noticed while building master on Windows, the build fails
very early on when I use --with-lang="en-US ja de fr" (which I always do in
my build).  Removing that option and re-building it solves it.  I don't
have a build log handy unfortunately, but it had something to do with not
finding some sort of file for language qtz related to
chart2/uiconfig/ui/smoothlinesdlg ...

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

[PATCH] Java cleanup, remove the rest of the unnecessary casts

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3432

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/3432/1

Java cleanup, remove the rest of the unnecessary casts

Change-Id: Ia61d250f6b3711abc29569c5ece38a6f87e38daa
---
M 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
M odk/examples/DevelopersGuide/Components/JavaComponent/TestJavaComponent.java
M odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
M odk/examples/DevelopersGuide/Config/ConfigExamples.java
M odk/examples/DevelopersGuide/Database/CodeSamples.java
M odk/examples/DevelopersGuide/Database/OpenQuery.java
M odk/examples/DevelopersGuide/Database/RowSet.java
M odk/examples/DevelopersGuide/Database/Sales.java
M odk/examples/DevelopersGuide/Database/SalesMan.java
M odk/examples/DevelopersGuide/Database/sdbcx.java
M odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java
M odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java
M odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java
M odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java
M odk/examples/DevelopersGuide/Drawing/DrawingDemo.java
M odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java
M odk/examples/DevelopersGuide/Drawing/GluePointDemo.java
M odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
M odk/examples/DevelopersGuide/Drawing/Helper.java
M odk/examples/DevelopersGuide/Drawing/LayerDemo.java
M odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java
M odk/examples/DevelopersGuide/Drawing/Organigram.java
M odk/examples/DevelopersGuide/Drawing/PageHelper.java
M odk/examples/DevelopersGuide/Drawing/PresentationDemo.java
M odk/examples/DevelopersGuide/Drawing/ShapeHelper.java
M odk/examples/DevelopersGuide/Drawing/StyleDemo.java
M odk/examples/DevelopersGuide/Drawing/TextDemo.java
M odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java
M odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java
M odk/examples/DevelopersGuide/GUI/DialogDocument.java
M odk/examples/DevelopersGuide/GUI/ImageControlSample.java
M odk/examples/DevelopersGuide/GUI/MessageBox.java
M odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java
M odk/examples/DevelopersGuide/GUI/SystemDialog.java
M odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
M odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
M odk/examples/DevelopersGuide/GUI/UnoMenu.java
M odk/examples/DevelopersGuide/GUI/UnoMenu2.java
M odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java
M odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
M 
odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java
M 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
M 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
M 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java
M odk/examples/DevelopersGuide/OfficeDev/MenuElement.java
M odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java
M odk/examples/DevelopersGuide/OfficeDev/PathSettings/PathSettingsTest.java
M 
odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java
M odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java
M 
odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java
M odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/UrlResolver.java
M 
odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/SimpleBootstrap_java.java
M 
odk/examples/DevelopersGuide/ScriptingFramework/SayHello/SayHello/SayHello.java
M 
odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
M odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
M odk/examples/DevelopersGuide/Spreadsheet/GeneralTableSample.java
M odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java
M odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java
M odk/examples/DevelopersGuide/Spreadsheet/ViewSample.java
M odk/examples/DevelopersGuide/Text/TextDocuments.java
M odk/examples/java/ConverterServlet/ConverterServlet.java
M odk/examples/java/DocumentHandling/DocumentConverter.java
M odk/examples/java/DocumentHandling/DocumentLoader.java
M odk/examples/java/DocumentHandling/DocumentPrinter.java
M odk/examples/java/DocumentHandling/DocumentSaver.java
M odk/examples/java/Drawing/SDraw.

[PATCH] Java cleanup, use generics in calls to UnoRuntime#queryInter...

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3433

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/3433/1

Java cleanup, use generics in calls to UnoRuntime#queryInterface

A handful of places wrap the call to queryInterface. With a little
generics love, we can reduce the casting required.

Change-Id: I9efca2afb1b23fad2359af24e1c273aea96e45fe
---
M forms/qa/integration/forms/DocumentHelper.java
M forms/qa/integration/forms/DocumentViewHelper.java
M forms/qa/integration/forms/FormComponent.java
M forms/qa/integration/forms/ListSelection.java
M forms/qa/integration/forms/MasterDetailForms.java
M forms/qa/integration/forms/TestCase.java
M odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
M odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
8 files changed, 20 insertions(+), 20 deletions(-)



diff --git a/forms/qa/integration/forms/DocumentHelper.java 
b/forms/qa/integration/forms/DocumentHelper.java
index a26434b..a5a44be 100644
--- a/forms/qa/integration/forms/DocumentHelper.java
+++ b/forms/qa/integration/forms/DocumentHelper.java
@@ -133,12 +133,12 @@
 /* -- */
 public boolean isModified()
 {
-XModifiable modify = (XModifiable)query( XModifiable.class );
+XModifiable modify = query( XModifiable.class );
 return modify.isModified();
 }
 
 /* -- */
-public Object query( Class aInterfaceClass )
+public  T query( Class aInterfaceClass )
 {
 return UnoRuntime.queryInterface( aInterfaceClass, m_documentComponent 
);
 }
diff --git a/forms/qa/integration/forms/DocumentViewHelper.java 
b/forms/qa/integration/forms/DocumentViewHelper.java
index 66d8f0b..76a03d0 100644
--- a/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/forms/qa/integration/forms/DocumentViewHelper.java
@@ -73,7 +73,7 @@
 @param aInterfaceClass
 the class of the interface which shall be returned
 */
-public Object query( Class aInterfaceClass )
+public  T query( Class aInterfaceClass )
 {
 return UnoRuntime.queryInterface( aInterfaceClass, m_controller );
 }
@@ -92,7 +92,7 @@
 XDispatch xReturn = null;
 
 // go get the current view
-XController xController = (XController)query( XController.class );
+XController xController = query( XController.class );
 // go get the dispatch provider of it's frame
 XDispatchProvider xProvider = UnoRuntime.queryInterface(
 XDispatchProvider.class, xController.getFrame() );
@@ -147,7 +147,7 @@
 public XControl getControl( XControlModel xModel ) throws 
com.sun.star.uno.Exception
 {
 // the current view of the document
-XControlAccess xCtrlAcc = (XControlAccess)query( XControlAccess.class 
);
+XControlAccess xCtrlAcc = query( XControlAccess.class );
 // delegate the task of looking for the control
 return xCtrlAcc.getControl( xModel );
 }
@@ -160,7 +160,7 @@
 }
 
 /* -- */
-public Object getControl( Object aModel, Class aInterfaceClass ) throws 
com.sun.star.uno.Exception
+public  T getControl( Object aModel, Class aInterfaceClass ) throws 
com.sun.star.uno.Exception
 {
 XControlModel xModel = UnoRuntime.queryInterface( XControlModel.class, 
aModel );
 return UnoRuntime.queryInterface( aInterfaceClass, getControl( xModel 
) );
@@ -171,7 +171,7 @@
  */
 public XFormController getFormController( XForm _form )
 {
-XFormLayerAccess formLayerAccess = (XFormLayerAccess)query( 
XFormLayerAccess.class );
+XFormLayerAccess formLayerAccess = query( XFormLayerAccess.class );
 return formLayerAccess.getFormController( _form );
 }
 
diff --git a/forms/qa/integration/forms/FormComponent.java 
b/forms/qa/integration/forms/FormComponent.java
index f19ceea..d6ea10d 100644
--- a/forms/qa/integration/forms/FormComponent.java
+++ b/forms/qa/integration/forms/FormComponent.java
@@ -79,7 +79,7 @@
 @param aInterfaceClass
 the class of the interface which shall be returned
 */
-public Object query( Class aInterfaceClass )
+public  T query( Class aInterfaceClass )
 {
 return UnoRuntime.queryInterface( aInterfaceClass, m_component );
 }
diff --git a/forms/qa/integration/forms/ListSelection.java 
b/forms/qa/integration/forms/ListSelection.java
index 5d080cb..64fef48 100644
--- a/forms/qa/integration/forms/ListSelection.java
+++ b/forms/qa/integration/forms/ListSelection.java
@@ -96,7 +96,7 @@
 for ( int i = 0; i < runs; ++i )
 {
 // obtain the active sheet
-XSpreadsheetView view = 
(XSpreadsheetView)m_document.getCurrentView().query( XS

[Libreoffice-commits] core.git: 2 commits - libmariadb/mariadb-trunk-40.patch libmariadb/UnpackedTarball_mariadb.mk solenv/gbuild

[Michael Stahl]

 libmariadb/UnpackedTarball_mariadb.mk |4 ++
 libmariadb/mariadb-trunk-40.patch |   52 +-
 solenv/gbuild/Dictionary.mk   |2 -
 3 files changed, 31 insertions(+), 27 deletions(-)

New commits:
commit e0e43597c4bf6f92f3d8406341f472be911169db
Author: Michael Stahl 
Date:   Wed Apr 17 15:15:03 2013 +0200

gbuild: fix gb_Dictionary_add_localized_xcu_file for --with-lang

... which has the same stupid mistake.

Change-Id: I128af77f0b75d2b60f5bb4b33e55c2bc0c94ae98

diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 0bb75b4..a7d458f 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -293,7 +293,7 @@ define gb_Dictionary_add_localized_xcu_file
 ifeq ($(gb_WITH_LANG),)
 $(call gb_Dictionary__add_file,$(1),$(1),$(2)/$(notdir $(3)),$(strip $(3)))
 else
-$(call gb_Dictionary__add_file,$(1),$(1)_generated,$(2),$(subst 
$(WORKDIR)/,,$(call gb_XcuFile_for_extension,$(strip $(3)
+$(call gb_Dictionary__add_file,$(1),$(1)_generated,$(2)/$(notdir $(3)),$(subst 
$(WORKDIR)/,,$(call gb_XcuFile_for_extension,$(strip $(3)
 $(call gb_PackageSet_add_package,$(call 
gb_Dictionary_get_packagesetname,$(1)),$(call 
gb_Dictionary_get_packagename,$(1)_generated))
 endif
 
commit 15990d8ccbd4e89770b449444ac430650ca6a381
Author: Michael Stahl 
Date:   Wed Apr 17 14:55:26 2013 +0200

libmariadb: fix wrong line ends in patch

Change-Id: I8fce7d3b3da2a6dad373409f9c9ba3b9cd06aa4f

diff --git a/libmariadb/UnpackedTarball_mariadb.mk 
b/libmariadb/UnpackedTarball_mariadb.mk
index f80bed6..f8694ab 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/libmariadb/UnpackedTarball_mariadb.mk
@@ -33,4 +33,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
 libmariadb/mariadb-static-inline.patch \
 ))
 
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\
+   libmysql/libmysql_exports.def \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libmariadb/mariadb-trunk-40.patch 
b/libmariadb/mariadb-trunk-40.patch
index a0082bc..de8f44c 100644
--- a/libmariadb/mariadb-trunk-40.patch
+++ b/libmariadb/mariadb-trunk-40.patch
@@ -3373,34 +3373,34 @@
 --- mariadb/libmysql/libmysql_exports.def  2012-11-28 13:09:17 +
 +++ mariadb/libmariadb/libmariadb_exports.def  2013-03-14 21:01:43 +
 @@ -1,4 +1,5 @@
- EXPORTS
-+ mysql_ps_fetch_functions DATA
-  get_tty_password
-  load_defaults
-  mysql_thread_end
+ EXPORTS
++ mysql_ps_fetch_functions DATA
+  get_tty_password
+  load_defaults
+  mysql_thread_end
 @@ -53,11 +54,10 @@
-  mysql_num_rows
-  mysql_options
-  mysql_stmt_param_count
-- ;mysql_stmt_param_metadata
-+ mysql_stmt_param_metadata
-  mysql_ping
-  mysql_stmt_result_metadata
-  mysql_query
-- mysql_read_query_result
-  mysql_real_connect
-  mysql_real_escape_string
-  mysql_real_query
+  mysql_num_rows
+  mysql_options
+  mysql_stmt_param_count
+- ;mysql_stmt_param_metadata
++ mysql_stmt_param_metadata
+  mysql_ping
+  mysql_stmt_result_metadata
+  mysql_query
+- mysql_read_query_result
+  mysql_real_connect
+  mysql_real_escape_string
+  mysql_real_query
 @@ -102,6 +102,6 @@
-  mysql_server_end
-  mysql_set_character_set
-  mysql_get_character_set_info
-- ;mysql_stmt_next_result
--
--
-+ mysql_stmt_next_result
-+ mariadb_connection
-+ mysql_get_server_name
+  mysql_server_end
+  mysql_set_character_set
+  mysql_get_character_set_info
+- ;mysql_stmt_next_result
+-
+-
++ mysql_stmt_next_result
++ mariadb_connection
++ mysql_get_server_name
 
 === renamed file 'libmysql/my_secure.c' => 'libmariadb/ma_secure.c'
 --- mariadb/libmysql/my_secure.c   2012-11-26 07:32:41 +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Empty Advanced options page on Windows

[Thomas Arnhold]

Hi Kohei,

seems to be my fault (7c48a2a83f4a92200c7f2b0f259bf1684d253436).

I'll investigate it.

Thomas

On 17.04.2013 14:49, Kohei Yoshida wrote:

Hi there,

I just completed my Windows build of the master branch and noticed that,
the Advanced options page is for some reason totally blank.  If my
attachment goes through, you can see it in the attached screenshot.

Does this ring any bell to anyone?

Kohei


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



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

[PUSHED] Converted Tools -> Solver widget.

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8413f2ee3bcd700409f6bfa3886ba91c2fa2b921
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulelah Alarifi 
Gerrit-Reviewer: Caolán McNamara 

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

forward RTL_CONTEXT_foo logging to SAL_INFO in default debugging

[Bjoern Michaelsen]

Hi,

please note:

 https://gerrit.libreoffice.org/#/c/3421/

and raise any violent opposition to this move here, if there is no such
opposition on the ESC call, Im going to push it tommorrow.

The rationale (beyond what is in the commit message) is as follows:
- manually replacing RTL_CONTEXT_foo to SAL_INFO might add some additional
  context (I would file that as an EasyHack) and sort the message into a proper
  SAL_LOG area
- this move makes the the messages available at all in SAL_LOG, which is better
  than nothing 

So:
- is anyone opposing this change now as an intermediate move?
- is anyone opposing killing RTL_CONTEXT_foo in the long term as suggested by
  sberg in the comment?

Best,

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

[Libreoffice-commits] core.git: libmariadb/mariadb-msvc.patch.1 libmariadb/UnpackedTarball_mariadb.mk

[Michael Stahl]

 libmariadb/UnpackedTarball_mariadb.mk |1 +
 libmariadb/mariadb-msvc.patch.1   |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 81bee24d6b6e12219811813aa1c16892c93e0ba7
Author: Michael Stahl 
Date:   Wed Apr 17 15:48:46 2013 +0200

libmariadb: make it build with MSVC 2008

... although i'm not sure if the stub implementation of
pthread_cond_timedwait makes that much sense.

Change-Id: If1926e760c0e1b84fd2ac48431c06c6f1ba4dd1d

diff --git a/libmariadb/UnpackedTarball_mariadb.mk 
b/libmariadb/UnpackedTarball_mariadb.mk
index f8694ab..ce0bd9f 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/libmariadb/UnpackedTarball_mariadb.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
 libmariadb/mariadb-swap.patch \
 libmariadb/mariadb-trunk-40.patch \
 libmariadb/mariadb-static-inline.patch \
+libmariadb/mariadb-msvc.patch.1 \
 ))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\
diff --git a/libmariadb/mariadb-msvc.patch.1 b/libmariadb/mariadb-msvc.patch.1
new file mode 100644
index 000..60fddae
--- /dev/null
+++ b/libmariadb/mariadb-msvc.patch.1
@@ -0,0 +1,13 @@
+--- mariadb/libmysql/my_pthread.c.orig 2013-04-17 15:45:52.025896770 +0200
 mariadb/libmysql/my_pthread.c  2013-04-17 15:47:32.292895908 +0200
+@@ -28,6 +28,10 @@
+ 
+ #ifdef _WIN32
+ 
++#ifndef ETIMEDOUT  /* does not exist MSVC 2008 but was added in MSVC 2010 */
++#define ETIMEDOUT 145
++#endif
++
+ int 
+ pthread_cond_init (pthread_cond_t *cv, const pthread_condattr_t *attr)
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: forward RTL_CONTEXT_foo logging to SAL_INFO in default debugging

[Stephan Bergmann]

On 04/17/2013 03:39 PM, Bjoern Michaelsen wrote:

please note:

  https://gerrit.libreoffice.org/#/c/3421/

and raise any violent opposition to this move here, if there is no such
opposition on the ESC call, Im going to push it tommorrow.

The rationale (beyond what is in the commit message) is as follows:
- manually replacing RTL_CONTEXT_foo to SAL_INFO might add some additional
   context (I would file that as an EasyHack) and sort the message into a proper
   SAL_LOG area
- this move makes the the messages available at all in SAL_LOG, which is better
   than nothing

So:
- is anyone opposing this change now as an intermediate move?


What good is the intermediate move?  That is, was there at least one 
situation in which it would have helped your debugging if an existing 
RTL_LOGFILE_* call had been behaving like SAL_LOG?


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

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

[Winfried Donkers]

 scaddins/source/analysis/analysishelper.cxx |  206 +---
 scaddins/source/analysis/analysishelper.hxx |5 
 2 files changed, 130 insertions(+), 81 deletions(-)

New commits:
commit 275e68d141179272258d03194d799495fa3dec4a
Author: Winfried Donkers 
Date:   Sat Apr 13 19:47:10 2013 +0200

fdo#40100 make function YEARFRAC comply with ODFF Version1.2

Change-Id: Ief5e5c89b7fb69fb9849cf2d6efe2b4c5b7f5391
Reviewed-on: https://gerrit.libreoffice.org/3375
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 278b26f..94e2da8 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -332,78 +332,6 @@ sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 
nYear2 )
 }
 
 
-void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 
nEndDate, sal_Int32 nMode,
-sal_uInt16& rYears, sal_Int32& rDayDiffPart, sal_Int32& rDaysInYear ) 
throw( uno::RuntimeException, lang::IllegalArgumentException )
-{
-if( nStartDate > nEndDate )
-{
-sal_Int32   n = nEndDate;
-nEndDate = nStartDate;
-nStartDate = n;
-}
-
-sal_Int32   nDate1 = nStartDate + nNullDate;
-sal_Int32   nDate2 = nEndDate + nNullDate;
-
-sal_uInt16  nDay1, nDay2;
-sal_uInt16  nMonth1, nMonth2;
-sal_uInt16  nYear1, nYear2;
-
-DaysToDate( nDate1, nDay1, nMonth1, nYear1 );
-DaysToDate( nDate2, nDay2, nMonth2, nYear2 );
-
-sal_uInt16  nYears;
-
-sal_Int32   nDayDiff, nDaysInYear;
-
-switch( nMode )
-{
-case 0: // 0=USA (NASD) 30/360
-case 4: // 4=Europe 30/360
-nDaysInYear = 360;
-nYears = nYear2 - nYear1;
-nDayDiff = GetDiffDate360( nDay1, nMonth1, nYear1, IsLeapYear( 
nYear1 ),
-nDay2, nMonth2, nYear2, nMode == 0 ) - 
nYears * nDaysInYear;
-break;
-case 1: // 1=exact/exact
-nYears = nYear2 - nYear1;
-
-nDaysInYear = IsLeapYear( nYear1 )? 366 : 365;
-
-if( nYears && ( nMonth1 > nMonth2 || ( nMonth1 == nMonth2 && nDay1 
> nDay2 ) ) )
-nYears--;
-
-if( nYears )
-nDayDiff = nDate2 - DateToDays( nDay1, nMonth1, nYear2 );
-else
-nDayDiff = nDate2 - nDate1;
-
-if( nDayDiff < 0 )
-nDayDiff += nDaysInYear;
-
-break;
-case 2: // 2=exact/360
-nDaysInYear = 360;
-nYears = sal_uInt16( ( nDate2 - nDate1 ) / nDaysInYear );
-nDayDiff = nDate2 - nDate1;
-nDayDiff %= nDaysInYear;
-break;
-case 3: //3=exact/365
-nDaysInYear = 365;
-nYears = sal_uInt16( ( nDate2 - nDate1 ) / nDaysInYear );
-nDayDiff = nDate2 - nDate1;
-nDayDiff %= nDaysInYear;
-break;
-default:
-throw lang::IllegalArgumentException();
-}
-
-rYears = nYears;
-rDayDiffPart = nDayDiff;
-rDaysInYear = nDaysInYear;
-}
-
-
 sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 
nEndDate, sal_Int32 nMode,
 sal_Int32* pOptDaysIn1stYear ) throw( uno::RuntimeException, 
lang::IllegalArgumentException )
 {
@@ -508,17 +436,143 @@ sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 
nDate, sal_Int32 nMode )
 }
 
 
+//fdo40100 toDo: make function fully compliant with ODFF1.2
+/**
+ * Function GetYearFrac implements YEARFRAC as defined in:
+ *   Open Document Format for Office Applications version 1.2 Part 2, par. 
6.10.24
+ *   The calculations are defined in:
+ *   Open Document Format for Office Applications version 1.2 Part 2, par. 
4.11.7
+ */
 double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 
nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException, 
lang::IllegalArgumentException )
 {
 if( nStartDate == nEndDate )
 return 0.0; // nothing to do...
 
-sal_uInt16  nYears;
-sal_Int32   nDayDiff, nDaysInYear;
+if( nStartDate > nEndDate )
+{
+sal_Int32   n = nEndDate;
+nEndDate = nStartDate;
+nStartDate = n;
+}
+
+sal_Int32 nDate1 = nStartDate + nNullDate;
+sal_Int32 nDate2 = nEndDate + nNullDate;
+
+sal_uInt16  nDay1, nDay2;
+sal_uInt16  nMonth1, nMonth2;
+sal_uInt16  nYear1, nYear2;
+
+DaysToDate( nDate1, nDay1, nMonth1, nYear1 );
+DaysToDate( nDate2, nDay2, nMonth2, nYear2 );
+
+// calculate days between nDate1 and nDate2
+sal_Int32 nDayDiff;
+switch( nMode )
+{
+case 0: // 0=USA (NASD) 30/360
+if ( nDay1 == 31 )
+{
+nDay1--;
+}
+if ( nDay1 == 30 && nDay2 == 31 )
+{
+nDay2--;
+}
+el

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

[Tor Lillqvist]

 solenv/bin/modules/installer/simplepackage.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c25b01fce27c85affee920441b9b09a7bfe0501
Author: Tor Lillqvist 
Date:   Wed Apr 17 17:09:46 2013 +0300

Eek, it is hard to get the right path to the .app that is being built

Temporary directory name upon temporary directory name. Just in
case. When in doubt, add one more temporary directory name layer.


workdir/unxmacxx.pro/installation/LibreOffice_Dev/dmg/install/en-US_inprogress_temp.62979/./LibreOfficeDev_4.1.0.0.alpha0_MacOS_x86-64/LibreOfficeDev.app

Couldn't quickly figure out how to construct the
"LibreOfficeDev_4.1.0.0.alpha0_MacOS_x86-64" part so just use a
wildcard * for that for now;) There won't be any other directories
there anyway, as far as I know.

Change-Id: If950d4cdfe3f7b0663f1b6fbd62185ca8284dd7f

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 3445fe3..e6e6484 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -435,7 +435,7 @@ sub create_package
 # participate in the signing and their validity can be
 # guaranteed.
 
-$systemcall = "codesign --sign 
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v 
$localtempdir/$folder/$volume_name_classic_app.app";
+$systemcall = "codesign --sign 
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v 
$localtempdir/$folder/*/$volume_name_classic_app.app";
 print "... $systemcall ...\n";
 my $returnvalue = system($systemcall);
 $infoline = "Systemcall: $systemcall\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#40100 make function YEARFRAC comply with ODFF Version1.2

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

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief5e5c89b7fb69fb9849cf2d6efe2b4c5b7f5391
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Winfried Donkers 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: Winfried Donkers 

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

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

[Tor Lillqvist]

 solenv/bin/modules/installer/simplepackage.pm |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a029b55d9f8a7b6040fdc27f0b5fde86e71d94a0
Author: Tor Lillqvist 
Date:   Wed Apr 17 17:16:34 2013 +0300

Remove a pointless assignment of a variable to itself

Change-Id: I6c983ec5f0f4597f7f86c1c9ff256881c360bb1d

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index e6e6484..3b8c8a3 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -281,7 +281,6 @@ sub create_package
 my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . 
$allvariables->{'PRODUCTVERSION'};
 my $volume_name_classic_app = $volume_name;  # "app" should not 
contain version number
 $volume_name_classic = $volume_name_classic;
-$volume_name_classic_app = $volume_name_classic_app;
 if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) {
 $volume_name = $volume_name . ' ' . 
$allvariables->{'DMG_VOLUMEEXTENSION'};
 $volume_name_classic = $volume_name_classic . ' ' . 
$allvariables->{'DMG_VOLUMEEXTENSION'};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LibreOffice 4.0.3 RC1 test builds available

[Fridrich Strba]

Hi *,

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

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

Builds are now being uploaded to a public (but non-mirrored - so don't
spread news too widely!) place, as soon as they're available. Grab
them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try & report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

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

The list of fixed bugs relative to 4.0.2 is here:

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

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


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

Re: extracting extended tooltips from the help texts

[Markus Mohrhard]

Hey Andras,


2013/4/17 Andras Timar 

> Hi Markus,
>
> On Wed, Apr 17, 2013 at 12:31 AM, Markus Mohrhard
>  wrote:
> >
> > attached you'll find the initial work on extracting the tooltips from the
> > help texts.
> >
>
> I tried your patch and it works. I don't have strong opinion about the
> actual place of these files in install set. help/tooltips is fine for
> me.
>
> I have some concerns, however.
>
> * This patch and follow-ups will suddenly add ~7 new words to
> translate to UI, effectively doubling the translatable wordcount. Old
> help translations can be migrated, but for those, who don't have help
> translations these strings will be new. Now, without local help,
> extended tips show normal tooltips - which are localized. After the
> patch English strings will appear in localized UI until teams complete
> translation of this huge amount.
>

Ok, I have no idea for that except maybe blocking the extended tooltips if
they are not translated.


>
> * Your work is part of the plan of getting rid of current help system
> (https://wiki.documentfoundation.org/Development/Wikihelp). But
> developments related to this happen on different time scales. You have
> a 80% ready patch, while other related tasks are only in planning
> phase. I don't see the advantage of integrating your patch into master
> (-> 4.1) now.
>

I don't see a big development item there that is in the planning stage. I
worked on this task because Kendy told me that it is the largest blocking
item for moving to the wikihelp.


>
> * Huge properties files will be converted to huge po files. From the
> translators' and translation tools' point of view, it would be better
> to have more, smaller files.
>

Ok. We can surely move the uno commands into own files which should help
with that a bit.


>
> * Originally (very long time ago) these extended tips were next to the
> resource, there was a HelpText field. Later HelpText became deprecated
> and these strings were shared with help, in order to reduce the amount
> of duplication. Now you restore the duplication, but strings are still
> out of context. Ideally the text of a control, its short tooltip
> (QuickHelpText) and its extended tip (HelpText) should be together. It
> would help translators a lot.
>
>
>
We can maybe do that when we transform src files to ui files but I'm unsure
how to do that for uno commands. For the ui files this can easily be done
as Easy Hack.

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

Re: forward RTL_CONTEXT_foo logging to SAL_INFO in default debugging

[Tor Lillqvist]

I am more and more starting to be of the opinion that all debugging
printouts, SAL_INFO() (or RTL_foo)  are mostly useless once the bug or
misfeature you have been chasing (for which you have added the
debugging logging) has been found and fixed;)

If and when later some other bug in the same area needs chasing, you
will have to add more SAL_INFOs, or add more information to existing
ones, anyway... I.e. there is no effective difference between SAL_INFO
and SAL_DEBUG.

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

Re: forward RTL_CONTEXT_foo logging to SAL_INFO in default debugging

[Bjoern Michaelsen]

On Wed, Apr 17, 2013 at 04:13:15PM +0200, Stephan Bergmann wrote:
> What good is the intermediate move?  That is, was there at least one
> situation in which it would have helped your debugging if an
> existing RTL_LOGFILE_* call had been behaving like SAL_LOG?

Yes, there had been: I was trying to wrap my haed around the
observer-pattern-gone-bad of vcl-callbacks going into
framework/uielement/menubarmanager.cxx to see if there is something going wrong
with the order of execution. RTL_LOGFILE provides some helpful ad-hoc hints
there without manually setting bazillion breakpoints or adding SAL_INFOs there.

Also, Im kinda testing here if someone has a secret love affair with
RTL_LOGFILE and does not want to see it die. ;)

Best,

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

[Libreoffice-commits] core.git: libmariadb/StaticLibrary_mariadb.mk

[Michael Stahl]

 libmariadb/StaticLibrary_mariadb.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 010dd7a05360a1aebebc3381ba96aa5ff4534543
Author: Michael Stahl 
Date:   Wed Apr 17 16:44:57 2013 +0200

libmariadb: fix unresolved dlopen etc. with MSVC 2008

Change-Id: I8268ac340f62a84bfae774194e8a6a50c8a707f3

diff --git a/libmariadb/StaticLibrary_mariadb.mk 
b/libmariadb/StaticLibrary_mariadb.mk
index 2f70dcb..338701f 100644
--- a/libmariadb/StaticLibrary_mariadb.mk
+++ b/libmariadb/StaticLibrary_mariadb.mk
@@ -22,6 +22,11 @@ $(eval $(call gb_StaticLibrary_set_include,mariadblib,\
-I$(call gb_UnpackedTarball_get_dir,mariadb)/include \
 ))
 
+# This is needed for MSVC 2008: it somehow finds a dlopen somewhere
+# but the static library then contains unreferenced symbols.
+# This macro enables a re-definition to native Win32 APIs in my_global.h.
+$(eval $(call gb_StaticLibrary_add_cflags,mariadblib,-DHAVE_DLOPEN))
+
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadblib,\
 UnpackedTarball/mariadb/libmysql/array \
 UnpackedTarball/mariadb/libmysql/bchange \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/unx/gtk3/window/gtk3gtkframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39c6a5cec7471029292de2cf1ebb2a18947be4e2
Author: Stephan Bergmann 
Date:   Wed Apr 17 16:57:56 2013 +0200

Adapt to gtkframe -> gtksalframe rename

Change-Id: I2a464208081b42a577aafbe321d9662007208d77

diff --git a/vcl/unx/gtk3/window/gtk3gtkframe.cxx 
b/vcl/unx/gtk3/window/gtk3gtkframe.cxx
index be4d678..cc93d6e 100644
--- a/vcl/unx/gtk3/window/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/window/gtk3gtkframe.cxx
@@ -27,6 +27,6 @@
  * instead of those above.
  */
 
-#include "../../gtk/window/gtkframe.cxx"
+#include "../../gtk/window/gtksalframe.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/uiconfig

[Caolán McNamara]

 helpcontent2  |2 +-
 sc/uiconfig/scalc/ui/solverdlg.ui |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9302aec448085b89f73adfc88a5c09180f7d4af8
Author: Caolán McNamara 
Date:   Wed Apr 17 16:15:27 2013 +0100

fix solver optionbutton group

Change-Id: I23cf85f5fbd2dcc333094e9003ce8f5ce4f0b68d

diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui 
b/sc/uiconfig/scalc/ui/solverdlg.ui
index e4702b0..3a3ab23 100644
--- a/sc/uiconfig/scalc/ui/solverdlg.ui
+++ b/sc/uiconfig/scalc/ui/solverdlg.ui
@@ -153,6 +153,7 @@
 True
 0
 True
+value
 
   
 
commit f1d22be9c19d6aa0fd904e67767be07b9c1c3a67
Author: Caolán McNamara 
Date:   Wed Apr 17 16:15:03 2013 +0100

Updated core
Project: help  0065ae78b41544cda55fb0cf4e776da56e4d

diff --git a/helpcontent2 b/helpcontent2
index 0a2a1d9..0065ae7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0a2a1d9d34779e473405adcae1a96710686c9cec
+Subproject commit 0065ae78b41544cda55fb0cf4e776da56e4d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst|   35 ---
 source/text/scalc/01/solver.xhp |   73 
 2 files changed, 37 insertions(+), 71 deletions(-)

New commits:
commit 0065ae78b41544cda55fb0cf4e776da56e4d
Author: Caolán McNamara 
Date:   Wed Apr 17 16:15:03 2013 +0100

update helpids for solver dialog .ui conversion

Change-Id: I9e6ef6fb678dbc1c853fb9b6245b58a2d6b08b30

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1fd405d..8ef203d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6591,17 +6591,6 @@ sc_Edit_RID_SCDLG_FILLSERIES_ED_START_VALUES,1493518388,
 sc_Edit_RID_SCDLG_FILTER_ED_COPY_AREA,2567079943,
 sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111,
 sc_Edit_RID_SCDLG_NEWSCENARIO_ED_NAME,1493846027,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT1,2569209860,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT2,2569209861,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT3,2569209862,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT4,2569209863,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_OBJECTIVECELL,2569209857,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT1,2569209864,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT2,2569209865,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT3,2569209866,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT4,2569209867,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_TARGET,2569209858,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_VARIABLECELLS,2569209859,
 sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962,
 sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943,
 sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD1,1495681326,
@@ -6640,21 +6629,6 @@ 
sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DEST_AREA,2567532076,
 sc_ImageButton_RID_SCDLG_DBNAMES_RB_DBAREA,2567335438,
 sc_ImageButton_RID_SCDLG_FILTER_RB_COPY_AREA,2567089672,
 sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE1,2569219596,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE2,2569219597,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE3,2569219598,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE4,2569219599,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT1,2569219588,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT2,2569219589,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT3,2569219590,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT4,2569219591,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_OBJECTIVECELL,2569219585,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT1,2569219592,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT2,2569219593,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT3,2569219594,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT4,2569219595,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_TARGET,2569219586,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_VARIABLECELLS,2569219587,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
 sc_ImageButton_RID_SCDLG_SIMPLEREF_RB_ASSIGN,2569006604,
@@ -6713,10 +6687,6 @@ sc_ListBox_RID_SCDLG_IMPORTOPT_LB_FONT,1494175242,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCDLG_NEWSCENARIO_LB_COLOR,1493847574,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP1,2569211393,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP2,2569211394,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP3,2569211395,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP4,2569211396,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND1,1493749277,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND2,1493749278,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND3,1493749279,
@@ -6796,8 +6766,6 @@ sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_ADD,2567524869,
 sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_REMOVE,2567524870,
 sc_PushButton_RID_SCDLG_DBNAMES_BTN_ADD,2567328259,
 sc_PushButton_RID_SCDLG_DBNAMES_BTN_REMOVE,2567328260,
-sc_PushButton_RID_SCDLG_OPTSOLVER_BTN_OPTIONS,2569212417,
-sc_PushButton_RID_SCDLG_OPTSOLVER_BTN_SOLVE,2569212420,
 sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS,2567508486,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE,2567508485,
@@ -6852,9 +6820,6 @@ sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_DIV,1493434911,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_MUL,1493434910,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_NOOP,1493434907,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_SUB,1493434909,
-sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_MAX,2569208321,
-sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_MIN,2569208322,
-sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_VALUE,2569208323,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_AUTO,1493828098,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_NONE,1493828097,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_USER,1493828099,
diff --git a/source/text/scalc/01/solver.xhp b/source/text/scalc/01/solver.xhp
index a39d077..5c45daf 100644
--- a/source/text/scalc/01/solver.xhp
+++ b/source/text/scalc/01/solver.xhp
@@ -34,7 +34,8 @@
 back-solving
 solver
 
-mw changed "what-if...", "goal seek;" and made 
"back-solving;" a one level entry
+
+
 Solver
 
 Opens the Solver dialog. A solver allows to solve 
equ

Re: cherry-pick across renames [was: minutes of ESC call ...]

[Miklos Vajna]

Hi Michael,

On Wed, Apr 17, 2013 at 11:55:04AM +0200, Michael Meeks 
 wrote:
> 
> On Tue, 2013-04-16 at 10:19 +0200, Miklos Vajna wrote:
> > I tried that on a sample repo, so thanks for bringing this up. It seems
> > the git rename detection is O(N^2), so the default number of renamed
> > files is limited to avoid long merges.
> 
>   Presumably it would be possible to cache rename information trawled
> from the history at great cost, so a second time a cherry-pick is done,
> things are much harder ? (at least locally that is).

If we see that a git cherry-pick indeed takes a lot of time, and if the
majority of the time is spent in rename detection, then I would look
into some kind of caching, sure.

IIRC rename detection works on two trees, though, so practically
whatever you cache may be potentially reused next time you cherry-pick
the same commit to the same branch, which is unlikely. :-)

Miklos


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

[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk helpcontent2

[Caolán McNamara]

 cui/UIConfig_cui.mk  |1 
 cui/source/inc/autocdlg.hxx  |   14 -
 cui/source/inc/helpid.hrc|1 
 cui/source/tabpages/autocdlg.cxx |   68 -
 cui/source/tabpages/autocdlg.src |   71 -
 cui/uiconfig/ui/autocorrectdialog.ui |  255 +++
 helpcontent2 |2 
 7 files changed, 296 insertions(+), 116 deletions(-)

New commits:
commit 2bbdf5c72254a70c43894eb907f23f78557f709a
Author: Caolán McNamara 
Date:   Wed Apr 17 16:57:31 2013 +0100

convert autocorrect dialog to .ui format

Just the outmost dialog itself, not the individual pages.

We have to go top down in this case to incrementally convert the pages 
because
of the non-standard additional widgets outside the tabcontrol area.

So this dialog is set to non-resizable until its contents are
converted over.

Change-Id: I92014a44b4cab8d345666295b052635d4b57a496

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index d8e94ba..7afa2df 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,cui))
 $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/asiantypography \
+   cui/uiconfig/ui/autocorrectdialog \
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/cellalignment \
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 1190ffe..91062f1 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -38,18 +38,18 @@ namespace editeng { class SortedAutoCompleteStrings; }
 
 class OfaAutoCorrDlg : public SfxTabDialog
 {
-FixedText   aLanguageFT;
-SvxLanguageBox  aLanguageLB;
+VclContainer* m_pLanguageBox;
+SvxLanguageBox*  m_pLanguageLB;
+
+sal_uInt16 m_nReplacePageId;
+sal_uInt16 m_nExceptionsPageId;
 
 DECL_LINK(SelectLanguageHdl, ListBox*);
 public:
 
-OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet );
-
-voidEnableLanguage(sal_Bool bEnable)
-{   aLanguageFT.Enable(bEnable);
-aLanguageLB.Enable(bEnable);}
+OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet);
 
+void EnableLanguage(bool bEnable);
 };
 
 #ifdef _OFA_AUTOCDLG_CXX
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 0f4a5a1..5c68192 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -229,7 +229,6 @@
 #define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY"
 #define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS"
 #define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB"
-#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE"
 #define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB"
 #define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1"
 #define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2"
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 2f11b4c..75fa160 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -59,11 +59,12 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star;
 using namespace ::rtl;
 
-OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
-SfxTabDialog( pParent,  CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet ),
-aLanguageFT ( this, CUI_RES( FT_LANG ) ),
-aLanguageLB ( this, CUI_RES( LB_LANG ) )
+OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet )
+: SfxTabDialog(pParent, "AutoCorrectDialog", 
"cui/ui/autocorrectdialog.ui", _pSet)
 {
+get(m_pLanguageBox, "langbox");
+get(m_pLanguageLB, "lang");
+
 sal_Bool bShowSWOptions = sal_False;
 sal_Bool bOpenSmartTagOptions = sal_False;
 
@@ -78,21 +79,16 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const 
SfxItemSet* _pSet ) :
 bOpenSmartTagOptions = sal_True;
 }
 
-aLanguageFT.SetZOrder(0, WINDOW_ZORDER_FIRST);
-aLanguageLB.SetZOrder(&aLanguageFT, WINDOW_ZORDER_BEHIND);
-aLanguageLB.SetHelpId(HID_AUTOCORR_LANGUAGE);
-FreeResource();
-
-AddTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS, OfaAutocorrOptionsPage::Create, 
0);
-AddTabPage(RID_OFAPAGE_AUTOFMT_APPLY, OfaSwAutoFmtOptionsPage::Create, 0);
-AddTabPage(RID_OFAPAGE_AUTOCOMPLETE_OPTIONS, 
OfaAutoCompleteTabPage::Create, 0);
-AddTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS, 
OfaSmartTagOptionsTabPage::Create, 0);
+AddTabPage("options", OfaAutocorrOptionsPage::Create, 0);
+AddTabPage("apply", OfaSwAutoFmtOptionsPage::Create, 0);
+AddTabPage("wordcompletion", OfaAutoCompleteTabPage::Create, 0);
+AddTabPage("smarttags", OfaSmartTagOptionsTabPage::Create, 0);
 
 if (!bShowSWOptions)
 {
-RemoveTabPage(RID_OFAPAGE_AUTOFMT_APPLY);
-RemoveTabPage(RID_OFAPAGE_AUTOCOMPLETE_OPTIONS);
-RemoveTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS);
+ 

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst   |1 -
 source/text/shared/01/06040300.xhp |4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0483b91db6d66dbe320ce8a129988a6ed8940832
Author: Caolán McNamara 
Date:   Wed Apr 17 17:04:56 2013 +0100

update helpids for autocorrect dialog .ui conversion

Change-Id: I5eec4ec839e83648362b60e2f840e8705bb4d7aa

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 8ef203d..5c72455 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -795,7 +795,6 @@ HID_AUTOCORR_HELP_SENTWORDENEMDASH,34109,
 HID_AUTOCORR_HELP_SETINETATTR,34116,
 HID_AUTOCORR_HELP_WORD,34099,
 HID_AUTOCORR_HELP_WORDENEMDASH,34107,
-HID_AUTOCORR_LANGUAGE,35091,
 HID_AUTOFORMAT_ACCEPT,54854,
 HID_AUTOFORMAT_CLB,52827,
 HID_AUTOFORMAT_CLOSE,52834,
diff --git a/source/text/shared/01/06040300.xhp 
b/source/text/shared/01/06040300.xhp
index b31e810..58e179f 100644
--- a/source/text/shared/01/06040300.xhp
+++ b/source/text/shared/01/06040300.xhp
@@ -37,9 +37,9 @@
 
 
 
-
+
 Replacements and exceptions for language:
-Select the language for which 
you want to create or edit the replacement rules. $[officename] first 
searches for exceptions that are defined for the language at the current cursor 
position in the document, and then searches the remaining languages.
+Select the language for 
which you want to create or edit the replacement rules. $[officename] 
first searches for exceptions that are defined for the language at the current 
cursor position in the document, and then searches the remaining 
languages.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Power]

 oox/inc/oox/ole/axbinaryreader.hxx |   16 +++--
 oox/inc/oox/ole/axcontrol.hxx  |   50 ++--
 oox/source/ole/axbinaryreader.cxx  |   11 +++
 oox/source/ole/axcontrol.cxx   |  115 +
 oox/source/ole/vbacontrol.cxx  |   63 ++--
 5 files changed, 240 insertions(+), 15 deletions(-)

New commits:
commit a43cc9ec8dde4f311bcf8ff96e6a26d56b2abdcf
Author: Noel Power 
Date:   Wed Apr 17 17:08:59 2013 +0100

implement MultiPage, Page & TabStrip import for oox

Change-Id: I1912c9550c12a971fcc7fdbc8bd623f18ccc40b8

diff --git a/oox/inc/oox/ole/axbinaryreader.hxx 
b/oox/inc/oox/ole/axbinaryreader.hxx
index f734a307..b6a937d 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -87,7 +87,7 @@ private:
 typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
 
 /** An array of string values as a property. */
-typedef ::std::vector< OUString > AxStringArray;
+typedef ::std::vector< OUString > AxArrayString;
 
 // 
 
@@ -112,6 +112,9 @@ public:
 /** Reads the next string property from the stream, if the respective flag
 in the property mask is set. */
 voidreadStringProperty( OUString& orValue );
+/** Reads ArrayString, an array of fmString ( compressed or uncompressed )
+is read from the stream and inserted into rStrings */
+voidreadArrayStringProperty( std::vector< OUString >& 
rStrings );
 /** Reads the next GUID property from the stream, if the respective flag
 in the property mask is set. The GUID will be enclosed in braces. */
 voidreadGuidProperty( OUString& orGuid );
@@ -135,6 +138,9 @@ public:
 /** Skips the next string property in the stream, if the respective flag in
 the property mask is set. */
 inline void skipStringProperty() { readStringProperty( 
maDummyString ); }
+/** Skips the next ArrayString property in the stream, if the respective 
flag in
+the property mask is set. */
+inline void skipArrayStringProperty() { readArrayStringProperty( 
maDummyArrayString ); }
 /** Skips the next GUID property in the stream, if the respective flag in
 the property mask is set. */
 inline void skipGuidProperty() { readGuidProperty( maDummyString 
); }
@@ -185,11 +191,11 @@ private:
 };
 
 /** Complex property for an array of strings. */
-struct StringArrayProperty : public ComplexProperty
+struct ArrayStringProperty : public ComplexProperty
 {
-AxStringArray&  mrArray;
+AxArrayString&  mrArray;
 sal_uInt32  mnSize;
-inline explicit StringArrayProperty( AxStringArray& rArray, 
sal_uInt32 nSize ) :
+inline explicit ArrayStringProperty( AxArrayString& rArray, 
sal_uInt32 nSize ) :
 mrArray( rArray ), mnSize( nSize ) {}
 virtual boolreadProperty( AxAlignedInputStream& rInStrm );
 };
@@ -234,7 +240,7 @@ private:
 AxFontData  maDummyFontData;///< Dummy font for unsupported 
properties.
 StreamDataSequence  maDummyPicData; ///< Dummy picture for unsupported 
properties.
 OUString maDummyString;  ///< Dummy string for unsupported 
properties.
-AxStringArray   maDummyStringArray; ///< Dummy string array for 
unsupported properties.
+AxArrayString maDummyArrayString; ///< Dummy strings for unsupported 
ArrayString properties.
 sal_Int64   mnPropFlags;///< Flags specifying existing 
properties.
 sal_Int64   mnNextProp; ///< Next property to read.
 sal_Int64   mnPropsEnd; ///< End position of simple/large 
properties.
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index 6612ef3..84e3a3e 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -157,13 +157,13 @@ enum ApiControlType
 API_CONTROL_COMBOBOX,
 API_CONTROL_SPINBUTTON,
 API_CONTROL_SCROLLBAR,
-API_CONTROL_TABSTRIP,
+API_CONTROL_TABSTRIP, //11
 API_CONTROL_PROGRESSBAR,
 API_CONTROL_GROUPBOX,
-API_CONTROL_FRAME,
-API_CONTROL_PAGE,
-API_CONTROL_MULTIPAGE,
-API_CONTROL_DIALOG
+API_CONTROL_FRAME, // 14
+API_CONTROL_PAGE,  // 15
+API_CONTROL_MULTIPAGE, // 16
+API_CONTROL_DIALOG // 17
 };
 
 // 
@@ -600,6 +600,24 @@ private:
 boolmbPicTiling;///< True = picture is repeated.
 };
 
+class OOX_DLLPUBLIC AxTabStripModel : public AxFontDataModel
+{
+public:
+explicitAxTabStripModel();
+
+virtual boolimportBinaryModel( BinaryInputStream& rInStrm );
+
+virtual ApiControlType getControlType() const;
+
+public:
+sal_uInt32   mnListIndex;
+

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

vitriol  changed:

   What|Removed |Added

 Depends on||63498

--- Comment #135 from vitriol  ---
Nominating Bug 63498: Personas doesn't work anymore. A new functionality
completely unusable.

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

[PATCH] WaE: g_type_init has been deprecated since GLib 2.36

[Ivan Timofeev (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3434

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/3434/1

WaE: g_type_init has been deprecated since GLib 2.36

Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
---
M shell/source/backends/gconfbe/gconfaccess.cxx
M shell/source/sessioninstall/SyncDbusSessionHelper.cxx
M tubes/source/manager.cxx
M ucb/source/ucp/gio/gio_provider.cxx
4 files changed, 8 insertions(+), 2 deletions(-)



diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx 
b/shell/source/backends/gconfbe/gconfaccess.cxx
index 1a1131c..d5b864d 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,8 +51,10 @@
 static GConfClient* mClient= 0;
 if (mClient == NULL)
 {
+#if !defined(GLIB_VERSION_2_36)
 /* initialize glib object type library */
 g_type_init();
+#endif
 
 GError* aError = NULL;
 if (!gconf_init(0, NULL, &aError))
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx 
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index e833784..a39c847 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,9 @@
 {
 SyncDbusSessionHelper::SyncDbusSessionHelper(Reference 
const&)
 {
+#if !defined(GLIB_VERSION_2_36)
 g_type_init ();
+#endif
 }
 void SAL_CALL SyncDbusSessionHelper::InstallPackageNames( const 
::sal_uInt32 nXid, const Sequence< OUString >& vPackages, const OUString& 
sInteraction ) throw (RuntimeException)
 {
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 70d9e44..a7acc3f 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -885,7 +885,9 @@
 mpFileTransferClient( NULL),
 mpAccountManager( NULL)
 {
+#if !defined(GLIB_VERSION_2_36)
 g_type_init();
+#endif
 }
 
 TeleManagerImpl::~TeleManagerImpl()
diff --git a/ucb/source/ucp/gio/gio_provider.cxx 
b/ucb/source/ucp/gio/gio_provider.cxx
index aad78b3..acd6e14 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,9 +100,9 @@
 uno::Reference< lang::XMultiServiceFactory > xSMgr
 (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
 uno::Reference< lang::XSingleServiceFactory > xFactory;
-
+#if !defined(GLIB_VERSION_2_36)
 g_type_init();
-
+#endif
 if ( 
!::gio::ContentProvider::getImplementationName_Static().compareToAscii( 
pImplName ) )
 xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ivan Timofeev 

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

[PATCH] Fix typos: HEIGTH -> HEIGHT and WEIGTH -> WEIGHT

[Lior Kaplan (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3435

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/3435/1

Fix typos: HEIGTH -> HEIGHT and WEIGTH -> WEIGHT

Change-Id: Ie5dc62bf535360cde8a5ccd6f8be3965ff48739c
---
M xmloff/inc/xmloff/PageMasterStyleMap.hxx
M xmloff/inc/xmloff/xmltoken.hxx
M xmloff/source/chart/PropertyMap.hxx
M xmloff/source/core/xmltoken.cxx
M xmloff/source/style/PageMasterExportPropMapper.cxx
M xmloff/source/style/PageMasterStyleMap.cxx
M xmloff/source/style/PagePropertySetContext.cxx
M xmloff/source/style/XMLFootnoteSeparatorExport.cxx
M xmloff/source/style/XMLFootnoteSeparatorImport.cxx
9 files changed, 11 insertions(+), 11 deletions(-)



diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx 
b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
index c1c6d31..c3a8392 100644
--- a/xmloff/inc/xmloff/PageMasterStyleMap.hxx
+++ b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
@@ -150,8 +150,8 @@
 #define CTF_PM_FOOTERMARGINLEFT (CTF_PM_FOOTERFLAG|CTF_PM_MARGINLEFT)
 #define CTF_PM_FOOTERMARGINRIGHT(CTF_PM_FOOTERFLAG|CTF_PM_MARGINRIGHT)
 
-#define CTF_PM_FTN_HEIGTH   (XML_PM_CTF_START + 0x0060)
-#define CTF_PM_FTN_LINE_WEIGTH  (XML_PM_CTF_START + 0x0061)
+#define CTF_PM_FTN_HEIGHT   (XML_PM_CTF_START + 0x0060)
+#define CTF_PM_FTN_LINE_WEIGHT  (XML_PM_CTF_START + 0x0061)
 #define CTF_PM_FTN_LINE_COLOR   (XML_PM_CTF_START + 0x0062)
 #define CTF_PM_FTN_LINE_WIDTH   (XML_PM_CTF_START + 0x0063)
 #define CTF_PM_FTN_LINE_ADJUST  (XML_PM_CTF_START + 0x0064)
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index e19043a..a40da2c 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -3183,7 +3183,7 @@
 XML_HORIZONTAL_BAR,
 XML_VERTICAL_BAR,
 
-XML_ERROR_STANDARD_WEIGTH, // errorbar standard deviation error weigth
+XML_ERROR_STANDARD_WEIGHT, // errorbar standard deviation error weight
 XML_TOKEN_END
 };
 
diff --git a/xmloff/source/chart/PropertyMap.hxx 
b/xmloff/source/chart/PropertyMap.hxx
index 6363fa2..e924b7f 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -192,7 +192,7 @@
 // errorbars properties (chart2)
 MAP_ENTRY_ODF_EXT( "PositiveError", CHART, XML_ERROR_LOWER_LIMIT, 
XML_TYPE_DOUBLE),
 MAP_ENTRY_ODF_EXT( "NegativeError", CHART, XML_ERROR_UPPER_LIMIT, 
XML_TYPE_DOUBLE),
-MAP_ENTRY_ODF_EXT( "Weigth", CHART, XML_ERROR_STANDARD_WEIGTH, 
XML_TYPE_DOUBLE),
+MAP_ENTRY_ODF_EXT( "Weight", CHART, XML_ERROR_STANDARD_WEIGHT, 
XML_TYPE_DOUBLE),
 
 // series/data-point properties
 MAP_SPECIAL( "DataCaption", CHART, XML_DATA_LABEL_NUMBER, XML_TYPE_NUMBER 
| MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_NUMBER ),   // 
convert one constant
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index da73b16..264770d 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3182,7 +3182,7 @@
 TOKEN( "horizontal-bar",   XML_HORIZONTAL_BAR ),
 TOKEN( "vertical-bar", XML_VERTICAL_BAR ),
 
-TOKEN( "std-weight", XML_ERROR_STANDARD_WEIGTH ),
+TOKEN( "std-weight", XML_ERROR_STANDARD_WEIGHT ),
 
 #if OSL_DEBUG_LEVEL > 0
 { 0, NULL, NULL,   XML_TOKEN_END }
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx 
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 72fcc67..db50eb6 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -292,7 +292,7 @@
 case CTF_PM_TEXTCOLUMNS:
 pThis->aTextColumnsExport.exportXML( rProperty.maValue );
 break;
-case CTF_PM_FTN_LINE_WEIGTH:
+case CTF_PM_FTN_LINE_WEIGHT:
 pThis->aFootnoteSeparatorExport.exportXML( pProperties, nIdx,
getPropertySetMapper());
 break;
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx 
b/xmloff/source/style/PageMasterStyleMap.cxx
index 815c5e9..8726729 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -115,13 +115,13 @@
 PLMAP( "UserDefinedAttributes", XML_NAMESPACE_TEXT, XML_XMLNS, 
 XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
 
 // footnote
-PLMAP( "FootnoteHeight",XML_NAMESPACE_STYLE,
XML_FOOTNOTE_MAX_HEIGHT, XML_TYPE_MEASURE, CTF_PM_FTN_HEIGTH ),
+PLMAP( "FootnoteHeight",XML_NAMESPACE_STYLE,
XML_FOOTNOTE_MAX_HEIGHT, XML_TYPE_MEASURE, CTF_PM_FTN_HEIGHT ),
 PLMAP( "FootnoteLineAdjust",XML_NAMESPACE_STYLE,XML__EMPTY,
 XML_TYPE_TEXT_HORIZONTAL_ADJUST|MID_FLAG_SPECIAL_ITEM,  CTF_PM_FTN_LINE_ADJUST 
),
 PLMAP( "Footno

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - basic/source oox/inc oox/source

[Noel Power]

 basic/source/runtime/step0.cxx |   43 ++---
 oox/inc/oox/ole/axbinaryreader.hxx |   20 --
 oox/inc/oox/ole/axcontrol.hxx  |   50 ++--
 oox/source/ole/axbinaryreader.cxx  |   11 +++
 oox/source/ole/axcontrol.cxx   |  115 +
 oox/source/ole/vbacontrol.cxx  |   63 ++--
 6 files changed, 274 insertions(+), 28 deletions(-)

New commits:
commit 474362028e13f98e73ea9420834a1aaa3490fd83
Author: Noel Power 
Date:   Wed Apr 17 17:08:59 2013 +0100

implement MultiPage, Page & TabStrip import for oox

Change-Id: I1912c9550c12a971fcc7fdbc8bd623f18ccc40b8
(cherry picked from commit a43cc9ec8dde4f311bcf8ff96e6a26d56b2abdcf)

Change-Id: I9d31017ab149ed8a4c80feefc891dc6c911bad20

diff --git a/oox/inc/oox/ole/axbinaryreader.hxx 
b/oox/inc/oox/ole/axbinaryreader.hxx
index d63ccb1..4a03f8a 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -87,7 +87,7 @@ private:
 typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
 
 /** An array of string values as a property. */
-typedef ::std::vector< ::rtl::OUString > AxStringArray;
+typedef ::std::vector< ::rtl::OUString > AxArrayString;
 
 // 
 
@@ -111,7 +111,10 @@ public:
 voidreadPairProperty( AxPairData& orPairData );
 /** Reads the next string property from the stream, if the respective flag
 in the property mask is set. */
-voidreadStringProperty( ::rtl::OUString& orValue );
+voidreadStringProperty( OUString& orValue );
+/** Reads ArrayString, an array of fmString ( compressed or uncompressed )
+is read from the stream and inserted into rStrings */
+voidreadArrayStringProperty( std::vector< OUString >& 
rStrings );
 /** Reads the next GUID property from the stream, if the respective flag
 in the property mask is set. The GUID will be enclosed in braces. */
 voidreadGuidProperty( ::rtl::OUString& orGuid );
@@ -135,6 +138,9 @@ public:
 /** Skips the next string property in the stream, if the respective flag in
 the property mask is set. */
 inline void skipStringProperty() { readStringProperty( 
maDummyString ); }
+/** Skips the next ArrayString property in the stream, if the respective 
flag in
+the property mask is set. */
+inline void skipArrayStringProperty() { readArrayStringProperty( 
maDummyArrayString ); }
 /** Skips the next GUID property in the stream, if the respective flag in
 the property mask is set. */
 inline void skipGuidProperty() { readGuidProperty( maDummyString 
); }
@@ -185,11 +191,11 @@ private:
 };
 
 /** Complex property for an array of strings. */
-struct StringArrayProperty : public ComplexProperty
+struct ArrayStringProperty : public ComplexProperty
 {
-AxStringArray&  mrArray;
+AxArrayString&  mrArray;
 sal_uInt32  mnSize;
-inline explicit StringArrayProperty( AxStringArray& rArray, 
sal_uInt32 nSize ) :
+inline explicit ArrayStringProperty( AxArrayString& rArray, 
sal_uInt32 nSize ) :
 mrArray( rArray ), mnSize( nSize ) {}
 virtual boolreadProperty( AxAlignedInputStream& rInStrm );
 };
@@ -233,8 +239,8 @@ private:
 AxPairData  maDummyPairData;///< Dummy pair for unsupported 
properties.
 AxFontData  maDummyFontData;///< Dummy font for unsupported 
properties.
 StreamDataSequence  maDummyPicData; ///< Dummy picture for unsupported 
properties.
-::rtl::OUString maDummyString;  ///< Dummy string for unsupported 
properties.
-AxStringArray   maDummyStringArray; ///< Dummy string array for 
unsupported properties.
+OUString maDummyString;  ///< Dummy string for unsupported 
properties.
+AxArrayString maDummyArrayString; ///< Dummy strings for unsupported 
ArrayString properties.
 sal_Int64   mnPropFlags;///< Flags specifying existing 
properties.
 sal_Int64   mnNextProp; ///< Next property to read.
 sal_Int64   mnPropsEnd; ///< End position of simple/large 
properties.
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index 9e00278..1f4b640 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -157,13 +157,13 @@ enum ApiControlType
 API_CONTROL_COMBOBOX,
 API_CONTROL_SPINBUTTON,
 API_CONTROL_SCROLLBAR,
-API_CONTROL_TABSTRIP,
+API_CONTROL_TABSTRIP, //11
 API_CONTROL_PROGRESSBAR,
 API_CONTROL_GROUPBOX,
-API_CONTROL_FRAME,
-API_CONTROL_PAGE,
-API_CONTROL_MULTIPAGE,
-API_CONTROL_DIALOG
+API_CONTROL_FRAME, // 14
+API_CONTROL_PAGE,  // 15
+API_C

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

[Luboš Luňák]

 sw/source/core/inc/drawfont.hxx   |   22 ++
 sw/source/core/txtnode/swfont.cxx |   10 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit f22006dc6ac34a35a060e15466cf6b2d2058617d
Author: Luboš Luňák 
Date:   Wed Apr 17 18:52:28 2013 +0200

fix stupid over-optimization

There's so little to be gained by storing pointers to simple
or refcounted types instead of using an instance. At least
SwTxtNode::GetMinMaxSize() and SwTxtNode::GetScalingOfSelectedText()
pass string temporaries to SwDrawTextInfo, so keeping a pointer
is clearly broken, and MSVC manages to optimize the code enough
to crash because of this. As all the pointers point to const references
and are accesses using const references as well, there shouldn't
be any harm in making a copy.
This fixes smoketest crash on Windows.

Change-Id: I7d7cb42e175a2e64fe9c84c98c0d0204a0c25c13

diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 204a1a7..f4a8b3d 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -42,12 +42,12 @@ class SwDrawTextInfo
 OutputDevice* pOut;
 ViewShell* pSh;
 const SwScriptInfo* pScriptInfo;
-const Point* pPos;
-const OUString* pText;
+Point pPos;
+OUString pText;
 const SwWrongList* pWrong;
 const SwWrongList* pGrammarCheck;
 const SwWrongList* pSmartTags;
-const Size* pSize;
+Size pSize;
 SwFont *pFnt;
 SwUnderlineFont* pUnderFnt;
 xub_StrLen* pHyphPos;
@@ -111,7 +111,7 @@ public:
 pSh = pS;
 pOut = &rO;
 pScriptInfo = pSI;
-pText = &rSt;
+pText = rSt;
 nIdx = nI;
 nLen = nL;
 nKern = 0;
@@ -129,11 +129,9 @@ public:
 
 // These values are initialized but have to be set explicitly via their
 // Set-function before they may be accessed by their Get-function:
-pPos = 0;
 pWrong = 0;
 pGrammarCheck = 0;
 pSmartTags = 0;
-pSize = 0;
 pFnt = 0;
 pHyphPos = 0;
 nLeft = 0;
@@ -192,7 +190,7 @@ public:
 #ifdef DBG_UTIL
 OSL_ENSURE( m_bPos, "DrawTextInfo: Undefined Position" );
 #endif
-return *pPos;
+return pPos;
 }
 
 xub_StrLen *GetHyphPos() const
@@ -205,7 +203,7 @@ public:
 
 const OUString &GetText() const
 {
-return *pText;
+return pText;
 }
 
 const SwWrongList* GetWrong() const
@@ -234,7 +232,7 @@ public:
 #ifdef DBG_UTIL
 OSL_ENSURE( m_bSize, "DrawTextInfo: Undefined Size" );
 #endif
-return *pSize;
+return pSize;
 }
 
 SwFont* GetFont() const
@@ -402,7 +400,7 @@ public:
 
 void SetPos( const Point &rNew )
 {
-pPos = &rNew;
+pPos = rNew;
 #ifdef DBG_UTIL
 m_bPos = true;
 #endif
@@ -418,7 +416,7 @@ public:
 
 void SetText( const OUString &rNew )
 {
-pText = &rNew;
+pText = rNew;
 }
 
 void SetWrong( const SwWrongList* pNew )
@@ -444,7 +442,7 @@ public:
 
 void SetSize( const Size &rNew )
 {
-pSize = &rNew;
+pSize = rNew;
 #ifdef DBG_UTIL
 m_bSize = true;
 #endif
diff --git a/sw/source/core/txtnode/swfont.cxx 
b/sw/source/core/txtnode/swfont.cxx
index ea9dd55..aed2079 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1163,17 +1163,17 @@ void SwDrawTextInfo::Shift( sal_uInt16 nDir )
 switch ( nDir )
 {
 case 0 :
-((Point*)pPos)->X() += GetSize().Width();
+pPos.X() += GetSize().Width();
 break;
 case 900 :
-OSL_ENSURE( ((Point*)pPos)->Y() >= GetSize().Width(), "Going 
underground" );
-((Point*)pPos)->Y() -= GetSize().Width();
+OSL_ENSURE( pPos.Y() >= GetSize().Width(), "Going underground" );
+pPos.Y() -= GetSize().Width();
 break;
 case 1800 :
-((Point*)pPos)->X() -= GetSize().Width();
+pPos.X() -= GetSize().Width();
 break;
 case 2700 :
-((Point*)pPos)->Y() += GetSize().Width();
+pPos.Y() += GetSize().Width();
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#63197, Remove Zip_launcher part

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3436

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3436/1

fdo#63197, Remove Zip_launcher part

Change-Id: I3d14cf90ec4d745a8fb70db8319a3a3042e93306
---
M wizards/Module_wizards.mk
D wizards/Zip_launcher.mk
D wizards/source/launcher/DicOOo.xba
D wizards/source/launcher/dialog.xlb
D wizards/source/launcher/script.xlb
5 files changed, 0 insertions(+), 119 deletions(-)



diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 14d6c05..d979ed0 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -43,7 +43,6 @@
Zip_form \
Zip_gimmicks \
Zip_import \
-   Zip_launcher \
Zip_share \
Zip_standard \
Zip_template \
diff --git a/wizards/Zip_launcher.mk b/wizards/Zip_launcher.mk
deleted file mode 100644
index 1fb18b0..000
--- a/wizards/Zip_launcher.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-$(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher))
-$(eval $(call gb_Zip_add_files,basicsrvlauncher,\
-   dialog.xlb \
-   DicOOo.xba \
-   script.xlb \
-))
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/launcher/DicOOo.xba 
b/wizards/source/launcher/DicOOo.xba
deleted file mode 100644
index 1e1e85e..000
--- a/wizards/source/launcher/DicOOo.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="DicOOo" script:language="StarBasic">Option Explicit
-
-Sub StartDicOOo
-
-Dim ThePath as string
-Dim DefPath as string
-Dim aService as object
-Dim MyDicOOo as string
-dim TheDoc as object
-dim args(1) as new com.sun.star.beans.PropertyValue
-
-on error resume next
-
-' Find path
-aService = CreateUnoService("com.sun.star.util.PathSubstitution")
-ThePath =ConvertToURL(aService.substituteVariables("$(user)", true))
-ThePath=ThePath & "/wordbook"
-DefPath =ConvertToURL(aService.substituteVariables("$(prog)", true))
-DefPath=DefPath & "/../share/dict/ooo"
-
-MyDicOOo=""
-
-if  fileExists(ThePath & "/DicOOo.lst") then
-   'read DicOOo.lst file in user directory
-Open ThePath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   if fileExists(DefPath & "/DicOOo.lst") then
-   'read DicOOo.lst file in share directory
-   Open DefPath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   'creates default file in user directory
-   Open ThePath & "/DicOOo.lst" for output as #1
-   print #1,convertFromURL(DefPath & "/DicOOo.sxw")
-   close #1
-endif
-endif
-
-'security 
-if Not fileExists(MyDicOOo) then
-MyDicOOo= DefPath & "/DicOOo.sxw"
-endif
-
-MyDicOOo=ConvertToURL(MyDicOOo)
-
-'Opens DicOOo main file
-args(0).name="InteractionHandler"
-args(0).value=""
-args(1).name="MacroExecutionMode"
-args(1).value=com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN 
'4
-TheDoc=StarDesktop.loadComponentFromURL(MyDicOOo,"_blank",0,args())
-
-End Sub
-
diff --git a/wizards/source/launcher/dialog.xlb 
b/wizards/source/launcher/dialog.xlb
deleted file mode 100644
index a4c6d75..000
--- a/wizards/source/launcher/dialog.xlb
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false"/>
diff --git a/wizards/source/launcher/script.xlb 
b/wizards/source/launcher/script.xlb
deleted file mode 100644
index 55310d9..000
--- a/wizards/source/launcher/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false">

[Libreoffice-commits] core.git: wizards/Module_wizards.mk wizards/source wizards/Zip_launcher.mk

[Julien Nabet]

 wizards/Module_wizards.mk  |1 
 wizards/Zip_launcher.mk|   34 
 wizards/source/launcher/DicOOo.xba |   76 -
 wizards/source/launcher/dialog.xlb |3 -
 wizards/source/launcher/script.xlb |5 --
 5 files changed, 119 deletions(-)

New commits:
commit 96adcf4b9f466e2bf26ec5aeb9e4202002376a61
Author: Julien Nabet 
Date:   Wed Apr 17 20:00:18 2013 +0200

Remove unused launcher wizard

Change-Id: I6c071f00eef88d3f56e76efddf6f0c71aa56b089
Reviewed-on: https://gerrit.libreoffice.org/3437
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 14d6c05..d979ed0 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Module_add_targets,wizards,\
Zip_form \
Zip_gimmicks \
Zip_import \
-   Zip_launcher \
Zip_share \
Zip_standard \
Zip_template \
diff --git a/wizards/Zip_launcher.mk b/wizards/Zip_launcher.mk
deleted file mode 100644
index 1fb18b0..000
--- a/wizards/Zip_launcher.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-$(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher))
-$(eval $(call gb_Zip_add_files,basicsrvlauncher,\
-   dialog.xlb \
-   DicOOo.xba \
-   script.xlb \
-))
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/launcher/DicOOo.xba 
b/wizards/source/launcher/DicOOo.xba
deleted file mode 100644
index 1e1e85e..000
--- a/wizards/source/launcher/DicOOo.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="DicOOo" script:language="StarBasic">Option Explicit
-
-Sub StartDicOOo
-
-Dim ThePath as string
-Dim DefPath as string
-Dim aService as object
-Dim MyDicOOo as string
-dim TheDoc as object
-dim args(1) as new com.sun.star.beans.PropertyValue
-
-on error resume next
-
-' Find path
-aService = CreateUnoService("com.sun.star.util.PathSubstitution")
-ThePath =ConvertToURL(aService.substituteVariables("$(user)", true))
-ThePath=ThePath & "/wordbook"
-DefPath =ConvertToURL(aService.substituteVariables("$(prog)", true))
-DefPath=DefPath & "/../share/dict/ooo"
-
-MyDicOOo=""
-
-if  fileExists(ThePath & "/DicOOo.lst") then
-   'read DicOOo.lst file in user directory
-Open ThePath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   if fileExists(DefPath & "/DicOOo.lst") then
-   'read DicOOo.lst file in share directory
-   Open DefPath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   'creates default file in user directory
-   Open ThePath & "/DicOOo.lst" for output as #1
-   print #1,convertFromURL(DefPath & "/DicOOo.sxw")
-   close #1
-endif
-endif
-
-'security 
-if Not fileExists(MyDicOOo) then
-MyDicOOo= DefPath & "/DicOOo.sxw"
-endif
-
-MyDicOOo=ConvertToURL(MyDicOOo)
-
-'Opens DicOOo main file
-args(0).name="InteractionHandler"
-args(0).value=""
-args(1).name="MacroExecutionMode"
-args(1).value=com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN 
'4
-TheDoc=StarDesktop.loadComponentFromURL(MyDicOOo,"_blank",0,args())
-
-End Sub
-
diff --git a/wizards/source/launcher/dialog.xlb 
b/wizards/source/launcher/dialog.xlb
deleted file mode 100644
index a4c6d75..000
--- a/wizards/source/launcher/dialog.xlb
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false"/>
diff --git a/wizards/source/launcher/script.xlb 
b/wizards/source/launcher/script.xlb
deleted file mode 100644
index 55310d9..000
--- a/

[PATCH] Remove unused launcher wizard

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3437

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/3437/1

Remove unused launcher wizard

Change-Id: I6c071f00eef88d3f56e76efddf6f0c71aa56b089
---
M wizards/Module_wizards.mk
D wizards/Zip_launcher.mk
D wizards/source/launcher/DicOOo.xba
D wizards/source/launcher/dialog.xlb
D wizards/source/launcher/script.xlb
5 files changed, 0 insertions(+), 119 deletions(-)



diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 14d6c05..d979ed0 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -43,7 +43,6 @@
Zip_form \
Zip_gimmicks \
Zip_import \
-   Zip_launcher \
Zip_share \
Zip_standard \
Zip_template \
diff --git a/wizards/Zip_launcher.mk b/wizards/Zip_launcher.mk
deleted file mode 100644
index 1fb18b0..000
--- a/wizards/Zip_launcher.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-$(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher))
-$(eval $(call gb_Zip_add_files,basicsrvlauncher,\
-   dialog.xlb \
-   DicOOo.xba \
-   script.xlb \
-))
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/launcher/DicOOo.xba 
b/wizards/source/launcher/DicOOo.xba
deleted file mode 100644
index 1e1e85e..000
--- a/wizards/source/launcher/DicOOo.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="DicOOo" script:language="StarBasic">Option Explicit
-
-Sub StartDicOOo
-
-Dim ThePath as string
-Dim DefPath as string
-Dim aService as object
-Dim MyDicOOo as string
-dim TheDoc as object
-dim args(1) as new com.sun.star.beans.PropertyValue
-
-on error resume next
-
-' Find path
-aService = CreateUnoService("com.sun.star.util.PathSubstitution")
-ThePath =ConvertToURL(aService.substituteVariables("$(user)", true))
-ThePath=ThePath & "/wordbook"
-DefPath =ConvertToURL(aService.substituteVariables("$(prog)", true))
-DefPath=DefPath & "/../share/dict/ooo"
-
-MyDicOOo=""
-
-if  fileExists(ThePath & "/DicOOo.lst") then
-   'read DicOOo.lst file in user directory
-Open ThePath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   if fileExists(DefPath & "/DicOOo.lst") then
-   'read DicOOo.lst file in share directory
-   Open DefPath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   'creates default file in user directory
-   Open ThePath & "/DicOOo.lst" for output as #1
-   print #1,convertFromURL(DefPath & "/DicOOo.sxw")
-   close #1
-endif
-endif
-
-'security 
-if Not fileExists(MyDicOOo) then
-MyDicOOo= DefPath & "/DicOOo.sxw"
-endif
-
-MyDicOOo=ConvertToURL(MyDicOOo)
-
-'Opens DicOOo main file
-args(0).name="InteractionHandler"
-args(0).value=""
-args(1).name="MacroExecutionMode"
-args(1).value=com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN 
'4
-TheDoc=StarDesktop.loadComponentFromURL(MyDicOOo,"_blank",0,args())
-
-End Sub
-
diff --git a/wizards/source/launcher/dialog.xlb 
b/wizards/source/launcher/dialog.xlb
deleted file mode 100644
index a4c6d75..000
--- a/wizards/source/launcher/dialog.xlb
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false"/>
diff --git a/wizards/source/launcher/script.xlb 
b/wizards/source/launcher/script.xlb
deleted file mode 100644
index 55310d9..000
--- a/wizards/source/launcher/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false">
- 
-

[ABANDONED] fdo#63197, Remove Zip_launcher part

[David Tardon (via Code Review)]

David Tardon has abandoned this change.

Change subject: fdo#63197, Remove Zip_launcher part
..


Patch Set 1: Abandoned

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I3d14cf90ec4d745a8fb70db8319a3a3042e93306
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[PUSHED] Remove unused launcher wizard

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

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c071f00eef88d3f56e76efddf6f0c71aa56b089
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[Libreoffice-commits] core.git: wizards/Module_wizards.mk wizards/source wizards/Zip_web.mk

[Julien Nabet]

 wizards/Module_wizards.mk   |1 
 wizards/Zip_web.mk  |   41 --
 wizards/source/webwizard/Bullets.xba|  134 ---
 wizards/source/webwizard/Common.xba |  162 
 wizards/source/webwizard/HtmlAutoPilotBasic.xba |  453 
 wizards/source/webwizard/Language.xba   |  101 -
 wizards/source/webwizard/WebWzrd.xdl|   45 --
 wizards/source/webwizard/dialog.xlb |5 
 wizards/source/webwizard/script.xlb |8 
 9 files changed, 950 deletions(-)

New commits:
commit 718cd9e46e47cc384758f0517d4e5b3b70d2a73d
Author: Julien Nabet 
Date:   Wed Apr 17 20:29:45 2013 +0200

Remove unused web wizard

Change-Id: I76ed89c4a46e5a7b6a639e2c2717bc53d9b68bc9
Reviewed-on: https://gerrit.libreoffice.org/3438
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index d979ed0..098433d 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Module_add_targets,wizards,\
Zip_tools \
Zip_tutorials \
Zip_usr \
-   Zip_web \
 ))
 
 ifeq ($(SOLAR_JAVA),TRUE)
diff --git a/wizards/Zip_web.mk b/wizards/Zip_web.mk
deleted file mode 100644
index c552440..000
--- a/wizards/Zip_web.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-$(eval $(call gb_Zip_Zip,basicsrvweb,$(SRCDIR)/wizards/source/webwizard))
-
-$(eval $(call gb_Zip_add_files,basicsrvweb,\
-   Bullets.xba \
-   Common.xba \
-   dialog.xlb \
-   HtmlAutoPilotBasic.xba \
-   Language.xba \
-   script.xlb \
-   WebWzrd.xdl \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/webwizard/Bullets.xba 
b/wizards/source/webwizard/Bullets.xba
deleted file mode 100644
index 76d825a..000
--- a/wizards/source/webwizard/Bullets.xba
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="Bullets" script:language="StarBasic">REM  *  BASIC  *
-Option Explicit
-
-
-SubSetBulletGraphics(sBulletUrl as String)
-Dim i as Integer
-Dim oBookMarkCursor as Object
-   oBookmarks = oBaseDocument.BookMarks
-   For i = 0 To oBookmarks.Count - 1
-   oBookMark = oBookmarks.GetbyIndex(i)
-   oBookMarkCursor = 
oBookMark.Anchor.Text.CreateTextCursorByRange(oBookMark.Anchor)
-   If 
oBookMarkCursor.PropertySetInfo.HasPropertybyName("NumberingRules") 
Then
-   ChangeBulletURL(sBulletUrl, oBookMarkCursor)
-   End If
-   Next i
-End Sub
-
-
-SubChangeBulletURL(sBulletUrl as String, oBookMarkCursor as Object)
-Dim n, m as Integer
-Dim oLevel()
-Dim oRules
-Dim bDoReplace as Boolean
-Dim oSize as New com.sun.star.awt.Size
-Dim oNumberingBuffer(0) as New com.sun.star.beans.PropertyValue
-Dim oNewBuffer(0) as New com.sun.star.beans.PropertyValue
-   oRules = oBookMarkCursor.NumberingRules
-   If Vartype(oRules()) = 9 Then
-   oNumberingBuffer(0).Name = "NumberingType"
-   oNumberingBuffer(0).Value = 
com.sun.star.style.NumberingType.BITMAP
-   For n = 0 To oRules.Count - 1
-   oLevel() = oRules.GetByIndex(n)
-   bDoReplace = ModifyPropertyValue(oLevel(), 
oNumberingBuffer())
-   If bDoReplace Then
-   oRules.ReplaceByIndex(n, oNumberingBuffer())
-   End If
-   Next n
-   oBookmarkCursor.NumberingRules = oRules
-   oNewBuffer(0).Name = "GraphicURL"
-   oNewBuffer(0).Value = sBulletUrl
-   For n = 0 To oRules.Count - 1
-   oLevel() =

[PATCH] Remove unused web wizard

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3438

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/3438/1

Remove unused web wizard

Change-Id: I76ed89c4a46e5a7b6a639e2c2717bc53d9b68bc9
---
M wizards/Module_wizards.mk
D wizards/Zip_web.mk
D wizards/source/webwizard/Bullets.xba
D wizards/source/webwizard/Common.xba
D wizards/source/webwizard/HtmlAutoPilotBasic.xba
D wizards/source/webwizard/Language.xba
D wizards/source/webwizard/WebWzrd.xdl
D wizards/source/webwizard/dialog.xlb
D wizards/source/webwizard/script.xlb
9 files changed, 0 insertions(+), 950 deletions(-)



diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index d979ed0..098433d 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -49,7 +49,6 @@
Zip_tools \
Zip_tutorials \
Zip_usr \
-   Zip_web \
 ))
 
 ifeq ($(SOLAR_JAVA),TRUE)
diff --git a/wizards/Zip_web.mk b/wizards/Zip_web.mk
deleted file mode 100644
index c552440..000
--- a/wizards/Zip_web.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-$(eval $(call gb_Zip_Zip,basicsrvweb,$(SRCDIR)/wizards/source/webwizard))
-
-$(eval $(call gb_Zip_add_files,basicsrvweb,\
-   Bullets.xba \
-   Common.xba \
-   dialog.xlb \
-   HtmlAutoPilotBasic.xba \
-   Language.xba \
-   script.xlb \
-   WebWzrd.xdl \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/webwizard/Bullets.xba 
b/wizards/source/webwizard/Bullets.xba
deleted file mode 100644
index 76d825a..000
--- a/wizards/source/webwizard/Bullets.xba
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="Bullets" script:language="StarBasic">REM  *  BASIC  *
-Option Explicit
-
-
-SubSetBulletGraphics(sBulletUrl as String)
-Dim i as Integer
-Dim oBookMarkCursor as Object
-   oBookmarks = oBaseDocument.BookMarks
-   For i = 0 To oBookmarks.Count - 1
-   oBookMark = oBookmarks.GetbyIndex(i)
-   oBookMarkCursor = 
oBookMark.Anchor.Text.CreateTextCursorByRange(oBookMark.Anchor)
-   If 
oBookMarkCursor.PropertySetInfo.HasPropertybyName("NumberingRules") 
Then
-   ChangeBulletURL(sBulletUrl, oBookMarkCursor)
-   End If
-   Next i
-End Sub
-
-
-SubChangeBulletURL(sBulletUrl as String, oBookMarkCursor as Object)
-Dim n, m as Integer
-Dim oLevel()
-Dim oRules
-Dim bDoReplace as Boolean
-Dim oSize as New com.sun.star.awt.Size
-Dim oNumberingBuffer(0) as New com.sun.star.beans.PropertyValue
-Dim oNewBuffer(0) as New com.sun.star.beans.PropertyValue
-   oRules = oBookMarkCursor.NumberingRules
-   If Vartype(oRules()) = 9 Then
-   oNumberingBuffer(0).Name = "NumberingType"
-   oNumberingBuffer(0).Value = 
com.sun.star.style.NumberingType.BITMAP
-   For n = 0 To oRules.Count - 1
-   oLevel() = oRules.GetByIndex(n)
-   bDoReplace = ModifyPropertyValue(oLevel(), 
oNumberingBuffer())
-   If bDoReplace Then
-   oRules.ReplaceByIndex(n, oNumberingBuffer())
-   End If
-   Next n
-   oBookmarkCursor.NumberingRules = oRules
-   oNewBuffer(0).Name = "GraphicURL"
-   oNewBuffer(0).Value = sBulletUrl
-   For n = 0 To oRules.Count - 1
-   oLevel() = oRules.GetByIndex(0)
-   bDoReplace = ModifyPropertyValue(oLevel(), oNewBuffer())
-   If bDoReplace Then
-   oRules.ReplaceByIndex(n, oNewBuffer())
-   End If
-   Next n
-   oBookmarkCursor.NumberingRules

[PUSHED] Remove unused web wizard

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

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76ed89c4a46e5a7b6a639e2c2717bc53d9b68bc9
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

Re: [ANN] --enable-dbgutil: everyone gets a Debug STL!

[Tor Lillqvist]

>>writing numbers to std streams now suppresses all output to
>> those streams, so that e.g., SAL_WARN("foo","bar") only writes "warn:foo:"

The problem seems to be an old one,
http://www.runcode.us/q/c-debug-builds-broke-in-snow-leopard-x-code

Looking at the interesting parts of ostream.tcc, I saw a mysterious comment

  // _GLIBCXX_RESOLVE_LIB_DEFECTS
  // 117. basic_ostream uses nonexistent num_put member functions.

and googling a bit I found
http://gcc.gnu.org/onlinedocs/libstdc++/ext/lwg-defects.html#117

hmm... no idea how to fix this yet, but apparently this is a bug in
the oldish version of GNU libstdc++ that Apple ships?

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

[PATCH] fdo#63197: convert wizards

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3439

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/3439/1

fdo#63197: convert wizards

Change-Id: Ic7fa577fbdb527a75643c4e2919e0527432d5536
---
M scp2/source/ooo/file_ooo.scp
M wizards/Module_wizards.mk
R wizards/Package_depot.mk
R wizards/Package_euro.mk
R wizards/Package_form.mk
R wizards/Package_gimmicks.mk
R wizards/Package_import.mk
C wizards/Package_share.mk
R wizards/Package_standard.mk
R wizards/Package_template.mk
R wizards/Package_tools.mk
R wizards/Package_tutorials.mk
R wizards/Package_usr.mk
D wizards/Zip_share.mk
14 files changed, 94 insertions(+), 102 deletions(-)



diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a15e58c..bd5b571 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -28,33 +28,38 @@
 #include "macros.inc"
 
 File gid_File_Basic_Depot
-Dir = gid_Dir_Basic_Depot;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvdepot.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvdepot.filelist";
 End
 
 File gid_File_Basic_Euro
-Dir = gid_Dir_Basic_Euro;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrveuro.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrveuro.filelist";
 End
 
 File gid_File_Basic_Gimmicks
-Dir = gid_Dir_Basic_Gimmicks;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvgimmicks.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvgimmicks.filelist";
 End
 
 File gid_File_Basic_Importwiz
-Dir = gid_Dir_Basic_Importwiz;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvimport.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvimport.filelist";
 End
 
 File gid_File_Basic_Formwiz
-Dir = gid_Dir_Basic_Formwiz;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvform.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvform.filelist";
 End
 
 #ifndef DISABLE_SCRIPTING
@@ -68,42 +73,45 @@
 #endif
 
 File gid_File_Basic_Template
-Dir = gid_Dir_Basic_Template;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtemplate.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtemplate.filelist";
 End
 
 File gid_File_Basic_Tools
-Dir = gid_Dir_Basic_Tools;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtools.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtools.filelist";
 End
 
 File gid_File_Basic_User
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_User_Basic;
-Name = "basicusr.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicusr.filelist";
 End
 
 File gid_File_Basic_Share
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_Basic;
-Name = "basicshare.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicshare.filelist";
 End
 
 File gid_File_Basic_User_Standard
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_Basic_Standard;
-Name = "basicsrvstandard.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicsrvstandard.filelist";
 End
 
 File gid_File_Basic_Tutorials
-Dir = gid_Dir_Basic_Tutorials;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtutorials.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtutorials.filelist";
 End
 
 #if defined ENABLE_NPAPI_INTO_BROWSER
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 098433d..2d6e36f 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -34,21 +34,21 @@
AllLangResTarget_imp \
AllLangResTarget_tpl \
AllLangResTarget_wzi \
+   Package_depot \
+   Package_euro \
+   Package_form \
+   Package_gimmicks \
+   Package_import \
+   Package_share \
+   Package_standard \
+   Package_template \
+   Package_tools \
+   Package_tutorials \
+   Package_usr \
Pyuno_fax \
Pyuno_letter \
Pyuno_agenda \
Pyuno_commonwizards \
-   Zip_depot \
-   Zip_euro \
-   Zip_form \
-   Zip_gimmicks \
-   Zip_import \
-   Zip_share \
-   Zip_standard \
-   Zip_template \
-   Zip_tools \
-   Zip_tutorials \
-   Zip_usr \
 ))
 
 ifeq ($(SOLAR_JAVA),TRUE)
diff --git a/wizards/Zip_depot.mk b/wizards/Package_depot.mk
similarity index 86%
rename from wizards/Zip_depot.mk
rename to wizards/Package_depot.mk
index 8dd5fef..229b

[Libreoffice-commits] core.git: scp2/source wizards/Module_wizards.mk wizards/Package_depot.mk wizards/Package_euro.mk wizards/Package_form.mk wizards/Package_gimmicks.mk wizards/Package_import.mk wiz

[Julien Nabet]

 scp2/source/ooo/file_ooo.scp |   74 +++
 wizards/Module_wizards.mk|   22 ++--
 wizards/Package_depot.mk |   56 
 wizards/Package_euro.mk  |   48 +++
 wizards/Package_form.mk  |   45 ++
 wizards/Package_gimmicks.mk  |   45 ++
 wizards/Package_import.mk|   44 +
 wizards/Package_share.mk |   38 ++
 wizards/Package_standard.mk  |   39 ++
 wizards/Package_template.mk  |   44 +
 wizards/Package_tools.mk |   45 ++
 wizards/Package_tutorials.mk |   47 +++
 wizards/Package_usr.mk   |   38 ++
 wizards/Zip_depot.mk |   54 ---
 wizards/Zip_euro.mk  |   46 --
 wizards/Zip_form.mk  |   43 
 wizards/Zip_gimmicks.mk  |   43 
 wizards/Zip_import.mk|   42 
 wizards/Zip_share.mk |   36 
 wizards/Zip_standard.mk  |   37 -
 wizards/Zip_template.mk  |   42 
 wizards/Zip_tools.mk |   43 
 wizards/Zip_tutorials.mk |   45 --
 wizards/Zip_usr.mk   |   36 
 24 files changed, 541 insertions(+), 511 deletions(-)

New commits:
commit 0191eb95fb39138500426a87569d365ecaaf8e42
Author: Julien Nabet 
Date:   Wed Apr 17 21:06:09 2013 +0200

fdo#63197: convert wizards

Change-Id: Ic7fa577fbdb527a75643c4e2919e0527432d5536
Reviewed-on: https://gerrit.libreoffice.org/3439
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a15e58c..bd5b571 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -28,33 +28,38 @@
 #include "macros.inc"
 
 File gid_File_Basic_Depot
-Dir = gid_Dir_Basic_Depot;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvdepot.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvdepot.filelist";
 End
 
 File gid_File_Basic_Euro
-Dir = gid_Dir_Basic_Euro;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrveuro.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrveuro.filelist";
 End
 
 File gid_File_Basic_Gimmicks
-Dir = gid_Dir_Basic_Gimmicks;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvgimmicks.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvgimmicks.filelist";
 End
 
 File gid_File_Basic_Importwiz
-Dir = gid_Dir_Basic_Importwiz;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvimport.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvimport.filelist";
 End
 
 File gid_File_Basic_Formwiz
-Dir = gid_Dir_Basic_Formwiz;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvform.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvform.filelist";
 End
 
 #ifndef DISABLE_SCRIPTING
@@ -68,42 +73,45 @@ End
 #endif
 
 File gid_File_Basic_Template
-Dir = gid_Dir_Basic_Template;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtemplate.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtemplate.filelist";
 End
 
 File gid_File_Basic_Tools
-Dir = gid_Dir_Basic_Tools;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtools.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtools.filelist";
 End
 
 File gid_File_Basic_User
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_User_Basic;
-Name = "basicusr.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicusr.filelist";
 End
 
 File gid_File_Basic_Share
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_Basic;
-Name = "basicshare.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicshare.filelist";
 End
 
 File gid_File_Basic_User_Standard
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_Basic_Standard;
-Name = "basicsrvstandard.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicsrvstandard.filelist";
 End
 
 File gid_File_Basic_Tutorials
-Dir = gid_Dir_Basic_Tutorials;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtutorials.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles =