from:"Ariel Constenla\-Haile"

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst

2017-02-02 Thread Ariel Constenla-Haile

 extensions.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cabc2b1415e7b3edea374279309961933e1229ec
Author: Ariel Constenla-Haile <arie...@apache.org>
Date:   Thu Feb 2 14:49:50 2017 +

i127310 - Update bundled dictionaries

diff --git a/extensions.lst b/extensions.lst
index 3232cf1..d711283 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -39,7 +39,7 @@
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
-47edc7a64a9a1e1f7d6e5dfa82ae0c91 
https://sourceforge.net/projects/aoo-extensions/files/17102/29/dict-en.oxt/download
 "dict-en.oxt"
+7addf9efd0570ec439593988ce6f43f7 
https://sourceforge.net/projects/aoo-extensions/files/17102/32/dict-en-20170101.oxt/download
 "dict-en-20170101.oxt"
 
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
@@ -137,7 +137,7 @@
 
 # Portuguese (European).
 [ language=pt || language=pt_PT ]
-57b12ab5d523711198c0f32dc37ecca6 
https://sourceforge.net/projects/aoo-extensions/files/1196/38/oo3x-pt-pt-16.7.4.1.oxt/download
 "oo3x-pt-pt-16.7.4.1.oxt"
+5f3e485ec61bbe1b9b0bfd6b782d973b 
https://sourceforge.net/projects/aoo-extensions/files/1196/40/oo3x-pt-pt-16.10.1.2.oxt/download
 "oo3x-pt-pt-16.10.1.2.oxt"
 
 # Catalan.
 [ language=ca ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/win32

2016-10-27 Thread Ariel Constenla-Haile

 desktop/win32/source/setup/setup.cpp |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 903b2240b3ad8fe050d2db659eeffb5b8983f66d
Author: Ariel Constenla-Haile <arie...@apache.org>
Date:   Fri Oct 28 02:17:19 2016 +

i127195 - Update product code of VC redistributables

diff --git a/desktop/win32/source/setup/setup.cpp 
b/desktop/win32/source/setup/setup.cpp
index 09406d8..a7df510 100644
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -81,8 +81,10 @@
 
 #define RUNTIME_X64_NAMETEXT( "redist\\vcredist_x64.exe" )
 #define RUNTIME_X86_NAMETEXT( "redist\\vcredist_x86.exe" )
-#define PRODUCTCODE_X86 TEXT( "{E503B4BF-F7BB-3D5F-8BC8-F694B1CFF942}" )
-#define PRODUCTCODE_X64 TEXT( "{350AA351-21FA-3270-8B7A-835434E766AD}" )
+// Microsoft Visual C++ 2008 Redistributable - x86 9.0.30729.6161
+#define PRODUCTCODE_X86 TEXT( "{9BE518E6-ECC6-35A9-88E4-87755C07200F}" )
+// Microsoft Visual C++ 2008 Redistributable - x64 9.0.30729.6161
+#define PRODUCTCODE_X64 TEXT( "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}" )
 
 #define MSIAPI_DllGetVersion "DllGetVersion"
 #define ADVAPI32API_CheckTokenMembership "CheckTokenMembership"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - stlport/systemstl

2016-10-25 Thread Ariel Constenla-Haile

 stlport/systemstl/functional |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4a5305d9474698cf29d31ebe4f19ab9b079ca4b9
Author: Ariel Constenla-Haile <arie...@apache.org>
Date:   Tue Oct 25 13:39:30 2016 +

i123947 - fix stlport emulation wrappers when compiling in C++11 mode

diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
index 44c4429..5915ca1 100644
--- a/stlport/systemstl/functional
+++ b/stlport/systemstl/functional
@@ -32,6 +32,8 @@
// note: VS2008SP1 has known problems after a security update 
(KB971092,KB974479,KB974223)
namespace std{ template void _Swap_adl(_T& l, _T& r) 
{swap(l,r);} }
 #endif 
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+#include_next 
 #else // fall back to boost/tr1
#include 
#include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svl/Library_passwordcontainer.mk

2016-10-24 Thread Ariel Constenla-Haile

 svl/Library_passwordcontainer.mk |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 1d688395e2dd0cb54b89cd365231e211546a9c82
Author: Ariel Constenla-Haile <arie...@apache.org>
Date:   Tue Oct 25 03:52:56 2016 +

i127139 - Work around broken toolchain

diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 24a8152..2056636 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -41,6 +41,17 @@ $(eval $(call gb_Library_add_api,passwordcontainer,\
 offapi \
 ))
 
+ifeq ($(GUI),UNX)
+ifeq ($(COM),GCC)
+ifeq ($(CPUNAME),INTEL)
+$(eval $(call gb_Library_set_ldflags,passwordcontainer,\
+$(gb_LinkTarget_LDFLAGS) \
+-Wl$(COMMA)--start-group -lc -Wl$(COMMA)--end-group \
+))
+endif
+endif
+endif
+
 $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
 cppu \
 cppuhelper \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - setup_native/source solenv/bin

2016-10-21 Thread Ariel Constenla-Haile

 setup_native/source/win32/customactions/shellextensions/registerextensions.cxx 
|2 
 setup_native/source/win32/nsis/downloadtemplate.nsi
|   94 +++---
 solenv/bin/modules/installer/download.pm   
|  136 --
 solenv/bin/modules/installer/globals.pm
|3 
 solenv/bin/modules/installer/simplepackage.pm  
|3 
 5 files changed, 48 insertions(+), 190 deletions(-)

New commits:
commit ff2631c08ee4ab17d99836c5d1b83c65123a601a
Author: Ariel Constenla-Haile <arie...@apache.org>
Date:   Fri Oct 21 14:30:14 2016 +

i127100 - Build Windows installer with NSIS >= 3.0

diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi 
b/setup_native/source/win32/nsis/downloadtemplate.nsi
index d755dfb..79d4d7a 100644
--- a/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -3,6 +3,9 @@
 !define PRODUCT_PUBLISHER "PUBLISHERPLACEHOLDER"
 !define PRODUCT_WEB_SITE "WEBSITEPLACEHOLDER"
 
+; Enable Unicode
+Unicode true
+
 ; SetCompressor lzma
 SetCompressor zlib
 
@@ -212,59 +215,44 @@ FunctionEnd
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
-#231#!macro MUI_LANGUAGE_PACK LANGUAGE
-#231#  !verbose push
-#231#  !verbose ${MUI_VERBOSE}
-#231#  !insertmacro MUI_INSERT
-#231#  LoadLanguageFile "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nlf"
-#231#  ;Set default language file for MUI and backup user setting
-#231#  !ifdef LANGFILE_DEFAULT
-#231#!define MUI_LANGFILE_DEFAULT_TEMP "${LANGFILE_DEFAULT}"
-#231#!undef LANGFILE_DEFAULT
-#231#  !endif
-#231#  !define LANGFILE_DEFAULT "${NSISDIR}\Contrib\Language files\English.nsh"
-#231#  ;Include language file
-#231#  !insertmacro LANGFILE_INCLUDE "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nsh"
-#231#  ;Restore user setting for default language file
-#231#  !undef LANGFILE_DEFAULT
-#231#  !ifdef MUI_LANGFILE_DEFAULT_TEMP
-#231#!define LANGFILE_DEFAULT "${MUI_LANGFILE_DEFAULT}"
-#231#  !endif
-#231#  ;Add language to list of languages for selection dialog  
-#231#  !ifndef MUI_LANGDLL_LANGUAGES
-#231#   !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' "
-#231#!define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' "
-#231#  !else
-#231#!ifdef MUI_LANGDLL_LANGUAGES_TEMP
-#231#  !undef MUI_LANGDLL_LANGUAGES_TEMP
-#231#!endif
-#231#!define MUI_LANGDLL_LANGUAGES_TEMP "${MUI_LANGDLL_LANGUAGES}"
-#231#!undef MUI_LANGDLL_LANGUAGES
-#231#  !ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP
-#231#  !undef MUI_LANGDLL_LANGUAGES_CP_TEMP
-#231#!endif
-#231#!define MUI_LANGDLL_LANGUAGES_CP_TEMP "${MUI_LANGDLL_LANGUAGES_CP}"
-#231#!undef MUI_LANGDLL_LANGUAGES_CP
-#231#!define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' ${MUI_LANGDLL_LANGUAGES_TEMP}"
-#231#!define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' ${MUI_LANGDLL_LANGUAGES_CP_TEMP}"
-#231#  !endif
-#231#  !verbose pop
-#231#!macroend
-
-#204#!macro MUI_LANGUAGE_PACK LANGUAGE
-#204#  !verbose push
-#204#  !verbose ${MUI_VERBOSE}
-#204#  !include "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nsh"
-#204#  !verbose pop
-#204#!macroend
-
-#204#!macro MUI_LANGUAGEFILE_PACK_BEGIN LANGUAGE
-#204#  !ifndef MUI_INSERT
-#204#!define MUI_INSERT
-#204#!insertmacro MUI_INSERT
-#204#  !endif
-#204#  LoadLanguageFile "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nlf"
-#204#!macroend
+!macro MUI_LANGUAGE_PACK LANGUAGE
+  !verbose push
+  !verbose ${MUI_VERBOSE}
+  !insertmacro MUI_INSERT
+  LoadLanguageFile "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nlf"
+  ;Set default language file for MUI and backup user setting
+  !ifdef LANGFILE_DEFAULT
+!define MUI_LANGFILE_DEFAULT_TEMP "${LANGFILE_DEFAULT}"
+!undef LANGFILE_DEFAULT
+  !endif
+  !define LANGFILE_DEFAULT "${NSISDIR}\Contrib\Language files\English.nsh"
+  ;Include language file
+  !insertmacro LANGFILE_INCLUDE "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nsh"
+  ;Restore user setting for default language file
+  !undef LANGFILE_DEFAULT
+  !ifdef MUI_LANGFILE_DEFAULT_TEMP
+!define LANGFILE_DEFAULT "${MUI_LANGFILE_DEFAULT}"
+  !endif
+  ;Add language to list of languages for selection dialog  
+  !ifndef MUI_LANGDLL_LANGUAGES
+   !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' "
+!define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' "
+  !else
+!ifdef MUI_LANGDLL_LANGUAGES_TEMP
+  !undef MUI_LANGDLL_LANGUAGES_TE

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source LICENSE_ALv2 NOTICE README

2016-09-15 Thread Ariel Constenla-Haile

 LICENSE_ALv2 |2 +-
 NOTICE   |2 +-
 README   |2 +-
 cui/source/dialogs/about.cxx |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4a6a8cf0700282052af625cddbe151d1bc029427
Author: Ariel Constenla-Haile <arie...@apache.org>
Date:   Mon Sep 12 23:46:32 2016 +

i127108 - Update the Copyright year

diff --git a/LICENSE_ALv2 b/LICENSE_ALv2
index 3a2f450..729d018 100644
--- a/LICENSE_ALv2
+++ b/LICENSE_ALv2
@@ -187,7 +187,7 @@
   same "printed page" as the copyright notice for easier
   identification within third-party archives.
 
-   Copyright 2011, 2012, 2013, 2014, 2015 Apache Software Foundation
+   Copyright 2011, 2012, 2013, 2014, 2015, 2016 Apache Software Foundation
 
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index e3e3a97..45f9255 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache OpenOffice (http://www.openoffice.org)
-Copyright 2011, 2015 The Apache Software Foundation
+Copyright 2011, 2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a457c2d..c002ded 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId  & 
rId ) :
 sbcopyright.appendAscii("Copyright ");
 sbcopyright.append((sal_Unicode)0x00a9);
 sbcopyright.appendAscii(" ");
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2015") );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2016") );
 if (vendor.EqualsAscii("Apache Software Foundation")) {
 sbcopyright.append(sYear);
 sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
commit 0311bcf35b7f0c7251fe9cc68dd512446089e5b5
Author: Jim Jagielski <j...@apache.org>
Date:   Thu Sep 8 21:34:50 2016 +

Correct subdir name

diff --git a/README b/README
index 833905f..1555075 100644
--- a/README
+++ b/README
@@ -54,4 +54,4 @@ Building Apache OpenOffice
 
 The default build will produce a setup version (e.g. setup program on 
windows, dmg on Mac OS, 
 rpm and deb packages on Linux, pkg packages on Solaris) and an archived 
version. The output
-can be found in the  directory in 
instsetoo_native//OpenOffice/...
+can be found in the  directory in 
instsetoo_native//Apache_OpenOffice/...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-06 Thread Ariel Constenla-Haile

 svtools/source/contnr/fileview.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d48b51ad4481a3e2ed8bc79728d1c845f58aed6
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Apr 5 15:28:38 2015 +

Resolves: #i81637# Replace column header Title by Name

Patch by: Driss Ben Zoubeir driss.zoub...@gmail.com
Review by: arie...@apache.org
(cherry picked from commit b923454a0922b6767b28c8dc131534b8daf6d96b)

Change-Id: Ifef870645491537217bf85b772b130d3bb4a92fd

diff --git a/svtools/source/contnr/fileview.src 
b/svtools/source/contnr/fileview.src
index 4a96d61..c645737 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -25,7 +25,7 @@
 
 String STR_SVT_FILEVIEW_COLUMN_TITLE
 {
-Text [ en-US ] = Title;
+Text [ en-US ] = Name;
 };
 
 String STR_SVT_FILEVIEW_COLUMN_SIZE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source

2015-04-05 Thread Ariel Constenla-Haile

 svtools/source/contnr/fileview.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b923454a0922b6767b28c8dc131534b8daf6d96b
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Apr 5 15:28:38 2015 +

i81637 - Replace column header Title by Name

Patch by: Driss Ben Zoubeir driss.zoub...@gmail.com
Review by: arie...@apache.org

diff --git a/svtools/source/contnr/fileview.src 
b/svtools/source/contnr/fileview.src
index b4f4f19..506a9b7 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -31,7 +31,7 @@
 
 String STR_SVT_FILEVIEW_COLUMN_TITLE
 {
-Text [ en-US ] = Title;
+Text [ en-US ] = Name;
 };
 
 String STR_SVT_FILEVIEW_COLUMN_SIZE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst

2015-04-04 Thread Ariel Constenla-Haile

 extensions.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9eff5cbb6763104f7e272b46ed6875de2e51fea0
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Apr 4 15:20:25 2015 +

i126223 - Update English dictionary

diff --git a/extensions.lst b/extensions.lst
index d49d3b3..7330aaf 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -39,7 +39,7 @@
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
-8f3c344aca0fc3c0e44988f34dbc327c 
http://sourceforge.net/projects/aoo-extensions/files/17102/10/dict-en.oxt/download
 dict-en.oxt
+5ddb509520382d0f2cb897b072904e25 
http://sourceforge.net/projects/aoo-extensions/files/17102/14/dict-en.oxt/download
 dict-en.oxt
 
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-21 Thread Ariel Constenla-Haile

 vcl/unx/generic/app/keysymnames.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5ce9606a669d451b71c9c0e1da33bb62007d8aae
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Jan 21 05:41:47 2015 +

Resolves: #i46871# Add French translation for Space key

(cherry picked from commit 58c7172ef98515e482bc87e219e58e1e126785d8)

Conflicts:
vcl/unx/generic/app/keysymnames.cxx

Change-Id: Id8b9aa912cd3de9d69bddb0316c73d19ffcc4769

diff --git a/vcl/unx/generic/app/keysymnames.cxx 
b/vcl/unx/generic/app/keysymnames.cxx
index fb77ac3..c07dd00 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -136,6 +136,7 @@ namespace vcl_sal {
 { XK_Down, Bas },
 { XK_BackSpace, Ret. Arr },
 { XK_Return, Retour },
+{ XK_space, Espace },
 { XK_KP_Enter, Entr\303\251e },
 { SunXK_Stop,  Stop },
 { SunXK_Again, Encore },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/unx

2015-01-20 Thread Ariel Constenla-Haile

 vcl/unx/generic/app/keysymnames.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 58c7172ef98515e482bc87e219e58e1e126785d8
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Jan 21 05:41:47 2015 +

i46871 - Add French translation for Space key

diff --git a/vcl/unx/generic/app/keysymnames.cxx 
b/vcl/unx/generic/app/keysymnames.cxx
index e62419d..fa573fa 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -167,6 +167,7 @@ namespace vcl_sal {
 { XK_Down, Bas },
 { XK_BackSpace, Ret. Arr },
 { XK_Return, Retour },
+{ XK_space, Espace },
 { XK_KP_Enter, EntrÃ©e },
 { SunXK_Stop,  Stop },
 { SunXK_Again, Encore },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - extensions.lst i18npool/source set_soenv.in

2015-01-16 Thread Ariel Constenla-Haile

 extensions.lst|2 +-
 i18npool/source/localedata/data/lt_LT.xml |9 -
 set_soenv.in  |3 ---
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit ca2d29e1377af165484156954b070b2c5e77f838
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Jan 16 19:07:24 2015 +

Update the English dictionary

diff --git a/extensions.lst b/extensions.lst
index 57b650d..d49d3b3 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -39,7 +39,7 @@
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
-119de082977cacc804ba56b044b87524 
http://sourceforge.net/projects/aoo-extensions/files/17102/9/dict-en.oxt/download
 dict-en.oxt
+8f3c344aca0fc3c0e44988f34dbc327c 
http://sourceforge.net/projects/aoo-extensions/files/17102/10/dict-en.oxt/download
 dict-en.oxt
 
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
commit 820cc9f285bffe4c37346ec45a8f4f6f8efc79b1
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Jan 16 18:50:58 2015 +

Fix build breaker introduced in revision 1651396

diff --git a/set_soenv.in b/set_soenv.in
index ae70515..7d0ffe3 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1898,9 +1898,6 @@ ToFile( CAIRO_LIBS,@CAIRO_LIBS@,   e );
 ToFile( XRANDR_CFLAGS, @XRANDR_CFLAGS@,e );
 ToFile( XRANDR_LIBS,   @XRANDR_LIBS@,  e );
 ToFile( XRANDR_DLOPEN, @XRANDR_DLOPEN@,e );
-ToFile( SYSTEM_LIBWPD, @SYSTEM_LIBWPD@,e );
-ToFile( LIBWPD_CFLAGS, @LIBWPD_CFLAGS@,e );
-ToFile( LIBWPD_LIBS,   @LIBWPD_LIBS@,  e );
 ToFile( SYSTEM_CPPUNIT,@SYSTEM_CPPUNIT@,   e );
 ToFile( CPPUNIT_CFLAGS,@CPPUNIT_CFLAGS@,   e );
 ToFile( CPPUNIT_LIBS,  @CPPUNIT_LIBS@, e );
commit 1f1c009877920ea59ffdc400b9876089d0ce295d
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Jan 16 18:11:43 2015 +

i125980 - EURO as default currency in Lithuanian locale data

diff --git a/i18npool/source/localedata/data/lt_LT.xml 
b/i18npool/source/localedata/data/lt_LT.xml
index b5f9845..497094f 100644
--- a/i18npool/source/localedata/data/lt_LT.xml
+++ b/i18npool/source/localedata/data/lt_LT.xml
@@ -357,7 +357,14 @@
 /Calendar
   /LC_CALENDAR
   LC_CURRENCY
-Currency default=true usedInCompatibleFormatCodes=true
+Currency default=true usedInCompatibleFormatCodes=false
+  CurrencyIDEUR/CurrencyID
+  CurrencySymbolâ¬/CurrencySymbol
+  BankSymbolEUR/BankSymbol
+  CurrencyNameEuras/CurrencyName
+  DecimalPlaces2/DecimalPlaces
+/Currency
+Currency default=false usedInCompatibleFormatCodes=true
   CurrencyIDLTL/CurrencyID
   CurrencySymbolLt/CurrencySymbol
   BankSymbolLTL/BankSymbol
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - shell/source

2014-05-30 Thread Ariel Constenla-Haile

 shell/source/unix/misc/senddoc.sh |   38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 81614e1cb8e300b1c586eb747539546fd65c11db
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat May 31 03:27:20 2014 +

i107072 - Quote uri-encode

diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index 0ba9ce9..9332863 100644
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -19,7 +19,7 @@
 #  under the License.
 #
 # *
-URI_ENCODE=`dirname $0`/uri-encode
+URI_ENCODE=`dirname $0`/uri-encode
 FOPTS=
 
 # linux file utility needs -L option to resolve symlinks
@@ -100,7 +100,7 @@ case `basename $MAILER | sed 's/-.*$//'` in
 shift
 ;;
 --attach)
-ATTACH=${ATTACH:-}${ATTACH:+,}`echo file://$2 | 
${URI_ENCODE}`
+ATTACH=${ATTACH:-}${ATTACH:+,}`echo file://$2 | 
${URI_ENCODE}`
 shift
 ;;
 *)
@@ -160,7 +160,7 @@ case `basename $MAILER | sed 's/-.*$//'` in
 shift
 ;;
 --attach)
-ATTACH=${ATTACH:-}${ATTACH:+ }--attach `echo file://$2 
| ${URI_ENCODE}`
+ATTACH=${ATTACH:-}${ATTACH:+ }--attach `echo file://$2 
| ${URI_ENCODE}`
 shift
 ;;
 *)
@@ -243,23 +243,23 @@ case `basename $MAILER | sed 's/-.*$//'` in
 shift
 ;;
 --cc)
-MAILTO=${MAILTO:-}${MAILTO:+}cc=`echo $2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}cc=`echo $2 | 
${URI_ENCODE}`
 shift
 ;;
 --bcc)
-MAILTO=${MAILTO:-}${MAILTO:+}bcc=`echo $2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}bcc=`echo $2 | 
${URI_ENCODE}`
 shift
 ;;
 --subject)
-MAILTO=${MAILTO:-}${MAILTO:+}subject=`echo $2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}subject=`echo $2 | 
${URI_ENCODE}`
 shift
 ;;
 --body)
-MAILTO=${MAILTO:-}${MAILTO:+}body=`echo $2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}body=`echo $2 | 
${URI_ENCODE}`
 shift
 ;;
 --attach)
-MAILTO=${MAILTO:-}${MAILTO:+}attach=`echo file://$2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}attach=`echo file://$2 | 
${URI_ENCODE}`
 shift
 ;;
 *)
@@ -285,23 +285,23 @@ case `basename $MAILER | sed 's/-.*$//'` in
 shift
 ;;
 --cc)
-MAILTO=${MAILTO:-}${MAILTO:+}cc=`echo $2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}cc=`echo $2 | 
${URI_ENCODE}`
 shift
 ;;
 --bcc)
-MAILTO=${MAILTO:-}${MAILTO:+}bcc=`echo $2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}bcc=`echo $2 | 
${URI_ENCODE}`
 shift
 ;;
 --subject)
-MAILTO=${MAILTO:-}${MAILTO:+}subject=`echo $2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}subject=`echo $2 | 
${URI_ENCODE}`
 shift
 ;;
 --body)
-MAILTO=${MAILTO:-}${MAILTO:+}body=`echo $2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}body=`echo $2 | 
${URI_ENCODE}`
 shift
 ;;
 --attach)
-MAILTO=${MAILTO:-}${MAILTO:+}attachment=`echo 
file://$2 | ${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO:+}attachment=`echo 
file://$2 | ${URI_ENCODE}`
 shift
 ;;
 *)
@@ -362,7 +362,7 @@ case `basename $MAILER | sed 's/-.*$//'` in
 case $1 in
 --attach)
 #i95688# fix filenames containing accented chars, whatever 
alien
-ATTACH=${ATTACH:-}${ATTACH:+ }`echo file://$2 | 
${URI_ENCODE}`
+ATTACH=${ATTACH:-}${ATTACH:+ }`echo file://$2 | 
${URI_ENCODE}`
 shift
 ;;
 *)
@@ -388,23 +388,23 @@ case `basename $MAILER | sed 's/-.*$//'` in
 shift
 ;;
 --cc)
-MAILTO=${MAILTO:-}${MAILTO:+}cc=`echo $2 | 
${URI_ENCODE}`
+MAILTO=${MAILTO:-}${MAILTO

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

2014-05-06 Thread Ariel Constenla-Haile

 odk/examples/cpp/complextoolbarcontrols/Makefile|   11 +-
 odk/examples/cpp/complextoolbarcontrols/description.xml |   26 
 odk/settings/platform.mk|   13 ++--
 3 files changed, 39 insertions(+), 11 deletions(-)

New commits:
commit f03d98a999d08e21a6d1774090e58fa6d928f013
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Apr 30 15:18:25 2014 +

Add extension description

(cherry picked from commit a738920303e77022fa89740c16cb832ee3477fa2)

Conflicts:
odk/examples/cpp/complextoolbarcontrols/Makefile

Change-Id: I28af30dc04068c670d31be7494b7ce9a7a25c3a3

diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile 
b/odk/examples/cpp/complextoolbarcontrols/Makefile
index a8f1a18..1199e63 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -39,6 +39,7 @@ SETTINGS=$(PRJ)/settings
 
 include $(SETTINGS)/settings.mk
 include $(SETTINGS)/std.mk
+include $(SETTINGS)/platform.mk
 
 # Define non-platform/compiler specific settings
 COMP_NAME=complextoolbarcontrols
@@ -49,6 +50,7 @@ OUT_COMP_SLO=$(OUT_SLO)/$(COMP_NAME)
 COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT)
 COMP_PACKAGE_URL = $(subst 
\\,\,$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT))
 COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml
+COMP_UNOPKG_DESCRIPTION = $(OUT_COMP_GEN)/$(COMPONENT_NAME)/description.xml
 COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components
 COMP_REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag
 COMP_TYPEFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_types.flag
@@ -95,6 +97,11 @@ ifeq $(OS) MACOSX
 endif
 endif
 
+# rule for extension description.xml
+$(COMP_UNOPKG_DESCRIPTION) :  description.xml
+   -$(MKDIR) $(subst /,$(PS),$(@D))
+   $(SDK_CAT) $ | $(SDK_SED) -e 
s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/  $@
+
 # rule for component package manifest
 $(OUT_COMP_GEN)/%/manifest.xml :
-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -131,11 +138,11 @@ $(COMP_COMPONENTS) :
@echo $(OSEP)/components$(CSEP)  $@
 
 # rule for component package file
-$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu 
ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu 
$(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
+$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu 
ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu 
$(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS) $(COMP_UNOPKG_DESCRIPTION)
-$(MKDIR) $(subst /,$(PS),$(@D))  $(DEL) $(subst \\,\,$(subst 
/,$(PS),$@))
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
$(COPY) $(subst /,$(PS),$) $(subst 
/,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
-   cd $(subst /,$(PS),$(OUT_COMP_GEN))  $(SDK_ZIP) -u ../../bin/$(@F) 
$(COMP_NAME).components
+   cd $(subst /,$(PS),$(OUT_COMP_GEN))  $(SDK_ZIP) -u ../../bin/$(@F) 
$(COMP_NAME).components description.xml
cd $(subst /,$(PS),$(OUT_COMP_GEN))  $(SDK_ZIP) -u ../../bin/$(@F) 
$(UNOPKG_PLATFORM)/$(F)
$(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu 
CalcWindowState.xcu logo_small.png logo_big.png
cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F)))  
$(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
diff --git a/odk/examples/cpp/complextoolbarcontrols/description.xml 
b/odk/examples/cpp/complextoolbarcontrols/description.xml
new file mode 100644
index 000..4053938
--- /dev/null
+++ b/odk/examples/cpp/complextoolbarcontrols/description.xml
@@ -0,0 +1,26 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+  * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+--
+description xmlns=http://openoffice.org/extensions/description/2006; 
xmlns:d=http://openoffice.org/extensions/description/2006; 
xmlns:xlink=http://www.w3.org/1999/xlink;
+version value=0.0.1/
+identifier 
value=org.apache.openoffice.framework.complextoolbarcontrols/
+platform value=#EXTENSION_PLATFORM#/
+display-name
+name lang=en-USComplex Toolbar Controls Demo/name
+/display-name
+/description
commit

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - framework/source

2014-04-18 Thread Ariel Constenla-Haile

 framework/source/uielement/popuptoolbarcontroller.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 46d6cabf120e6c1cdf4b01548f435a5ae6f72ae2
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Apr 18 05:40:56 2014 +

i124706 - Consider the toolbar alignment when executing the PopupMenu

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index 5e160d4..f269d81 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -156,10 +156,13 @@ PopupMenuToolbarController::createPopupWindow()
 return xRet;
 
 pToolBox-SetItemDown( m_nToolBoxId, sal_True );
+WindowAlign eAlign( pToolBox-GetAlign() );
 sal_uInt16 nId = m_xPopupMenu-execute(
 css::uno::Reference css::awt::XWindowPeer ( getParent(), 
css::uno::UNO_QUERY ),
 VCLUnoHelper::ConvertToAWTRect( pToolBox-GetItemRect( m_nToolBoxId ) 
),
-css::awt::PopupMenuDirection::EXECUTE_DEFAULT );
+( eAlign == WINDOWALIGN_TOP || eAlign == WINDOWALIGN_BOTTOM ) ?
+css::awt::PopupMenuDirection::EXECUTE_DOWN :
+css::awt::PopupMenuDirection::EXECUTE_RIGHT );
 pToolBox-SetItemDown( m_nToolBoxId, sal_False );
 
 if ( nId )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-18 Thread Ariel Constenla-Haile

 framework/source/uielement/popuptoolbarcontroller.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d8db205e7fdedddee10ac81a32a28df1e0ad6c56
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Apr 18 05:40:56 2014 +

Resolves: #i124706# Consider the toolbar alignment...

when executing the PopupMenu

(cherry picked from commit 46d6cabf120e6c1cdf4b01548f435a5ae6f72ae2)

Conflicts:
framework/source/uielement/popuptoolbarcontroller.cxx

Change-Id: Icfccdd35c1849ea00a1ea706aedac25de794bbf6

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index e871cae..df569dc 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -187,10 +187,13 @@ PopupMenuToolbarController::createPopupWindow()
 return xRet;
 
 pToolBox-SetItemDown( m_nToolBoxId, true );
+WindowAlign eAlign( pToolBox-GetAlign() );
 sal_uInt16 nId = m_xPopupMenu-execute(
 css::uno::Reference css::awt::XWindowPeer ( getParent(), 
css::uno::UNO_QUERY ),
 VCLUnoHelper::ConvertToAWTRect( pToolBox-GetItemRect( m_nToolBoxId ) 
),
-css::awt::PopupMenuDirection::EXECUTE_DEFAULT );
+( eAlign == WINDOWALIGN_TOP || eAlign == WINDOWALIGN_BOTTOM ) ?
+css::awt::PopupMenuDirection::EXECUTE_DOWN :
+css::awt::PopupMenuDirection::EXECUTE_RIGHT );
 pToolBox-SetItemDown( m_nToolBoxId, false );
 
 if ( nId )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-11 Thread Ariel Constenla-Haile

 svtools/source/uno/wizard/unowizard.cxx   |2 +-
 svtools/source/uno/wizard/wizardshell.cxx |7 ++-
 svtools/source/uno/wizard/wizardshell.hxx |6 --
 3 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 78d015849cda869e1ed5411a9cc1db912eab2f57
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Apr 10 15:33:21 2014 +

Resolves: #i124629# UNO Wizard - avoid crash by removing unneeded reference

(cherry picked from commit 6a820f13a5cadc3d6d8c7bac1e4042adcee379ac)

Conflicts:
svtools/source/uno/wizard/wizardshell.cxx

Change-Id: I2d67451c6fb536149603777a84d9b73494b6ed84

diff --git a/svtools/source/uno/wizard/unowizard.cxx 
b/svtools/source/uno/wizard/unowizard.cxx
index e337261..3e3e851 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -270,7 +270,7 @@ namespace {
 
 Dialog* Wizard::createDialog( Window* i_pParent )
 {
-WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, 
m_aWizardSteps ) );
+WizardShell* pDialog( new WizardShell( i_pParent, m_xController, 
m_aWizardSteps ) );
 pDialog-SetHelpId(  lcl_getHelpId( m_sHelpURL ) );
 pDialog-setTitleBase( m_sTitle );
 return pDialog;
diff --git a/svtools/source/uno/wizard/wizardshell.cxx 
b/svtools/source/uno/wizard/wizardshell.cxx
index e25f27f..35b00e6 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -62,16 +62,13 @@ namespace svt { namespace uno
 
 
 //= WizardShell
-
-
-WizardShell::WizardShell( Window* i_pParent, const Reference XWizard  
i_rWizard, const Reference XWizardController  i_rController,
+WizardShell::WizardShell( Window* i_pParent, const Reference 
XWizardController  i_rController,
 const Sequence Sequence sal_Int16   i_rPaths )
 :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE )
-,m_xWizard( i_rWizard )
 ,m_xController( i_rController )
 ,m_nFirstPageID( lcl_determineFirstPageID( i_rPaths ) )
 {
-ENSURE_OR_THROW( m_xWizard.is()  m_xController.is(), invalid 
wizard/controller );
+ENSURE_OR_THROW( m_xController.is(), invalid controller );
 
 // declare the paths
 for ( sal_Int32 i=0; ii_rPaths.getLength(); ++i )
diff --git a/svtools/source/uno/wizard/wizardshell.hxx 
b/svtools/source/uno/wizard/wizardshell.hxx
index b882cdf..07a33ae 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -45,7 +45,6 @@ namespace svt { namespace uno
 public:
 WizardShell(
 Window* _pParent,
-const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizard  i_rWizard,
 const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizardController  i_rController,
 const ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Sequence sal_Int16   i_rPaths
 );
@@ -64,10 +63,6 @@ namespace svt { namespace uno
 virtual IWizardPageController*
 getPageController( TabPage* _pCurrentPage ) const 
SAL_OVERRIDE;
 
-// attribute access
-const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizard 
-getWizard() const { return m_xWizard; }
-
 static sal_Int16 convertCommitReasonToTravelType( const 
CommitPageReason i_eReason );
 
 // operations
@@ -125,7 +120,6 @@ namespace svt { namespace uno
 private:
 typedef ::std::map TabPage*, PWizardPageController  
Page2ControllerMap;
 
-const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizard m_xWizard;
 const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizardController   m_xController;
 const sal_Int16
 m_nFirstPageID;
 Page2ControllerMap 
 m_aPageControllers;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - filter/source i18npool/source sdext/source svtools/source

2014-04-10 Thread Ariel Constenla-Haile

 filter/source/svg/svgexport.cxx |   84 
 filter/source/svg/svgfilter.cxx |   17 
 filter/source/svg/svgfilter.hxx |1 
 i18npool/source/localedata/data/localedata_euro.map |   17 
 i18npool/source/localedata/data/makefile.mk |1 
 i18npool/source/localedata/data/tt_RU.xml   |  354 
 i18npool/source/localedata/localedata.cxx   |1 
 sdext/source/minimizer/optimizerdialog.cxx  |2 
 svtools/source/uno/wizard/unowizard.cxx |2 
 svtools/source/uno/wizard/wizardshell.cxx   |5 
 svtools/source/uno/wizard/wizardshell.hxx   |6 
 11 files changed, 470 insertions(+), 20 deletions(-)

New commits:
commit 6a820f13a5cadc3d6d8c7bac1e4042adcee379ac
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Apr 10 15:33:21 2014 +

i124629 - UNO Wizard - avoid crash by removing unneeded reference

diff --git a/svtools/source/uno/wizard/unowizard.cxx 
b/svtools/source/uno/wizard/unowizard.cxx
index 845adfc..b1da984 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -228,7 +228,7 @@ namespace svt { namespace uno
 //
 Dialog* Wizard::createDialog( Window* i_pParent )
 {
-WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, 
m_aWizardSteps ) );
+WizardShell* pDialog( new WizardShell( i_pParent, m_xController, 
m_aWizardSteps ) );
 pDialog-SetHelpId(  lcl_getHelpId( m_sHelpURL ) );
 pDialog-setTitleBase( m_sTitle );
 return pDialog;
diff --git a/svtools/source/uno/wizard/wizardshell.cxx 
b/svtools/source/uno/wizard/wizardshell.cxx
index 51d85e6..a78503e 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -72,14 +72,13 @@ namespace svt { namespace uno
 //= WizardShell
 
//==
 
//--
-WizardShell::WizardShell( Window* i_pParent, const Reference XWizard  
i_rWizard, const Reference XWizardController  i_rController,
+WizardShell::WizardShell( Window* i_pParent, const Reference 
XWizardController  i_rController,
 const Sequence Sequence sal_Int16   i_rPaths )
 :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE )
-,m_xWizard( i_rWizard )
 ,m_xController( i_rController )
 ,m_nFirstPageID( lcl_determineFirstPageID( i_rPaths ) )
 {
-ENSURE_OR_THROW( m_xWizard.is()  m_xController.is(), invalid 
wizard/controller );
+ENSURE_OR_THROW( m_xController.is(), invalid controller );
 
 // declare the paths
 for ( sal_Int32 i=0; ii_rPaths.getLength(); ++i )
diff --git a/svtools/source/uno/wizard/wizardshell.hxx 
b/svtools/source/uno/wizard/wizardshell.hxx
index 0587f0d..6f218bc 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -51,7 +51,6 @@ namespace svt { namespace uno
 public:
 WizardShell(
 Window* _pParent,
-const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizard  i_rWizard,
 const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizardController  i_rController,
 const ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Sequence sal_Int16   i_rPaths
 );
@@ -70,10 +69,6 @@ namespace svt { namespace uno
 virtual IWizardPageController*
 getPageController( TabPage* _pCurrentPage ) const;
 
-// attribute access
-const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizard 
-getWizard() const { return m_xWizard; }
-
 static sal_Int16 convertCommitReasonToTravelType( const 
CommitPageReason i_eReason );
 
 // operations
@@ -131,7 +126,6 @@ namespace svt { namespace uno
 private:
 typedef ::std::map TabPage*, PWizardPageController  
Page2ControllerMap;
 
-const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizard m_xWizard;
 const ::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XWizardController   m_xController;
 const sal_Int16
 m_nFirstPageID;
 Page2ControllerMap 
 m_aPageControllers;
commit 87a8aa9a79874c759631548545c63fe13d695f68
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Apr 10 15:33:10 2014 +

Use high-contrast image

diff --git a/sdext/source/minimizer/optimizerdialog.cxx 
b/sdext

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source

2014-04-10 Thread Ariel Constenla-Haile

 i18npool/source/localedata/data/tt_RU.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4019978dd2a8fd57e8d007a24b3c47e74317c57a
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Apr 10 16:44:51 2014 +

i124631 - Fix two DefaultFullName

Patch by:  Irek Khaziev khazi...@mail.ru

diff --git a/i18npool/source/localedata/data/tt_RU.xml 
b/i18npool/source/localedata/data/tt_RU.xml
index 9f4fce1..2445188 100644
--- a/i18npool/source/localedata/data/tt_RU.xml
+++ b/i18npool/source/localedata/data/tt_RU.xml
@@ -220,12 +220,12 @@
 Day
 DayIDtue/DayID
 DefaultAbbrvNameÐ¡Ñ/DefaultAbbrvName
-DefaultFullNameÐ¡Ð¸ÑÓÐ¼Ð±Ðµ/DefaultFullName
+DefaultFullNameÑÐ¸ÑÓÐ¼Ð±Ðµ/DefaultFullName
 /Day
 Day
 DayIDwed/DayID
 DefaultAbbrvNameÐ§Ñ/DefaultAbbrvName
-DefaultFullNameÐ§ÓÑÑÓÐ¼Ð±Ðµ/DefaultFullName
+DefaultFullNameÑÓÑÑÓÐ¼Ð±Ðµ/DefaultFullName
 /Day
 Day
 DayIDthu/DayID
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-08 Thread Ariel Constenla-Haile

 cui/source/options/treeopt.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit d4d28a97106aaef125fb46808c5d992b0b3a59f8
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Apr 7 23:53:55 2014 +

Resolves: #i124623# Dispose extension's Options page to avoid memory leaks

(cherry picked from commit 363c5553b7386da80abef818a196f5cf7d353ae0)

Change-Id: Ic04b523f5f9d4092889b3ad59569f02946091652

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index fa5d890..e5b1bf3 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2298,6 +2298,22 @@ ExtensionsTabPage::~ExtensionsTabPage()
 {
 Hide();
 DeactivatePage();
+
+if ( m_xPage.is() )
+{
+Reference XComponent  xComponent( m_xPage, UNO_QUERY );
+if ( xComponent.is() )
+{
+try
+{
+xComponent-dispose();
+}
+catch ( const Exception  )
+{
+}
+}
+m_xPage.clear();
+}
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-07 Thread Ariel Constenla-Haile

 i18npool/source/localedata/data/nds_DE.xml |  372 +
 1 file changed, 372 insertions(+)

New commits:
commit 1d7ca3dbcfc21b2ab85b6fb8ba912917befb8d8f
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Apr 5 19:26:46 2014 +

Resolves: #i124611# - nds-DE locale data

Locale data contributed by Timo Putzer tput...@gmx.de
(cherry picked from commit 7070f04ae10f0da2e33c543ff0282e252b7e7869)

Change-Id: I0d0b43fe98398bec7c4f717c1be2f39b4ea832f5

diff --git a/i18npool/source/localedata/data/nds_DE.xml 
b/i18npool/source/localedata/data/nds_DE.xml
new file mode 100644
index 000..a70225d
--- /dev/null
+++ b/i18npool/source/localedata/data/nds_DE.xml
@@ -0,0 +1,372 @@
+?xml version=1.0 encoding=UTF-8 ?
+!DOCTYPE Locale SYSTEM 'locale.dtd'
+!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ --
+Locale versionDTD=2.0.3 allowUpdateFromCLDR=no version=1.0
+  LC_INFO
+Language
+  LangIDnds/LangID
+  DefaultNameGerman, Low/DefaultName
+/Language
+Country
+  CountryIDDE/CountryID
+  DefaultNameGermany/DefaultName
+/Country
+  /LC_INFO
+  LC_CTYPE
+Separators
+  DateSeparator./DateSeparator
+  ThousandSeparator./ThousandSeparator
+  DecimalSeparator,/DecimalSeparator
+  TimeSeparator:/TimeSeparator
+  Time100SecSeparator,/Time100SecSeparator
+  ListSeparator;/ListSeparator
+  LongDateDayOfWeekSeparator, /LongDateDayOfWeekSeparator
+  LongDateDaySeparator. /LongDateDaySeparator
+  LongDateMonthSeparator /LongDateMonthSeparator
+  LongDateYearSeparator /LongDateYearSeparator
+/Separators
+Markers
+  QuotationStartâ/QuotationStart
+  QuotationEndâ/QuotationEnd
+  DoubleQuotationStartâ/DoubleQuotationStart
+  DoubleQuotationEndâ/DoubleQuotationEnd
+/Markers
+TimeAMvÃ¼Ã¶rm./TimeAM
+TimePMnaom./TimePM
+MeasurementSystemmetric/MeasurementSystem
+  /LC_CTYPE
+  LC_FORMAT
+FormatElement msgid=FixedFormatskey1 default=true type=medium 
usage=FIXED_NUMBER formatindex=0
+  FormatCodeStandard/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey2 default=true type=short 
usage=FIXED_NUMBER formatindex=1
+  FormatCode0/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey3 default=false type=medium 
usage=FIXED_NUMBER formatindex=2
+  FormatCode0,00/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey4 default=false type=short 
usage=FIXED_NUMBER formatindex=3
+  FormatCode#.##0/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey5 default=false type=medium 
usage=FIXED_NUMBER formatindex=4
+  FormatCode#.##0,00/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey6 default=false type=medium 
usage=FIXED_NUMBER formatindex=5
+  FormatCode#.###,00/FormatCode
+/FormatElement
+FormatElement msgid=ScientificFormatskey1 default=true type=medium 
usage=SCIENTIFIC_NUMBER formatindex=6
+  FormatCode0,00E+000/FormatCode
+/FormatElement
+FormatElement msgid=ScientificFormatskey2 default=false type=medium 
usage=SCIENTIFIC_NUMBER formatindex=7
+  FormatCode0,00E+00/FormatCode
+/FormatElement
+FormatElement msgid=PercentFormatskey1 default=true type=short 
usage=PERCENT_NUMBER formatindex=8
+  FormatCode0%/FormatCode
+/FormatElement
+FormatElement msgid=PercentFormatskey2 default=true type=long 
usage=PERCENT_NUMBER formatindex=9
+  FormatCode0,00%/FormatCode
+/FormatElement
+FormatElement msgid=CurrencyFormatskey1 default=true type=short 
usage=CURRENCY formatindex=12
+  FormatCode#.##0 [$DM-407];-#.##0 [$DM-407]/FormatCode
+/FormatElement
+FormatElement msgid=CurrencyFormatskey2 default=false type=medium 
usage=CURRENCY formatindex=13
+  FormatCode#.##0,00 [$DM-407];-#.##0,00 [$DM-407]/FormatCode
+/FormatElement
+FormatElement msgid=CurrencyFormatskey3 default=false type=medium 
usage=CURRENCY formatindex=14
+  FormatCode#.##0 [$DM-407];[ROT]-#.##0 [$DM-407]/FormatCode
+/FormatElement
+FormatElement msgid=CurrencyFormatskey4 default=true type=medium 
usage=CURRENCY formatindex=15

[Libreoffice-commits] core.git: i18npool/Library_localedata_euro.mk i18npool/source

2014-04-07 Thread Ariel Constenla-Haile

 i18npool/Library_localedata_euro.mk   |1 +
 i18npool/source/localedata/localedata.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 0d6028479c53747d9332866787d4e1642ccf18e1
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Apr 5 19:27:01 2014 +

Related: #i124611# - Include nds-DE locale data

(cherry picked from commit bd1eb988440fb0d1d207fd3ef590f9115d259c81)

Conflicts:
i18npool/source/localedata/data/localedata_euro.map
i18npool/source/localedata/data/makefile.mk

Change-Id: I18e828af3a51735caa3c8e70326766f998b44419

diff --git a/i18npool/Library_localedata_euro.mk 
b/i18npool/Library_localedata_euro.mk
index 8e04448..a551ace 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -66,6 +66,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_mt_MT \
CustomTarget/i18npool/localedata/localedata_myv_RU \
CustomTarget/i18npool/localedata/localedata_nb_NO \
+   CustomTarget/i18npool/localedata/localedata_nds_DE \
CustomTarget/i18npool/localedata/localedata_nl_BE \
CustomTarget/i18npool/localedata/localedata_nl_NL \
CustomTarget/i18npool/localedata/localedata_nn_NO \
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index f383626..218356f 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -118,6 +118,7 @@ static const struct {
 { no_NO,  lcl_DATA_EURO },
 { nn_NO,  lcl_DATA_EURO },
 { nb_NO,  lcl_DATA_EURO },
+{ nds_DE, lcl_DATA_EURO },
 { pl_PL,  lcl_DATA_EURO },
 { pt_BR,  lcl_DATA_EURO },
 { pt_PT,  lcl_DATA_EURO },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-07 Thread Ariel Constenla-Haile

 i18npool/source/localedata/data/nds_DE.xml |   38 ++---
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit f92d835246dfd5800e7e131ec4fcc8ba20feca67
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Apr 6 19:16:34 2014 +

Related: #i124611# Correct date format in nds-DE locale data

Patch by: Timo Putzer tput...@gmx.de
(cherry picked from commit d1268a86dfef20ba8d2f4059180bd55764e4092d)

Conflicts:
i18npool/source/localedata/data/nds_DE.xml

Change-Id: I83ad5057d08e5a5058f2f87bcaeeaa7d86788d31

diff --git a/i18npool/source/localedata/data/nds_DE.xml 
b/i18npool/source/localedata/data/nds_DE.xml
index a70225d..a58976b 100644
--- a/i18npool/source/localedata/data/nds_DE.xml
+++ b/i18npool/source/localedata/data/nds_DE.xml
@@ -101,57 +101,57 @@
   FormatCode#.##0,-- [$DM-407];[ROT]-#.##0,-- [$DM-407]/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey1 default=true type=short 
usage=DATE formatindex=18
-  FormatCodeDD.MM.JJ/FormatCode
+  FormatCodeDD.MM.YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey9 default=true type=long 
usage=DATE formatindex=19
-  FormatCodeD.  /FormatCode
+  FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey8 default=true type=medium 
usage=DATE formatindex=20
-  FormatCodeDD.MM.JJ/FormatCode
+  FormatCodeDD.MM.YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey7 default=false type=medium 
usage=DATE formatindex=21
-  FormatCodeDD.MM./FormatCode
+  FormatCodeDD.MM./FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey10 default=false type=long 
usage=DATE formatindex=22
-  FormatCodeD. MMM JJ/FormatCode
+  FormatCodeD. MMM YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey11 default=false type=long 
usage=DATE formatindex=23
-  FormatCodeD. MMM /FormatCode
+  FormatCodeD. MMM /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey16 default=false type=long 
usage=DATE formatindex=24
-  FormatCodeD. MMM. /FormatCode
+  FormatCodeD. MMM. /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey12 default=false type=long 
usage=DATE formatindex=25
-  FormatCodeD.  /FormatCode
+  FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey17 default=false type=long 
usage=DATE formatindex=26
-  FormatCodeD.  /FormatCode
+  FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey13 default=false type=long 
usage=DATE formatindex=27
-  FormatCodeNN, D. MMM JJ/FormatCode
+  FormatCodeNN, D. MMM YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey2 default=false type=medium 
usage=DATE formatindex=28
-  FormatCodeNN DD.MMM JJ/FormatCode
+  FormatCodeNN DD.MMM YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey14 default=false type=long 
usage=DATE formatindex=29
-  FormatCodeNN, D.  /FormatCode
+  FormatCodeNN, D.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey15 default=false type=long 
usage=DATE formatindex=30
-  FormatCodeD.  /FormatCode
+  FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey18 default=false type=short 
usage=DATE formatindex=31
   FormatCodeMM-DD/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey19 default=false type=medium 
usage=DATE formatindex=32
-  FormatCodeJJ-MM-DD/FormatCode
+  FormatCodeYY-MM-DD/FormatCode
   DefaultNameISO 8601 (EN 28601, DIN 5008)/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey20 default=false type=medium 
usage=DATE formatindex=33
-  FormatCode-MM-DD/FormatCode
+  FormatCode-MM-DD/FormatCode
   DefaultNameISO 8601 (EN 28601, DIN 5008)/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey3 default=false type=medium 
usage=DATE formatindex=34
-  FormatCodeMM.JJ/FormatCode
+  FormatCodeMM.YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey4 default=false type=medium 
usage=DATE formatindex=35
   FormatCodeDD.MMM/FormatCode
@@ -160,7 +160,7 @@
   FormatCode/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey6 default=false type=medium 
usage=DATE formatindex=37
-  FormatCodeQQ JJ/FormatCode
+  FormatCodeQQ YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey21 default=false type=medium 
usage=DATE formatindex=38
   FormatCodeWW/FormatCode
@@ -187,10 +187,10 @@
   FormatCode[HH]:MM:SS,00/FormatCode
 /FormatElement
 FormatElement msgid=DateTimeFormatskey1 default=true type=medium 
usage=DATE_TIME

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source

2014-04-06 Thread Ariel Constenla-Haile

 i18npool/source/localedata/data/nds_DE.xml |   38 ++---
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit d1268a86dfef20ba8d2f4059180bd55764e4092d
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Apr 6 19:16:34 2014 +

i124611 - Correct date format in nds-DE locale data

Patch by: Timo Putzer tput...@gmx.de

diff --git a/i18npool/source/localedata/data/nds_DE.xml 
b/i18npool/source/localedata/data/nds_DE.xml
index 5cd7f49..65ac138 100644
--- a/i18npool/source/localedata/data/nds_DE.xml
+++ b/i18npool/source/localedata/data/nds_DE.xml
@@ -104,57 +104,57 @@
 FormatCode#.##0,-- [$DM-407];[ROT]-#.##0,-- 
[$DM-407]/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey1 default=true type=short 
usage=DATE formatindex=18
-FormatCodeDD.MM.JJ/FormatCode
+FormatCodeDD.MM.YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey9 default=true type=long 
usage=DATE formatindex=19
-FormatCodeD.  /FormatCode
+FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey8 default=true type=medium 
usage=DATE formatindex=20
-FormatCodeDD.MM.JJ/FormatCode
+FormatCodeDD.MM.YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey7 default=false type=medium 
usage=DATE formatindex=21
-FormatCodeDD.MM./FormatCode
+FormatCodeDD.MM./FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey10 default=false type=long 
usage=DATE formatindex=22
-FormatCodeD. MMM JJ/FormatCode
+FormatCodeD. MMM YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey11 default=false type=long 
usage=DATE formatindex=23
-FormatCodeD. MMM /FormatCode
+FormatCodeD. MMM /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey16 default=false type=long 
usage=DATE formatindex=24
-FormatCodeD. MMM. /FormatCode
+FormatCodeD. MMM. /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey12 default=false type=long 
usage=DATE formatindex=25
-FormatCodeD.  /FormatCode
+FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey17 default=false type=long 
usage=DATE formatindex=26
-FormatCodeD.  /FormatCode
+FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey13 default=false type=long 
usage=DATE formatindex=27
-FormatCodeNN, D. MMM JJ/FormatCode
+FormatCodeNN, D. MMM YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey2 default=false type=medium 
usage=DATE formatindex=28
-FormatCodeNN DD.MMM JJ/FormatCode
+FormatCodeNN DD.MMM YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey14 default=false type=long 
usage=DATE formatindex=29
-FormatCodeNN, D.  /FormatCode
+FormatCodeNN, D.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey15 default=false type=long 
usage=DATE formatindex=30
-FormatCodeD.  /FormatCode
+FormatCodeD.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey18 default=false type=short 
usage=DATE formatindex=31
 FormatCodeMM-DD/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey19 default=false type=medium 
usage=DATE formatindex=32
-FormatCodeJJ-MM-DD/FormatCode
+FormatCodeYY-MM-DD/FormatCode
 DefaultNameISO 8601 (EN 28601, DIN 5008)/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey20 default=false type=medium 
usage=DATE formatindex=33
-FormatCode-MM-DD/FormatCode
+FormatCode-MM-DD/FormatCode
 DefaultNameISO 8601 (EN 28601, DIN 5008)/DefaultName
 /FormatElement
 FormatElement msgid=DateFormatskey3 default=false type=medium 
usage=DATE formatindex=34
-FormatCodeMM.JJ/FormatCode
+FormatCodeMM.YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey4 default=false type=medium 
usage=DATE formatindex=35
 FormatCodeDD.MMM/FormatCode
@@ -163,7 +163,7 @@
 FormatCode/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey6 default=false type=medium 
usage=DATE formatindex=37
-FormatCodeQQ JJ/FormatCode
+FormatCodeQQ YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey21 default=false type=medium 
usage=DATE formatindex=38
 FormatCodeWW

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - external_deps.lst i18npool/source

2014-04-05 Thread Ariel Constenla-Haile

 external_deps.lst   |7 
 i18npool/source/localedata/data/localedata_euro.map |   17 
 i18npool/source/localedata/data/makefile.mk |3 
 i18npool/source/localedata/data/nds_DE.xml  |  375 
 i18npool/source/localedata/localedata.cxx   |1 
 5 files changed, 399 insertions(+), 4 deletions(-)

New commits:
commit bd1eb988440fb0d1d207fd3ef590f9115d259c81
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Apr 5 19:27:01 2014 +

i124611 - Include nds-DE locale data

diff --git a/i18npool/source/localedata/data/localedata_euro.map 
b/i18npool/source/localedata/data/localedata_euro.map
index 9a1070f..1dbbe31 100644
--- a/i18npool/source/localedata/data/localedata_euro.map
+++ b/i18npool/source/localedata/data/localedata_euro.map
@@ -68,6 +68,7 @@ getAllCalendars_lv_LV;
 getAllCalendars_mk_MK;
 getAllCalendars_mt_MT;
 getAllCalendars_nb_NO;
+getAllCalendars_nds_DE;
 getAllCalendars_nl_BE;
 getAllCalendars_nl_NL;
 getAllCalendars_nn_NO;
@@ -140,6 +141,7 @@ getAllCurrencies_lv_LV;
 getAllCurrencies_mk_MK;
 getAllCurrencies_mt_MT;
 getAllCurrencies_nb_NO;
+getAllCurrencies_nds_DE;
 getAllCurrencies_nl_BE;
 getAllCurrencies_nl_NL;
 getAllCurrencies_nn_NO;
@@ -212,6 +214,7 @@ getAllFormats0_lv_LV;
 getAllFormats0_mk_MK;
 getAllFormats0_mt_MT;
 getAllFormats0_nb_NO;
+getAllFormats0_nds_DE;
 getAllFormats0_nl_BE;
 getAllFormats0_nl_NL;
 getAllFormats0_nn_NO;
@@ -284,6 +287,7 @@ getBreakIteratorRules_lv_LV;
 getBreakIteratorRules_mk_MK;
 getBreakIteratorRules_mt_MT;
 getBreakIteratorRules_nb_NO;
+getBreakIteratorRules_nds_DE;
 getBreakIteratorRules_nl_BE;
 getBreakIteratorRules_nl_NL;
 getBreakIteratorRules_nn_NO;
@@ -356,6 +360,7 @@ getCollationOptions_lv_LV;
 getCollationOptions_mk_MK;
 getCollationOptions_mt_MT;
 getCollationOptions_nb_NO;
+getCollationOptions_nds_DE;
 getCollationOptions_nl_BE;
 getCollationOptions_nl_NL;
 getCollationOptions_nn_NO;
@@ -428,6 +433,7 @@ getCollatorImplementation_lv_LV;
 getCollatorImplementation_mk_MK;
 getCollatorImplementation_mt_MT;
 getCollatorImplementation_nb_NO;
+getCollatorImplementation_nds_DE;
 getCollatorImplementation_nl_BE;
 getCollatorImplementation_nl_NL;
 getCollatorImplementation_nn_NO;
@@ -500,6 +506,7 @@ getContinuousNumberingLevels_lv_LV;
 getContinuousNumberingLevels_mk_MK;
 getContinuousNumberingLevels_mt_MT;
 getContinuousNumberingLevels_nb_NO;
+getContinuousNumberingLevels_nds_DE;
 getContinuousNumberingLevels_nl_BE;
 getContinuousNumberingLevels_nl_NL;
 getContinuousNumberingLevels_nn_NO;
@@ -572,6 +579,7 @@ getFollowPageWords_lv_LV;
 getFollowPageWords_mk_MK;
 getFollowPageWords_mt_MT;
 getFollowPageWords_nb_NO;
+getFollowPageWords_nds_DE;
 getFollowPageWords_nl_BE;
 getFollowPageWords_nl_NL;
 getFollowPageWords_nn_NO;
@@ -644,6 +652,7 @@ getForbiddenCharacters_lv_LV;
 getForbiddenCharacters_mk_MK;
 getForbiddenCharacters_mt_MT;
 getForbiddenCharacters_nb_NO;
+getForbiddenCharacters_nds_DE;
 getForbiddenCharacters_nl_BE;
 getForbiddenCharacters_nl_NL;
 getForbiddenCharacters_nn_NO;
@@ -716,6 +725,7 @@ getIndexAlgorithm_lv_LV;
 getIndexAlgorithm_mk_MK;
 getIndexAlgorithm_mt_MT;
 getIndexAlgorithm_nb_NO;
+getIndexAlgorithm_nds_DE;
 getIndexAlgorithm_nl_BE;
 getIndexAlgorithm_nl_NL;
 getIndexAlgorithm_nn_NO;
@@ -788,6 +798,7 @@ getLCInfo_lv_LV;
 getLCInfo_mk_MK;
 getLCInfo_mt_MT;
 getLCInfo_nb_NO;
+getLCInfo_nds_DE;
 getLCInfo_nl_BE;
 getLCInfo_nl_NL;
 getLCInfo_nn_NO;
@@ -860,6 +871,7 @@ getLocaleItem_lv_LV;
 getLocaleItem_mk_MK;
 getLocaleItem_mt_MT;
 getLocaleItem_nb_NO;
+getLocaleItem_nds_DE;
 getLocaleItem_nl_BE;
 getLocaleItem_nl_NL;
 getLocaleItem_nn_NO;
@@ -932,6 +944,7 @@ getOutlineNumberingLevels_lv_LV;
 getOutlineNumberingLevels_mk_MK;
 getOutlineNumberingLevels_mt_MT;
 getOutlineNumberingLevels_nb_NO;
+getOutlineNumberingLevels_nds_DE;
 getOutlineNumberingLevels_nl_BE;
 getOutlineNumberingLevels_nl_NL;
 getOutlineNumberingLevels_nn_NO;
@@ -1004,6 +1017,7 @@ getReservedWords_lv_LV;
 getReservedWords_mk_MK;
 getReservedWords_mt_MT;
 getReservedWords_nb_NO;
+getReservedWords_nds_DE;
 getReservedWords_nl_BE;
 getReservedWords_nl_NL;
 getReservedWords_nn_NO;
@@ -1076,6 +1090,7 @@ getSearchOptions_lv_LV;
 getSearchOptions_mk_MK;
 getSearchOptions_mt_MT;
 getSearchOptions_nb_NO;
+getSearchOptions_nds_DE;
 getSearchOptions_nl_BE;
 getSearchOptions_nl_NL;
 getSearchOptions_nn_NO;
@@ -1148,6 +1163,7 @@ getTransliterations_lv_LV;
 getTransliterations_mk_MK;
 getTransliterations_mt_MT;
 getTransliterations_nb_NO;
+getTransliterations_nds_DE;
 getTransliterations_nl_BE;
 getTransliterations_nl_NL;
 getTransliterations_nn_NO;
@@ -1220,6 +1236,7 @@ getUnicodeScripts_lv_LV;
 getUnicodeScripts_mk_MK;
 getUnicodeScripts_mt_MT;
 getUnicodeScripts_nb_NO;
+getUnicodeScripts_nds_DE;
 getUnicodeScripts_nl_BE;
 getUnicodeScripts_nl_NL;
 getUnicodeScripts_nn_NO;
diff --git a/i18npool/source/localedata/data/makefile.mk 
b/i18npool/source/localedata/data/makefile.mk
index

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source

2014-03-31 Thread Ariel Constenla-Haile

 svtools/source/control/roadmap.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 54f27df803da7f9b0d7de9dc027dc89bc20ad560
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Mar 31 19:41:22 2014 +

i124570 - Prevent a null pointer dereference

diff --git a/svtools/source/control/roadmap.cxx 
b/svtools/source/control/roadmap.cxx
index 5178b69..ad4c75a 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -766,7 +766,8 @@ namespace svt
 SetFont( aFont );
 RoadmapTypes::ItemId curItemID = GetCurrentRoadmapItemID();
 RoadmapItem* pLabelItem = GetByID( curItemID );
-
pLabelItem-ToggleBackgroundColor(rStyleSettings.GetHighlightColor());
+if ( pLabelItem != NULL )
+
pLabelItem-ToggleBackgroundColor(rStyleSettings.GetHighlightColor());
 Invalidate();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2014-03-11 Thread Ariel Constenla-Haile

 offapi/com/sun/star/ui/dialogs/Wizard.idl|2 ++
 offapi/com/sun/star/ui/dialogs/WizardButton.idl  |2 ++
 offapi/com/sun/star/ui/dialogs/WizardTravelType.idl  |2 ++
 offapi/com/sun/star/ui/dialogs/XWizard.idl   |2 ++
 offapi/com/sun/star/ui/dialogs/XWizardController.idl |2 ++
 offapi/com/sun/star/ui/dialogs/XWizardPage.idl   |2 ++
 6 files changed, 12 insertions(+)

New commits:
commit e94d87d3268624a41d4edcdb749035f94e7a7636
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Mar 10 23:52:31 2014 +

Related: #i124397# - [API] Add since tag to Wizard API IDL files

(cherry picked from commit f72b30998429ded67cdea0d002b9d0227f4438f6)

Conflicts:
offapi/com/sun/star/ui/dialogs/WizardButton.idl
offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
offapi/com/sun/star/ui/dialogs/XWizardController.idl
offapi/com/sun/star/ui/dialogs/XWizardPage.idl

Change-Id: If651451b86829c7f066272e9362e3943f56cbf34

diff --git a/offapi/com/sun/star/ui/dialogs/Wizard.idl 
b/offapi/com/sun/star/ui/dialogs/Wizard.idl
index b1963a0..dba330a 100644
--- a/offapi/com/sun/star/ui/dialogs/Wizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/Wizard.idl
@@ -30,6 +30,8 @@ interface XWizardController;
 
 
 /** provides a framework for implementing a wizard dialog.
+
+@since OOo 3.3
  */
 service Wizard : XWizard
 {
diff --git a/offapi/com/sun/star/ui/dialogs/WizardButton.idl 
b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
index 65fd834..757a7d3 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardButton.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
@@ -25,6 +25,8 @@ module com { module sun { module star { module ui { module 
dialogs {
 
 
 /** denotes the buttons found in a Wizard
+
+@since OOo 3.3
  */
 constants WizardButton
 {
diff --git a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl 
b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
index 1b91a04..8df9865 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
@@ -25,6 +25,8 @@ module com { module sun { module star { module ui { module 
dialogs {
 
 
 /** denotes ways to leave a Wizard's page
+
+@since OOo 3.3
  */
 constants WizardTravelType
 {
diff --git a/offapi/com/sun/star/ui/dialogs/XWizard.idl 
b/offapi/com/sun/star/ui/dialogs/XWizard.idl
index 7d22899..59b8d61 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizard.idl
@@ -69,6 +69,8 @@ interface XWizardPage;
 
 @see XWizardController
 @see XWizardPage
+
+@since OOo 3.3
  */
 interface XWizard
 {
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardController.idl 
b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
index c25f8e6..b15286c 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardController.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
@@ -27,6 +27,8 @@ module com { module sun { module star { module ui { module 
dialogs {
 
 
 /** is the interface of a client-provided controller of a custom Wizard.
+
+@since OOo 3.3
  */
 interface XWizardController
 {
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl 
b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
index 6cfdbe4..c7c1be2 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
@@ -27,6 +27,8 @@ module com { module sun { module star { module ui { module 
dialogs {
 
 
 /** is a single page of a Wizard
+
+@since OOo 3.3
  */
 interface XWizardPage : ::com::sun::star::lang::XComponent
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - offapi/com offapi/type_reference

2014-03-10 Thread Ariel Constenla-Haile

 offapi/com/sun/star/ui/dialogs/Wizard.idl|   16 
 offapi/com/sun/star/ui/dialogs/WizardButton.idl  |   12 ++--
 offapi/com/sun/star/ui/dialogs/WizardTravelType.idl  |   12 ++--
 offapi/com/sun/star/ui/dialogs/XWizard.idl   |   15 ---
 offapi/com/sun/star/ui/dialogs/XWizardController.idl |   14 +++---
 offapi/com/sun/star/ui/dialogs/XWizardPage.idl   |   14 +++---
 offapi/type_reference/typelibrary_history.txt|5 -
 offapi/type_reference/types.rdb  |binary
 8 files changed, 22 insertions(+), 66 deletions(-)

New commits:
commit b8c4b4e281caaebbcec1cae960b233465ef92297
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Mar 10 23:53:00 2014 +

i124385 - Correct date

diff --git a/offapi/type_reference/typelibrary_history.txt 
b/offapi/type_reference/typelibrary_history.txt
index b944cba..2c7bf7e 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -209,7 +209,7 @@
 23/03/2013 (arielch): TaskID=121946
   css::ucb::XWebDAVCommandEnvironment: use enums to identify WebDAV/HTTP 
methods
 
-23/03/2013 (arielch): TaskID=124385
+09/03/2014 (arielch): TaskID=124385
   Unpublish the Undo API
 
 10/03/2014 (arielch): TaskID=124398
commit 52d2a1738ec34eac07de302520dd39f70ef1577e
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Mar 10 23:52:53 2014 +

Remove useless comments and some white spaces

diff --git a/offapi/com/sun/star/ui/dialogs/Wizard.idl 
b/offapi/com/sun/star/ui/dialogs/Wizard.idl
index dd3d746..2c3e932 100644
--- a/offapi/com/sun/star/ui/dialogs/Wizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/Wizard.idl
@@ -19,22 +19,16 @@
  *
  */
 
-
-
 #ifndef __com_sun_star_ui_dialogs_Wizard_idl__
 #define __com_sun_star_ui_dialogs_Wizard_idl__
 
 #include com/sun/star/ui/dialogs/XWizard.idl
 #include com/sun/star/lang/IllegalArgumentException.idl
 
-//==
-
 module com { module sun { module star { module ui { module dialogs {
 
 interface XWizardController;
 
-//==
-
 /** provides a framework for implementing a wizard dialog.
 
 @since OpenOffice 3.3
@@ -65,10 +59,6 @@ service Wizard : XWizard
 );
 };
 
-//==
-
 }; }; }; }; };
 
-//==
-
 #endif
diff --git a/offapi/com/sun/star/ui/dialogs/WizardButton.idl 
b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
index 5b41d8d..46a5907 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardButton.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
@@ -19,17 +19,11 @@
  *
  */
 
-
-
 #ifndef __com_sun_star_ui_dialogs_WizardButton_idl__
 #define __com_sun_star_ui_dialogs_WizardButton_idl__
 
-//==
-
 module com { module sun { module star { module ui { module dialogs {
 
-//==
-
 /** denotes the buttons found in a typeWizard/type
 
 @since OpenOffice 3.3
@@ -50,10 +44,6 @@ constants WizardButton
 const short HELP = 5;
 };
 
-//==
-
 }; }; }; }; };
 
-//==
-
 #endif
diff --git a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl 
b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
index b489ff8..51883ad 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
@@ -19,17 +19,11 @@
  *
  */
 
-
-
 #ifndef __com_sun_star_ui_dialogs_WizardTravelType_idl__
 #define __com_sun_star_ui_dialogs_WizardTravelType_idl__
 
-//==
-
 module com { module sun { module star { module ui { module dialogs {
 
-//==
-
 /** denotes ways to leave a typeWizard/type's page
 
 @since OpenOffice 3.3
@@ -44,10 +38,6 @@ constants WizardTravelType
 const short FINISH = 3

[Libreoffice-commits] core.git: Branch 'aoo/trunk' -

2014-03-09 Thread Ariel Constenla-Haile

 0 files changed

New commits:
commit 60f8a854555a4ce435893223c523e4622434a33b
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Mar 9 06:19:15 2014 +

Fix line endings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2014-03-09 Thread Ariel Constenla-Haile

 offapi/com/sun/star/document/EmptyUndoStackException.idl   |1 +
 offapi/com/sun/star/document/UndoContextNotClosedException.idl |1 +
 offapi/com/sun/star/document/UndoFailedException.idl   |1 +
 offapi/com/sun/star/document/UndoManagerEvent.idl  |1 +
 offapi/com/sun/star/document/XUndoAction.idl   |1 +
 offapi/com/sun/star/document/XUndoManager.idl  |2 ++
 offapi/com/sun/star/document/XUndoManagerListener.idl  |1 +
 offapi/com/sun/star/document/XUndoManagerSupplier.idl  |2 ++
 8 files changed, 10 insertions(+)

New commits:
commit a842c6e7b33aca734946a32ecff90a11e184f802
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Mar 9 05:46:37 2014 +

Related: #i124384# Add since tag to Undo API IDL files

(cherry picked from commit e2fb6101543888977e882596ae64d854f1b09cb5)

Change-Id: I6ab35082503b506bd5d61af0b1ed67c662100716

diff --git a/offapi/com/sun/star/document/EmptyUndoStackException.idl 
b/offapi/com/sun/star/document/EmptyUndoStackException.idl
index 7812710..8ad1311 100644
--- a/offapi/com/sun/star/document/EmptyUndoStackException.idl
+++ b/offapi/com/sun/star/document/EmptyUndoStackException.idl
@@ -28,6 +28,7 @@ module com { module sun { module star { module document {
 
 /** is raised when an operation is attemption at an XUndoManager which 
requires a non-empty stack
 of undo actions, and this requirement is not fullfilled.
+@since OOo 3.4
  */
 exception EmptyUndoStackException : 
::com::sun::star::util::InvalidStateException
 {
diff --git a/offapi/com/sun/star/document/UndoContextNotClosedException.idl 
b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
index fbccfc0..fb26efd 100644
--- a/offapi/com/sun/star/document/UndoContextNotClosedException.idl
+++ b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
@@ -28,6 +28,7 @@ module com { module sun { module star { module document {
 
 /** is thrown when an operation is attempted at an XUndoManager which requires 
all undo
 contexts to be closed, but this requirement is not fullfilled.
+@since OOo 3.4
  */
 exception UndoContextNotClosedException : 
::com::sun::star::util::InvalidStateException
 {
diff --git a/offapi/com/sun/star/document/UndoFailedException.idl 
b/offapi/com/sun/star/document/UndoFailedException.idl
index c726d67..9c71daf 100644
--- a/offapi/com/sun/star/document/UndoFailedException.idl
+++ b/offapi/com/sun/star/document/UndoFailedException.idl
@@ -30,6 +30,7 @@ module com { module sun { module star { module document {
 
 @see XUndoAction::undo
 @see XUndoManager::undo
+@since OOo 3.4
  */
 exception UndoFailedException : ::com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/document/UndoManagerEvent.idl 
b/offapi/com/sun/star/document/UndoManagerEvent.idl
index 37e466f..769e3ea 100644
--- a/offapi/com/sun/star/document/UndoManagerEvent.idl
+++ b/offapi/com/sun/star/document/UndoManagerEvent.idl
@@ -31,6 +31,7 @@ module com { module sun { module star { module document {
 @see XUndoManager
 @see XUndoManagerListener
 @see XUndoAction
+@since OOo 3.4
  */
 struct UndoManagerEvent : ::com::sun::star::lang::EventObject
 {
diff --git a/offapi/com/sun/star/document/XUndoAction.idl 
b/offapi/com/sun/star/document/XUndoAction.idl
index 6dfbf48..dd9b132 100644
--- a/offapi/com/sun/star/document/XUndoAction.idl
+++ b/offapi/com/sun/star/document/XUndoAction.idl
@@ -28,6 +28,7 @@ module com { module sun { module star { module document {
 
 
 /** represents a single (undoable) action on a document
+@since OOo 3.4
  */
 interface XUndoAction
 {
diff --git a/offapi/com/sun/star/document/XUndoManager.idl 
b/offapi/com/sun/star/document/XUndoManager.idl
index cfe5645..0ba866a 100644
--- a/offapi/com/sun/star/document/XUndoManager.idl
+++ b/offapi/com/sun/star/document/XUndoManager.idl
@@ -66,6 +66,8 @@ interface XUndoManagerListener;
 pAn Undo manager can be locked and unlocked, using the XLockable::lock() 
and
 XLockable::unlock() methods. When it is locked, then every attempt to add 
an undo action, or to
 enter or leave an Undo context, will be silently ignored./p
+
+@since OOo 3.4
  */
 interface XUndoManager
 {
diff --git a/offapi/com/sun/star/document/XUndoManagerListener.idl 
b/offapi/com/sun/star/document/XUndoManagerListener.idl
index aacae13..82bb529 100644
--- a/offapi/com/sun/star/document/XUndoManagerListener.idl
+++ b/offapi/com/sun/star/document/XUndoManagerListener.idl
@@ -30,6 +30,7 @@ module com { module sun { module star { module document {
 /** implemented by components which want to be notified of changes in the 
Undo/Redo stacks of an Undo manager.
 
 @see XUndoManager
+@since OOo 3.4
  */
 interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/document/XUndoManagerSupplier.idl 
b/offapi/com/sun/star/document

[Libreoffice-commits] core.git: 3 commits - hwpfilter/source offapi/com

2014-03-09 Thread Ariel Constenla-Haile

 hwpfilter/source/hwpread.cxx  |   17 +++--
 offapi/com/sun/star/document/XUndoManager.idl |2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit df4db631c5a35101283895937d5277a5c0b79690
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Mar 9 05:47:10 2014 +

Do not display heading in the IDL short description
(cherry picked from commit 8242e5eed90db471b5dbe37a6bf03e96988ec26d)

diff --git a/offapi/com/sun/star/document/XUndoManager.idl 
b/offapi/com/sun/star/document/XUndoManager.idl
index 0ba866a..04f8b7e 100644
--- a/offapi/com/sun/star/document/XUndoManager.idl
+++ b/offapi/com/sun/star/document/XUndoManager.idl
@@ -37,7 +37,7 @@ interface XUndoManagerListener;
 
 
 /** provides access to the undo/redo stacks of a document
-
+p/p
 h3Undo/h3
 pChanges to a document usually result in recording of information how to 
undo those changes, if desired. A so-called
 undo action records the information how to undo a single change. Undo 
actions are maintained in a stack, so that
commit 3f0a8dc3c8204d6a500a5da64ad57996d593022f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sun Mar 9 17:06:59 2014 +

coverity#707905 Uninitialized scalar field

Change-Id: Icb00858146d65963a1c3144a61aa467d7da461e4

diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index d0b37c4..a5ba049 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -637,13 +637,16 @@ bool NewNum::Read(HWPFile  hwpf)
 return !hwpf.State();
 }
 
-
 // show page number (20)
-ShowPageNum::ShowPageNum():HBox(CH_SHOW_PAGE_NUM)
+ShowPageNum::ShowPageNum()
+: HBox(CH_SHOW_PAGE_NUM)
+, where(0)
+, m_nPageNumber(0)
+, shape(0)
+, dummy(0)
 {
 }
 
-
 bool ShowPageNum::Read(HWPFile  hwpf)
 {
 hwpf.Read2b(where, 1);
commit 1ac855e8550af5cb54b27f306743f56a26c8f9c1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sun Mar 9 17:05:50 2014 +

coverity#707904 Uninitialized scalar field

Change-Id: Ied056d944574534e1900cf6644d1eea868cbeee1

diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index ae6a0a8..d0b37c4 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -659,13 +659,15 @@ bool ShowPageNum::Read(HWPFile  hwpf)
 return !hwpf.State();
 }
 
-
 /* È¦¼öÂÊ½ÃÀÛ/°¨Ãß±â (21) */
-PageNumCtrl::PageNumCtrl():HBox(CH_PAGE_NUM_CTRL)
+PageNumCtrl::PageNumCtrl()
+: HBox(CH_PAGE_NUM_CTRL)
+, kind(0)
+, what(0)
+, dummy(0)
 {
 }
 
-
 bool PageNumCtrl::Read(HWPFile  hwpf)
 {
 hwpf.Read2b(kind, 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - offapi/com offapi/type_reference

2014-03-08 Thread Ariel Constenla-Haile

 offapi/com/sun/star/document/EmptyUndoStackException.idl   |   13 +-
 offapi/com/sun/star/document/UndoContextNotClosedException.idl |   13 +-
 offapi/com/sun/star/document/UndoFailedException.idl   |   13 +-
 offapi/com/sun/star/document/UndoManagerEvent.idl  |   13 +-
 offapi/com/sun/star/document/XUndoAction.idl   |   13 +-
 offapi/com/sun/star/document/XUndoManager.idl  |   20 
+++---
 offapi/com/sun/star/document/XUndoManagerListener.idl  |   13 +-
 offapi/com/sun/star/document/XUndoManagerSupplier.idl  |   16 ++--
 offapi/type_reference/typelibrary_history.txt  |3 +
 offapi/type_reference/types.rdb|binary
 10 files changed, 25 insertions(+), 92 deletions(-)

New commits:
commit 8242e5eed90db471b5dbe37a6bf03e96988ec26d
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Mar 9 05:47:10 2014 +

Do not display heading in the IDL short description

diff --git a/offapi/com/sun/star/document/XUndoManager.idl 
b/offapi/com/sun/star/document/XUndoManager.idl
index c2e6b13..e70fc3b 100644
--- a/offapi/com/sun/star/document/XUndoManager.idl
+++ b/offapi/com/sun/star/document/XUndoManager.idl
@@ -37,7 +37,7 @@ interface XUndoAction;
 interface XUndoManagerListener;
 
 /** provides access to the undo/redo stacks of a document
-
+p/p
 h3Undo/h3
 pChanges to a document usually result in recording of information how to 
undo those changes, if desired. A so-called
 undo action records the information how to undo a single change. Undo 
actions are maintained in a stack, so that
commit 3c6c05b09ab858ed23797cff13894138e5243d92
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Mar 9 05:47:02 2014 +

Remove useless comments

diff --git a/offapi/com/sun/star/document/EmptyUndoStackException.idl 
b/offapi/com/sun/star/document/EmptyUndoStackException.idl
index bfdda63..aa0e639 100644
--- a/offapi/com/sun/star/document/EmptyUndoStackException.idl
+++ b/offapi/com/sun/star/document/EmptyUndoStackException.idl
@@ -19,19 +19,13 @@
  *
  */
 
-
-
 #ifndef __com_sun_star_document_EmptyUndoStackException_idl__
 #define __com_sun_star_document_EmptyUndoStackException_idl__
 
 #include com/sun/star/util/InvalidStateException.idl
 
-//==
-
 module com { module sun { module star { module document {
 
-//==
-
 /** is raised when an operation is attemption at an XUndoManager which 
requires a non-empty stack
 of undo actions, and this requirement is not fullfilled.
 @since OpenOffice 3.4
@@ -40,10 +34,6 @@ exception EmptyUndoStackException : 
::com::sun::star::util::InvalidStateExceptio
 {
 };
 
-//==
-
 }; }; }; };
 
-//==
-
 #endif
diff --git a/offapi/com/sun/star/document/UndoContextNotClosedException.idl 
b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
index 1cad848..4e22b21 100644
--- a/offapi/com/sun/star/document/UndoContextNotClosedException.idl
+++ b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
@@ -19,19 +19,13 @@
  *
  */
 
-
-
 #ifndef __com_sun_star_document_UndoContextNotClosedException_idl__
 #define __com_sun_star_document_UndoContextNotClosedException_idl__
 
 #include com/sun/star/util/InvalidStateException.idl
 
-//==
-
 module com { module sun { module star { module document {
 
-//==
-
 /** is thrown when an operation is attempted at an typeXUndoManager/type 
which requires all undo
 contexts to be closed, but this requirement is not fullfilled.
 @since OpenOffice 3.4
@@ -40,10 +34,6 @@ exception UndoContextNotClosedException : 
::com::sun::star::util::InvalidStateEx
 {
 };
 
-//==
-
 }; }; }; };
 
-//==
-
 #endif
diff --git a/offapi/com/sun/star/document/UndoFailedException.idl 
b/offapi/com/sun/star/document/UndoFailedException.idl
index 4907278..40d78c1 100644
--- a/offapi/com/sun/star/document/UndoFailedException.idl
+++ b/offapi/com/sun/star/document

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmlhelp/util

2013-11-13 Thread Ariel Constenla-Haile

 xmlhelp/util/main_transform.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2afc19e04f8bb3089cbfef34960ad8f0a3b99bf
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Nov 13 12:33:51 2013 +

i123670 - Add support for https links

diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl
index 5d84746..4c6acf2 100644
--- a/xmlhelp/util/main_transform.xsl
+++ b/xmlhelp/util/main_transform.xsl
@@ -613,7 +613,7 @@
 xsl:variable name=archivexsl:value-of 
select=concat(substring-before(substring-after(@href,'text/'),'/'),'/')//xsl:variable
 xsl:variable name=dbpostfixxsl:call-template 
name=createDBpostfixxsl:with-param name=archive 
select=$archive//xsl:call-template/xsl:variable
xsl:choose
-   xsl:when test=starts-with(@href,'http://')  !-- web links 
--
+   xsl:when test=starts-with(@href,'http://') or 
starts-with(@href,'https://')  !-- web links --
a href={@href}xsl:apply-templates //a
/xsl:when
xsl:when test=contains(@href,'#')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlhelp/util

2013-11-13 Thread Ariel Constenla-Haile

 xmlhelp/util/main_transform.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5026aaabf49b9c6e23bf9329674de2c24272c4e
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Nov 13 12:33:51 2013 +

i123670 - Add support for https links
(cherry picked from commit a2afc19e04f8bb3089cbfef34960ad8f0a3b99bf)

diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl
index 2834668..b6b9c2e 100644
--- a/xmlhelp/util/main_transform.xsl
+++ b/xmlhelp/util/main_transform.xsl
@@ -628,7 +628,7 @@
 xsl:variable name=archivexsl:value-of 
select=concat(substring-before(substring-after(@href,'text/'),'/'),'/')//xsl:variable
 xsl:variable name=dbpostfixxsl:call-template 
name=createDBpostfixxsl:with-param name=archive 
select=$archive//xsl:call-template/xsl:variable
xsl:choose
-   xsl:when test=starts-with(@href,'http://')  !-- web links 
--
+   xsl:when test=starts-with(@href,'http://') or 
starts-with(@href,'https://')  !-- web links --
a href={@href}xsl:apply-templates //a
/xsl:when
xsl:when test=contains(@href,'#')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-27 Thread Ariel Constenla-Haile

 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 4089083f32a22e7f308b82b9e8dc4a4abaee8b24
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Oct 25 12:49:16 2013 +

Resolves: #i123544# Prevent accessing empty filters' vector

(cherry picked from commit 3b16c98449d120b07ca4f2f312e31127ac655482)

Change-Id: Ieb71209d9c299ef7f050e00ccf010aca87ee2ab7

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index b6def5b..1e5f9cd 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -899,15 +899,18 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const 
RequestRef rRequest)
 {
 UINT nFileType;
 hResult = iDialog-GetFileTypeIndex(nFileType);
-if ( SUCCEEDED(hResult) )
+if ( SUCCEEDED(hResult)  nFileType  0 )
 {
 ::sal_Int32 nRealIndex = (nFileType-1); // COM dialog 
base on 1 ... filter container on 0 .-)
 ::std::vector COMDLG_FILTERSPEC  lFilters = 
lcl_buildFilterList(m_lFilters);
-LPCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec;
+if ( nRealIndex  lFilters.size() )
+{
+LPCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec;
 
-lpFilterExt = wcsrchr( lpFilterExt, '.' );
-if ( lpFilterExt )
-aFileURL += reinterpret_castconst 
sal_Unicode*(lpFilterExt);
+lpFilterExt = wcsrchr( lpFilterExt, '.' );
+if ( lpFilterExt )
+aFileURL += reinterpret_castconst 
sal_Unicode*(lpFilterExt);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/source

2013-10-25 Thread Ariel Constenla-Haile

 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 3b16c98449d120b07ca4f2f312e31127ac655482
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Oct 25 12:49:16 2013 +

i123544 - Prevent accessing empty filters' vector

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index f44ba31..42ebb61 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -915,15 +915,18 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const 
RequestRef rRequest)
 ::rtl::OUString aExt;
 UINT nFileType;
 hResult = iDialog-GetFileTypeIndex(nFileType);
-if ( SUCCEEDED(hResult) )
+if ( SUCCEEDED(hResult)  nFileType  0 )
 {
 ::sal_Int32 nRealIndex = (nFileType-1); // COM dialog 
base on 1 ... filter container on 0 .-)
 ::std::vector COMDLG_FILTERSPEC  lFilters = 
lcl_buildFilterList(m_lFilters);
-LPCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec;
+if ( nRealIndex  lFilters.size() )
+{
+LPCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec;
 
-lpFilterExt = wcsrchr( lpFilterExt, '.' );
-if ( lpFilterExt )
-aFileURL += reinterpret_castconst 
sal_Unicode*(lpFilterExt);
+lpFilterExt = wcsrchr( lpFilterExt, '.' );
+if ( lpFilterExt )
+aFileURL += reinterpret_castconst 
sal_Unicode*(lpFilterExt);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' -

2013-10-23 Thread Ariel Constenla-Haile

 0 files changed

New commits:
commit 163c0e0ad7857ca3f290d4e5d52e2cbf3b39db44
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Oct 23 20:04:47 2013 +

Convert line endings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/inc sfx2/source

2013-10-20 Thread Ariel Constenla-Haile

 sfx2/inc/sfx2/dinfdlg.hxx  |9 -
 sfx2/source/dialog/dinfdlg.cxx |   36 
 2 files changed, 28 insertions(+), 17 deletions(-)

New commits:
commit e52d79b8f536aee6e5c7f7137c483c55052dd7b6
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Oct 20 19:12:44 2013 +

i123097 - Scroll all controls in a line

diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 88dc957..bea9f93 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -440,14 +440,10 @@ struct CustomPropertyLine
 CustomPropertiesTimeField   m_aTimeField;
 const Stringm_sDurationFormat;
 CustomPropertiesDurationField   m_aDurationField;
-CustomPropertiesEditButton m_aEditButton;
+CustomPropertiesEditButton  m_aEditButton;
 CustomPropertiesYesNoButton m_aYesNoButton;
 CustomPropertiesRemoveButtonm_aRemoveButton;
 
-Point   m_aDatePos;
-Point   m_aTimePos;
-Sizem_aDateTimeSize;
-
 boolm_bIsRemoved;
 boolm_bTypeLostFocus;
 
@@ -471,6 +467,9 @@ private:
 CustomPropertiesYesNoButton m_aYesNoButton;
 ImageButton m_aRemoveButton;
 
+longm_nDatePosX;
+longm_nTimePosX;
+
 sal_Int32   m_nLineHeight;
 sal_Int32   m_nScrollPos;
 SvtSysLocalem_aSysLocale;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 4c71213..c1b355c 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1847,8 +1847,9 @@ IMPL_LINK( CustomPropertiesWindow, TypeHdl, 
CustomPropertiesTypeBox*, pBox )
 }
 else if( nType == CUSTOM_TYPE_DATETIME)
 {
-pLine-m_aDateField.SetPosSizePixel( pLine-m_aDatePos, 
pLine-m_aDateTimeSize );
-pLine-m_aTimeField.SetPosSizePixel(pLine-m_aTimePos, 
pLine-m_aDateTimeSize );
+const long nPosY( pLine-m_aDateField.GetPosPixel().Y() );
+pLine-m_aDateField.SetPosPixel( ::Point( m_nDatePosX, nPosY ) );
+pLine-m_aTimeField.SetPosPixel( ::Point( m_nTimePosX, nPosY ) );
 }
 
 return 0;
@@ -1871,10 +1872,15 @@ IMPL_LINK( CustomPropertiesWindow, RemoveHdl, 
CustomPropertiesRemoveButton*, pBu
 if ( pLine-m_bIsRemoved )
 continue;
 
-Window* pWindows[] = {  pLine-m_aNameBox, pLine-m_aTypeBox, 
pLine-m_aValueEdit,
-pLine-m_aDateField, pLine-m_aTimeField,
-pLine-m_aDurationField, 
pLine-m_aEditButton,
-pLine-m_aYesNoButton, 
pLine-m_aRemoveButton, NULL };
+Window* pWindows[] = {  pLine-m_aNameBox,
+pLine-m_aTypeBox,
+pLine-m_aValueEdit,
+pLine-m_aDateField,
+pLine-m_aTimeField,
+pLine-m_aDurationField,
+pLine-m_aEditButton,
+pLine-m_aYesNoButton,
+pLine-m_aRemoveButton, NULL };
 Window** pCurrent = pWindows;
 while ( *pCurrent )
 {
@@ -2042,6 +2048,9 @@ void CustomPropertiesWindow::InitControls( HeaderBar* 
pHeaderBar, const ScrollBa
 
 m_nLineHeight =
 ( m_aRemoveButton.GetPosPixel().Y() * 2 ) + 
m_aRemoveButton.GetSizePixel().Height();
+
+m_nDatePosX = m_aDateField.GetPosPixel().X();
+m_nTimePosX = m_aTimeField.GetPosPixel().X();
 }
 
 sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const
@@ -2096,10 +2105,6 @@ void CustomPropertiesWindow::AddLine( const 
::rtl::OUString sName, Any rAny )
 pCurrent++;
 pNewCurrent++;
 }
-//
-pNewLine-m_aDatePos = pNewLine-m_aDateField.GetPosPixel();
-pNewLine-m_aTimePos = pNewLine-m_aTimeField.GetPosPixel();
-pNewLine-m_aDateTimeSize = pNewLine-m_aDateField.GetSizePixel();
 
 double nTmpValue = 0;
 bool bTmpValue = false;
@@ -2208,8 +2213,15 @@ void CustomPropertiesWindow::DoScroll( sal_Int32 nNewPos 
)
 if ( pLine-m_bIsRemoved )
 continue;
 
-Window* pWindows[] = {  pLine-m_aNameBox, pLine-m_aTypeBox, 
pLine-m_aValueEdit, pLine-m_aDurationField,
-pLine-m_aYesNoButton, 
pLine-m_aRemoveButton, NULL };
+Window* pWindows[] = {  pLine-m_aNameBox,
+pLine-m_aTypeBox,
+pLine-m_aValueEdit,
+pLine-m_aDurationField,
+pLine-m_aEditButton,
+pLine

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2013-10-15 Thread Ariel Constenla-Haile

 cui/source/options/optsave.cxx |   35 ---
 1 file changed, 16 insertions(+), 19 deletions(-)

New commits:
commit a17e221225915c140c7840904cb9b46d75731edc
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue Oct 15 21:17:30 2013 +

i122759 - Pass the Sequence by reference

Despite it's name, rProperties, the Sequence is not a reference in the
function signature.

Besides, some small improvements:

- remove the unused code related to the Flags
- instead of compareToAscii, use equalsAsciiL, which is  optimized for
performance

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index a67b864..99d58e6 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -655,32 +655,29 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, 
pBox )
 /* -05.04.01 13:10
 
  ---*/
-OUString lcl_ExtracUIName(const SequencePropertyValue rProperties)
+OUString lcl_ExtracUIName(const SequencePropertyValue rProperties)
 {
-OUString sRet;
-sal_Int32 nFlags;
-const PropertyValue* pProperties = rProperties.getConstArray();
-for(int nProp = 0; nProp  rProperties.getLength(); nProp++)
+OUString sName;
+const PropertyValue* pPropVal = rProperties.getConstArray();
+const PropertyValue* const pEnd = pPropVal + rProperties.getLength();
+for( ; pPropVal != pEnd; pPropVal++ )
 {
-if(!pProperties[nProp].Name.compareToAscii(UIName))
+const OUString rName = pPropVal-Name;
+if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( UIName ) ) )
 {
-if ( pProperties[nProp].Value = sRet )
-break;
+OUString sUIName;
+if ( ( pPropVal-Value = sUIName )  sUIName.getLength() )
+return sUIName;
 }
-else if(!pProperties[nProp].Name.compareToAscii(Flags))
+else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( Name ) ) )
 {
-if ( pProperties[nProp].Value = nFlags )
-{
-nFlags = 0x100;
-}
-}
-else if(!pProperties[nProp].Name.compareToAscii(Name))
-{
-if ( !sRet.getLength() )
-pProperties[nProp].Value = sRet;
+pPropVal-Value = sName;
 }
 }
-return sRet;
+
+OSL_ENSURE( false, Filter without UIName! );
+
+return sName;
 }
 /* -05.04.01 13:37
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - readlicense_oo/docs

2013-10-15 Thread Ariel Constenla-Haile

 readlicense_oo/docs/readme/readme.xrm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6f9694374143ce181353b44df1d9da78d7dd7cc1
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Oct 16 00:04:54 2013 +

i123481 - Paragraph should have a language to mark it localizable

diff --git a/readlicense_oo/docs/readme/readme.xrm 
b/readlicense_oo/docs/readme/readme.xrm
index 2757068..d2f34e8 100644
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -301,8 +301,8 @@
/div
 
div id=ModifiedSourceCode
-   h2 id=sdffd23r3cefwefew xml:lang=en-USUsed / 
Modified Source Code/h2
-p id=sdffd23red32efewFor detailed information about used 
and/or modified source code, see the NOTICE file which is part of the 
installation./p
+   h2 id=ModifiedSourceCodeHeading 
xml:lang=en-USUsed / Modified Source Code/h2
+p id=ModifiedSourceCodePara xml:lang=en-USFor detailed 
information about used and/or modified source code, see the NOTICE file which 
is part of the installation./p
/div
/body
 /html
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - basegfx/inc basegfx/source default_images/introabout svgio/inc svgio/source

2013-10-11 Thread Ariel Constenla-Haile

 basegfx/inc/basegfx/polygon/b2dpolygontools.hxx  |8 
 basegfx/source/polygon/b2dpolygontools.cxx   |   82 +++
 default_images/introabout/about.png  |binary
 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |8 
 svgio/source/svgreader/svgstyleattributes.cxx|  269 +++
 5 files changed, 230 insertions(+), 137 deletions(-)

New commits:
commit 6a73411295de9cda5441b58cf6c5c13f89cdcd80
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Oct 11 17:20:02 2013 +

Remove orb from About dialog's header

diff --git a/default_images/introabout/about.png 
b/default_images/introabout/about.png
index c1a5464..2e25ec1 100755
Binary files a/default_images/introabout/about.png and 
b/default_images/introabout/about.png differ
commit ff1eee61fc56b06e436735f5e2b133db56de3608
Author: Armin Le Grand a...@apache.org
Date:   Fri Oct 11 16:57:46 2013 +

i123379 various SVG marker corrections

diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx 
b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
index 721779a..c3212ea 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
@@ -532,6 +532,14 @@ namespace basegfx
 */
 bool containsOnlyHorizontalAndVerticalEdges(const B2DPolygon 
rCandidate);
 
+/// get the tangent with which the given point is entered seen from 
the previous
+/// polygon path data. Take into account all stuff like closed state, 
zero-length edges and others.
+B2DVector getTangentEnteringPoint(const B2DPolygon rCandidate, 
sal_uInt32 nIndex);
+
+/// get the tangent with which the given point is left seen from the 
following
+/// polygon path data. Take into account all stuff like closed state, 
zero-length edges and others.
+B2DVector getTangentLeavingPoint(const B2DPolygon rCandidate, 
sal_uInt32 nIndex);
+
 } // end of namespace tools
 } // end of namespace basegfx
 
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx 
b/basegfx/source/polygon/b2dpolygontools.cxx
index c30b042d..2c08c29 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3660,6 +3660,88 @@ namespace basegfx
 return true;
 }
 
+B2DVector getTangentEnteringPoint(const B2DPolygon rCandidate, 
sal_uInt32 nIndex)
+{
+B2DVector aRetval(0.0, 0.0);
+const sal_uInt32 nCount(rCandidate.count());
+
+if(nIndex = nCount)
+{
+// out of range
+return aRetval;
+}
+
+// start immediately at prev point compared to nIndex
+const bool bClosed(rCandidate.isClosed());
+sal_uInt32 nPrev(bClosed ? (nIndex + nCount - 1) % nCount : nIndex 
? nIndex - 1 : nIndex);
+
+if(nPrev == nIndex)
+{
+// no previous, done
+return aRetval;
+}
+
+B2DCubicBezier aSegment;
+
+// go backward in the polygon; if closed, maximal back to start 
index (nIndex); if not closed,
+// until zero. Use nIndex as stop criteria
+while(nPrev != nIndex)
+{
+// get BezierSegment and tangent at the *end* of segment
+rCandidate.getBezierSegment(nPrev, aSegment);
+aRetval = aSegment.getTangent(1.0);
+
+if(!aRetval.equalZero())
+{
+// if we have a tangent, return it
+return aRetval;
+}
+
+// prepare index before checked one
+nPrev = bClosed ? (nPrev + nCount - 1) % nCount : nPrev ? 
nPrev - 1 : nIndex;
+}
+
+return aRetval;
+}
+
+B2DVector getTangentLeavingPoint(const B2DPolygon rCandidate, 
sal_uInt32 nIndex)
+{
+B2DVector aRetval(0.0, 0.0);
+const sal_uInt32 nCount(rCandidate.count());
+
+if(nIndex = nCount)
+{
+// out of range
+return aRetval;
+}
+
+// start at nIndex
+const bool bClosed(rCandidate.isClosed());
+sal_uInt32 nCurrent(nIndex);
+B2DCubicBezier aSegment;
+
+// go forward; if closed, do this until once around and back at 
start index (nIndex); if not
+// closed, until last point (nCount - 1). Use nIndex as stop 
criteria
+do
+{
+// get BezierSegment and tangent at the *beginning* of segment
+rCandidate.getBezierSegment(nCurrent, aSegment);
+aRetval = aSegment.getTangent(0.0);
+
+if(!aRetval.equalZero())
+{
+// if we have a tangent, return it
+return aRetval;
+}
+
+// prepare next index

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry

2013-08-28 Thread Ariel Constenla-Haile

 officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs |   26 
+-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 57c7320e1ec93e028491687c3f91a29f3005ab16
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Aug 29 01:17:40 2013 +

i123125 - Mark localized strings as such in the schema

diff --git 
a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs 
b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
index 9eef7c5..3450fa4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
@@ -34,8 +34,8 @@
   prop oor:name=Name oor:type=xs:string
 infodescName of the bitmap.  Used to look-up the bitmap in a 
container./desc/info
   /prop
-  prop oor:name=Text oor:type=xs:string
-infodescText that is displayed together with the 
icon./desc/info
+  prop oor:name=Text oor:type=xs:string oor:localized=true
+infodescLocalized text that is displayed together with the 
icon./desc/info
   /prop
   prop oor:name=NormalFileName oor:type=xs:string
 infodescRelative file name to the bitmap for the normal 
icon./desc/info
@@ -166,8 +166,8 @@
   node-ref oor:name=Icon oor:node-type=BitmapDescriptor
 infodescThe icon to display./desc/info
   /node-ref
-  prop oor:name=Text oor:type=xs:string
-infodescThe text to display./desc/info
+  prop oor:name=Text oor:type=xs:string oor:localized=true
+infodescThe localized text to display./desc/info
   /prop
   prop oor:name=Action oor:type=xs:string
 infodescAction to execute when a button is triggered./desc/info
@@ -211,8 +211,8 @@
   node-ref oor:name=Icon oor:node-type=BitmapDescriptor
 infodescThe icon to display./desc/info
   /node-ref
-  prop oor:name=Text oor:type=xs:string
-infodescThe text to display./desc/info
+  prop oor:name=Text oor:type=xs:string oor:localized=true
+infodescThe localized text to display./desc/info
   /prop
   prop oor:name=Action oor:type=xs:string
 infodescAction to execute when a button is triggered./desc/info
@@ -220,11 +220,11 @@
 /group
 group oor:name=HelpEntry
   infodescDescribes a Help entry./desc/info
-  prop oor:name=Left oor:type=xs:string
-infodescTypically a list of keyboard key names./desc/info
+  prop oor:name=Left oor:type=xs:string oor:localized=true
+infodescTypically a list of localized keyboard key 
names./desc/info
   /prop
-  prop oor:name=Right oor:type=xs:string
-infodescTypically a description of the action triggered by 
pressing the keys on the left./desc/info
+  prop oor:name=Right oor:type=xs:string oor:localized=true
+infodescTypically a localized description of the action triggered 
by pressing the keys on the left./desc/info
   /prop
 /group
 group oor:name=PaneStyle
@@ -289,7 +289,7 @@
 /group
 group oor:name=PresenterString
   infodescA Presenter string/desc/info
-  prop oor:name=String oor:type=xs:string
+  prop oor:name=String oor:type=xs:string oor:localized=true
 infodescThe localized string./desc/info
   /prop
 /group
@@ -302,12 +302,12 @@
   prop oor:name=StyleName oor:type=xs:string
 infodescName of a view style./desc/info
   /prop
-  prop oor:name=Title oor:type=xs:string
+  prop oor:name=Title oor:type=xs:string oor:localized=true
 infodescTitle displayed for the component.  An empty or missing
 title means that no title is displayed./desc/info
 value/value
   /prop
-  prop oor:name=AccessibleTitle oor:type=xs:string
+  prop oor:name=AccessibleTitle oor:type=xs:string 
oor:localized=true
 infodescTitle displayed for the component when accessibility 
support is active.
 An empty or missing title means that no title is 
displayed./desc/info
 value/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: #i121577# Allow setting toolbar name in Addons.xcu

2013-07-23 Thread Ariel Constenla-Haile

Hi Stephan,

On Tue, Jul 23, 2013 at 07:09:36PM +0200, Stephan Bergmann wrote:
 Do we really want the below commits introduce an incompatible change
 in LO 4.2?

This change should only be applied on a major release - if ever (in
retrospective, I wouldn't even commit this code, but not because I don't
think it is an improvement...); in context:
http://markmail.org/message/jpn4e3no4jgv3n4d
http://markmail.org/message/fhsepy2a56yhubi2

 On 06/24/2013 12:58 PM, Ariel Constenla-Haile wrote:


Regards
-- 
Ariel Constenla-Haile
La Plata, Argentina


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

[Libreoffice-commits] core.git: desktop/test include/toolkit odk/examples offapi/com offapi/type_reference offapi/UnoApi_offapi.mk qadevOOo/tests swext/mediawiki sw/source toolkit/source UnoControls/i

2013-07-11 Thread Ariel Constenla-Haile

 UnoControls/inc/basecontrol.hxx
 |1 
 UnoControls/source/inc/progressmonitor.hxx 
 |1 
 desktop/test/deployment/active/Dispatch.java   
 |3 
 desktop/test/deployment/active/active_native.cxx   
 |2 
 desktop/test/deployment/active/active_python.py
 |3 
 
desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java 
|3 
 desktop/test/deployment/passive/passive_native.cxx 
 |2 
 desktop/test/deployment/passive/passive_python.py  
 |3 
 include/toolkit/awt/vclxtoolkit.hxx
 |2 
 odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java   
 |4 
 odk/examples/DevelopersGuide/GUI/MessageBox.java   
 |5 
 odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx  
 |3 
 odk/examples/java/Inspector/Inspector.java 
 |3 
 offapi/UnoApi_offapi.mk
 |3 
 offapi/com/sun/star/awt/MessageBoxButtons.idl  
 |6 -
 offapi/com/sun/star/awt/MessageBoxCommand.idl  
 |   55 -
 offapi/com/sun/star/awt/MessageBoxResults.idl  
 |   58 ++
 offapi/com/sun/star/awt/MessageBoxType.idl 
 |   50 
 offapi/com/sun/star/awt/XMessageBox.idl
 |   35 +-
 offapi/com/sun/star/awt/XMessageBoxFactory.idl 
 |   53 +++--
 offapi/type_reference/offapi.rdb   
 |binary
 qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java   
 |2 
 sw/source/ui/envelp/labimp.hxx 
 |1 
 swext/mediawiki/src/com/sun/star/wiki/Helper.java  
 |7 -
 swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
 |4 
 toolkit/source/awt/vclxtoolkit.cxx 
 |   48 +++-
 26 files changed, 208 insertions(+), 149 deletions(-)

New commits:
commit 805c6101b3427cc98b53f1c48f22f705206c384d
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Dec 24 08:07:25 2012 +

Resolves: #i121544# - Clean-up MessageBox API

(cherry picked from commit 27cfcb1e9d103b3e49c1263b1fa59fee8b187b21)

Conflicts:
desktop/test/deployment/active/active_native.cxx
desktop/test/deployment/passive/Dispatch.java
desktop/test/deployment/passive/passive_native.cxx
odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
odk/examples/DevelopersGuide/GUI/MessageBox.java
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
odk/examples/java/Inspector/Inspector.java
offapi/com/sun/star/awt/MessageBoxButtons.idl
offapi/com/sun/star/awt/MessageBoxResults.idl
offapi/com/sun/star/awt/XMessageBox.idl
offapi/com/sun/star/awt/XMessageBoxFactory.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/types.rdb
sdext/source/minimizer/unodialog.cxx
toolkit/inc/toolkit/awt/vclxtoolkit.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/layout/core/root.cxx

Change-Id: I170b494fb96362bb25ba8d0f2518d4e46934dd67

Related: #i121544# - Clean-up MessageBox API (post fix)

(cherry picked from commit c9f7a06e7798bcd5253844c49d210ea9345bd4b8)

Conflicts:
sw/inc/pch/precompiled_sw.hxx

Change-Id: Ib8b1e7aaac769feff5206fcdd238c487a6130dd1

Related: #i121544# - Fix header guards

Found by: Tsutomu Uchino

(cherry picked from commit 82194a19ff4f29c8451c8e6ab6fe4f1b9d08df27)

Conflicts:
offapi/com/sun/star/awt/MessageBoxType.idl

Change-Id: Ide8ba697fbc80395d2f30a068a0820a6afa3332f

diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 0aa633d..2ae330f 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -75,7 +75,6 @@
 #include com/sun/star/awt/XComboBox.hpp
 #include com/sun/star/awt/XControl.hpp
 #include com/sun/star/awt/XCheckBox.hpp
-#include com/sun/star/awt/MessageBoxCommand.hpp
 #include com/sun/star/awt/XLayoutConstrains.hpp
 #include com/sun/star/awt/XProgressBar.hpp
 #include com/sun/star/awt/XTopWindow.hpp
diff --git a/UnoControls/source/inc/progressmonitor.hxx 
b/UnoControls/source/inc/progressmonitor.hxx
index 163dc09..48bc2b9 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc

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

2013-07-08 Thread Ariel Constenla-Haile

 framework/source/uielement/popuptoolbarcontroller.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f00d4f6dbf393bb41195430b1f54acbbefb85d9c
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Jul 6 04:01:21 2013 +

Resolves: #i122678# Workaround for dynamic cast runtime bug

(cherry picked from commit be9ff0830ba1f8b3c782aa269c78657d264e48a9)

Change-Id: I89a7b4ba8680606d97c26b9fde604f63ca814319

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index 26ac39c..1660e6c 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -297,8 +297,8 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
 {
 // TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu
 MenuConfiguration::Attributes* pMenuAttributes( 0 );
-VCLXPopupMenu*  pTkPopupMenu = dynamic_cast VCLXPopupMenu * (
-VCLXMenu::GetImplementation( m_xPopupMenu ) );
+VCLXPopupMenu*  pTkPopupMenu =
+( VCLXPopupMenu * ) VCLXMenu::GetImplementation( m_xPopupMenu );
 
 SolarMutexGuard aSolarMutexGuard;
 PopupMenu* pVCLPopupMenu = dynamic_cast PopupMenu * ( 
pTkPopupMenu-GetMenu() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/human icon-themes/oxygen include/toolkit offapi/com offapi/UnoApi_offapi.mk qadevOOo/objdsc scp2/source swext/mediawiki toolkit/AllLangResTarget_tk.mk toolk

2013-07-05 Thread Ariel Constenla-Haile

 dev/null  
|binary
 include/toolkit/helper/servicenames.hxx   
|2 
 offapi/UnoApi_offapi.mk   
|3 
 offapi/com/sun/star/awt/UnoControlThrobber.idl
|   48 --
 offapi/com/sun/star/awt/UnoControlThrobberModel.idl   
|   45 --
 offapi/com/sun/star/awt/WindowDescriptor.idl  
|1 
 offapi/com/sun/star/awt/XThrobber.idl 
|   44 --
 qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControl.csv  
|   36 -
 qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControlModel.csv 
|   29 -
 scp2/source/ooo/file_resource_ooo.scp 
|2 
 swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java 
|   10 
 toolkit/AllLangResTarget_tk.mk
|   39 --
 toolkit/Library_tk.mk 
|2 
 toolkit/Module_toolkit.mk 
|1 
 toolkit/qa/unoapi/knownissues.xcl 
|   11 
 toolkit/qa/unoapi/toolkit.sce 
|2 
 toolkit/source/awt/vclxtoolkit.cxx
|9 
 toolkit/source/awt/xthrobber.cxx  
|  106 -
 toolkit/source/awt/xthrobber.hrc  
|   27 -
 toolkit/source/awt/xthrobber.src  
|   96 
 toolkit/source/controls/tkthrobber.cxx
|  195 --
 toolkit/source/helper/registerservices.cxx
|5 
 toolkit/source/helper/servicenames.cxx
|2 
 toolkit/util/tk.component 
|8 
 24 files changed, 6 insertions(+), 717 deletions(-)

New commits:
commit 680608b15dd158f9ad4ceae328abb10b5185a27b
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Dec 20 03:56:07 2012 +

Related: #i121513# Remove deprecated UnoControlThrobberModel

(cherry picked from commit 5569d97f06a0299e41b91ca248bf7eaa038b1f21)

Conflicts:
icon-themes/human/toolkit/source/awt/spinner03-grey_01.png
icon-themes/human/toolkit/source/awt/spinner03-grey_02.png
icon-themes/human/toolkit/source/awt/spinner03-grey_03.png
icon-themes/human/toolkit/source/awt/spinner03-grey_04.png
icon-themes/human/toolkit/source/awt/spinner03-grey_05.png
icon-themes/human/toolkit/source/awt/spinner03-grey_06.png
icon-themes/human/toolkit/source/awt/spinner03-grey_07.png
icon-themes/human/toolkit/source/awt/spinner03-grey_08.png
icon-themes/human/toolkit/source/awt/spinner03-grey_09.png
icon-themes/human/toolkit/source/awt/spinner03-grey_10.png
icon-themes/human/toolkit/source/awt/spinner03-grey_11.png
icon-themes/human/toolkit/source/awt/spinner03-grey_12.png
offapi/com/sun/star/awt/UnoControlThrobber.idl
offapi/com/sun/star/awt/UnoControlThrobberModel.idl
offapi/com/sun/star/awt/XThrobber.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/typelibrary_history.txt
offapi/type_reference/types.rdb
rat-excludes
swext/mediawiki/help/component.txt
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
swext/mediawiki/src/description.xml
toolkit/AllLangResTarget_tk.mk
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/xthrobber.cxx
toolkit/source/awt/xthrobber.hrc
toolkit/source/awt/xthrobber.src
toolkit/source/controls/tkthrobber.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/src2xml/src.lst
toolkit/util/toolkit.xml

Change-Id: Ic415a96fe6ba7040a3b03fd562f997d2df1516d6

diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png 
b/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png
deleted file mode 100644
index 2c6b693..000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png and 
/dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png 
b/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png
deleted file mode 100644
index 4662ddf..000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png and 
/dev

[Libreoffice-commits] core.git: include/toolkit offapi/com offapi/UnoApi_offapi.mk qadevOOo/objdsc toolkit/Library_tk.mk toolkit/qa toolkit/source toolkit/util

2013-07-05 Thread Ariel Constenla-Haile

 include/toolkit/helper/servicenames.hxx
  |2 
 offapi/UnoApi_offapi.mk
  |3 
 offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl  
  |   48 --
 offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl 
  |   47 --
 offapi/com/sun/star/awt/WindowDescriptor.idl   
  |1 
 offapi/com/sun/star/awt/XSimpleAnimation.idl   
  |   45 --
 
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv 
 |   36 -
 
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv
 |   29 -
 toolkit/Library_tk.mk  
  |2 
 toolkit/qa/unoapi/knownissues.xcl  
  |   11 
 toolkit/qa/unoapi/toolkit.sce  
  |2 
 toolkit/source/awt/vclxtoolkit.cxx 
  |   11 
 toolkit/source/awt/xsimpleanimation.cxx
  |  142 ---
 toolkit/source/controls/tksimpleanimation.cxx  
  |  183 --
 toolkit/source/helper/registerservices.cxx 
  |5 
 toolkit/source/helper/servicenames.cxx 
  |2 
 toolkit/util/tk.component  
  |8 
 17 files changed, 1 insertion(+), 576 deletions(-)

New commits:
commit 303096c50c850b05a158a1a429c9fd5d0251a892
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Dec 20 03:56:35 2012 +

Related: #i121514# Remove deprecated UnoControlSimpleAnimation

(cherry picked from commit 514bb6777e001d02dbd9be63fc7a6187560aad63)

Conflicts:
offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
offapi/com/sun/star/awt/XSimpleAnimation.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/typelibrary_history.txt
offapi/type_reference/types.rdb
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/xsimpleanimation.cxx
toolkit/source/controls/tksimpleanimation.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/util/toolkit.xml

Change-Id: If7f8de62713e28434e28975026cf8e5c66c831aa

diff --git a/include/toolkit/helper/servicenames.hxx 
b/include/toolkit/helper/servicenames.hxx
index 32b964a..fffdc16 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -97,8 +97,6 @@ extern const sal_Char szServiceName_DefaultGridColumnModel[];
 extern const sal_Char szServiceName_GridColumn[];
 extern const sal_Char szServiceName_SortableGridDataModel[];
 
-extern const sal_Char szServiceName_UnoSimpleAnimationControl[], 
szServiceName2_UnoSimpleAnimationControl[];
-extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[], 
szServiceName2_UnoSimpleAnimationControlModel[];
 extern const sal_Char szServiceName_AnimatedImagesControl[];
 extern const sal_Char szServiceName_AnimatedImagesControlModel[];
 extern const sal_Char szServiceName_SpinningProgressControlModel[];
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index ad51c73..c743345 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -573,8 +573,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
UnoControlRoadmapModel \
UnoControlScrollBar \
UnoControlScrollBarModel \
-   UnoControlSimpleAnimation \
-   UnoControlSimpleAnimationModel \
UnoControlSpinButton \
UnoControlSpinButtonModel \
UnoControlTimeField \
@@ -1853,7 +1851,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
XRequestCallback \
XReschedule \
XScrollBar \
-   XSimpleAnimation \
XSimpleTabController \
XSpinField \
XSpinListener \
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl 
b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
deleted file mode 100644
index 94bcf2f..000
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - framework/source

2013-07-05 Thread Ariel Constenla-Haile

 framework/source/uielement/popuptoolbarcontroller.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit be9ff0830ba1f8b3c782aa269c78657d264e48a9
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Jul 6 04:01:21 2013 +

i122678 - Workaround for dynamic cast runtime bug

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index cb19d84..5e160d4 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -305,8 +305,8 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
 {
 // TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu
 MenuConfiguration::Attributes* pMenuAttributes( 0 );
-VCLXPopupMenu*  pTkPopupMenu = dynamic_cast VCLXPopupMenu * (
-VCLXMenu::GetImplementation( m_xPopupMenu ) );
+VCLXPopupMenu*  pTkPopupMenu =
+( VCLXPopupMenu * ) VCLXMenu::GetImplementation( m_xPopupMenu );
 
 vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
 PopupMenu* pVCLPopupMenu = dynamic_cast PopupMenu * ( 
pTkPopupMenu-GetMenu() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com oox/source reportdesign/source svx/source toolkit/source vcl/source vcl/workben wizards/com xmloff/source

2013-06-27 Thread Ariel Constenla-Haile

 offapi/com/sun/star/awt/ImageScaleMode.idl   | 
  10 ++--
 oox/source/ole/axcontrol.cxx | 
   8 +++---
 reportdesign/source/core/api/ImageControl.cxx| 
   6 ++---
 reportdesign/source/filter/xml/xmlHelper.cxx | 
   4 +--
 reportdesign/source/filter/xml/xmlImage.cxx  | 
   4 +--
 svx/source/form/formcontrolfactory.cxx   | 
   2 -
 toolkit/source/awt/animatedimagespeer.cxx| 
   4 +--
 toolkit/source/awt/vclxtoolkit.cxx   | 
   4 +--
 toolkit/source/awt/vclxwindows.cxx   | 
   8 +++---
 toolkit/source/controls/animatedimages.cxx   | 
  12 +-
 toolkit/source/controls/unocontrols.cxx  | 
   8 +++---
 vcl/source/control/imgctrl.cxx   | 
  10 
 vcl/source/control/throbber.cxx  | 
   4 +--
 vcl/workben/svpclient.cxx| 
   2 -
 wizards/com/sun/star/wizards/document/DatabaseControl.java   | 
   2 -
 wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 
   2 -
 xmloff/source/forms/formenums.cxx| 
  10 
 17 files changed, 48 insertions(+), 52 deletions(-)

New commits:
commit 949f97ba480f96c7892602f3208467ac925fab15
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Dec 23 18:20:18 2012 +

Resolves: #i121162# ImageScaleMode constants should be in UPPERCASE

(cherry picked from commit 734b532fb77d2d5be7eb7becb6720dbd7b3d8978)

Conflicts:
offapi/com/sun/star/awt/ImageScaleMode.idl
oox/source/ole/axcontrol.cxx
reportdesign/source/filter/xml/xmlHelper.cxx

wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java

Change-Id: Ib5fa7b82edddb809129a4e5619a20ca7a7b2e38a

diff --git a/offapi/com/sun/star/awt/ImageScaleMode.idl 
b/offapi/com/sun/star/awt/ImageScaleMode.idl
index c0f69d3..cb05a16 100644
--- a/offapi/com/sun/star/awt/ImageScaleMode.idl
+++ b/offapi/com/sun/star/awt/ImageScaleMode.idl
@@ -20,34 +20,30 @@
 #ifndef __com_sun_star_awt_ImageScaleMode_idl__
 #define __com_sun_star_awt_ImageScaleMode_idl__
 
-
 module com { module sun { module star { module awt {
 
-
 /** defines modes how an image displayed in a given area should be scaled to 
fit this area
  */
 constants ImageScaleMode
 {
 /** specifies that no scaling should happen at all
 */
-const short None = 0;
+const short NONE = 0;
 
 /** specifies that the image should be scaled up or down to the size of 
the surrounding area isotropically,
 i.e. by keeping its aspect ratio.
 */
-const short Isotropic = 1;
+const short ISOTROPIC = 1;
 
 /** specifies that the image should be scaled up or down to the size of 
the surrounding area anisotropically.
 
 pThe image will finally cover all of the surrounding area, but its 
dimensions might be distorted./p
 */
-const short Anisotropic = 2;
+const short ANISOTROPIC = 2;
 };
 
-
 }; }; }; };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 2f777b4..35a0ea5 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -508,12 +508,12 @@ void ControlConverter::convertAxPicture( PropertyMap 
rPropMap, const StreamData
 convertPicture( rPropMap, rPicData );
 
 // picture scale mode
-sal_Int16 nScaleMode = ImageScaleMode::None;
+sal_Int16 nScaleMode = ImageScaleMode::NONE;
 switch( nPicSizeMode )
 {
-case AX_PICSIZE_CLIP:   nScaleMode = ImageScaleMode::None; 
 break;
-case AX_PICSIZE_STRETCH:nScaleMode = ImageScaleMode::Anisotropic;  
 break;
-case AX_PICSIZE_ZOOM:   nScaleMode = ImageScaleMode::Isotropic;
 break;
+case AX_PICSIZE_CLIP:   nScaleMode = ImageScaleMode::NONE; 
 break;
+case AX_PICSIZE_STRETCH:nScaleMode = ImageScaleMode::ANISOTROPIC;  
 break;
+case AX_PICSIZE_ZOOM:   nScaleMode = ImageScaleMode::ISOTROPIC;
 break;
 default:OSL_FAIL( ControlConverter::convertAxPicture - unknown 
picture size mode );
 }
 rPropMap.setProperty( PROP_ScaleMode, nScaleMode );
diff --git a/reportdesign/source/core/api/ImageControl.cxx 
b/reportdesign/source/core/api/ImageControl.cxx
index 5971aeb..b159e6c 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -118,7 +118,7 @@ OImageControl::OImageControl(uno::Reference 
uno

[Libreoffice-commits] core.git: 2 commits - odk/config odk/docs odk/settings slideshow/source

2013-06-26 Thread Ariel Constenla-Haile

 odk/config/cfgWin.js |  138 ++-
 odk/config/configure.pl  |   60 
 odk/config/setsdkenv_unix.sh.in  |   24 +
 odk/config/setsdkenv_windows.template|   28 ++
 odk/docs/install.html|   22 +
 odk/settings/std.mk  |2 
 slideshow/source/engine/animationnodes/basecontainernode.cxx |2 
 7 files changed, 271 insertions(+), 5 deletions(-)

New commits:
commit 2250429dda5539466e2c3d1e33e555c4d66131e6
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Dec 6 12:31:44 2012 +

Related: #i121442# Add sed and cat as dependencies to odk

(cherry picked from commit 0a78e6e85d8e921705b7ea90038f822d47fb58ab)

Conflicts:
odk/cfgWin.js
odk/configure.pl
odk/docs/install.html
odk/setsdkenv_unix.sh.in
odk/setsdkenv_windows.template
odk/settings/std.mk

Change-Id: Ie124ffbb857e796923981e13dc3116c7af341056

diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js
index 99dca7f..0702103 100644
--- a/odk/config/cfgWin.js
+++ b/odk/config/cfgWin.js
@@ -57,6 +57,8 @@ var oo_sdk_ure_home=office_home + \\URE;
 
 var oo_sdk_make_home=getMakeHome();
 var oo_sdk_zip_home=getZipHome();
+var oo_sdk_cat_home=getCatHome();
+var oo_sdk_sed_home=getSedHome();
 var oo_sdk_manifest_used=;
 var oo_sdk_windowssdk=;
 var oo_sdk_cpp_home=getCppHome();
@@ -317,6 +319,110 @@ function getZipHome()
 }
 }
 
+function getCatHome()
+{
+var sSuggestedHome = WshSysEnv(OO_SDK_CAT_HOME);
+
+while(true)
+{
+stdout.Write(\n Enter a cat (2.0 or higher) tools directory [ +
+ sSuggestedHome + ]:);
+var sHome = stdin.ReadLine();
+if (sHome.length == 0)
+{
+//No user input, use default.
+if ( ! aFileSystemObject.FolderExists(sSuggestedHome))
+{
+stdout.WriteLine(\n Error: Could not find directory \ +
+ sSuggestedHome + \. cat is required, please 
 +
+ specify a cat tools directory. +
+ \nYou can get cat from  +
+ 
http://sourceforge.net/projects/unxutils/files/latest/download;);
+sSuggestedHome = ;
+continue;
+}
+sHome = sSuggestedHome;
+}
+else
+{
+//validate the user input
+if ( ! aFileSystemObject.FolderExists(sHome))
+{
+stdout.WriteLine(\n Error: The directory \ + sHome +
+ \ does not exist. cat is required, please  
+
+ specify a cat tools directory. +
+ \nYou can get cat from  +
+ 
http://sourceforge.net/projects/unxutils/files/latest/download;);
+continue;
+}
+}
+//Check for the make executable
+var sCatPath = sHome + \\cat.exe;
+if (! aFileSystemObject.FileExists(sCatPath))
+{
+stdout.WriteLine(\n Error: Could not find \ + sCatPath +
+ \. cat is required, please specify a cat tools 
 +
+ directory. +
+ \nYou can get cat from  +
+ 
http://sourceforge.net/projects/unxutils/files/latest/download;);
+continue;
+}
+return sHome;
+}
+}
+
+function getSedHome()
+{
+var sSuggestedHome = WshSysEnv(OO_SDK_SED_HOME);
+
+while(true)
+{
+stdout.Write(\n Enter a sed (3.02 or higher) tools directory [ +
+ sSuggestedHome + ]:);
+var sHome = stdin.ReadLine();
+if (sHome.length == 0)
+{
+//No user input, use default.
+if ( ! aFileSystemObject.FolderExists(sSuggestedHome))
+{
+stdout.WriteLine(\n Error: Could not find directory \ +
+ sSuggestedHome + \. sed is required, please 
 +
+ specify a sed tools directory. +
+ \nYou can get sed from  +
+ 
http://sourceforge.net/projects/unxutils/files/latest/download;);
+sSuggestedHome = ;
+continue;
+}
+sHome = sSuggestedHome;
+}
+else
+{
+//validate the user input
+if ( ! aFileSystemObject.FolderExists(sHome))
+{
+stdout.WriteLine(\n Error: The directory \ + sHome +
+ \ does not exist. sed is required, please  
+
+ specify a sed tools directory

[Libreoffice-commits] core.git: framework/inc framework/Library_fwk.mk framework/Library_fwl.mk framework/source framework/util officecfg/registry

2013-06-24 Thread Ariel Constenla-Haile

 framework/Library_fwk.mk|5 
 framework/Library_fwl.mk|1 
 framework/inc/uielement/popupmenucontroller.hxx |   74 -
 framework/inc/uielement/popuptoolbarcontroller.hxx  |   96 ++
 framework/source/register/registerservices.cxx  |6 
 framework/source/register/registertemp.cxx  |4 
 framework/source/uielement/popupmenucontroller.cxx  |  235 -
 framework/source/uielement/popuptoolbarcontroller.cxx   |  406 
++
 framework/util/fwk.component|9 
 framework/util/fwl.component|3 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   33 
 11 files changed, 553 insertions(+), 319 deletions(-)

New commits:
commit a659ac906aa2d0dfd6d10e40d8a5a6d2d70cc8fc
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat May 25 22:11:08 2013 +

framework::PopupMenuController clean-up

Changed the name, it is not a PopupMenuController, but a ToolbarController 
that
shows a PopupMenu filled at runtime by a PopupMenuController

Make it a base class for other ToolbarController components, there is no 
sense
to make it a component by itself

Use this base class for three new pure UNO ToolbarController's

(cherry picked from commit 9d1015051c92900def3d465d2eb8bf179f19a398)

Conflicts:
framework/Library_fwk.mk
framework/inc/uielement/popupmenucontroller.hxx
framework/source/uielement/popupmenucontroller.cxx
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu

Change-Id: I2f5ec06df098d65ffaa17a8f7f6f3ea8774b43c3

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index bc9b711..0e36505 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -104,11 +104,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/loadenv/loadenv \
 framework/source/loadenv/targethelper \
 framework/source/register/registerservices \
+framework/source/services/ContextChangeEventMultiplexer \
 framework/source/services/autorecovery \
 framework/source/services/backingcomp \
 framework/source/services/backingwindow \
 framework/source/services/desktop \
-framework/source/services/ContextChangeEventMultiplexer \
 framework/source/services/frame \
 framework/source/services/modulemanager \
 framework/source/services/pathsettings \
@@ -143,6 +143,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/uielement/menubarmerger \
 framework/source/uielement/menubarwrapper \
 framework/source/uielement/objectmenucontroller \
+framework/source/uielement/popuptoolbarcontroller \
 framework/source/uielement/progressbarwrapper \
 framework/source/uielement/recentfilesmenucontroller \
 framework/source/uielement/spinfieldtoolbarcontroller \
@@ -161,8 +162,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/uifactory/factoryconfiguration \
 framework/source/uifactory/menubarfactory \
 framework/source/uifactory/statusbarfactory \
-framework/source/uifactory/uicontrollerfactory \
 framework/source/uifactory/toolboxfactory \
+framework/source/uifactory/uicontrollerfactory \
 framework/source/uifactory/uielementfactorymanager \
 framework/source/uifactory/windowcontentfactorymanager \
 framework/source/xml/acceleratorconfigurationreader \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index afcb77c..fe87449 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\
 framework/source/uielement/langselectionmenucontroller \
 framework/source/uielement/macrosmenucontroller \
 framework/source/uielement/newmenucontroller \
-framework/source/uielement/popupmenucontroller \
 framework/source/uielement/toolbarsmenucontroller \
 ))
 
diff --git a/framework/inc/uielement/popupmenucontroller.hxx 
b/framework/inc/uielement/popupmenucontroller.hxx
deleted file mode 100644
index 7511af00..000
--- a/framework/inc/uielement/popupmenucontroller.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional

[Libreoffice-commits] core.git: 5 commits - dbaccess/Library_dbu.mk dbaccess/source dbaccess/util framework/inc framework/source include/sfx2 include/svtools officecfg/registry sfx2/source svtools/sou

2013-06-24 Thread Ariel Constenla-Haile

 dbaccess/Library_dbu.mk |1 
 dbaccess/source/ui/control/statusbarontroller.cxx   |   40 -
 dbaccess/source/ui/inc/statusbarontroller.hxx   |   45 -
 dbaccess/source/ui/misc/uiservices.cxx  |2 
 dbaccess/util/dbu.component |3 
 framework/inc/uielement/popuptoolbarcontroller.hxx  |4 
 framework/source/uielement/popuptoolbarcontroller.cxx   |   71 +
 include/sfx2/mnuitem.hxx|   28 
 include/sfx2/tbxctrl.hxx|   38 -
 include/svtools/toolboxcontroller.hxx   |   24 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   44 -
 sfx2/source/appl/appreg.cxx |2 
 sfx2/source/menu/mnuitem.cxx|  149 
 sfx2/source/toolbox/tbxitem.cxx |  357 
--
 svtools/source/uno/toolboxcontroller.cxx|   19 
 svx/source/tbxctrls/extrusioncontrols.cxx   |2 
 svx/util/svxcore.component  |2 
 17 files changed, 260 insertions(+), 571 deletions(-)

New commits:
commit 2f3e79ee907f6e483d8886984f262fd1763adccc
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue May 28 22:09:27 2013 +

Resolves: #i122401# framework::NewToolbarController needs...

early initialization of its PopupMenu

(cherry picked from commit 5149ad822bb66cca9561b7c181c6c2279affc29a)

Conflicts:
framework/inc/uielement/popuptoolbarcontroller.hxx
framework/source/uielement/popuptoolbarcontroller.cxx

Change-Id: I619fe7b86a19b146079792a73a50d23682d04a3c

diff --git a/framework/inc/uielement/popuptoolbarcontroller.hxx 
b/framework/inc/uielement/popuptoolbarcontroller.hxx
index f8e8bf9..56f3251 100644
--- a/framework/inc/uielement/popuptoolbarcontroller.hxx
+++ b/framework/inc/uielement/popuptoolbarcontroller.hxx
@@ -77,6 +77,7 @@ namespace framework
 DECLARE_XSERVICEINFO
 private:
 void functionExecuted( const OUString rCommand );
+void SAL_CALL initialize( const ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Any  aArguments ) throw 
(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 void SAL_CALL statusChanged( const 
::com::sun::star::frame::FeatureStateEvent rEvent ) throw ( 
::com::sun::star::uno::RuntimeException );
 void SAL_CALL execute( sal_Int16 KeyModifier ) throw 
(::com::sun::star::uno::RuntimeException);
 void setItemImage( const OUString rCommand );
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index b38c617..26ac39c 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -257,6 +257,17 @@ NewToolbarController::NewToolbarController(
 }
 
 void SAL_CALL
+NewToolbarController::initialize(
+const css::uno::Sequence css::uno::Any  aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException )
+{
+PopupMenuToolbarController::initialize( aArguments );
+
+osl::MutexGuard aGuard( m_aMutex );
+createPopupMenuController();
+}
+
+void SAL_CALL
 NewToolbarController::statusChanged(
 const css::frame::FeatureStateEvent rEvent )
 throw ( css::uno::RuntimeException )
@@ -401,10 +412,7 @@ void NewToolbarController::setItemImage( const OUString 
rCommand )
 Image aMenuImage;
 
 sal_Bool bValid( Impl_ExistURLInMenu( m_xPopupMenu, aURL, sFallback, 
aMenuImage ) );
-// do not change aURL if Impl_ExistURLInMenu returned sal_False
-// this allows later initialization of the PopupMenuController on 
createPopupWindow()
-// and works even if SvFileInformationManager does not know the module
-if ( !aURL.getLength() )
+if ( !bValid )
 aURL = sFallback;
 
 sal_Bool bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
@@ -412,16 +420,9 @@ void NewToolbarController::setItemImage( const OUString 
rCommand )
 INetURLObject aURLObj( aURL );
 Image aImage = SvFileInformationManager::GetImageNoDefault( aURLObj, bBig 
);
 if ( !aImage )
-{
-if ( !!aMenuImage )
-aImage =  aMenuImage;
-else if ( !bValid )
-// If SvFileInformationManager didn't know the module, try with 
the default
-aImage = SvFileInformationManager::GetImageNoDefault( 
INetURLObject( sFallback ), bBig );
-
-if ( !aImage )
-aImage = SvFileInformationManager::GetImage( aURLObj, bBig );
-}
+aImage = !!aMenuImage ?
+aMenuImage :
+SvFileInformationManager::GetImage( aURLObj, bBig );
 
 // if everything failed, just use the image associated with the toolbar 
item

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

2013-06-23 Thread Ariel Constenla-Haile

 ucb/source/ucp/webdav/DAVResourceAccess.cxx|   43 ++-
 ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx   |5 +
 ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx |   15 
 ucb/source/ucp/webdav/webdavprovider.cxx   |   76 +
 ucb/source/ucp/webdav/webdavuseragent.hxx  |   34 +
 5 files changed, 152 insertions(+), 21 deletions(-)

New commits:
commit ae57695241d41022f4559601addbedea36b88f37
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Mar 24 12:22:15 2013 +

Resolves: #i121947# Default User-Agent

(cherry picked from commit 339d75d9c99462d63234845031f24a42e7ffdd27)

Conflicts:
ucb/source/ucp/webdav/DAVResourceAccess.cxx
ucb/source/ucp/webdav/makefile.mk

Change-Id: Ie74275cfa9953fdc4fa0801224909efbcecab3a9

diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx 
b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 531d6d1..ba6652b 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1110,32 +1110,33 @@ void DAVResourceAccess::getUserRequestHeaders(
 const OUString  rMethod,
 DAVRequestHeaders  rRequestHeaders )
 {
-if ( xEnv.is() )
-{
-uno::Reference ucb::XWebDAVCommandEnvironment  xDAVEnv(
-xEnv, uno::UNO_QUERY );
+if ( !xEnv.is() )
+return;
 
-if ( xDAVEnv.is() )
-{
-uno::Sequence beans::NamedValue  aRequestHeaders
-= xDAVEnv-getUserRequestHeaders( rURI, rMethod );
+uno::Reference ucb::XWebDAVCommandEnvironment  xDAVEnv(
+xEnv, uno::UNO_QUERY );
 
-for ( sal_Int32 n = 0; n  aRequestHeaders.getLength(); ++n )
-{
-OUString aValue;
-sal_Bool isString = aRequestHeaders[ n ].Value = aValue;
+if ( !xDAVEnv.is() )
+return;
 
-if ( !isString )
-{
-OSL_ENSURE( isString,
-DAVResourceAccess::getUserRequestHeaders :
-Value is not a string! Ignoring... );
-}
+uno::Sequence beans::NamedValue  aRequestHeaders
+= xDAVEnv-getUserRequestHeaders( rURI, rMethod );
 
-rRequestHeaders.push_back(
-DAVRequestHeader( aRequestHeaders[ n ].Name, aValue ) );
-}
+for ( sal_Int32 n = 0; n  aRequestHeaders.getLength(); ++n )
+{
+OUString aValue;
+sal_Bool isString = aRequestHeaders[ n ].Value = aValue;
+
+if ( !isString )
+{
+OSL_ENSURE( isString,
+DAVResourceAccess::getUserRequestHeaders :
+Value is not a string! Ignoring... );
+continue;
 }
+
+rRequestHeaders.push_back(
+DAVRequestHeader( aRequestHeaders[ n ].Name, aValue ) );
 }
 }
 
diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
index 6440318..78b454a 100644
--- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
@@ -79,6 +79,11 @@ serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( 
serf_request_t * in
 }
 
 
+// set request header fields
+serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt );
+// general header fields provided by caller
+setRequestHeaders( hdrs_bkt );
+
 return req_bkt;
 }
 
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx 
b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
index 60e3217..9be84da 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include SerfRequestProcessorImpl.hxx
+#include webdavuseragent.hxx
 
 namespace http_dav_ucp
 {
@@ -51,6 +52,7 @@ bool SerfRequestProcessorImpl::useChunkedEncoding() const
 
 void SerfRequestProcessorImpl::setRequestHeaders( serf_bucket_t* 
inoutSerfHeaderBucket )
 {
+bool bHasUserAgent( false );
 DAVRequestHeaders::const_iterator aHeaderIter( mrRequestHeaders.begin() );
 const DAVRequestHeaders::const_iterator aEnd( mrRequestHeaders.end() );
 
@@ -61,6 +63,11 @@ void SerfRequestProcessorImpl::setRequestHeaders( 
serf_bucket_t* inoutSerfHeader
 const OString aValue = OUStringToOString( (*aHeaderIter).second,
 
RTL_TEXTENCODING_UTF8 );
 
+OSL_TRACE( Request Header - \%s: %s\, aHeader.getStr(), 
aValue.getStr() );
+if ( !bHasUserAgent )
+bHasUserAgent = aHeaderIter-first.equalsAsciiL(
+RTL_CONSTASCII_STRINGPARAM( User-Agent ) );
+
 serf_bucket_headers_set( inoutSerfHeaderBucket,
  aHeader.getStr(),
  aValue.getStr() );
@@ -68,6 +75,14 @@ void SerfRequestProcessorImpl::setRequestHeaders( 
serf_bucket_t

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

2013-06-19 Thread Ariel Constenla-Haile

 sfx2/source/doc/printhelper.cxx |   47 +++-
 1 file changed, 23 insertions(+), 24 deletions(-)

New commits:
commit bf4ecd6138f07ca6207eeec306517eff4aff220e
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Feb 24 18:23:09 2013 +

Resolves: fdo#65908 #i114817# missing PrintableState_JOB_STARTED 
notification

(cherry picked from commit 914cb68eed75ee8aa38fbf48d029057a66a21f30)

Change-Id: Icb7c304b856cfca7f80090c2d193a0b92a27bb30

diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index e55276b..1b00652 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -789,32 +789,31 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence 
beans::PropertyValue 
 
 void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster rBC, const 
SfxHint rHint )
 {
-if ( rBC == m_pObjectShell )
+SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, rHint );
+if ( rBC != m_pObjectShell
+|| !pPrintHint
+|| pPrintHint-GetWhich() == -2 ) // -2 : CancelPrintJob
+return;
+
+if ( pPrintHint-GetWhich() == 
com::sun::star::view::PrintableState_JOB_STARTED )
 {
-SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, rHint );
-if ( pPrintHint )
-{
-if ( pPrintHint-GetWhich() == 
com::sun::star::view::PrintableState_JOB_STARTED )
-{
-if ( !m_xPrintJob.is() )
-m_xPrintJob = new SfxPrintJob_Impl( this );
-m_aPrintOptions = pPrintHint-GetOptions();
-}
-else if ( pPrintHint-GetWhich() != -2 )// -2 : CancelPrintJob
-{
-view::PrintJobEvent aEvent;
-aEvent.Source = m_xPrintJob;
-aEvent.State = (com::sun::star::view::PrintableState) 
pPrintHint-GetWhich();
-::cppu::OInterfaceContainerHelper* pContainer = 
m_aInterfaceContainer.getContainer( ::getCppuType( ( const uno::Reference 
view::XPrintJobListener *) NULL ) );
-if ( pContainer!=NULL )
-{
-::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
-while (pIterator.hasMoreElements())
-
((view::XPrintJobListener*)pIterator.next())-printJobEvent( aEvent );
-}
-}
-}
+if ( !m_xPrintJob.is() )
+m_xPrintJob = new SfxPrintJob_Impl( this );
+m_aPrintOptions = pPrintHint-GetOptions();
 }
+
+::cppu::OInterfaceContainerHelper* pContainer = 
m_aInterfaceContainer.getContainer(
+::getCppuType( ( const uno::Reference view::XPrintJobListener *) 
NULL ) );
+if ( !pContainer )
+return;
+
+view::PrintJobEvent aEvent;
+aEvent.Source = m_xPrintJob;
+aEvent.State = (com::sun::star::view::PrintableState) 
pPrintHint-GetWhich();
+
+::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+while (pIterator.hasMoreElements())
+((view::XPrintJobListener*)pIterator.next())-printJobEvent( aEvent );
 }
 
 void SAL_CALL SfxPrintHelper::addPrintJobListener( const 
::com::sun::star::uno::Reference ::com::sun::star::view::XPrintJobListener  
xListener ) throw (::com::sun::star::uno::RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst officecfg/registry

2013-06-15 Thread Ariel Constenla-Haile

 external_deps.lst|6 -
 officecfg/registry/data/org/openoffice/Office/Common.xcu |   58 +++
 officecfg/registry/data/org/openoffice/Office/Writer.xcu |6 +
 3 files changed, 65 insertions(+), 5 deletions(-)

New commits:
commit 10a7481b927d3a9940eeeff4f3ea09f2506d36de
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Jun 15 04:15:20 2013 +

i122518 - Partial revert of revision 1465678

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index dcfee1d..db9480b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -32,10 +32,68 @@
 /node
 node oor:name=Localisation
   prop oor:name=AutoMnemonic
+value xml:lang=x-no-translatetrue/value
+value xml:lang=arfalse/value
+value xml:lang=catrue/value
+value xml:lang=cstrue/value
+value xml:lang=datrue/value
+value xml:lang=detrue/value
+value xml:lang=eltrue/value
 value xml:lang=en-UStrue/value
+value xml:lang=estrue/value
+value xml:lang=ettrue/value
+value xml:lang=fitrue/value
+value xml:lang=frtrue/value
+value xml:lang=hetrue/value
+value xml:lang=hi-INtrue/value
+value xml:lang=hutrue/value
+value xml:lang=ittrue/value
+value xml:lang=jatrue/value
+value xml:lang=kotrue/value
+value xml:lang=nltrue/value
+value xml:lang=pltrue/value
+value xml:lang=pttrue/value
+value xml:lang=pt-BRtrue/value
+value xml:lang=rutrue/value
+value xml:lang=sktrue/value
+value xml:lang=sltrue/value
+value xml:lang=svtrue/value
+value xml:lang=thtrue/value
+value xml:lang=trtrue/value
+value xml:lang=zh-CNtrue/value
+value xml:lang=zh-TWtrue/value
   /prop
   prop oor:name=DialogScale
+value xml:lang=x-no-translate10/value
+value xml:lang=ca10/value
+value xml:lang=cs10/value
+value xml:lang=da10/value
+value xml:lang=de0/value
+value xml:lang=el10/value
 value xml:lang=en-US10/value
+value xml:lang=es10/value
+value xml:lang=et10/value
+value xml:lang=fi10/value
+value xml:lang=fr10/value
+value xml:lang=he10/value
+value xml:lang=hi-IN10/value
+value xml:lang=hu10/value
+value xml:lang=it10/value
+value xml:lang=nl10/value
+value xml:lang=pl13/value
+value xml:lang=pt10/value
+value xml:lang=pt-BR10/value
+value xml:lang=sk10/value
+value xml:lang=sl10/value
+value xml:lang=sv10/value
+value xml:lang=th10/value
+value xml:lang=ar13/value
+value xml:lang=ja13/value
+value xml:lang=ko13/value
+value xml:lang=ru13/value
+value xml:lang=tr13/value
+value xml:lang=zh-CN13/value
+value xml:lang=zh-TW13/value
 /prop
 /node
 node oor:name=FontAntiAliasing install:module=gconflockdown
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu 
b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index 992b135..429f571 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -50,7 +50,8 @@
   node oor:name=Insert
 node oor:name=Caption
   prop oor:name=CaptionOrderNumberingFirst
- value xml:lang=en-UStrue/value
+ value xml:lang=x-no-translate/
+ value xml:lang=hutrue/value
   /prop
   node oor:name=WriterObject
 node oor:name=Table
@@ -701,7 +702,8 @@
  node oor:name=Layout 
   node oor:name=Other 
 prop oor:name=TabStop
- value xml:lang=en-US740/value
+value xml:lang=x-no-translate1250/value
+value xml:lang=zh-CN740/value
 /prop
   /node
  /node
commit a8d5cd07fabbf7a30b79b9378b0ea042e652
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Jun 15 04:15:06 2013 +

i121823 - Update serf to new version 1.2.1

diff --git a/external_deps.lst b/external_deps.lst
index 5e02b96..3c14624 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -126,9 +126,9 @@ if ( true )
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
-SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61
-name = serf-1.2.0.tar.bz2
-URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2
+SHA1 = f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
+name = serf-1.2.1.tar.bz2
+URL1 = http://serf.googlecode.com/files/serf-1.2.1.tar.bz2
 URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
 
 if (SOLAR_JAVA==TRUE  (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http

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

2013-06-15 Thread Ariel Constenla-Haile

 odk/config/setsdkenv_unix |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0d61e5dcdbe2cec9df33ac22e3f0e4fbd6a07517
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Dec 6 12:31:21 2012 +

odk - Fix reading OOVERSION from settings/dk.mk

(cherry picked from commit decff1733c9cdeca40fc0438a1333de236c954cd)

Conflicts:
odk/setsdkenv_unix

Change-Id: I4d78ebbb9f7b6d188dcba2140f26a17a8c17732f

diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix
index 85925fe..10db4da 100755
--- a/odk/config/setsdkenv_unix
+++ b/odk/config/setsdkenv_unix
@@ -22,7 +22,7 @@ HOSTNAME=`hostname`
 CURRENTDIR=`/bin/pwd`
 SDKTMPDIR=`dirname $0`
 OO_SDK_HOME=`(cd $SDKTMPDIR  pwd  cd $CURRENTDIR) | head -n 1`
-OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -2 | head -n 1 | cut -d= 
-f2 | cut -d. -f1,2`
+OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -3 | head -n 1 | cut -d= 
-f2 | cut -d. -f1,2`
 if [ $OSTYPE = Darwin ]
 then
 OO_SDK_NAME=`basename $OO_SDK_HOME`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2013-06-07 Thread Ariel Constenla-Haile

 offapi/com/sun/star/text/AutoTextGroup.idl |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit e98c03ed6525b026ca3cd7941b3634c0f5561397
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Nov 4 02:42:08 2012 +

Resolves: #i87780# Document css::text::AutoTextGroup properties

(cherry picked from commit cdc1af8302d0998f98776ec103f1402ee9a3d6f4)

Conflicts:
offapi/com/sun/star/text/AutoTextGroup.idl

Change-Id: I543e5c34973e39c4f5fe95388411db2967f7ced2

diff --git a/offapi/com/sun/star/text/AutoTextGroup.idl 
b/offapi/com/sun/star/text/AutoTextGroup.idl
index 82d60f0..be9f194 100644
--- a/offapi/com/sun/star/text/AutoTextGroup.idl
+++ b/offapi/com/sun/star/text/AutoTextGroup.idl
@@ -20,28 +20,33 @@
 #define __com_sun_star_text_AutoTextGroup_idl__
 
 #include com/sun/star/text/XAutoTextGroup.idl
-
 #include com/sun/star/container/XIndexAccess.idl
-
 #include com/sun/star/container/XNamed.idl
 
+module com {  module sun {  module star {  module text {
 
-
- module com {  module sun {  module star {  module text {
-
-/** provides access to text blocks in a group.@see 
com::sun::star::text::AutoTextContainer
+/** provides access to text blocks in a group.
+@see com::sun::star::text::AutoTextContainer
  */
 published service AutoTextGroup
 {
 interface com::sun::star::text::XAutoTextGroup;
+
 interface com::sun::star::container::XIndexAccess;
 
 /** provides access to the name of the group.
- */
+*/
 interface com::sun::star::container::XNamed;
 
-};
+/** The path to the file containing the AutoTextEntryapos;s in this group
+ */
+[property, readonly] string FilePath;
 
+/** The title of this AutoTextGroup
+ */
+[property] string Title;
+
+};
 
 }; }; }; };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com officecfg/registry sw/inc sw/source

2013-06-07 Thread Ariel Constenla-Haile

 offapi/com/sun/star/text/ViewSettings.idl  |   34 +++--
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |9 +++
 sw/inc/viewopt.hxx |6 +-
 sw/source/ui/config/usrpref.cxx|7 +-
 sw/source/ui/uiview/viewport.cxx   |   31 ++-
 sw/source/ui/uno/unomod.cxx|6 +-
 6 files changed, 60 insertions(+), 33 deletions(-)

New commits:
commit 6005dd5366a86d6b7b1535233a99e24501e053a3
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue Dec 11 03:31:17 2012 +

Resolves: #i25945# Allow disabling scrollbar tips by API and configuration

(cherry picked from commit a2bbabbe141de1303ebf052e5c22b6e77387785e)

Conflicts:
offapi/com/sun/star/text/ViewSettings.idl
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
sw/source/ui/config/usrpref.cxx
sw/source/ui/uiview/viewport.cxx

Change-Id: I939ec22527a0b654de5f379e781c24c0a3088739

diff --git a/offapi/com/sun/star/text/ViewSettings.idl 
b/offapi/com/sun/star/text/ViewSettings.idl
index 4b626a9..dd5025d 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -23,8 +23,7 @@
 #include com/sun/star/view/DocumentZoomType.idl
 #include com/sun/star/lang/IllegalArgumentException.idl
 
-
- module com {  module sun {  module star {  module text {
+module com {  module sun {  module star {  module text {
 
 /** provides access to the settings of the controller of a text document.
  */
@@ -65,20 +64,17 @@ published service ViewSettings
  */
 [property] boolean ShowHiddenText;
 
+/** ShowHoriRuler and ShowVertRuler determine whether a ruler is visible.
+ */
+[property] boolean ShowRulers;
 
- /** ShowHoriRuler and ShowVertRuler determine whether a ruler is 
visible.
- */
-[property] boolean ShowRulers;
-
-
-/** If this property is `TRUE` and the property ShowRulers is `TRUE`,
-   the horizontal ruler is displayed.
+/** If this property is `TRUE` and the property ShowRulers is `TRUE`,
+the horizontal ruler is displayed.
  */
 [property] boolean ShowHoriRuler;
 
-
-/** If this property is `TRUE` and the property ShowRulers is `TRUE`,
-   the horizontal scroll bar is displayed.
+/** If this property is `TRUE` and the property ShowRulers is `TRUE`,
+the horizontal scroll bar is displayed.
  */
 [property] boolean ShowHoriScrollBar;
 
@@ -220,7 +216,7 @@ published service ViewSettings
  */
 [optional, property] long RasterResolutionY;
 
-/** If this property is `TRUE`, hidden characters are displayed
+/** If this property is TRUE/, hidden characters are displayed
 
 @since OOo 3.0
  */
@@ -233,6 +229,7 @@ published service ViewSettings
 @since OOo 3.0
  */
 [optional, property] boolean ShowNonprintingCharacters;
+
 /** metric unit of the horizontal ruler
 
 pUses values com::sun::star::awt::FieldUnit/p
@@ -240,6 +237,7 @@ published service ViewSettings
 @since OOo 3.1
  */
 [optional, property] long HorizontalRulerMetric;
+
 /** metric unit of the vertical ruler
 
 pUses values from com::sun::star::awt::FieldUnit/p
@@ -247,15 +245,21 @@ published service ViewSettings
 @since OOo 3.1
  */
 [optional, property] long VerticalRulerMetric;
-//-
+
 /** If this property is `TRUE`, tips for document content are shown,
 typically in a help balloon when the mouse is over the content.
 
 @since LibreOffice 4.1
  */
 [optional, property] boolean ShowContentTips;
-};
 
+/** If this property is `TRUE`, and the scroll bar is shown, a tool tip
+is displayed while scrolling.
+
+@since LibreOffice 4.2
+ */
+[optional, property] boolean ShowScrollBarTips;
+};
 
 }; }; }; };
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 78524c4..fad816c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1253,6 +1253,15 @@
 info
   descContains various window settings such as scrollbars, rules, 
etc./desc
 /info
+prop oor:name=ShowScrollBarTips oor:type=xs:boolean
+  !-- UIHints: Not accessible via user interface --
+  info
+authorarielch/author
+descEnables the user to prevent the display of help tips on the 
scrollbars programmatically./desc
+labelPrevent scrollbars help tips/label
+  /info
+  valuetrue/value
+/prop
 prop oor:name=HorizontalScroll oor:type=xs:boolean 
oor:nillable=false

[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk shell/source

2013-06-07 Thread Ariel Constenla-Haile

 offapi/UnoApi_offapi.mk|1 
 offapi/com/sun/star/system/XSimpleMailMessage2.idl |   36 +++
 shell/source/cmdmail/cmdmailmsg.cxx|   66 +++--
 shell/source/cmdmail/cmdmailmsg.hxx|   15 +++-
 shell/source/cmdmail/cmdmailsuppl.cxx  |   13 
 shell/source/win32/simplemail/smplmailclient.cxx   |   15 
 shell/source/win32/simplemail/smplmailmsg.cxx  |   12 +++
 shell/source/win32/simplemail/smplmailmsg.hxx  |   12 ++-
 shell/source/win32/simplemail/smplmailsuppl.hxx|1 
 9 files changed, 120 insertions(+), 51 deletions(-)

New commits:
commit a47a153a7f75edfe3bce33f0d34b723cbd2d5195
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue Oct 16 20:28:22 2012 +

Resolves: #i93995# Allow setting Body of a simple mail message

(cherry picked from commit 093977b1171fae4eaef13a6d32929451fc64ae66)

Conflicts:
offapi/com/sun/star/system/makefile.mk
shell/source/cmdmail/cmdmailmsg.cxx
shell/source/cmdmail/cmdmailmsg.hxx
shell/source/win32/simplemail/smplmailclient.cxx
shell/source/win32/simplemail/smplmailclient.hxx
shell/source/win32/simplemail/smplmailmsg.hxx
shell/source/win32/simplemail/smplmailsuppl.hxx

Change-Id: Ief1aefee32a6750dfed96476d2968ce76b038440

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index bd28407..1342d3f 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3582,6 +3582,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\
XSimpleMailClient \
XSimpleMailClientSupplier \
XSimpleMailMessage \
+   XSimpleMailMessage2 \
XSystemShellExecute \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\
diff --git a/offapi/com/sun/star/system/XSimpleMailMessage2.idl 
b/offapi/com/sun/star/system/XSimpleMailMessage2.idl
new file mode 100644
index 000..2108956
--- /dev/null
+++ b/offapi/com/sun/star/system/XSimpleMailMessage2.idl
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_system_XSimpleMailMessage2_idl__
+#define __com_sun_star_system_XSimpleMailMessage2_idl__
+
+#include com/sun/star/system/XSimpleMailMessage.idl
+
+module com { module sun { module star { module system {
+
+/** This interface extends XSimpleMailMessage
+
+@since LibreOffice 4.2
+*/
+interface XSimpleMailMessage2 : XSimpleMailMessage
+{
+[attribute] string Body;
+};
+
+}; }; }; };
+
+#endif
diff --git a/shell/source/cmdmail/cmdmailmsg.cxx 
b/shell/source/cmdmail/cmdmailmsg.cxx
index ca56e0f..298da1d 100644
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -17,16 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include osl/diagnose.h
 #include cmdmailmsg.hxx
-#include com/sun/star/uri/XExternalUriReferenceTranslator.hpp
-#include com/sun/star/uri/ExternalUriReferenceTranslator.hpp
-#include com/sun/star/uno/Reference.hxx
-#include com/sun/star/uno/RuntimeException.hpp
-
-//
-// namespace directives
-//
 
 using com::sun::star::lang::IllegalArgumentException;
 using com::sun::star::lang::WrappedTargetException;
@@ -38,7 +29,19 @@ using namespace cppu;
 using namespace com::sun::star::uno;
 
 
-//
+void SAL_CALL CmdMailMsg::setBody( const OUString aBody )
+throw (RuntimeException)
+{
+MutexGuard aGuard( m_aMutex );
+m_aBody = aBody;
+}
+
+OUString SAL_CALL CmdMailMsg::getBody(  )
+throw (RuntimeException)
+{
+MutexGuard aGuard( m_aMutex );
+return m_aBody;
+}
 
 void SAL_CALL CmdMailMsg::setRecipient( const OUString aRecipient )
 throw (RuntimeException)
@@ -47,8 +50,6 @@ void SAL_CALL CmdMailMsg::setRecipient( const OUString 
aRecipient )
 m_aRecipient = aRecipient;
 }
 
-//
-
 OUString SAL_CALL CmdMailMsg::getRecipient(  )
 throw (RuntimeException

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

2013-06-07 Thread Ariel Constenla-Haile

 connectivity/source/manager/mdrivermanager.cxx |   18 --
 connectivity/source/manager/mdrivermanager.hxx |1 -
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit c154f180e22e5cd494b5c71453cb93f30fd71f6e
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Feb 4 16:54:16 2013 +

Ensure UNO context propagation on drivers instantiation

Use a better approach than 33c2427824ac893b15777527b818ec99c78c61dd

(cherry picked from commit 7f635eeb69e1257a37c2d3bfe9afe5e56daf259c)

Conflicts:
connectivity/source/manager/mdrivermanager.cxx
connectivity/source/manager/mdrivermanager.hxx

Change-Id: Ic7ce5449d4c5e5231c838f9b7733fd4703e6252c

diff --git a/connectivity/source/manager/mdrivermanager.cxx 
b/connectivity/source/manager/mdrivermanager.cxx
index 6458cf0..67ea3ec 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -114,6 +114,9 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) 
throw(NoSuchElementException, W
 /// an STL functor which ensures that a SdbcDriver described by a 
DriverAccess is loaded
 struct EnsureDriver : public ::std::unary_function DriverAccess, 
DriverAccess 
 {
+EnsureDriver( const Reference XComponentContext  rxContext )
+: mxContext( rxContext ) {}
+
 const DriverAccess operator()( const DriverAccess _rDescriptor ) 
const
 {
 if ( !_rDescriptor.xDriver.is() )
@@ -121,9 +124,12 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) 
throw(NoSuchElementException, W
 if ( _rDescriptor.xComponentFactory.is() )
 // we have a factory for it
 const_cast DriverAccess ( _rDescriptor ).xDriver = 
_rDescriptor.xDriver.query(
-
_rDescriptor.xComponentFactory-createInstanceWithContext( 
_rDescriptor.xUNOContext ) );
+
_rDescriptor.xComponentFactory-createInstanceWithContext( mxContext ) );
 return _rDescriptor;
 }
+
+private:
+Reference XComponentContext  mxContext;
 };
 
 /// an STL functor which extracts a SdbcDriver from a DriverAccess
@@ -139,7 +145,8 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) 
throw(NoSuchElementException, W
 /// an STL functor which loads a driver described by a DriverAccess, and 
extracts the SdbcDriver
 struct ExtractAfterLoad : public ExtractAfterLoad_BASE
 {
-ExtractAfterLoad() : ExtractAfterLoad_BASE( ExtractDriverFromAccess(), 
EnsureDriver() ) { }
+ExtractAfterLoad( const Reference XComponentContext  rxContext )
+: ExtractAfterLoad_BASE( ExtractDriverFromAccess(), EnsureDriver( 
rxContext ) ) {}
 };
 
 struct ExtractDriverFromCollectionElement : public ::std::unary_function 
DriverCollection::value_type, ReferenceXDriver 
@@ -287,7 +294,6 @@ void OSDBCDriverManager::bootstrapDrivers()
 {   // yes - no need to load the driver immediately (load it 
later when needed)
 aDriverDescriptor.sImplementationName = 
xSI-getImplementationName();
 aDriverDescriptor.xComponentFactory = xFactory;
-aDriverDescriptor.xUNOContext = m_xContext;
 bValidDescriptor = sal_True;
 
 m_aEventLogger.log( LogLevel::CONFIG,
@@ -475,7 +481,7 @@ Reference XEnumeration  SAL_CALL 
OSDBCDriverManager::createEnumeration(  ) thr
 ODriverEnumeration::DriverArray aDrivers;
 
 // ensure that all our bootstrapped drivers are instantiated
-::std::for_each( m_aDriversBS.begin(), m_aDriversBS.end(), EnsureDriver() 
);
+::std::for_each( m_aDriversBS.begin(), m_aDriversBS.end(), EnsureDriver( 
m_xContext ) );
 
 // copy the bootstrapped drivers
 ::std::transform(
@@ -655,13 +661,13 @@ Reference XDriver  
OSDBCDriverManager::implGetDriverForURL(const OUString _rU
 aFind = ::std::find_if(
 m_aDriversBS.begin(),   // begin of search range
 m_aDriversBS.end(), // end of search range
-o3tl::unary_compose AcceptsURL, ExtractAfterLoad ( 
AcceptsURL( _rURL ), ExtractAfterLoad() )
+o3tl::unary_compose AcceptsURL, ExtractAfterLoad ( 
AcceptsURL( _rURL ), ExtractAfterLoad( m_xContext ) )
 // compose two functors: extract 
the driver from the access, then ask the resulting driver for acceptance
 );
 } // if ( m_aDriversBS.find(sDriverFactoryName ) == m_aDriversBS.end() 
)
 else
 {
-EnsureDriver aEnsure;
+EnsureDriver aEnsure( m_xContext );
 aEnsure(*aFind);
 }
 
diff --git a/connectivity/source/manager/mdrivermanager.hxx 
b/connectivity/source/manager/mdrivermanager.hxx
index be1e258..a311c02 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2013-06-07 Thread Ariel Constenla-Haile

 solenv/bin/modules/installer/control.pm |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3ad9bb02f84c05964f73ffe08495c3140ac2151e
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Jun 8 01:46:14 2013 +

Fix build breaker

The log file is checked for the word error at the end of the packaging
process, this breaks the build when the word is part of a file name,
like boost error.hpp/error.ipp headers.

diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index 3648aff..bad8c98 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -347,6 +347,9 @@ sub check_logfile
 $compareline =~ s/Error\.ulf//g;# removing all occurences of 
Error.ulf
 $compareline =~ s/Error\.idl//g;# removing all occurences of 
Error.idl
 $compareline =~ s/Error\.html//g;   # removing all occurences of 
Error.html
+# Ugly workaround for (boost) headers
+$compareline =~ s/error\.hpp//g;# removing all occurences of 
error.hpp
+$compareline =~ s/error\.ipp//g;# removing all occurences of 
error.ipp
 
 if ( $compareline =~ /\bError\b/i )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/examples

2013-06-06 Thread Ariel Constenla-Haile

 odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e013ffd6113384a9508f3eef701413c0dae6d170
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Jun 6 04:10:00 2013 +

Fix wrong import

diff --git a/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java 
b/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
index 4f44211..7e471fa 100644
--- a/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
+++ b/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
@@ -28,7 +28,7 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexContainer;
 import com.sun.star.form.FormComponentType;
 import com.sun.star.form.XForm;
-import com.sun.star.form.XFormController;
+import com.sun.star.form.runtime.XFormController;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Ariel Constenla-Haile

 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f97b3e270736284e2b189508b808711ebe46b26
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Jun 6 03:23:59 2013 +

Fix breaker when compiled with DEBUG=yes

(cherry picked from commit 07c6343beaea37e8e6254e0f988e19f1eccf38ce)

Conflicts:

odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx

Change-Id: I75278282efc80f3e9c31c413842392030beeb265

diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index 5cfe660..321bcf0 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -178,7 +178,7 @@ sal_Bool XFlatXml::importer(
 catch( Exception exc)
 {
 // something went wrong
-OSL_FAIL(exc.Message);
+
OSL_FAIL(rtl::OUStringToOString(exc.Message,RTL_TEXTENCODING_UTF8).getStr());
 return sal_False;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2013-06-05 Thread Ariel Constenla-Haile

 offapi/com/sun/star/awt/UnoControlThrobber.idl  |2 +-
 offapi/com/sun/star/awt/UnoControlThrobberModel.idl |2 +-
 offapi/com/sun/star/awt/XThrobber.idl   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 62cffb489cf7926fc6843e9ac05939b298394ad7
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Oct 8 08:23:48 2012 +

Related: #i121181# Deprecated Throbber API

(cherry picked from commit 1a172ca66feac0e1a745ce9a4839f0c8336e14bd)

Conflicts:
offapi/com/sun/star/awt/UnoControlThrobber.idl
offapi/com/sun/star/awt/UnoControlThrobberModel.idl
offapi/com/sun/star/awt/XThrobber.idl

Change-Id: If63545328b79ec8ccd89c695f17b44b992a2dcdd

diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl 
b/offapi/com/sun/star/awt/UnoControlThrobber.idl
index 20a7050..ef9e5fc 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobber.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobber.idl
@@ -30,7 +30,7 @@
 /**
 @since OOo 2.2
 @deprecated
-You should use AnimatedImagesControl.
+You should use AnimatedImagesControl and SpinningProgressControlModel
  */
 published service UnoControlThrobber
 {
diff --git a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl 
b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
index 4f5616b..363750b 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
@@ -29,7 +29,7 @@
 /**
 @since OOo 2.2
 @deprecated
-You should use SpinningAnimationControlModel.
+You should use SpinningProgressControlModel.
  */
 
 published service UnoControlThrobberModel
diff --git a/offapi/com/sun/star/awt/XThrobber.idl 
b/offapi/com/sun/star/awt/XThrobber.idl
index 8234c5a..fdbd436 100644
--- a/offapi/com/sun/star/awt/XThrobber.idl
+++ b/offapi/com/sun/star/awt/XThrobber.idl
@@ -28,7 +28,7 @@
 
 /**
 @deprecated
-You should use XAnimation, AnimatedImagesControl, and 
AnimatedImagesControlModel.
+You should use XAnimation, AnimatedImagesControl, and 
SpinningProgressControlModel.
  */
 published interface XThrobber: com::sun::star::uno::XInterface
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2013-06-05 Thread Ariel Constenla-Haile

 offapi/com/sun/star/awt/SpinningProgressControlModel.idl |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6d51f9f948c5bf877ec8a53e3716f00fe5e81a23
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Oct 8 08:40:27 2012 +

Resolves: #i121180# Fix SpinningProgressControlModel description

IDL description by Bernard Marcelly

(cherry picked from commit 56da9fdf911795afcddaf3f30bbdcf8396a8e373)

Conflicts:
offapi/com/sun/star/awt/SpinningProgressControlModel.idl

Change-Id: I893615fc6432432971311aa20eb9180f32ec747e

diff --git a/offapi/com/sun/star/awt/SpinningProgressControlModel.idl 
b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
index 7d55386..98cbc23 100644
--- a/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
+++ b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
@@ -26,8 +26,10 @@
 module com { module sun { module star { module awt {
 
 
-/** is a specialization of the AnimatedImagesControlModel which provides 
standard image sets
-for displaying a non-procentual progress.
+/** is a specialization of the AnimatedImagesControlModel.
+
+pTo show a progress which cannot be expressed as a percentage of 
execution,
+it displays animated images from a standard image set./p
 
 pThree image sets are provided, of size 16x16, 32x32, and 64x64 
pixels./p
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-06-05 Thread Ariel Constenla-Haile

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a1b7295260b0293ebf7d89bd84806b5b52aa07a4
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Apr 26 21:56:09 2013 +

Specify an icon for .uno:ExtendedHelp

(cherry picked from commit 52a0a12e677e96ae0df70a710c3e10f00c8abf4b)

Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

Change-Id: If5da2911b3ca94b93e09917f74640ff5ac9f75f3

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index bbed900..dbdc93a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1505,6 +1505,9 @@
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USWhat's ~This?/value
 /prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
   /node
   node oor:name=.uno:ActiveHelp oor:op=replace
 prop oor:name=Label oor:type=xs:string
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/examples

2013-06-05 Thread Ariel Constenla-Haile

 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 07c6343beaea37e8e6254e0f988e19f1eccf38ce
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Jun 6 03:23:59 2013 +

Fix breaker when compiled with DEBUG=yes

diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index b887ba7..d55d387 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -167,7 +167,7 @@ sal_Bool XFlatXml::importer(
 catch( Exception exc)
 {
 // something went wrong
-OSL_ENSURE(0, exc.Message);
+OSL_ENSURE(0, 
rtl::OUStringToOString(exc.Message,RTL_TEXTENCODING_UTF8).getStr());
 return sal_False;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ucb/source

2013-06-01 Thread Ariel Constenla-Haile

 ucb/source/ucp/ftp/ftpcfunc.cxx  |   14 +++--
 ucb/source/ucp/ftp/ftpcfunc.hxx  |2 
 ucb/source/ucp/ftp/ftpinpstr.cxx |   92 +--
 ucb/source/ucp/ftp/ftpinpstr.hxx |   29 
 ucb/source/ucp/ftp/ftpurl.cxx|   26 ++-
 ucb/source/ucp/ftp/ftpurl.hxx|4 -
 6 files changed, 70 insertions(+), 97 deletions(-)

New commits:
commit c4ef17d5e2844ca8d2459a3bfa1f91d99ac297f2
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Jun 1 17:16:49 2013 +

i122273 - Avoid using tmpfile()

diff --git a/ucb/source/ucp/ftp/ftpcfunc.cxx b/ucb/source/ucp/ftp/ftpcfunc.cxx
index 7146308..f6adc8b 100644
--- a/ucb/source/ucp/ftp/ftpcfunc.cxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.cxx
@@ -33,7 +33,7 @@
 
 #include ftpcontentidentifier.hxx
 #include ftpinpstr.hxx
-#include stdio.h
+#include osl/file.h
 
 using namespace ftp;
 using namespace com::sun::star::uno;
@@ -42,11 +42,15 @@ extern C {
 
 int file_write(void *buffer,size_t size,size_t nmemb,void *stream)
 {
-FILE* file =
-reinterpret_castFILE*(stream);
-if(!file)
+oslFileHandle aFile = reinterpret_cast oslFileHandle ( stream );
+if( !aFile )
 return 0;
-return fwrite(buffer,size,nmemb,file);
+
+sal_uInt64 nWritten = 0;
+sal_uInt64 nToWrite( size * nmemb );
+osl_writeFile( aFile, buffer, nToWrite, nWritten );
+
+return nWritten != nToWrite ? 0 : nmemb;
 }
 
 }
diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx
index 8da6a93..2b31710 100644
--- a/ucb/source/ucp/ftp/ftpcfunc.hxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.hxx
@@ -48,7 +48,7 @@ extern C {
 
 /** callback for curl_easy_perform(),
  *  forwarding the written content to the stream.
- *  stream has to be of type 'FTPStreamContainer'.
+ *  stream has to be of type oslFileHandle.
  */
 
 
diff --git a/ucb/source/ucp/ftp/ftpinpstr.cxx b/ucb/source/ucp/ftp/ftpinpstr.cxx
index d44bc0b..be88f35 100644
--- a/ucb/source/ucp/ftp/ftpinpstr.cxx
+++ b/ucb/source/ucp/ftp/ftpinpstr.cxx
@@ -37,7 +37,6 @@
 #include algorithm
 #define STD_ALGORITHM
 #endif
-#include stdio.h
 
 using namespace ftp;
 using namespace com::sun::star::uno;
@@ -45,53 +44,29 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::io;
 
 
-FTPInputStream::FTPInputStream(FILE* tmpfl)
-: m_tmpfl(tmpfl ? tmpfl : tmpfile())
+FTPInputStream::FTPInputStream( oslFileHandle tmpfl )
+: m_tmpfl(tmpfl)
+, m_nLength( 0 )
 {
-fseek(m_tmpfl,0,SEEK_END);
-//  fpos_t pos;
-//  fgetpos(m_tmpfl,pos);
-long pos = ftell(m_tmpfl);
-rewind(m_tmpfl);
-m_nLength = sal_Int64(pos);
+if ( !m_tmpfl )
+osl_createTempFile( NULL, m_tmpfl, NULL );
+OSL_ENSURE( m_tmpfl, input stream without tempfile! );
+
+if ( osl_setFilePos( m_tmpfl, osl_Pos_End, 0 ) == osl_File_E_None )
+{
+sal_uInt64 nFileSize = 0;
+if ( osl_getFilePos( m_tmpfl, nFileSize ) == osl_File_E_None )
+m_nLength = nFileSize;
+osl_setFilePos( m_tmpfl, osl_Pos_Absolut, 0 );
+}
 }
 
-
-
 FTPInputStream::~FTPInputStream()
 {
 if ( 0 != m_tmpfl)
-fclose(m_tmpfl);
-}
-
-
-Any SAL_CALL FTPInputStream::queryInterface(
-const Type rType
-)
-throw(
-RuntimeException
-)
-{
-Any aRet = ::cppu::queryInterface(rType,
-  SAL_STATIC_CAST( XInputStream*,this ),
-  SAL_STATIC_CAST( XSeekable*,this ) );
-
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+osl_closeFile(m_tmpfl);
 }
 
-
-
-void SAL_CALL FTPInputStream::acquire( void ) throw() {
-OWeakObject::acquire();
-}
-
-
-
-void SAL_CALL FTPInputStream::release( void ) throw() {
-OWeakObject::release();
-}
-
-
 sal_Int32 SAL_CALL FTPInputStream::readBytes(Sequence sal_Int8  aData,
  sal_Int32 nBytesToRead)
 throw(NotConnectedException,
@@ -101,23 +76,22 @@ sal_Int32 SAL_CALL FTPInputStream::readBytes(Sequence 
sal_Int8  aData,
 {
 osl::MutexGuard aGuard(m_aMutex);
 
-if(0 = nBytesToRead  aData.getLength()  nBytesToRead)
-aData.realloc(nBytesToRead);
+sal_uInt64 nBeforePos( 0 );
+sal_uInt64 nBytesRequested( nBytesToRead );
+sal_uInt64 nBytesRead( 0 );
 
-// fpos_t bpos,epos;
+osl_getFilePos( m_tmpfl, nBeforePos );
 
-// fgetpos(m_tmpfl,bpos);
-// fread(aData.getArray(),nBytesToRead,1,m_tmpfl);
-// fgetpos(m_tmpfl,epos);
-long bpos,epos;
+if ( 0 == ( nBytesRequested = std::min sal_uInt64 ( m_nLength - 
nBeforePos, nBytesRequested ) ) )
+return 0;
 
-bpos = ftell(m_tmpfl);
-if (fread(aData.getArray(),nBytesToRead,1,m_tmpfl) != 1)
-throw IOException();
+if ( 0 = nBytesToRead  aData.getLength()  nBytesToRead )
+aData.realloc( nBytesToRead );
 
-epos = ftell(m_tmpfl

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source

2013-05-30 Thread Ariel Constenla-Haile

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9de24052fb470d13c4848fb2eabc3d53ebf1521c
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri May 31 02:42:46 2013 +

Fix build breaker

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 32cb9a3..d912807 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -488,8 +488,8 @@ void ParaPropertyPanel::InitToolBoxSpacing()
 maTopDist-SetModifyHdl(aLink);
 maBottomDist-SetModifyHdl( aLink );
 
-mpTopDist-SetAccessibleName(mpTopDist-GetQuickHelpText());
-mpBottomDist-SetAccessibleName(mpBottomDist-GetQuickHelpText());
+maTopDist-SetAccessibleName(maTopDist-GetQuickHelpText());
+maBottomDist-SetAccessibleName(maBottomDist-GetQuickHelpText());
 
 maTbxUL_IncDec-SetItemImage(TOOLBOX_ITEM1, maParInc);
 maTbxUL_IncDec-SetItemImage(TOOLBOX_ITEM2, maParDec);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/source officecfg/registry

2013-05-28 Thread Ariel Constenla-Haile

 extensions/source/logging/loggerconfig.cxx  |   43 +++-
 officecfg/registry/schema/org/openoffice/Office/Logging.xcs |   18 -
 2 files changed, 57 insertions(+), 4 deletions(-)

New commits:
commit 7e7e4c7a38764283ea334187fae4e21bd7d4f478
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Oct 15 03:36:40 2012 +

Resolves: #i121216# Allow unique logger file name

(cherry picked from commit a9606aa4d8a6bcb3955d991ee45c56cb93be2450)

Conflicts:
officecfg/registry/schema/org/openoffice/Office/Logging.xcs

Change-Id: I25719f2898df2f91ef9c71234e9eab83f8140b96

diff --git a/extensions/source/logging/loggerconfig.cxx 
b/extensions/source/logging/loggerconfig.cxx
index af0fac9..dae01ef 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -19,6 +19,7 @@
 
 
 #include loggerconfig.hxx
+#include stdio.h
 
 #include com/sun/star/configuration/theDefaultProvider.hpp
 #include com/sun/star/lang/XMultiServiceFactory.hpp
@@ -33,6 +34,8 @@
 #include com/sun/star/logging/XLogFormatter.hpp
 
 #include tools/diagnose_ex.h
+#include osl/process.h
+#include rtl/ustrbuf.hxx
 
 #include comphelper/componentcontext.hxx
 
@@ -97,9 +100,47 @@ namespace logging
 try { sLoggerName = _rxLogger-getName(); }
 catch( const Exception ) { DBG_UNHANDLED_EXCEPTION(); }
 
+TimeValue aTimeValue;
+oslDateTime aDateTime;
+OSL_VERIFY( osl_getSystemTime( aTimeValue ) );
+OSL_VERIFY( osl_getDateTimeFromTimeValue( aTimeValue, aDateTime 
) );
+
+char buffer[ 30 ];
+const size_t buffer_size = sizeof( buffer );
+
+snprintf( buffer, buffer_size, %04i-%02i-%02i,
+  (int)aDateTime.Year,
+  (int)aDateTime.Month,
+  (int)aDateTime.Day );
+rtl::OUString sDate = rtl::OUString::createFromAscii( buffer );
+
+snprintf( buffer, buffer_size, %02i-%02i-%02i.%03i,
+(int)aDateTime.Hours,
+(int)aDateTime.Minutes,
+(int)aDateTime.Seconds,
+::sal::static_int_cast sal_Int16 ( aDateTime.NanoSeconds / 
1000 ) );
+rtl::OUString sTime = rtl::OUString::createFromAscii( buffer );
+
+rtl::OUStringBuffer aBuff;
+aBuff.append( sDate );
+aBuff.append( sal_Unicode( '.' ) );
+aBuff.append( sTime );
+rtl::OUString sDateTime = aBuff.makeStringAndClear();
+
+oslProcessIdentifier aProcessId = 0;
+oslProcessInfo info;
+info.Size = sizeof (oslProcessInfo);
+if ( osl_getProcessInfo ( 0, osl_Process_IDENTIFIER, info ) == 
osl_Process_E_None)
+aProcessId = info.Ident;
+rtl::OUString aPID = rtl::OUString::valueOf( sal_Int64( aProcessId 
) );
+
 Variable aVariables[] =
 {
-Variable( RTL_CONSTASCII_USTRINGPARAM( $(loggername) ), 
sLoggerName )
+Variable( RTL_CONSTASCII_USTRINGPARAM( $(loggername) ), 
sLoggerName ),
+Variable( RTL_CONSTASCII_USTRINGPARAM( $(date) ), sDate ),
+Variable( RTL_CONSTASCII_USTRINGPARAM( $(time) ), sTime ),
+Variable( RTL_CONSTASCII_USTRINGPARAM( $(datetime) ), 
sDateTime ),
+Variable( RTL_CONSTASCII_USTRINGPARAM( $(pid) ), aPID )
 };
 
 for ( size_t i = 0; i  SAL_N_ELEMENTS( aVariables ); ++i )
diff --git a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
index 2679d1f..5801359 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
@@ -46,9 +46,21 @@
 /info
 prop oor:name=FileURL oor:type=xs:string oor:nillable=false
   info
-descSpecifies the file URL for the log handler. The default 
value here will expand to a file
-with the same name as the logger for which the handler is used, 
with extension .log.
-It will be located in the user's OOo data folder./desc
+descSpecifies the file URL for the log handler.
+This URL will be resolved using the
+::com::sun::star::util::PathSubstitution service. That is, it 
is
+allowed to include placeholders supported by that service,
+such as $(userurl). Beside these, the following default
+placeholders can also be included:
+$(loggername) - the name of the logger
+$(date) - the current date
+$(time) - the current time
+$(datetime) - the current date time
+$(pid) - the process identifier
+The default value here will expand to a file

[Libreoffice-commits] core.git: 5 commits - configure.ac include/sfx2 include/svx officecfg/registry sc/source sd/source sfx2/source solenv/bin svx/source

2013-05-28 Thread Ariel Constenla-Haile

 configure.ac |   
17 +-
 include/sfx2/shell.hxx   |   
15 +
 include/sfx2/sidebar/EnumContext.hxx |
1 
 include/svx/sidebar/SelectionAnalyzer.hxx|   
16 +-
 include/svx/sidebar/SelectionChangeHandler.hxx   |
4 
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
12 -
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |
3 
 sc/source/ui/drawfunc/drawsh2.cxx|   
26 ++-
 sc/source/ui/inc/drawsh.hxx  |
4 
 sd/source/ui/inc/DrawViewShell.hxx   |
5 
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx  |   
18 --
 sd/source/ui/view/drviews1.cxx   |   
12 -
 sd/source/ui/view/drviewsa.cxx   |   
36 ++--
 sd/source/ui/view/outlnvsh.cxx   |
2 
 sd/source/ui/view/viewshel.cxx   |
2 
 sfx2/source/control/shell.cxx|   
25 +--
 sfx2/source/sidebar/EnumContext.cxx  |
8 +
 solenv/bin/msg_filter|   
78 --
 svx/source/sidebar/SelectionAnalyzer.cxx |   
54 --
 svx/source/sidebar/SelectionChangeHandler.cxx|
5 
 svx/source/sidebar/text/TextPropertyPanel.cxx|   
37 
 svx/source/sidebar/text/TextPropertyPanel.hxx|
9 +
 22 files changed, 206 insertions(+), 183 deletions(-)

New commits:
commit 0a5fda73e82b7c47db2612954f061f9ab2824de8
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun May 26 17:38:27 2013 +

Remove icon property from commands without icon

(cherry picked from commit 76f5fa8ed67bfcd162de49a74b2f4484935d55b2)

Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

Change-Id: I72d3f6ae382793943084235a8e8112bba509e694

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index a1fef54..824eb62 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1236,33 +1236,21 @@
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USPicture Placeholders/value
 /prop
-prop oor:name=Properties oor:type=xs:int
-  value1/value
-/prop
   /node
   node oor:name=.uno:FillDraft oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USContour Mode/value
 /prop
-prop oor:name=Properties oor:type=xs:int
-  value1/value
-/prop
   /node
   node oor:name=.uno:TextDraft oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USText Placeholders/value
 /prop
-prop oor:name=Properties oor:type=xs:int
-  value1/value
-/prop
   /node
   node oor:name=.uno:LineDraft oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USLine Contour Only/value
 /prop
-prop oor:name=Properties oor:type=xs:int
-  value1/value
-/prop
   /node
   node oor:name=.uno:SolidCreate oor:op=replace
 prop oor:name=Label oor:type=xs:string
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 1134e9e..46ed65a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2282,9 +2282,6 @@
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USStop Loading/value
 /prop
-prop oor:name=Properties oor:type=xs:int
-  value1/value
-/prop
   /node
   node oor:name=.uno:Radiobutton oor:op=replace
 prop oor:name=Label oor:type=xs:string
commit aa4ceee5cc4fab5d55ba4cf7970a41df4e2d8ca7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue May 28 16:39:49 2013 +0100

drop ludicrously old msg_filter foo

Change-Id: Ie53c9acd51a53fbb11f0735739edbf18551a620b

diff --git a/solenv/bin/msg_filter b/solenv/bin/msg_filter
deleted file mode 100755
index 2d59e16..000
--- a/solenv/bin/msg_filter

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - framework/inc framework/source offapi/com svx/source svx/util

2013-05-28 Thread Ariel Constenla-Haile

 framework/inc/uielement/popuptoolbarcontroller.hxx|1 
 framework/source/uielement/popuptoolbarcontroller.cxx |   29 +-
 offapi/com/sun/star/awt/MessageBoxResults.idl |4 +-
 offapi/com/sun/star/awt/MessageBoxType.idl|4 +-
 svx/source/tbxctrls/extrusioncontrols.cxx |2 -
 svx/util/svxcore.component|2 -
 6 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 82194a19ff4f29c8451c8e6ab6fe4f1b9d08df27
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue May 28 22:09:37 2013 +

i121544 - Fix header guards

Found by: Tsutomu Uchino

diff --git a/offapi/com/sun/star/awt/MessageBoxResults.idl 
b/offapi/com/sun/star/awt/MessageBoxResults.idl
index baa72cf..ba551fc 100644
--- a/offapi/com/sun/star/awt/MessageBoxResults.idl
+++ b/offapi/com/sun/star/awt/MessageBoxResults.idl
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __com_sun_star_awt_MessageBoxCommand_idl__
-#define __com_sun_star_awt_MessageBoxCommand_idl__
+#ifndef __com_sun_star_awt_MessageBoxResults_idl__
+#define __com_sun_star_awt_MessageBoxResults_idl__
 
 module com {  module sun {  module star {  module awt {
 
diff --git a/offapi/com/sun/star/awt/MessageBoxType.idl 
b/offapi/com/sun/star/awt/MessageBoxType.idl
index c18274e..b3bfd2d 100644
--- a/offapi/com/sun/star/awt/MessageBoxType.idl
+++ b/offapi/com/sun/star/awt/MessageBoxType.idl
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __com_sun_star_awt_MessageBoxCommand_idl__
-#define __com_sun_star_awt_MessageBoxCommand_idl__
+#ifndef __com_sun_star_awt_MessageBoxType_idl__
+#define __com_sun_star_awt_MessageBoxType_idl__
 
 module com {  module sun {  module star {  module awt {
 
commit 5149ad822bb66cca9561b7c181c6c2279affc29a
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue May 28 22:09:27 2013 +

i122401 - framework::NewToolbarController needs early initialization of its 
PopupMenu

diff --git a/framework/inc/uielement/popuptoolbarcontroller.hxx 
b/framework/inc/uielement/popuptoolbarcontroller.hxx
index f6b1ae0..99e4d90 100644
--- a/framework/inc/uielement/popuptoolbarcontroller.hxx
+++ b/framework/inc/uielement/popuptoolbarcontroller.hxx
@@ -81,6 +81,7 @@ namespace framework
 DECLARE_XSERVICEINFO
 private:
 void functionExecuted( const rtl::OUString rCommand );
+void SAL_CALL initialize( const ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Any  aArguments ) throw 
(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 void SAL_CALL statusChanged( const 
::com::sun::star::frame::FeatureStateEvent rEvent ) throw ( 
::com::sun::star::uno::RuntimeException );
 void SAL_CALL execute( sal_Int16 KeyModifier ) throw 
(::com::sun::star::uno::RuntimeException);
 void setItemImage( const rtl::OUString rCommand );
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index 87bf920..cb19d84 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -265,6 +265,17 @@ NewToolbarController::NewToolbarController(
 }
 
 void SAL_CALL
+NewToolbarController::initialize(
+const css::uno::Sequence css::uno::Any  aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException )
+{
+PopupMenuToolbarController::initialize( aArguments );
+
+osl::MutexGuard aGuard( m_aMutex );
+createPopupMenuController();
+}
+
+void SAL_CALL
 NewToolbarController::statusChanged(
 const css::frame::FeatureStateEvent rEvent )
 throw ( css::uno::RuntimeException )
@@ -409,10 +420,7 @@ void NewToolbarController::setItemImage( const OUString 
rCommand )
 Image aMenuImage;
 
 sal_Bool bValid( Impl_ExistURLInMenu( m_xPopupMenu, aURL, sFallback, 
aMenuImage ) );
-// do not change aURL if Impl_ExistURLInMenu returned sal_False
-// this allows later initialization of the PopupMenuController on 
createPopupWindow()
-// and works even if SvFileInformationManager does not know the module
-if ( !aURL.getLength() )
+if ( !bValid )
 aURL = sFallback;
 
 sal_Bool bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
@@ -421,16 +429,9 @@ void NewToolbarController::setItemImage( const OUString 
rCommand )
 INetURLObject aURLObj( aURL );
 Image aImage = SvFileInformationManager::GetImageNoDefault( aURLObj, bBig, 
bHC );
 if ( !aImage )
-{
-if ( !!aMenuImage )
-aImage =  aMenuImage;
-else if ( !bValid )
-// If SvFileInformationManager didn't know the module, try with 
the default
-aImage = SvFileInformationManager::GetImageNoDefault( 
INetURLObject( sFallback ), bBig, bHC );
-
-if ( !aImage )
-aImage = SvFileInformationManager

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source

2013-05-28 Thread Ariel Constenla-Haile

 sw/source/ui/fldui/fldref.src |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 5e59a33a330ec1bbc7ebea0c43d59eadc7460b9b
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed May 29 00:44:00 2013 +

i122351 - Rearrange controls of Cross-reference page in Fields dialog

Patch by: Tsutomu Uchino

diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src
index 541c88a..55eccd1 100644
--- a/sw/source/ui/fldui/fldref.src
+++ b/sw/source/ui/fldui/fldref.src
@@ -42,7 +42,7 @@ TabPage TP_FLD_REF
 HelpID = sw:ListBox:TP_FLD_REF:LB_REFTYPE;
 Border = TRUE ;
 Pos = MAP_APPFONT ( 6 , 14 ) ;
-Size = MAP_APPFONT ( 76 , 165 ) ;
+Size = MAP_APPFONT ( 76 , 73 ) ;
 TabStop = TRUE ;
 AutoHScroll = TRUE ;
 };
@@ -58,7 +58,7 @@ TabPage TP_FLD_REF
 HelpID = sw:ListBox:TP_FLD_REF:LB_REFSELECTION;
 Border = TRUE ;
 Pos = MAP_APPFONT ( 88 , 14 ) ;
-Size = MAP_APPFONT ( 166 , 73 ) ;
+Size = MAP_APPFONT ( 166 , 136 ) ;
 TabStop = TRUE ;
 Sort = TRUE ;
 };
@@ -68,12 +68,12 @@ TabPage TP_FLD_REF
 HelpID = HID_REFSELECTION_TOOLTIP ;
 Border = TRUE ;
 Pos = MAP_APPFONT ( 88 , 14 ) ;
-Size = MAP_APPFONT ( 166 , 73 ) ;
+Size = MAP_APPFONT ( 166 , 136 ) ;
 TabStop = TRUE ;
 };
 FixedText FT_REFFORMAT
 {
-Pos = MAP_APPFONT ( 88 , 93 ) ;
+Pos = MAP_APPFONT ( 6 , 93 ) ;
 Size = MAP_APPFONT ( 76 , 8 ) ;
 Left = TRUE ;
 Text [ en-US ] = Insert ~reference to ;
@@ -82,7 +82,7 @@ TabPage TP_FLD_REF
 {
 HelpID = sw:ListBox:TP_FLD_REF:LB_REFFORMAT;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 88 , 104 ) ;
+Pos = MAP_APPFONT ( 6 , 104 ) ;
 Size = MAP_APPFONT ( 76 , 75 ) ;
 TabStop = TRUE ;
 DropDown = FALSE ;
@@ -90,8 +90,8 @@ TabPage TP_FLD_REF
 };
 FixedText FT_REFNAME
 {
-Pos = MAP_APPFONT ( 170 , 93 ) ;
-Size = MAP_APPFONT ( 84 , 10 ) ;
+Pos = MAP_APPFONT ( 88 , 155 ) ;
+Size = MAP_APPFONT ( 80 , 10 ) ;
 Left = TRUE ;
 Text [ en-US ] = Na~me ;
 };
@@ -99,15 +99,15 @@ TabPage TP_FLD_REF
 {
 HelpID = sw:Edit:TP_FLD_REF:ED_REFNAME;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 170 , 104 ) ;
-Size = MAP_APPFONT ( 84 , 12 ) ;
+Pos = MAP_APPFONT ( 88 , 167 ) ;
+Size = MAP_APPFONT ( 80 , 12 ) ;
 TabStop = TRUE ;
 Left = TRUE ;
 };
 FixedText FT_REFVALUE
 {
-Pos = MAP_APPFONT ( 170 , 122 ) ;
-Size = MAP_APPFONT ( 84 , 8 ) ;
+Pos = MAP_APPFONT ( 174 , 155 ) ;
+Size = MAP_APPFONT ( 80 , 8 ) ;
 Text [ en-US ] = ~Value ;
 Disable = TRUE ;
 Left = TRUE ;
@@ -116,8 +116,8 @@ TabPage TP_FLD_REF
 {
 HelpID = sw:Edit:TP_FLD_REF:ED_REFVALUE;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 170 , 136 ) ;
-Size = MAP_APPFONT ( 84 , 12 ) ;
+Pos = MAP_APPFONT ( 174 , 167 ) ;
+Size = MAP_APPFONT ( 80 , 12 ) ;
 TabStop = TRUE ;
 Disable = TRUE ;
 Left = TRUE ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-27 Thread Ariel Constenla-Haile

 framework/source/services/backingwindow.cxx |  191 +---
 framework/source/services/backingwindow.hxx |   19 +-
 2 files changed, 73 insertions(+), 137 deletions(-)

New commits:
commit 174e32567f410e9049e9856629896ae6a798d752
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat May 25 22:10:24 2013 +

Recent files menu in the StartModule should be the same as in the menubar

(cherry picked from commit cbf0812a9bcd4287af1f5db0f2c30caf1508baa6)

Conflicts:
framework/source/services/backingwindow.cxx
framework/source/services/backingwindow.hxx

Change-Id: I49dc11e1cf9bd6831c16e53d24a131de4d565373

diff --git a/framework/source/services/backingwindow.cxx 
b/framework/source/services/backingwindow.cxx
index 5f03d48..7dab8c9 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -46,6 +46,8 @@
 #include comphelper/sequenceashashmap.hxx
 #include comphelper/configurationhelper.hxx
 
+#include toolkit/awt/vclxmenu.hxx
+
 #include cppuhelper/implbase1.hxx
 
 #include rtl/strbuf.hxx
@@ -61,7 +63,7 @@
 #include com/sun/star/task/XJobExecutor.hpp
 #include com/sun/star/util/XStringWidth.hpp
 #include com/sun/star/util/URLTransformer.hpp
-
+#include com/sun/star/frame/PopupMenuControllerFactory.hpp
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -69,6 +71,8 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 using namespace framework;
 
+#define RECENT_FILE_LIST.uno:RecentFileList
+
 #define WRITER_URL  private:factory/swriter
 #define CALC_URLprivate:factory/scalc
 #define IMPRESS_WIZARD_URL private:factory/simpress?slot=6686
@@ -149,15 +153,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 mnHideExternalLinks( 0 ),
 mpAccExec( NULL ),
 mnBtnPos( 120 ),
-mnBtnTop( 150 ),
-mpRecentMenu( NULL )
+mnBtnTop( 150 )
 {
 mnColumnWidth[0] = mnColumnWidth[1] = 0;
 mnTextColumnWidth[0] = mnTextColumnWidth[1] = 0;
 
 try
 {
-Referencelang::XMultiServiceFactory xConfig = 
configuration::theDefaultProvider::get( 
comphelper::getProcessComponentContext() );
+mxContext.set( ::comphelper::getProcessComponentContext(), 
uno::UNO_SET_THROW );
+Referencelang::XMultiServiceFactory xConfig = 
configuration::theDefaultProvider::get( mxContext );
 SequenceAny args(1);
 PropertyValue val(
 nodepath,
@@ -172,9 +176,20 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 Any value( xNameAccess-getByName(StartCenterHideExternalLinks) 
);
 mnHideExternalLinks = value.getsal_Int32();
 }
+
+mxPopupMenuFactory.set(
+frame::PopupMenuControllerFactory::create( mxContext ) );
+// TODO If there is no PopupMenuController, the button should be a 
nomral one not a MenuButton
+if ( mxPopupMenuFactory-hasController(
+OUString( RECENT_FILE_LIST ) , 
OUString(com.sun.star.frame.StartModule) ) )
+{
+mxPopupMenu.set( 
mxContext-getServiceManager()-createInstanceWithContext(
+OUString( com.sun.star.awt.PopupMenu ), mxContext ), 
uno::UNO_QUERY_THROW );
+}
 }
-catch (const Exception)
+catch (const Exception e)
 {
+SAL_WARN( fwk, BackingWindow - caught an exception!   e.Message 
);
 }
 
 OUString aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
@@ -244,8 +259,24 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 BackingWindow::~BackingWindow()
 {
 maToolbox.RemoveEventListener( LINK( this, BackingWindow, 
WindowEventListener ) );
-delete mpRecentMenu;
 delete mpAccExec;
+
+if( mxPopupMenuController.is() )
+{
+Reference lang::XComponent  xComponent( mxPopupMenuController, 
UNO_QUERY );
+if( xComponent.is() )
+{
+try
+{
+xComponent-dispose();
+}
+catch (...)
+{}
+}
+mxPopupMenuController.clear();
+}
+mxPopupMenuFactory.clear();
+mxPopupMenu.clear();
 }
 
 void BackingWindow::GetFocus()
@@ -282,117 +313,40 @@ IMPL_LINK( BackingWindow, WindowEventListener, 
VclSimpleEvent*, pEvent )
 
 void BackingWindow::prepareRecentFileMenu()
 {
-if( ! mpRecentMenu )
-mpRecentMenu = new PopupMenu();
-mpRecentMenu-Clear();
-maRecentFiles.clear();
-
-// get recent file list and dispatch arguments
-Sequence Sequence PropertyValue   aHistoryList( 
SvtHistoryOptions().GetList( ePICKLIST ) );
-
-sal_Int32 nPickListMenuItems = ( aHistoryList.getLength()  99 ) ? 99 : 
aHistoryList.getLength();
+if( ! mxPopupMenu.is() )
+return;
 
-if( ( nPickListMenuItems  0 ) )
+if ( !mxPopupMenuController.is() )
 {
-maRecentFiles.reserve( nPickListMenuItems );
-for ( sal_Int32 i = 0; i  nPickListMenuItems; i

[Libreoffice-commits] core.git: basctl/uiconfig chart2/uiconfig dbaccess/uiconfig framework/uiconfig sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig

2013-05-27 Thread Ariel Constenla-Haile

 basctl/uiconfig/basicide/toolbar/standardbar.xml   |2 +-
 chart2/uiconfig/toolbar/standardbar.xml|4 ++--
 dbaccess/uiconfig/dbapp/toolbar/toolbar.xml|4 ++--
 framework/uiconfig/startmodule/toolbar/standardbar.xml |2 +-
 sc/uiconfig/scalc/toolbar/standardbar.xml  |2 +-
 sd/uiconfig/sdraw/toolbar/standardbar.xml  |2 +-
 sd/uiconfig/simpress/toolbar/standardbar.xml   |2 +-
 starmath/uiconfig/smath/toolbar/standardbar.xml|2 +-
 sw/uiconfig/sglobal/toolbar/standardbar.xml|2 +-
 sw/uiconfig/sweb/toolbar/standardbar.xml   |2 +-
 sw/uiconfig/swform/toolbar/standardbar.xml |2 +-
 sw/uiconfig/swreport/toolbar/standardbar.xml   |2 +-
 sw/uiconfig/swriter/toolbar/standardbar.xml|2 +-
 sw/uiconfig/swxform/toolbar/standardbar.xml|2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit eaad3098c605390b9312e37aa05dd8288ea81888
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat May 25 22:11:30 2013 +

Make .uno:Open a drop-down toolbar item

(cherry picked from commit b38a51d67373daf9a45a4701e7c760c7b3571a66)

Conflicts:
chart2/uiconfig/toolbar/standardbar.xml
dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
sc/uiconfig/scalc/toolbar/standardbar.xml
sd/uiconfig/sdraw/toolbar/standardbar.xml
starmath/uiconfig/smath/toolbar/standardbar.xml
sw/uiconfig/sglobal/toolbar/standardbar.xml
sw/uiconfig/sweb/toolbar/standardbar.xml
sw/uiconfig/swform/toolbar/standardbar.xml
sw/uiconfig/swreport/toolbar/standardbar.xml
sw/uiconfig/swriter/toolbar/standardbar.xml
sw/uiconfig/swxform/toolbar/standardbar.xml

Change-Id: Iac0c7e8e474e8d217ca4daf47232019c64ca888f

diff --git a/basctl/uiconfig/basicide/toolbar/standardbar.xml 
b/basctl/uiconfig/basicide/toolbar/standardbar.xml
index 1dc2675..9dec388 100644
--- a/basctl/uiconfig/basicide/toolbar/standardbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/standardbar.xml
@@ -20,7 +20,7 @@
 toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; 
xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar
  toolbar:toolbaritem xlink:href=.uno:OpenUrl toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:AddDirect toolbar:style=dropdown/
- toolbar:toolbaritem xlink:href=.uno:Open/
+ toolbar:toolbaritem xlink:href=.uno:Open toolbar:style=dropdown/
  toolbar:toolbaritem xlink:href=.uno:Save/
  toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false/
  toolbar:toolbarseparator/
diff --git a/chart2/uiconfig/toolbar/standardbar.xml 
b/chart2/uiconfig/toolbar/standardbar.xml
index a7dee53..eef05bd 100644
--- a/chart2/uiconfig/toolbar/standardbar.xml
+++ b/chart2/uiconfig/toolbar/standardbar.xml
@@ -20,7 +20,7 @@
 toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; 
xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar
  toolbar:toolbaritem xlink:href=.uno:AddDirect toolbar:text= 
toolbar:style=dropdown/
  toolbar:toolbaritem xlink:href=.uno:NewDoc toolbar:text= 
toolbar:visible=false/
- toolbar:toolbaritem xlink:href=.uno:Open toolbar:text=/
+ toolbar:toolbaritem xlink:href=.uno:Open toolbar:text= 
toolbar:style=dropdown/
  toolbar:toolbaritem xlink:href=.uno:Save toolbar:text=/
  toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:text= 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:text=/
@@ -36,4 +36,4 @@
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:Undo toolbar:text=/
  toolbar:toolbaritem xlink:href=.uno:Redo toolbar:text=/
-/toolbar:toolbar
\ No newline at end of file
+/toolbar:toolbar
diff --git a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml 
b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
index cb5a7bb..ef5dfba 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
@@ -20,7 +20,7 @@
 toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; 
xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar
  toolbar:toolbaritem xlink:href=.uno:OpenUrl toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:AddDirect toolbar:text= 
toolbar:style=dropdown/
- toolbar:toolbaritem xlink:href=.uno:Open toolbar:text=/
+ toolbar:toolbaritem xlink:href=.uno:Open toolbar:text= 
toolbar:style=dropdown/
  toolbar:toolbaritem xlink:href=.uno:Save toolbar:text=/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:Copy toolbar:text=/
@@ -33,4 +33,4 @@
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:HelpIndex toolbar:text=/
  toolbar:toolbaritem xlink:href=.uno:ExtendedHelp toolbar:visible=false/
-/toolbar:toolbar
\ No newline at end of file
+/toolbar:toolbar
diff --git a/framework/uiconfig/startmodule/toolbar/standardbar.xml 
b/framework/uiconfig/startmodule/toolbar/standardbar.xml
index

[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/hicontrast officecfg/registry

2013-05-27 Thread Ariel Constenla-Haile

 icon-themes/galaxy/cmd/lc_autopilotmenu.png  |binary
 icon-themes/galaxy/cmd/sc_autopilotmenu.png  |binary
 icon-themes/hicontrast/cmd/lch_autopilotmenu.png |binary
 icon-themes/hicontrast/cmd/sch_autopilotmenu.png |binary
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 +++
 5 files changed, 3 insertions(+)

New commits:
commit f77388c643399af7852e59fb0c3fd1da3795ea44
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat May 25 22:11:47 2013 +

Add an icon for .uno:AutoPilotMenu

(cherry picked from commit c1954d6e72071c12aa4eda412d4370a22f91f787)

Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

Change-Id: I623febfcbdb642fe4b5b0b42e7e89054e3db45de

diff --git a/icon-themes/galaxy/cmd/lc_autopilotmenu.png 
b/icon-themes/galaxy/cmd/lc_autopilotmenu.png
new file mode 100644
index 000..ff5ec86
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_autopilotmenu.png differ
diff --git a/icon-themes/galaxy/cmd/sc_autopilotmenu.png 
b/icon-themes/galaxy/cmd/sc_autopilotmenu.png
new file mode 100644
index 000..ed92277
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_autopilotmenu.png differ
diff --git a/icon-themes/hicontrast/cmd/lch_autopilotmenu.png 
b/icon-themes/hicontrast/cmd/lch_autopilotmenu.png
new file mode 100644
index 000..9dbb8b6
Binary files /dev/null and b/icon-themes/hicontrast/cmd/lch_autopilotmenu.png 
differ
diff --git a/icon-themes/hicontrast/cmd/sch_autopilotmenu.png 
b/icon-themes/hicontrast/cmd/sch_autopilotmenu.png
new file mode 100644
index 000..4611aed
Binary files /dev/null and b/icon-themes/hicontrast/cmd/sch_autopilotmenu.png 
differ
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 74fbeeb..92955f5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2968,6 +2968,9 @@
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-US~Wizards/value
 /prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
   /node
   node oor:name=.uno:OutlineCollapse oor:op=replace
 prop oor:name=Label oor:type=xs:string
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - ucb/source

2013-05-27 Thread Ariel Constenla-Haile

 ucb/source/ucp/webdav/AprEnv.cxx  |2 
 ucb/source/ucp/webdav/DAVRequestEnvironment.hxx   |2 
 ucb/source/ucp/webdav/DAVResource.hxx |4 
 ucb/source/ucp/webdav/DAVResourceAccess.cxx   |   55 +-
 ucb/source/ucp/webdav/DAVResourceAccess.hxx   |8 
 ucb/source/ucp/webdav/SerfCallbacks.cxx   |6 
 ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx |2 
 ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx |2 
 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx   |2 
 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx   |2 
 ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx  |2 
 ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx  |6 
 ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx |2 
 ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx |6 
 ucb/source/ucp/webdav/SerfLockStore.cxx   |6 
 ucb/source/ucp/webdav/SerfLockStore.hxx   |4 
 ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx|2 
 ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx|2 
 ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx |2 
 ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx |2 
 ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx |2 
 ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx |4 
 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx |   36 ++--
 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx |4 
 ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx|   85 +
 ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx|4 
 ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx  |2 
 ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx  |2 
 ucb/source/ucp/webdav/SerfRequestProcessor.cxx|   10 -
 ucb/source/ucp/webdav/SerfRequestProcessor.hxx|8 
 ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx|2 
 ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx|2 
 ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx |   22 +-
 ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx |4 
 ucb/source/ucp/webdav/SerfSession.cxx |   16 -
 ucb/source/ucp/webdav/SerfSession.hxx |6 
 ucb/source/ucp/webdav/SerfUri.cxx |2 
 ucb/source/ucp/webdav/SerfUri.hxx |2 
 ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx|2 
 ucb/source/ucp/webdav/webdavcontent.cxx   |  162 --
 ucb/source/ucp/webdav/webdavprovider.cxx  |2 
 ucb/source/ucp/webdav/webdavresponseparser.cxx|2 
 ucb/source/ucp/webdav/webdavresponseparser.hxx|2 
 43 files changed, 355 insertions(+), 147 deletions(-)

New commits:
commit 7056e8ef89e938e38fc5b2b8a7493f0c79d5efd4
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Mar 24 12:21:32 2013 +

Resolves@ #i121926# fix malformed PROPFIND/PROPPATCH request body

(cherry picked from commit 3c83ceae5e4ff5afe20ea76aeaaae6303cdaec2d)

Conflicts:
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx

Change-Id: I13dab5fb80235e2ab968a1492c05bf579ba08d40

diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
index ef02e68..ccceaf4 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
@@ -23,6 +23,8 @@
 
 #include webdavresponseparser.hxx
 #include comphelper/seqstream.hxx
+#include rtl/ustrbuf.hxx
+
 
 using namespace com::sun::star;
 
@@ -89,14 +91,20 @@ serf_bucket_t * 
SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
 
 // body bucket - certain properties OR all properties OR only property 
names
 serf_bucket_t* body_bkt = 0;
-OUString aBodyText;
+OString aBodyText;
 {
+// TODO is it really needed a Unicode string buffer?
+// All properties and property names aren't supposed to be ASCII?
+rtl::OUStringBuffer aBuffer;
+aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( PROPFIND_HEADER ));
+
 // create and fill body bucket with requested properties
 const int nPropCount = ( !mbOnlyPropertyNames  mpPropNames )
? mpPropNames-size()
: 0;
 if ( nPropCount  0 )
 {
+aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( prop ) );
 SerfPropName thePropName;
 for ( int theIndex = 0; theIndex  nPropCount; theIndex ++ )
 {
@@ -120,23 +128,19 @@ serf_bucket_t * 
SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
 {
 if ( mbOnlyPropertyNames )
 {
-aBodyText = OUString::createFromAscii( propname/ );
+aBuffer.appendAscii

[Libreoffice-commits] core.git: 2 commits - framework/source include/svtools svtools/source

2013-05-26 Thread Ariel Constenla-Haile

 framework/source/uielement/generictoolbarcontroller.cxx  |6 +
 framework/source/uielement/recentfilesmenucontroller.cxx |4 
 framework/source/uielement/toolbarmanager.cxx|   16 ++
 include/svtools/toolboxcontroller.hxx|   17 ++-
 svtools/source/uno/toolboxcontroller.cxx |   84 +--
 5 files changed, 69 insertions(+), 58 deletions(-)

New commits:
commit 16db62a9c0894e655d8ecc82c8ed64db94187c75
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat May 25 22:10:31 2013 +

Recent file list: small fix when no documents

(cherry picked from commit da18984094aa5ae4a66731bf581103298b133738)

Change-Id: I56413b68d28b206212561dcbf662940862cebeb7

diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx 
b/framework/source/uielement/recentfilesmenucontroller.cxx
index 2be9117..57cf1d2 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -186,7 +186,9 @@ void RecentFilesMenuController::fillPopupMenu( Reference 
css::awt::XPopupMenu 
 {
 // No recent documents = insert no document string
 pVCLPopupMenu-InsertItem( 1, String( FwkResId( STR_NODOCUMENT ) ) 
);
-pVCLPopupMenu-EnableItem( 1, sal_False );
+// Do not disable it, otherwise the Toolbar controller and 
MenuButton
+// will display SV_RESID_STRING_NOSELECTIONPOSSIBLE instead of 
STR_NODOCUMENT
+pVCLPopupMenu-SetItemBits( 1, pVCLPopupMenu-GetItemBits( 1 ) | 
MIB_NOSELECT );
 }
 }
 }
commit 1e85fc5b2d8aeafb12f414c6bf0692fb2ca221eb
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat May 25 22:10:02 2013 +

svt::ToolboxController clean-up

Some small clean-up to use the PopupMenu ToolbarController

(cherry picked from commit e1687ce159e787d98f79d29a3d2131cca4b6ec71)

Conflicts:
svtools/inc/svtools/toolboxcontroller.hxx
svtools/source/uno/toolboxcontroller.cxx

Change-Id: Ie5e0397c32352d52cf2664bdbab920923e74bd03

diff --git a/framework/source/uielement/generictoolbarcontroller.cxx 
b/framework/source/uielement/generictoolbarcontroller.cxx
index 6ed7651..fc6ad41 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -362,8 +362,14 @@ MenuToolbarController::createPopupWindow() throw 
(::com::sun::star::uno::Runtime
 }
 }
 
+if ( !pMenu || !m_pToolbar )
+return NULL;
+
+OSL_ENSURE ( pMenu-GetItemCount(), Empty PopupMenu! );
+
 ::Rectangle aRect( m_pToolbar-GetItemRect( m_nID ) );
 pMenu-Execute( m_pToolbar, aRect, POPUPMENU_EXECUTE_DOWN );
+
 return NULL;
 }
 } // namespace
diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index 2ddcda5..675e839 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -928,6 +928,9 @@ void ToolBarManager::CreateControllers()
 aPropValue.Name = OUString( ParentWindow );
 aPropValue.Value= xToolbarWindow;
 aPropertyVector.push_back( makeAny( aPropValue ));
+aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
Identifier ));
+aPropValue.Value= uno::makeAny( nId );
+aPropertyVector.push_back( uno::makeAny( aPropValue ) );
 
 if ( nWidth  0 )
 {
@@ -1041,6 +1044,9 @@ void ToolBarManager::CreateControllers()
 aPropValue.Name = OUString( ModuleIdentifier );
 aPropValue.Value = m_aModuleIdentifier;
 aPropertyVector.push_back( makeAny( aPropValue ));
+aPropValue.Name = rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( Identifier ));
+aPropValue.Value= uno::makeAny( nId );
+aPropertyVector.push_back( uno::makeAny( aPropValue ) );
 
 if ( nWidth  0 )
 {
@@ -1248,9 +1254,12 @@ void ToolBarManager::FillToolbar( const Reference 
XIndexAccess  rItemContaine
 try
 {
 Reference XIndexAccess  xMenuContainer;
-if ( m_xDocUICfgMgr.is() )
+if ( m_xDocUICfgMgr.is() 
+ m_xDocUICfgMgr-hasSettings( aCommandURL 
) )
 xMenuContainer  = 
m_xDocUICfgMgr-getSettings( aCommandURL, sal_False );
-if ( !xMenuContainer.is()  m_xUICfgMgr.is() )
+if ( !xMenuContainer.is() 
+ m_xUICfgMgr.is() 
+ m_xUICfgMgr-hasSettings( aCommandURL ) )
 xMenuContainer

[Libreoffice-commits] core.git: 5 commits - dbaccess/source extensions/source offapi/com scp2/source sd/source svtools/source tools/source vcl/source

2013-05-23 Thread Ariel Constenla-Haile

 dbaccess/source/ui/dlg/admincontrols.cxx  |1 
 extensions/source/ole/oleobjw.cxx |4 
 extensions/source/ole/unoconversionutilities.hxx  |4 
 offapi/com/sun/star/linguistic2/XLanguageGuessing.idl |2 
 scp2/source/ooo/module_helppack.ulf   |4 
 scp2/source/ooo/module_langpack.ulf   |4 
 sd/source/filter/eppt/epptso.cxx  |8 +
 svtools/source/misc/langtab.src   |2 
 tools/source/generic/poly2.cxx|   65 +
 vcl/source/gdi/outdev4.cxx|   85 +++---
 10 files changed, 116 insertions(+), 63 deletions(-)

New commits:
commit 1bfbe4963db6edb7dc4333988d147d9b13689e2b
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Mar 17 23:08:31 2013 +

Fix build breaker

(cherry picked from commit 4f7c31cdcf7ba9558e59bc345b3925f6b3d2695c)

Change-Id: Iccb1de40dc66d94128d4db2ca08b05b7e4c567f5

diff --git a/extensions/source/ole/oleobjw.cxx 
b/extensions/source/ole/oleobjw.cxx
index d487a15..b3b7b52 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1646,7 +1646,7 @@ TypeDescription 
IUnknownWrapper_Impl::getInterfaceMemberDescOfCurrentCall(const
 {
 typelib_TypeDescriptionReference* pTypeRefMember = 
pInterface-ppAllMembers[i];
 typelib_TypeDescription* pDescMember= NULL;
-TYPELIB_DANGER_GET( pDescMember, pTypeRefMember)
+TYPELIB_DANGER_GET( pDescMember, pTypeRefMember);
 
 typelib_InterfaceMemberTypeDescription* pInterfaceMember=
 (typelib_InterfaceMemberTypeDescription*) pDescMember;
@@ -1655,7 +1655,7 @@ TypeDescription 
IUnknownWrapper_Impl::getInterfaceMemberDescOfCurrentCall(const
 pMember= pInterfaceMember;
 break;
 }
-TYPELIB_DANGER_RELEASE( pDescMember)
+TYPELIB_DANGER_RELEASE( pDescMember);
 }
 
 if( pMember)
diff --git a/extensions/source/ole/unoconversionutilities.hxx 
b/extensions/source/ole/unoconversionutilities.hxx
index a77fbf6..36af845 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -2023,9 +2023,9 @@ void 
UnoConversionUtilitiesT::dispatchExObject2Sequence( const VARIANTARG* pva
 typelib_TypeDescriptionReference *pSeqElemDescRef= pSeqDesc-pType; // 
type of the Sequence' elements
 Type elemType( pSeqElemDescRef);
 _typelib_TypeDescription* pSeqElemDesc=NULL;
-TYPELIB_DANGER_GET( pSeqElemDesc, pSeqElemDescRef)
+TYPELIB_DANGER_GET( pSeqElemDesc, pSeqElemDescRef);
 sal_uInt32 nelementSize= pSeqElemDesc-nSize;
-TYPELIB_DANGER_RELEASE( pSeqElemDesc)
+TYPELIB_DANGER_RELEASE( pSeqElemDesc);
 
 uno_Sequence *p_uno_Seq;
 uno_sequence_construct( p_uno_Seq, pDesc, NULL, length, cpp_acquire);
commit c1acf1d72ea1421cbb460e65ee5b1d9d3200033c
Author: Armin Le Grand a...@apache.org
Date:   Thu Sep 27 12:07:14 2012 +

Resolves: #i115630# secured OutputDevice::ImplDrawHatch in vcl

and PolyPolygon::Optimize in tools to useful fallbacks when working on
PolyPolygons (what they do *not* support)

(cherry picked from commit dbe489ab9766d96c5cafb079bc4778103bded783)

Conflicts:
vcl/source/gdi/outdev4.cxx

Change-Id: I5d2374ec95702cb0cab29d2e82710d4aa29fa823

diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 535ff9a..2650960 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -241,39 +241,62 @@ void PolyPolygon::Optimize( sal_uIntPtr nOptimizeFlags, 
const PolyOptimizeData*
 {
 DBG_CHKTHIS( PolyPolygon, NULL );
 
-if( nOptimizeFlags )
+if(nOptimizeFlags  Count())
 {
-double  fArea;
-const sal_Bool  bEdges = ( nOptimizeFlags  POLY_OPTIMIZE_EDGES ) == 
POLY_OPTIMIZE_EDGES;
-sal_uInt16  nPercent = 0;
+// #115630# ImplDrawHatch does not work with beziers included in the 
polypolygon, take care of that
+bool bIsCurve(false);
 
-if( bEdges )
+for(sal_uInt16 a(0); !bIsCurve  a  Count(); a++)
 {
-const Rectangle aBound( GetBoundRect() );
-
-fArea = ( aBound.GetWidth() + aBound.GetHeight() ) * 0.5;
-nPercent = pData ? pData-GetPercentValue() : 50;
-nOptimizeFlags = ~POLY_OPTIMIZE_EDGES;
+if((*this)[a].HasFlags())
+{
+bIsCurve = true;
+}
 }
 
-// watch for ref counter
-if( mpImplPolyPolygon-mnRefCount  1 )
+if(bIsCurve)
 {
-mpImplPolyPolygon-mnRefCount--;
-mpImplPolyPolygon = new ImplPolyPolygon( *mpImplPolyPolygon

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

2013-05-23 Thread Ariel Constenla-Haile

 sdext/source/minimizer/fileopendialog.cxx |   23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

New commits:
commit a0dcc8f78061d22d925f31ef8d03ca751ad6dc19
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Mar 6 12:15:24 2013 +

Resolves: #i121857# Presentation Minimizer: fix filter naming

(cherry picked from commit 75833fdb6ede664fdcef38a16ecf1f8d3f3adc7d)

Conflicts:
sdext/source/minimizer/fileopendialog.cxx

Change-Id: I164cc6d9916ddf9dba9da273b5181e5728127292

diff --git a/sdext/source/minimizer/fileopendialog.cxx 
b/sdext/source/minimizer/fileopendialog.cxx
index 93f2cb7..bb3bb5c 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -46,6 +46,7 @@
 #include com/sun/star/view/XControlAccess.hpp
 #include com/sun/star/ucb/InteractiveAugmentedIOException.hpp
 
+#include rtl/ustrbuf.hxx
 
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
@@ -140,7 +141,27 @@ FileOpenDialog::FileOpenDialog( const Reference 
XComponentContext  rxContext
 }
 if ( aExtensions.getLength() )
 {
-mxFilePicker-appendFilter( aIter-maUIName, aExtensions[ 
0 ] );
+OUString aExtension = aExtensions[0];
+
+const char filter[] = *.;
+// the filter title must be formed in the same it is 
currently done
+// in the internal implementation: UIName (.extension)
+OUStringBuffer aUIName;
+// the filter must be in the form *.extension
+OUStringBuffer aFilter;
+
+// form the title: UIName (.extension)
+aUIName.append( aIter-maUIName );
+aUIName.appendAscii( RTL_CONSTASCII_STRINGPARAM(  (. ));
+aUIName.append( aExtension );
+aUIName.append( sal_Unicode( ')' ) );
+// form the filter: (*.extension)
+aFilter.appendAscii( RTL_CONSTASCII_STRINGPARAM( filter ) 
);
+aFilter.append( aExtensions[0] );
+
+mxFilePicker-appendFilter( aUIName.makeStringAndClear(),
+  aFilter.makeStringAndClear() 
);
+
 if ( aIter-maFlags  0x100 )
 mxFilePicker-setCurrentFilter( aIter-maUIName );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sdext/source

2013-05-23 Thread Ariel Constenla-Haile

 sdext/source/minimizer/fileopendialog.cxx |   23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

New commits:
commit d443bfea35c97cdb10e72e0eab5fb19845fc4447
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Mar 6 12:15:24 2013 +

Resolves: #i121857# Presentation Minimizer: fix filter naming

(cherry picked from commit 75833fdb6ede664fdcef38a16ecf1f8d3f3adc7d)

Conflicts:
sdext/source/minimizer/fileopendialog.cxx

Change-Id: I164cc6d9916ddf9dba9da273b5181e5728127292
(cherry picked from commit a0dcc8f78061d22d925f31ef8d03ca751ad6dc19)

diff --git a/sdext/source/minimizer/fileopendialog.cxx 
b/sdext/source/minimizer/fileopendialog.cxx
index 93f2cb7..bb3bb5c 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -46,6 +46,7 @@
 #include com/sun/star/view/XControlAccess.hpp
 #include com/sun/star/ucb/InteractiveAugmentedIOException.hpp
 
+#include rtl/ustrbuf.hxx
 
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
@@ -140,7 +141,27 @@ FileOpenDialog::FileOpenDialog( const Reference 
XComponentContext  rxContext
 }
 if ( aExtensions.getLength() )
 {
-mxFilePicker-appendFilter( aIter-maUIName, aExtensions[ 
0 ] );
+OUString aExtension = aExtensions[0];
+
+const char filter[] = *.;
+// the filter title must be formed in the same it is 
currently done
+// in the internal implementation: UIName (.extension)
+OUStringBuffer aUIName;
+// the filter must be in the form *.extension
+OUStringBuffer aFilter;
+
+// form the title: UIName (.extension)
+aUIName.append( aIter-maUIName );
+aUIName.appendAscii( RTL_CONSTASCII_STRINGPARAM(  (. ));
+aUIName.append( aExtension );
+aUIName.append( sal_Unicode( ')' ) );
+// form the filter: (*.extension)
+aFilter.appendAscii( RTL_CONSTASCII_STRINGPARAM( filter ) 
);
+aFilter.append( aExtensions[0] );
+
+mxFilePicker-appendFilter( aUIName.makeStringAndClear(),
+  aFilter.makeStringAndClear() 
);
+
 if ( aIter-maFlags  0x100 )
 mxFilePicker-setCurrentFilter( aIter-maUIName );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2013-05-22 Thread Ariel Constenla-Haile

 offapi/com/sun/star/text/XAutoTextContainer.idl |   77 
 1 file changed, 41 insertions(+), 36 deletions(-)

New commits:
commit 25c30d0a27aebe31dfb7c72971f95e569aa9577b
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Nov 4 05:25:45 2012 +

Resolves: #i85426# - Document css::text::XAutoTextContainer paths handling

(cherry picked from commit 9314f61d6111280f2a02b09f9c2c0a7506cdbc79)

Conflicts:
offapi/com/sun/star/text/XAutoTextContainer.idl

Change-Id: If775043efb6dae9832cbfd347f206278f3abb44c

diff --git a/offapi/com/sun/star/text/XAutoTextContainer.idl 
b/offapi/com/sun/star/text/XAutoTextContainer.idl
index 49385d1..06fd171 100644
--- a/offapi/com/sun/star/text/XAutoTextContainer.idl
+++ b/offapi/com/sun/star/text/XAutoTextContainer.idl
@@ -19,62 +19,67 @@
 #ifndef __com_sun_star_text_XAutoTextContainer_idl__
 #define __com_sun_star_text_XAutoTextContainer_idl__
 
-#include com/sun/star/container/XNameAccess.idl
-
-#include com/sun/star/text/XAutoTextGroup.idl
-
-#include com/sun/star/lang/IllegalArgumentException.idl
-
 #include com/sun/star/container/ElementExistException.idl
-
 #include com/sun/star/container/NoSuchElementException.idl
+#include com/sun/star/container/XNameAccess.idl
+#include com/sun/star/lang/IllegalArgumentException.idl
+#include com/sun/star/text/XAutoTextGroup.idl
 
-
-
- module com {  module sun {  module star {  module text {
+module com {  module sun {  module star {  module text {
 
 /** handles blocks of typeAutoTextEntry/type.
-
-
-
-
-
-
-
-@example pre
-AutoTextPath=d:\office\autotext;f:\user\autotext
-
-groupname:  standard*0
--amp;amp;gt; the group file is located n the path d:\office\autotext
-groupname:  all*1
--amp;amp;gt; the group file is located in the path f:\user\autotext\
-/pre
-
-pIf the path extension is not specified, then the first directory
-is used.  For automatic text expansion, the name of an actual group is
-set to search first in this group.
-
-/p@see AutoTextContainer
- */
+@see AutoTextContainer
+*/
 published interface XAutoTextContainer: com::sun::star::container::XNameAccess
 {
 /** creates a new AutoText group.
- */
+
+@param aGroupName the name of the typeAutoTextContainer/type
+
+pThe name must follow the pattern codegroupname*pathid/code, 
where:/p
+
+ul
+licodegroupname/code should contain only alphanumeric characters
+(A-Za-z0-9), underscore (_) or space (0x20)/li
+lian asterisk (*) delimiter separates the group name from the path
+identifier/li
+licodepathid/code is a number (0 or 1) identifying the directory
+where the AutoText file is stored. Paths are stored in the Office
+configuration and accessed through
+member scope=com::sun::star::utilPathSettings::AutoText/member.
+ul
+li0 indicates the path of the bOffice Basis/b layer/li
+li1 indicates the path of the buser/b directory/li
+/ul
+/li
+/ul
+If only codegroupname/code is specified, the path defaults to 0, the
+bOffice Basis/b layer./brNote that in some systems the user may lack 
of
+write access to the Office Basis directory.
+
+@example
+
+ul
+licodestandard*0/code/brthe standard AutoTextGroup in the 
Office Basis layer/li
+licodetemplate/code/brthe template AutoTextGroup in the 
Office Basis layer/li
+licodemytexts*1/code/brthe mytexts AutoTextGroup in the user 
directory/li
+/ul
+
+*/
 com::sun::star::text::XAutoTextGroup insertNewByName( [in] string 
aGroupName )
 raises( com::sun::star::lang::IllegalArgumentException,
 com::sun::star::container::ElementExistException );
 
 /** deletes the specified AutoText group.
- */
+@param aGroupName see the documentation for 
memberXAutoTextContainer::insertNewByName()/member
+*/
 void removeByName( [in] string aGroupName )
 raises( com::sun::star::container::NoSuchElementException );
 
 };
 
-
 }; }; }; };
 
-
 #endif
 
 /* 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: Branch 'libreoffice-4-1' - offapi/com

2013-05-22 Thread Ariel Constenla-Haile

 offapi/com/sun/star/text/XAutoTextContainer.idl |   77 
 1 file changed, 41 insertions(+), 36 deletions(-)

New commits:
commit eaae64951422fe7513c7310e636f9d5f0be9b28f
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Nov 4 05:25:45 2012 +

Resolves: #i85426# - Document css::text::XAutoTextContainer paths handling

(cherry picked from commit 9314f61d6111280f2a02b09f9c2c0a7506cdbc79)

Conflicts:
offapi/com/sun/star/text/XAutoTextContainer.idl

Change-Id: If775043efb6dae9832cbfd347f206278f3abb44c
(cherry picked from commit 25c30d0a27aebe31dfb7c72971f95e569aa9577b)

diff --git a/offapi/com/sun/star/text/XAutoTextContainer.idl 
b/offapi/com/sun/star/text/XAutoTextContainer.idl
index 49385d1..06fd171 100644
--- a/offapi/com/sun/star/text/XAutoTextContainer.idl
+++ b/offapi/com/sun/star/text/XAutoTextContainer.idl
@@ -19,62 +19,67 @@
 #ifndef __com_sun_star_text_XAutoTextContainer_idl__
 #define __com_sun_star_text_XAutoTextContainer_idl__
 
-#include com/sun/star/container/XNameAccess.idl
-
-#include com/sun/star/text/XAutoTextGroup.idl
-
-#include com/sun/star/lang/IllegalArgumentException.idl
-
 #include com/sun/star/container/ElementExistException.idl
-
 #include com/sun/star/container/NoSuchElementException.idl
+#include com/sun/star/container/XNameAccess.idl
+#include com/sun/star/lang/IllegalArgumentException.idl
+#include com/sun/star/text/XAutoTextGroup.idl
 
-
-
- module com {  module sun {  module star {  module text {
+module com {  module sun {  module star {  module text {
 
 /** handles blocks of typeAutoTextEntry/type.
-
-
-
-
-
-
-
-@example pre
-AutoTextPath=d:\office\autotext;f:\user\autotext
-
-groupname:  standard*0
--amp;amp;gt; the group file is located n the path d:\office\autotext
-groupname:  all*1
--amp;amp;gt; the group file is located in the path f:\user\autotext\
-/pre
-
-pIf the path extension is not specified, then the first directory
-is used.  For automatic text expansion, the name of an actual group is
-set to search first in this group.
-
-/p@see AutoTextContainer
- */
+@see AutoTextContainer
+*/
 published interface XAutoTextContainer: com::sun::star::container::XNameAccess
 {
 /** creates a new AutoText group.
- */
+
+@param aGroupName the name of the typeAutoTextContainer/type
+
+pThe name must follow the pattern codegroupname*pathid/code, 
where:/p
+
+ul
+licodegroupname/code should contain only alphanumeric characters
+(A-Za-z0-9), underscore (_) or space (0x20)/li
+lian asterisk (*) delimiter separates the group name from the path
+identifier/li
+licodepathid/code is a number (0 or 1) identifying the directory
+where the AutoText file is stored. Paths are stored in the Office
+configuration and accessed through
+member scope=com::sun::star::utilPathSettings::AutoText/member.
+ul
+li0 indicates the path of the bOffice Basis/b layer/li
+li1 indicates the path of the buser/b directory/li
+/ul
+/li
+/ul
+If only codegroupname/code is specified, the path defaults to 0, the
+bOffice Basis/b layer./brNote that in some systems the user may lack 
of
+write access to the Office Basis directory.
+
+@example
+
+ul
+licodestandard*0/code/brthe standard AutoTextGroup in the 
Office Basis layer/li
+licodetemplate/code/brthe template AutoTextGroup in the 
Office Basis layer/li
+licodemytexts*1/code/brthe mytexts AutoTextGroup in the user 
directory/li
+/ul
+
+*/
 com::sun::star::text::XAutoTextGroup insertNewByName( [in] string 
aGroupName )
 raises( com::sun::star::lang::IllegalArgumentException,
 com::sun::star::container::ElementExistException );
 
 /** deletes the specified AutoText group.
- */
+@param aGroupName see the documentation for 
memberXAutoTextContainer::insertNewByName()/member
+*/
 void removeByName( [in] string aGroupName )
 raises( com::sun::star::container::NoSuchElementException );
 
 };
 
-
 }; }; }; };
 
-
 #endif
 
 /* 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: officecfg/registry

2013-05-22 Thread Ariel Constenla-Haile

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 1d296f2b48827df13172e3b8c3fdf708807392e8
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Jan 13 16:25:29 2013 +

Document missing enumeration value

Add missing Key Tab in
/org.openoffice.Office.Writer/AutoFunction/Completion/AcceptKey

(cherry picked from commit 4ff43c2b8dbf361093ff2ffa683e117526771332)

Conflicts:
officecfg/registry/schema/org/openoffice/Office/Writer.xcs

Change-Id: I3441a9b97f3e74c115bde84da9a1c85f9c901185

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 5a1d564..78524c4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -4647,6 +4647,11 @@
 descKeyRight/desc
   /info
 /enumeration
+enumeration oor:value=1282 !-- 0x502 --
+  info
+descKeyTab/desc
+  /info
+/enumeration
 enumeration oor:value=1284
   !-- 0x504 --
   info
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - officecfg/registry

2013-05-22 Thread Ariel Constenla-Haile

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 1f53f369403c98e41989fd2f94f61ec018871470
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Jan 13 16:25:29 2013 +

Document missing enumeration value

Add missing Key Tab in
/org.openoffice.Office.Writer/AutoFunction/Completion/AcceptKey

(cherry picked from commit 4ff43c2b8dbf361093ff2ffa683e117526771332)

Conflicts:
officecfg/registry/schema/org/openoffice/Office/Writer.xcs

Change-Id: I3441a9b97f3e74c115bde84da9a1c85f9c901185
(cherry picked from commit 1d296f2b48827df13172e3b8c3fdf708807392e8)

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 5a1d564..78524c4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -4647,6 +4647,11 @@
 descKeyRight/desc
   /info
 /enumeration
+enumeration oor:value=1282 !-- 0x502 --
+  info
+descKeyTab/desc
+  /info
+/enumeration
 enumeration oor:value=1284
   !-- 0x504 --
   info
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-18 Thread Ariel Constenla-Haile

 starmath/inc/edit.hxx|1 +
 starmath/source/edit.cxx |   24 
 2 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit 13adadee52c71a1b7db95f36e34a8c622ab1179e
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Jul 2 10:42:58 2012 +

Resolves: #ii120149# Flash changes on slot execution to reflect AutoUpdate

(cherry picked from commit b73c741c4f792c71623127fdc711dc3f38603083)

Conflicts:
starmath/source/edit.cxx

Change-Id: Ie073deabb1a48f3479a9c6bbf89d1e40f5cea663

diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 1cb9183..a9d9ca4 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -85,6 +85,7 @@ class SmEditWindow : public Window, public DropTargetHelper
 voidSetScrollBarRanges();
 voidInitScrollBars();
 voidInvalidateSlots();
+voidUpdateStatus( bool bSetDocModified = false );
 
 public:
 SmEditWindow( SmCmdBoxWindow rMyCmdBoxWin );
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index d10a59b..fc88ba7 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -243,9 +243,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent )
 
 IMPL_LINK( SmEditWindow, ModifyTimerHdl, Timer *, EMPTYARG /*pTimer*/ )
 {
-SmModule *pp = SM_MOD();
-if (pp-GetConfig()-IsAutoRedraw())
-Flush();
+UpdateStatus();
 aModifyTimer.Stop();
 return 0;
 }
@@ -637,7 +635,7 @@ void SmEditWindow::GetFocus()
 // Note: will implicitly send the AccessibleStateType::FOCUSED event
 ::accessibility::AccessibleTextHelper *pHelper = 
pAccessible-GetTextHelper();
 if (pHelper)
-pHelper-SetFocus( sal_True );
+pHelper-SetFocus(true);
 }
 
 if (!pEditView)
@@ -665,7 +663,7 @@ void SmEditWindow::LoseFocus()
 // Note: will implicitly send the AccessibleStateType::FOCUSED event
 ::accessibility::AccessibleTextHelper *pHelper = 
pAccessible-GetTextHelper();
 if (pHelper)
-pHelper-SetFocus( sal_False );
+pHelper-SetFocus(false);
 }
 }
 
@@ -871,13 +869,23 @@ bool SmEditWindow::IsSelected() const
 return pEditView ? pEditView-HasSelection() : false;
 }
 
+
+void SmEditWindow::UpdateStatus( bool bSetDocModified )
+{
+SmModule *pMod = SM_MOD();
+if (pMod  pMod-GetConfig()-IsAutoRedraw())
+Flush();
+if ( bSetDocModified )
+GetDoc()-SetModified(true);
+}
+
 void SmEditWindow::Cut()
 {
 OSL_ENSURE( pEditView, EditView missing );
 if (pEditView)
 {
 pEditView-Cut();
-GetDoc()-SetModified( true );
+UpdateStatus(true);
 }
 }
 
@@ -894,7 +902,7 @@ void SmEditWindow::Paste()
 if (pEditView)
 {
 pEditView-Paste();
-GetDoc()-SetModified( true );
+UpdateStatus(true);
 }
 }
 
@@ -904,7 +912,7 @@ void SmEditWindow::Delete()
 if (pEditView)
 {
 pEditView-DeleteSelected();
-GetDoc()-SetModified( true );
+UpdateStatus(true);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source offapi/com officecfg/registry sfx2/source sw/inc sw/source

2013-05-18 Thread Ariel Constenla-Haile

 cui/source/customize/acccfg.cxx|3 ++-
 cui/source/customize/acccfg.src|2 +-
 offapi/com/sun/star/text/ViewSettings.idl  |7 +++
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |9 +
 sfx2/source/appl/newhelp.cxx   |2 +-
 sw/inc/viewopt.hxx |   10 +-
 sw/source/ui/config/usrpref.cxx|6 +++---
 sw/source/ui/docvw/edtwin2.cxx |2 +-
 sw/source/ui/uno/unomod.cxx|8 
 9 files changed, 29 insertions(+), 20 deletions(-)

New commits:
commit 852bf3ad922ab8e5dfd8da2f5861b8b30d6c5782
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Aug 15 08:31:46 2012 +

Resolves: #i120571# Enhancements in Save/Load Keyboard Config dialog

(cherry picked from commit fe75dbb733e6b25da8233d4a1dc12a8288e1b608)

Conflicts:
cui/source/customize/acccfg.cxx

Change-Id: I967ed2b4b7b3c9dfeebf07af544216afc8bead8d

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a5770f1..77ec9c3 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1387,7 +1387,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
 void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String 
rTitle )
 {
 bool bSave = ( ( nBits  WB_SAVEAS ) == WB_SAVEAS );
-short nDialogType = bSave ? 
css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE
+short nDialogType = bSave ? 
css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION
   : 
css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE;
 if ( m_pFileDlg )
 delete m_pFileDlg;
@@ -1396,6 +1396,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits 
nBits, const String rTi
 m_pFileDlg-SetTitle( rTitle );
 m_pFileDlg-AddFilter( aFilterAllStr, OUString(FILEDIALOG_FILTER_ALL) );
 m_pFileDlg-AddFilter( aFilterCfgStr, OUString(*.cfg) );
+m_pFileDlg-SetCurrentFilter( aFilterCfgStr );
 
 Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, 
SaveHdl )
 : LINK( this, SfxAcceleratorConfigPage, 
LoadHdl );
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index f88c33d..81abe9d 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -193,7 +193,7 @@ TabPage RID_SVXPAGE_KEYBOARD
 };
 String STR_FILTERNAME_CFG
 {
-Text [ en-US ] = Configuration ;
+Text [ en-US ] = Configuration (*.cfg) ;
 };
 };
 
commit 74970948bbd410278964bd02cb5741c6c87eb30d
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Jul 19 22:32:34 2012 +

Resolves: #i120300# Add new property ShowContentTips...

in com.sun.star.text.ViewSettings

(cherry picked from commit 8c5cd0cbad918949f898d7fccb4f1a00a8a9f5f5)

Conflicts:
offapi/com/sun/star/text/ViewSettings.idl
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
sfx2/source/appl/newhelp.cxx
sw/source/ui/docvw/edtwin2.cxx
sw/source/ui/uno/unomod.cxx

Change-Id: Ia03bea5c7a81efbf1f3f40e8299168887140fe40

diff --git a/offapi/com/sun/star/text/ViewSettings.idl 
b/offapi/com/sun/star/text/ViewSettings.idl
index 5fcb790..702f73e 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -247,6 +247,13 @@ published service ViewSettings
 @since OOo 3.1
  */
 [optional, property] long VerticalRulerMetric;
+//-
+/** If this property is TRUE/, tips for document content are shown,
+typically in a help balloon when the mouse is over the content.
+
+@since LibreOffice 4.1
+ */
+[optional, property] boolean ShowContentTips;
 };
 
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 161d1d9..5a1d564 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1046,13 +1046,14 @@
   /info
   valuetrue/value
 /prop
-prop oor:name=PreventTips oor:type=xs:boolean 
oor:nillable=false
+prop oor:name=ShowContentTips oor:type=xs:boolean
+  !-- OldPath: Writer/Content/Display/PreventTips --
   !-- UIHints: Not accessible via user interface --
   info
-descEnables the writer to prevent the display of help tips 
programmatically./desc
-labelPrevent help tips/label
+descEnables the writer to prevent the display of tips for 
document content programmatically./desc
+labelShow

[Libreoffice-commits] core.git: jvmfwk/plugins

2013-05-18 Thread Ariel Constenla-Haile

 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c0b455a664bae6047992a98e3c991b8b5dc84736
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Aug 26 11:51:55 2012 +

Clearer javaldx message

(cherry picked from commit fdebe4193ae0f3f8a8281dfc0a2f053e578cf1b9)

Conflicts:
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx

Change-Id: I4c26c704ce85a273d7022260bb721e295041c260

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 718844d..fb99974 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -59,7 +59,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 }
 else if (errcode != JFW_E_NONE  errcode != JFW_E_DIRECT_MODE)
 {
-fprintf(stderr,javaldx failed! \n);
+fprintf(stderr,javaldx failed!\n);
 return -1;
 }
 
@@ -69,7 +69,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
 if (errcode != JFW_E_NONE  errcode != JFW_E_INVALID_SETTINGS)
 {
-fprintf(stderr,javaldx failed! \n);
+fprintf(stderr,javaldx failed!\n);
 return -1;
 }
 
@@ -151,7 +151,7 @@ static bool findAndSelect(JavaInfo ** ppInfo)
 javaFrameworkError errcode = jfw_findAndSelectJRE(ppInfo);
 if (errcode == JFW_E_NO_JAVA_FOUND)
 {
-fprintf(stderr,javaldx: Could not find a Java Runtime Environment! 
\n);
+fprintf(stderr,javaldx: Could not find a Java Runtime 
Environment!\n);
 return false;
 }
 else if (errcode != JFW_E_NONE  errcode != JFW_E_DIRECT_MODE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source

2013-05-15 Thread Ariel Constenla-Haile

 svx/source/dialog/sdstring.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f65bceb5d3e43619b929d17e5f4aa4387a70eb5
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu May 16 01:09:57 2013 +

i122317 - Mark API name as not localizable

diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 588d25c..8e6a72f 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -498,7 +498,7 @@ String RID_SVXSTR_COLOR_TURQUOISE_DEF
 /* DO NOT TRANSLATE */
 String RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF
 {
-Text [ en-US ] = Blue classic ;
+Text = Blue classic ;
 };
 
 ///
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk i18npool/source sd/uiconfig

2013-05-14 Thread Ariel Constenla-Haile

 cui/UIConfig_cui.mk   |1 
 cui/source/dialogs/pastedlg.cxx   |   56 +
 cui/source/dialogs/svuidlg.hrc|   14 --
 cui/source/dialogs/svuidlg.src|   88 --
 cui/source/inc/helpid.hrc |1 
 cui/source/inc/pastedlg.hxx   |   25 
 cui/uiconfig/ui/pastespecial.ui   |  184 ++
 i18npool/source/localedata/data/gl_ES.xml |   38 +++---
 sd/uiconfig/sdraw/ui/pastespecial.ui  |  181 -
 9 files changed, 221 insertions(+), 367 deletions(-)

New commits:
commit 4d8301935d5ccb39e0853d447a02511c0bb76f28
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue May 14 00:23:03 2013 +

Resolves: #i122306# Remove dot from abbreviate day and month names in 
Galician

(cherry picked from commit ba12679129efc39834114be8bca835d8a84aacb6)

Change-Id: Ifa216baec3e89578215e868c63a1add446005f4b
Signed-off-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/i18npool/source/localedata/data/gl_ES.xml 
b/i18npool/source/localedata/data/gl_ES.xml
index 01fe4bd..4b02e59 100644
--- a/i18npool/source/localedata/data/gl_ES.xml
+++ b/i18npool/source/localedata/data/gl_ES.xml
@@ -201,99 +201,99 @@
   DaysOfWeek
 Day
   DayIDsun/DayID
-  DefaultAbbrvNamedom./DefaultAbbrvName
+  DefaultAbbrvNamedom/DefaultAbbrvName
   DefaultFullNamedomingo/DefaultFullName
 /Day
 Day
   DayIDmon/DayID
-  DefaultAbbrvNamelun./DefaultAbbrvName
+  DefaultAbbrvNamelun/DefaultAbbrvName
   DefaultFullNameluns/DefaultFullName
 /Day
 Day
   DayIDtue/DayID
-  DefaultAbbrvNamemar./DefaultAbbrvName
+  DefaultAbbrvNamemar/DefaultAbbrvName
   DefaultFullNamemartes/DefaultFullName
 /Day
 Day
   DayIDwed/DayID
-  DefaultAbbrvNamemÃ©r./DefaultAbbrvName
+  DefaultAbbrvNamemÃ©r/DefaultAbbrvName
   DefaultFullNamemÃ©rcores/DefaultFullName
 /Day
 Day
   DayIDthu/DayID
-  DefaultAbbrvNamexov./DefaultAbbrvName
+  DefaultAbbrvNamexov/DefaultAbbrvName
   DefaultFullNamexoves/DefaultFullName
 /Day
 Day
   DayIDfri/DayID
-  DefaultAbbrvNameven./DefaultAbbrvName
+  DefaultAbbrvNameven/DefaultAbbrvName
   DefaultFullNamevenres/DefaultFullName
 /Day
 Day
   DayIDsat/DayID
-  DefaultAbbrvNamesÃ¡b./DefaultAbbrvName
+  DefaultAbbrvNamesÃ¡b/DefaultAbbrvName
   DefaultFullNamesÃ¡bado/DefaultFullName
 /Day
   /DaysOfWeek
   MonthsOfYear
 Month
   MonthIDjan/MonthID
-  DefaultAbbrvNamexan./DefaultAbbrvName
+  DefaultAbbrvNamexan/DefaultAbbrvName
   DefaultFullNamexaneiro/DefaultFullName
 /Month
 Month
   MonthIDfeb/MonthID
-  DefaultAbbrvNamefeb./DefaultAbbrvName
+  DefaultAbbrvNamefeb/DefaultAbbrvName
   DefaultFullNamefebreiro/DefaultFullName
 /Month
 Month
   MonthIDmar/MonthID
-  DefaultAbbrvNamemar./DefaultAbbrvName
+  DefaultAbbrvNamemar/DefaultAbbrvName
   DefaultFullNamemarzo/DefaultFullName
 /Month
 Month
   MonthIDapr/MonthID
-  DefaultAbbrvNameabr./DefaultAbbrvName
+  DefaultAbbrvNameabr/DefaultAbbrvName
   DefaultFullNameabril/DefaultFullName
 /Month
 Month
   MonthIDmay/MonthID
-  DefaultAbbrvNamemai./DefaultAbbrvName
+  DefaultAbbrvNamemai/DefaultAbbrvName
   DefaultFullNamemaio/DefaultFullName
 /Month
 Month
   MonthIDjun/MonthID
-  DefaultAbbrvNamexuÃ±./DefaultAbbrvName
+  DefaultAbbrvNamexuÃ±/DefaultAbbrvName
   DefaultFullNamexuÃ±o/DefaultFullName
 /Month
 Month
   MonthIDjul/MonthID
-  DefaultAbbrvNamexul./DefaultAbbrvName
+  DefaultAbbrvNamexul/DefaultAbbrvName
   DefaultFullNamexullo/DefaultFullName
 /Month
 Month
   MonthIDaug/MonthID
-  DefaultAbbrvNameago./DefaultAbbrvName
+  DefaultAbbrvNameago/DefaultAbbrvName
   DefaultFullNameagosto/DefaultFullName
 /Month
 Month
   MonthIDsep/MonthID
-  DefaultAbbrvNameset./DefaultAbbrvName
+  DefaultAbbrvNameset/DefaultAbbrvName
   DefaultFullNamesetembro/DefaultFullName
 /Month
 Month
   MonthIDoct/MonthID
-  DefaultAbbrvNameout./DefaultAbbrvName
+  DefaultAbbrvNameout/DefaultAbbrvName
   DefaultFullNameoutubro/DefaultFullName
 /Month
 Month
   MonthIDnov/MonthID
-  DefaultAbbrvNamenov./DefaultAbbrvName
+  DefaultAbbrvNamenov/DefaultAbbrvName
   DefaultFullNamenovembro

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

2013-05-14 Thread Ariel Constenla-Haile

 sdext/source/minimizer/informationdialog.cxx |   52 +++
 sdext/source/minimizer/informationdialog.hxx |1 
 2 files changed, 14 insertions(+), 39 deletions(-)

New commits:
commit 9ddf14e46b0129e828e01cbf279eb46a9a583fd6
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Mar 6 12:45:15 2013 +

Resolves: #i82852# Presentation Minimizer: missing icon in info dialog

(cherry picked from commit 8fd66eeb883676c095c8360ef609e56b9bc055a3)

Conflicts:
sdext/source/minimizer/informationdialog.cxx
sdext/source/minimizer/informationdialog.hxx

Change-Id: I8f6ea8edf7c1b95fefa6c280a92030d628339e56

diff --git a/sdext/source/minimizer/informationdialog.cxx 
b/sdext/source/minimizer/informationdialog.cxx
index 92accb2..babba10 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -90,8 +90,15 @@ OUString InsertFixedText( InformationDialog 
rInformationDialog, const OUString
 return rControlName;
 }
 
-OUString InsertImage( InformationDialog rInformationDialog, const OUString 
rControlName, const OUString rURL,
-sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, 
sal_Int32 nHeight )
+OUString InsertImage(
+InformationDialog rInformationDialog,
+const OUString rControlName,
+const OUString rURL,
+sal_Int32 nPosX,
+sal_Int32 nPosY,
+sal_Int32 nWidth,
+sal_Int32 nHeight,
+sal_Bool bScale )
 {
 OUString pNames[] = {
 TKGet( TK_Border ),
@@ -108,7 +115,7 @@ OUString InsertImage( InformationDialog 
rInformationDialog, const OUString rCo
 Any( rURL ),
 Any( nPosX ),
 Any( nPosY ),
-Any( sal_True ),
+Any( bScale ),
 Any( nWidth ) };
 sal_Int32 nCount = SAL_N_ELEMENTS( pNames );
 
@@ -202,40 +209,6 @@ static OUString ImpValueOfInMB( const sal_Int64 rVal )
 return aVal.makeStringAndClear();
 }
 
-OUString InformationDialog::ImpGetStandardImage( const OUString sPrivateURL )
-{
-OUString sURL;
-try
-{
-mxTempFile = Reference XStream ( io::TempFile::create(mxMSF), 
UNO_QUERY_THROW );
-Reference XPropertySet  xPropSet( mxTempFile, UNO_QUERY );
-Reference XOutputStream  xOutputStream( 
mxTempFile-getOutputStream() );
-if ( xOutputStream.is()  xPropSet.is() )
-{
-Reference graphic::XGraphicProvider  xGraphicProvider( 
graphic::GraphicProvider::create( mxMSF ) );
-Sequence PropertyValue  aArgs( 1 );
-aArgs[ 0 ].Name = OUString(URL);
-aArgs[ 0 ].Value = sPrivateURL;
-Reference graphic::XGraphic  xGraphic( 
xGraphicProvider-queryGraphic( aArgs ) );
-if ( xGraphic.is() )
-{
-OUString aDestMimeType( image/png  );
-Sequence PropertyValue  aArgs2( 2 );
-aArgs2[ 0 ].Name = TKGet( TK_MimeType );// the 
GraphicProvider is using MimeType, the GraphicExporter MediaType...
-aArgs2[ 0 ].Value = aDestMimeType;
-aArgs2[ 1 ].Name = TKGet( TK_OutputStream );
-aArgs2[ 1 ].Value = xOutputStream;
-xGraphicProvider-storeGraphic( xGraphic, aArgs2 );
-}
-xPropSet-getPropertyValue( OUString(Uri) ) = sURL;
-}
-}
-catch( Exception )
-{
-}
-return sURL;
-}
-
 void InformationDialog::InitDialog()
 {
 sal_Int32 nDialogHeight = DIALOG_HEIGHT;
@@ -325,7 +298,10 @@ void InformationDialog::InitDialog()
 aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), 
aTitle );
 
 com::sun::star::uno::Reference com::sun::star::awt::XItemListener  
xItemListener;
-InsertImage( *this, OUString(aboutimage), ImpGetStandardImage( 
OUString(private:standardimage/query) ), 5, 5, 25, 25 );
+InsertImage( *this,
+ OUString( aboutimage ),
+ OUString( private:standardimage/query ),
+ 5, 5, 25, 25, sal_False );
 InsertFixedText( *this, OUString(fixedtext), aInfoString, PAGE_POS_X, 6, 
PAGE_WIDTH, 24, sal_True, 0 );
 if ( !maSaveAsURL.isEmpty() )
 InsertCheckBox(  *this, TKGet( TK_OpenNewDocument ), xItemListener, 
getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 );
diff --git a/sdext/source/minimizer/informationdialog.hxx 
b/sdext/source/minimizer/informationdialog.hxx
index 8486de3..5de67e1 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -61,7 +61,6 @@ private :
 
 com::sun::star::uno::Reference com::sun::star::awt::XActionListener   
mxActionListener;
 
-OUString ImpGetStandardImage( const OUString rPrivateURL );
 void InitDialog();
 
 sal_Int64 mnSourceSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source

2013-05-13 Thread Ariel Constenla-Haile

 i18npool/source/localedata/data/gl_ES.xml |   38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit ba12679129efc39834114be8bca835d8a84aacb6
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue May 14 00:23:03 2013 +

i122306 - Remove dot from abbreviate day and month names in Galician

diff --git a/i18npool/source/localedata/data/gl_ES.xml 
b/i18npool/source/localedata/data/gl_ES.xml
index 2c13fb9..669e4eb 100644
--- a/i18npool/source/localedata/data/gl_ES.xml
+++ b/i18npool/source/localedata/data/gl_ES.xml
@@ -204,99 +204,99 @@
   DaysOfWeek
 Day
   DayIDsun/DayID
-  DefaultAbbrvNamedom./DefaultAbbrvName
+  DefaultAbbrvNamedom/DefaultAbbrvName
   DefaultFullNamedomingo/DefaultFullName
 /Day
 Day
   DayIDmon/DayID
-  DefaultAbbrvNamelun./DefaultAbbrvName
+  DefaultAbbrvNamelun/DefaultAbbrvName
   DefaultFullNameluns/DefaultFullName
 /Day
 Day
   DayIDtue/DayID
-  DefaultAbbrvNamemar./DefaultAbbrvName
+  DefaultAbbrvNamemar/DefaultAbbrvName
   DefaultFullNamemartes/DefaultFullName
 /Day
 Day
   DayIDwed/DayID
-  DefaultAbbrvNamemÃ©r./DefaultAbbrvName
+  DefaultAbbrvNamemÃ©r/DefaultAbbrvName
   DefaultFullNamemÃ©rcores/DefaultFullName
 /Day
 Day
   DayIDthu/DayID
-  DefaultAbbrvNamexov./DefaultAbbrvName
+  DefaultAbbrvNamexov/DefaultAbbrvName
   DefaultFullNamexoves/DefaultFullName
 /Day
 Day
   DayIDfri/DayID
-  DefaultAbbrvNameven./DefaultAbbrvName
+  DefaultAbbrvNameven/DefaultAbbrvName
   DefaultFullNamevenres/DefaultFullName
 /Day
 Day
   DayIDsat/DayID
-  DefaultAbbrvNamesÃ¡b./DefaultAbbrvName
+  DefaultAbbrvNamesÃ¡b/DefaultAbbrvName
   DefaultFullNamesÃ¡bado/DefaultFullName
 /Day
   /DaysOfWeek
   MonthsOfYear
 Month
   MonthIDjan/MonthID
-  DefaultAbbrvNamexan./DefaultAbbrvName
+  DefaultAbbrvNamexan/DefaultAbbrvName
   DefaultFullNamexaneiro/DefaultFullName
 /Month
 Month
   MonthIDfeb/MonthID
-  DefaultAbbrvNamefeb./DefaultAbbrvName
+  DefaultAbbrvNamefeb/DefaultAbbrvName
   DefaultFullNamefebreiro/DefaultFullName
 /Month
 Month
   MonthIDmar/MonthID
-  DefaultAbbrvNamemar./DefaultAbbrvName
+  DefaultAbbrvNamemar/DefaultAbbrvName
   DefaultFullNamemarzo/DefaultFullName
 /Month
 Month
   MonthIDapr/MonthID
-  DefaultAbbrvNameabr./DefaultAbbrvName
+  DefaultAbbrvNameabr/DefaultAbbrvName
   DefaultFullNameabril/DefaultFullName
 /Month
 Month
   MonthIDmay/MonthID
-  DefaultAbbrvNamemai./DefaultAbbrvName
+  DefaultAbbrvNamemai/DefaultAbbrvName
   DefaultFullNamemaio/DefaultFullName
 /Month
 Month
   MonthIDjun/MonthID
-  DefaultAbbrvNamexuÃ±./DefaultAbbrvName
+  DefaultAbbrvNamexuÃ±/DefaultAbbrvName
   DefaultFullNamexuÃ±o/DefaultFullName
 /Month
 Month
   MonthIDjul/MonthID
-  DefaultAbbrvNamexul./DefaultAbbrvName
+  DefaultAbbrvNamexul/DefaultAbbrvName
   DefaultFullNamexullo/DefaultFullName
 /Month
 Month
   MonthIDaug/MonthID
-  DefaultAbbrvNameago./DefaultAbbrvName
+  DefaultAbbrvNameago/DefaultAbbrvName
   DefaultFullNameagosto/DefaultFullName
 /Month
 Month
   MonthIDsep/MonthID
-  DefaultAbbrvNameset./DefaultAbbrvName
+  DefaultAbbrvNameset/DefaultAbbrvName
   DefaultFullNamesetembro/DefaultFullName
 /Month
 Month
   MonthIDoct/MonthID
-  DefaultAbbrvNameout./DefaultAbbrvName
+  DefaultAbbrvNameout/DefaultAbbrvName
   DefaultFullNameoutubro/DefaultFullName
 /Month
 Month
   MonthIDnov/MonthID
-  DefaultAbbrvNamenov./DefaultAbbrvName
+  DefaultAbbrvNamenov/DefaultAbbrvName
   DefaultFullNamenovembro/DefaultFullName
 /Month
 Month
   MonthIDdec/MonthID
-  DefaultAbbrvNamedec./DefaultAbbrvName
+  DefaultAbbrvNamedec/DefaultAbbrvName
   DefaultFullNamedecembro/DefaultFullName
 /Month
   /MonthsOfYear
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-12 Thread Ariel Constenla-Haile

 dev/null|binary
 odk/examples/cpp/custompanel/CalcWindowState.xcu|   39 +++
 odk/examples/cpp/custompanel/DrawWindowState.xcu|   39 +++
 odk/examples/cpp/custompanel/Factories.xcu  |   39 +++
 odk/examples/cpp/custompanel/ImpressWindowState.xcu |   39 +++
 odk/examples/cpp/custompanel/Makefile   |  171 +
 odk/examples/cpp/custompanel/WriterWindowState.xcu  |   53 
 odk/examples/cpp/custompanel/ctp_factory.cxx|  156 
 odk/examples/cpp/custompanel/ctp_factory.hxx|   74 +
 odk/examples/cpp/custompanel/ctp_panel.cxx  |  255 +++
 odk/examples/cpp/custompanel/ctp_panel.hxx  |  116 
 odk/examples/cpp/custompanel/ctp_services.cxx   |   57 
 odk/examples/cpp/custompanel/description.xml|   33 ++
 odk/examples/cpp/custompanel/manifest.xml   |   35 ++
 odk/examples/cpp/custompanel/panel.png  |binary
 sfx2/workben/custompanel/CalcWindowState.xcu|   39 ---
 sfx2/workben/custompanel/DrawWindowState.xcu|   39 ---
 sfx2/workben/custompanel/Factories.xcu  |   39 ---
 sfx2/workben/custompanel/ImpressWindowState.xcu |   39 ---
 sfx2/workben/custompanel/WriterWindowState.xcu  |   53 
 sfx2/workben/custompanel/ctp_factory.cxx|  156 
 sfx2/workben/custompanel/ctp_factory.hxx|   74 -
 sfx2/workben/custompanel/ctp_panel.cxx  |  258 
 sfx2/workben/custompanel/ctp_panel.hxx  |  117 -
 sfx2/workben/custompanel/ctp_services.cxx   |   74 -
 sfx2/workben/custompanel/description.xml|   33 --
 sfx2/workben/custompanel/manifest.xml   |   35 --
 27 files changed, 1106 insertions(+), 956 deletions(-)

New commits:
commit dca437578e09ac00c6df8aa0b8908d4ae24188fe
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Fri Jun 15 05:50:26 2012 +

Custom Panel SDK Example Fixes

- Remove unused boost header
- OUT_DEPLOY_URL must be an URL

Both break building the example on Windows

(cherry picked from commit 8af699cb89d9477b13d8701266b7c1fdf9356cfa)

Change-Id: Iedc1b1d6d9493390cdf8b9055afe7c712c6bfc31

diff --git a/odk/examples/cpp/custompanel/Makefile 
b/odk/examples/cpp/custompanel/Makefile
index 1e81c9b..95268db 100644
--- a/odk/examples/cpp/custompanel/Makefile
+++ b/odk/examples/cpp/custompanel/Makefile
@@ -36,10 +36,8 @@ COMP_PACKAGE_URL = $(subst 
\\,\,$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_E
 COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml
 COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map
 COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components
-COMP_REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag
 COMP_TYPEFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_types.flag
 
-
 # Allow deploying the extension when running it
 
 #this should be in odk/settings/std.mk
@@ -47,12 +45,11 @@ OUT_DEPLOY=$(OUT)/deploy
 
 OUT_COMP_DEPLOY=$(OUT_DEPLOY)/$(COMP_NAME)
 OUT_DEPLOY_DIR=$(subst /,$(PS),$(OUT_COMP_DEPLOY))
-OUT_DEPLOY_URL=$(URLPREFIX)$(subst \\,\,$(OUT_DEPLOY_DIR))
+OUT_DEPLOY_URL=$(URLPREFIX)$(OUT_COMP_DEPLOY)
 ENV_USER_INSTALL=-env:UserInstallation=$(OUT_DEPLOY_URL)
 OFFICE_START_OPTIONS=-nologo -nofirststartwizard -norestore -writer
 OXT_DEPLOYEDFLAG=$(OUT_MISC)/cpp_$(COMP_NAME)_deployed_oxt.flag
 
-
 CXXFILES = \
ctp_factory.cxx \
ctp_panel.cxx \
@@ -144,7 +141,6 @@ $(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) 
WriterWindowState.xcu CalcW
$(SDK_ZIP) -u $@  WriterWindowState.xcu CalcWindowState.xcu 
DrawWindowState.xcu ImpressWindowState.xcu Factories.xcu panel.png
cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F)))  
$(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
 
-
 CustomToolPanelExample : $(COMP_PACKAGE)
@echo 

@echo Please use the following command to deploy the example!
@@ -153,7 +149,6 @@ CustomToolPanelExample : $(COMP_PACKAGE)
@echo -
@echo 

 
-
 CustomToolPanelExample.run: $(OXT_DEPLOYEDFLAG)
$(OFFICE_PROGRAM_PATH)$(PS)soffice $(OFFICE_START_OPTIONS)  
$(ENV_USER_INSTALL)
 
@@ -164,9 +159,6 @@ $(OXT_DEPLOYEDFLAG) : $(COMP_PACKAGE)
$(DEPLOYTOOL) $(COMP_PACKAGE_URL) $(ENV_USER_INSTALL)
@echo flagged  $(subst /,$(PS),$@)
 
-
-
-
 .PHONY: clean
 clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_INC))
@@ -174,7 +166,6 @@ clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_SLO))
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_DEPLOY_DIR))
-$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMP_PACKAGE_URL)))
-   -$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMP_REGISTERFLAG)))
-$(DEL

[Libreoffice-commits] core.git: swext/mediawiki

2013-05-12 Thread Ariel Constenla-Haile

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   48 ++-
 1 file changed, 33 insertions(+), 15 deletions(-)

New commits:
commit bc0e857b9699bfefa2d8204fe627063675c9cfc9
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Mar 23 12:49:10 2013 +

Resolves: #i121907# upgrade odt2mediawiki to latest version

upstream changed license to ALv2

Besides the license change, there are two bug fixes:
* Do not apply any transformation to the contents marked as WikiMath.
* Join sibling nodes marked as WikiMath.

Patch by: Bernhard Haumacher

(cherry picked from commit 414a61fa4c4f03a2b2645682c55ee56ae9c84a79)

Change-Id: I6b996631ebdd908c6d96d2c9dde1a3d6dd3e212f

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 845a11a..6a44ecd 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -1,22 +1,21 @@
 ?xml version=1.0 encoding=UTF-8?
+!--
+odt2mediawiki: OpenDocument to WikiMedia transformation
+Copyright (C) 2007-2013  Bernhard Haumacher (haui at haumacher dot de)
 
-!-- 
-   odt2wiki: OpenDocument to WikiMedia transformation
-Copyright (C) 2007  Bernhard Haumacher (haui at haumacher dot de)
+Licensed under the Apache License, Version 2.0 (the License);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+http://www.apache.org/licenses/LICENSE-2.0
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an AS IS BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+$Id: odt2mediawiki.xsl 3180 2013-03-17 16:00:43Z hauma $
 --
 stylesheet version=1.0 
xmlns=http://www.w3.org/1999/XSL/Transform;
@@ -478,12 +477,31 @@
== WikiMath == 
 --
 
+!--
+   Make sure to join sibling node that are all formated with WikiMath 
style without repeating
+   the math../math markup.
+
+   Do not apply any transformation to the contents marked as WikiMath.
+   --
template match=text:span[@text:style-name='WikiMath']
value-of select='lt;mathgt;'/
-   apply-templates/
+   value-of select=string(.)/
value-of select='lt;/mathgt;'/
/template
 
+   template match=text:span[@text:style-name='WikiMath' and 
boolean(preceding-sibling::node()[position()=1 and local-name(.)='span' and 
@text:style-name='WikiMath'])]
+   value-of select=string(.)/
+   value-of select='lt;/mathgt;'/
+   /template
+
+   template match=text:span[@text:style-name='WikiMath' and 
boolean(following-sibling::node()[position()=1 and local-name(.)='span' and 
@text:style-name='WikiMath'])]
+   value-of select='lt;mathgt;'/
+   value-of select=string(.)/
+   /template
+
+   template match=text:span[@text:style-name='WikiMath' and 
boolean(following-sibling::node()[position()=1 and local-name(.)='span' and 
@text:style-name='WikiMath']) and 
boolean(preceding-sibling::node()[position()=1 and local-name(.)='span' and 
@text:style-name='WikiMath'])]
+   value-of select=string(.)/
+/template
 
!-- 
== Native links == 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2013-05-12 Thread Ariel Constenla-Haile

 offapi/com/sun/star/presentation/XSlideShow.idl |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 5de5a073e0c64699e716d71e1d6b700380eeced6
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Jul 2 08:28:55 2012 +

Related: #i120145# Remove ENABLE_PRESENTER_EXTRA_UI

(cherry picked from commit 59d811efac87bf84169ca439a7d9b5181fc5929d)

Change-Id: I958f54f4a9ec590baf9fb1ddb75c85595d4e248b

diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl 
b/offapi/com/sun/star/presentation/XSlideShow.idl
index c99cc09..0cc95db 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -120,8 +120,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
 The slide to display.
 
 @param xDrawPages
-For future use.
-This parameter can be NULL when the ENABLE_PRESENTER_EXTRA_UI feature is 
disabled.
+For future use.
 
 @param xAnimationNode
 The animation node determine the animations to display.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-11 Thread Ariel Constenla-Haile

 scripting/source/pyprov/pythonscript.py |   56 +---
 1 file changed, 51 insertions(+), 5 deletions(-)

New commits:
commit b0c59c314610ee5c6a361b0d3629d5a676305c58
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed May 30 03:08:28 2012 +

Resolves: #ii118478# Implement getInvocationContext in PyUNO ScriptContext

Original author: Tsutomu Uchino hanya.runo at gmail.com

(cherry picked from commit 5de5fd495d7cdad852d1631941ae03ec213f93b7)

Change-Id: Iaa0aa8b1dd6a326cd738f2e296a1b5ecdc379c65

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index 52ae89b..c92d212 100755
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -117,9 +117,9 @@ from com.sun.star.lang import IllegalArgumentException
 from com.sun.star.container import NoSuchElementException
 from com.sun.star.lang import XServiceInfo
 from com.sun.star.io import IOException
-from com.sun.star.ucb import CommandAbortedException, XCommandEnvironment, 
XProgressHandler
+from com.sun.star.ucb import CommandAbortedException, XCommandEnvironment, 
XProgressHandler, Command
 from com.sun.star.task import XInteractionHandler
-from com.sun.star.beans import XPropertySet
+from com.sun.star.beans import XPropertySet, Property
 from com.sun.star.container import XNameContainer
 from com.sun.star.xml.sax import XDocumentHandler, InputSource
 from com.sun.star.uno import Exception as UnoException
@@ -251,12 +251,15 @@ def checkForPythonPathBesideScript( url ):
 
 
 class ScriptContext(unohelper.Base):
-def __init__( self, ctx, doc ):
+def __init__( self, ctx, doc, inv ):
 self.ctx = ctx
 self.doc = doc
+self.inv = inv

# XScriptContext
 def getDocument(self):
+if self.doc:
+return self.doc
 return self.getDesktop().getCurrentComponent()
 
 def getDesktop(self):
@@ -266,6 +269,9 @@ class ScriptContext(unohelper.Base):
 def getComponentContext(self):
 return self.ctx
 
+def getInvocationContext(self):
+return self.inv
+
 #--
 # Global Module Administration
 # does not fit together with script
@@ -745,7 +751,32 @@ class CommandEnvironment(unohelper.Base, 
XCommandEnvironment):
 #log.isDebugLevel() and log.debug( pythonscript: 
ModifyListener.modified  + str( event ) )
 #def disposing( self, event ):
 #log.isDebugLevel() and log.debug( pythonscript: 
ModifyListener.disposing  + str( event ) )
+
+def getModelFromDocUrl(ctx, url):
+Get document model from document url.
+doc = None
+args = (Local, Office)
+ucb = ctx.getServiceManager().createInstanceWithArgumentsAndContext(
+com.sun.star.ucb.UniversalContentBroker, args, ctx)
+identifier = ucb.createContentIdentifier(url)
+content = ucb.queryContent(identifier)
+p = Property()
+p.Name = DocumentModel
+p.Handle = -1
 
+c = Command()
+c.Handle = -1
+c.Name = getPropertyValues
+c.Argument = uno.Any([]com.sun.star.beans.Property, (p,))
+
+env = CommandEnvironment()
+try:
+ret = content.execute(c, 0, env)
+doc = ret.getObject(1, None)
+except Exception as e:
+log.isErrorLevel() and log.error(getModelFromDocUrl: %s % url)
+return doc
+
 def mapStorageType2PackageContext( storageType ):
 ret = storageType
 if( storageType == share:uno_packages ):
@@ -872,11 +903,26 @@ class PythonScriptProvider( unohelper.Base, XBrowseNode, 
XScriptProvider, XNameC
 mystr = mystr + str(i)
 log.debug( Entering PythonScriptProvider.ctor + mystr )
 
+doc = None
+inv = None
 storageType = 
+
 if isinstance(args[0],unicode ):
 storageType = args[0]
+if storageType.startswith( vnd.sun.star.tdoc ):
+doc = getModelFromDocUrl(ctx, storageType)
 else:
-storageType = args[0].SCRIPTING_DOC_URI
+inv = args[0]
+try:
+doc = inv.ScriptContainer
+content = ctx.getServiceManager().createInstanceWithContext(
+
com.sun.star.frame.TransientDocumentsDocumentContentFactory,
+ctx).createDocumentContent(doc)
+storageType = content.getIdentifier().getContentIdentifier()
+except Exception as e:
+text = lastException2String()
+log.error( text )
+
 isPackage = storageType.endswith( :uno_packages )
 
 try:
@@ -895,7 +941,7 @@ class PythonScriptProvider( unohelper.Base, XBrowseNode, 
XScriptProvider, XNameC
 raise RuntimeException(
 PythonScriptProvider couldn't instantiate  +ucbService, 
self)
 self.provCtx = ProviderContext(
-storageType, sfa, urlHelper, ScriptContext

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

2013-05-11 Thread Ariel Constenla-Haile

 extensions/source/update/check/org/openoffice/Office/Jobs.xcu |5 +
 1 file changed, 5 insertions(+)

New commits:
commit b9d460f18bc0144452a5fa9a4da85b5f5827d21b
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Aug 1 23:35:27 2012 +

Related: #i120413# document helpful precalculated CheckInterval vals

(cherry picked from commit 1045898eb4be2f19d8435e86ff600f4d9541abf9)

Conflicts:
extensions/source/update/check/Jobs.xcu

Change-Id: Iddf1ba34bd6a48ae64c3b7b104d2e942f39df244

diff --git a/extensions/source/update/check/org/openoffice/Office/Jobs.xcu 
b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu
index b1f9c91..f11c14e 100644
--- a/extensions/source/update/check/org/openoffice/Office/Jobs.xcu
+++ b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu
@@ -30,6 +30,11 @@
 value0/value
 /prop
 prop oor:name=CheckInterval oor:type=xs:long 
oor:op=replace
+!--
+Every Day   =   86400
+Every Week  =  604800
+Every Month = 2592000
+--
 value604800/value
 /prop
 prop oor:name=DownloadDestination oor:type=xs:string 
oor:op=replace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cppuhelper/qa oox/inc oox/source sal/inc sdext/source svx/source vcl/source writerfilter/source xmloff/source

2013-05-08 Thread Ariel Constenla-Haile

 cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx   |   18 ---
 oox/inc/oox/export/shapes.hxx|2 -
 oox/source/export/shapes.cxx |   12 +--
 sal/inc/rtl/string.hxx   |   23 +++
 sdext/source/minimizer/pppoptimizertoken.cxx |   11 +--
 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx |   10 +-
 vcl/source/glyphs/gcach_ftyp.cxx |3 -
 writerfilter/source/resourcemodel/TagLogger.cxx  |   10 --
 xmloff/source/draw/EnhancedCustomShapeToken.cxx  |   11 +--
 9 files changed, 35 insertions(+), 65 deletions(-)

New commits:
commit be3f41391a4eb370080be25c6857066a21cb6fdd
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed May 8 22:11:05 2013 +

Fix build breaker

diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index bc9b670..0519b1a 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -131,7 +131,7 @@ FT_Error (*pFTEmbolden)(FT_GlyphSlot);
 FT_Error (*pFTOblique)(FT_GlyphSlot);
 static bool bEnableSizeFT = false;
 
-typedef ::std::hash_map const char*, FtFontFile*, CStringHash, CStringEqual 
FontFileList;
+typedef ::std::hash_map const char*, FtFontFile*, rtl::CStringHash, 
rtl::CStringEqual FontFileList;
 namespace { struct vclFontFileList : public rtl::Static FontFileList, 
vclFontFileList  {}; }
 
 // ---
commit b7e3470a154538a92f0a21b14e726d75723f4a92
Author: Herbert DÃ¼rr h...@apache.org
Date:   Wed May 8 15:17:19 2013 +

#i122208# use rtl::CStringHash and rtl::CStringEqual instead of relying on 
pre-tr1-stl specializations

In stlport=4 the functors hash and equal_to had specializions for 
conveniently handling c-strings.
For consistency reasons this specialization was not included in the TR1 
report and the C++11 standard.
The two new helper functors are drop-in replacements for the old 
specializations.

diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx 
b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index b63b408..6b21e43 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -33,22 +33,6 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-
-struct equalStr
-{
-bool operator()(
-const char * const rA,
-const char * const rB) const
-{ return !strcmp(rA, rB); }
-};
-struct hashStr
-{
-size_t operator()( const char * rName ) const
-{
-return rtl::OString(rName).hashCode();
-}
-};
-
 class ContainerListener;
 
 struct ContainerStats {
@@ -253,7 +237,7 @@ namespace cppu_ifcontainer
 void testOMultiTypeInterfaceContainerHelperVar()
 {
 typedef ::cppu::OMultiTypeInterfaceContainerHelperVar
-const char *,hashStr,equalStr StrContainer;
+const char*, rtl::CStringHash, rtl::CStringEqual StrContainer;
 
 const char *pTypes[nTests] =
 {
diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx
index 077ef93..6af7b91 100644
--- a/oox/inc/oox/export/shapes.hxx
+++ b/oox/inc/oox/export/shapes.hxx
@@ -62,7 +62,7 @@ private:
 
 struct ShapeHash
 {
-std::hashconst char* maHashFunction;
+rtl::CStringHash maHashFunction;
 
 size_t operator()( const ::com::sun::star::uno::Reference  
::com::sun::star::drawing::XShape  ) const;
 };
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 49ae8d9..5b6c624 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -307,15 +307,7 @@ static const CustomShapeTypeTranslationTable 
pCustomShapeTypeTranslationTable[]
 { mso-spt202, rect }
 };
 
-struct StringCheck
-{
-bool operator()( const char* s1, const char* s2 ) const
-{
-return strcmp( s1, s2 ) == 0;
-}
-};
-
-typedef std::hash_map const char*, const char*, std::hashconst char*, 
StringCheck CustomShapeTypeTranslationHashMap;
+typedef std::hash_map const char*, const char*, CStringHash, CStringEqual 
CustomShapeTypeTranslationHashMap;
 static CustomShapeTypeTranslationHashMap* pCustomShapeTypeTranslationHashMap = 
NULL;
 
 static const char* lcl_GetPresetGeometry( const char* sShapeType )
@@ -869,7 +861,7 @@ ShapeExport ShapeExport::WriteRectangleShape( Reference 
XShape  xShape )
 }
 
 typedef ShapeExport (ShapeExport::*ShapeConverter)( Reference XShape  );
-typedef std::hash_map const char*, ShapeConverter, std::hashconst char*, 
StringCheck NameToConvertMapType;
+typedef std::hash_map const char*, ShapeConverter, CStringHash, CStringEqual 
NameToConvertMapType;
 
 static const NameToConvertMapType lcl_GetConverters()
 {
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl

[Libreoffice-commits] core.git: jvmfwk/distributions jvmfwk/plugins

2013-05-02 Thread Ariel Constenla-Haile

 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |4 ++--
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml   |4 ++--
 jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 55d2d982d0722e2ede96811d2a38ad3d70fc9d62
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Jun 10 22:31:42 2012 +

Resolves: #i66923# Add support for JRockit JVM

(cherry picked from commit cb38ee0da6fa928118fbc1da118a707d7799cb40)

Conflicts:
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

Change-Id: Iffd413ba1d74ae3b7da58df7b092c43c4f64a7c9

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 97c2550..2ff9946 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -20,14 +20,14 @@
 javaSelection xmlns=http://openoffice.org/2004/java/framework/1.0;
 xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
 
- updated2012-07-12/updated
+ updated2013-05-02/updated
 
  vendorInfos
   vendor name=Sun Microsystems Inc.
 minVersion1.5.0/minVersion
   /vendor
   vendor name=Oracle Corporation
-minVersion1.7.0/minVersion
+minVersion1.6.0/minVersion
   /vendor
   vendor name=IBM Corporation
 minVersion1.5.0/minVersion
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 3ad59c3..e48037f 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -20,14 +20,14 @@
 javaSelection xmlns=http://openoffice.org/2004/java/framework/1.0;
 xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
 
- updated2012-07-12/updated
+ updated2013-05-02/updated
 
  vendorInfos
   vendor name=Sun Microsystems Inc.
 minVersion1.5.0/minVersion
   /vendor
   vendor name=Oracle Corporation
-minVersion1.7.0/minVersion
+minVersion1.6.0/minVersion
   /vendor
   vendor name=IBM Corporation
 minVersion1.5.0/minVersion
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index f82a286..180bbb9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -57,6 +57,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 /bin/client/jvm.dll,
 /bin/hotspot/jvm.dll,
 /bin/classic/jvm.dll,
+/bin/jrockit/jvm.dll,
 // The 64-bit JRE has the jvm in bin/server
 /bin/server/jvm.dll
 #elif defined MACOSX  defined X86_64
@@ -65,7 +66,8 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 #elif defined UNX
 /lib/ JFW_PLUGIN_ARCH /client/libjvm.so,
 /lib/ JFW_PLUGIN_ARCH /server/libjvm.so,
-/lib/ JFW_PLUGIN_ARCH /classic/libjvm.so
+/lib/ JFW_PLUGIN_ARCH /classic/libjvm.so,
+/lib/ JFW_PLUGIN_ARCH /jrockit/libjvm.so
 #endif
 };
 *size = SAL_N_ELEMENTS(ar);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - cui/source officecfg/registry sc/inc sc/sdi sc/source sd/source sfx2/source svx/inc

2013-04-25 Thread Ariel Constenla-Haile

 cui/source/inc/cuires.hrc |3 
 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu |   26 

 sc/inc/sc.hrc |5 -
 sc/sdi/cellsh.sdi |1 
 sc/sdi/scalc.sdi  |   26 

 sc/source/ui/view/cellsh3.cxx |4 +
 sd/source/ui/unoidl/DrawController.cxx|1 
 sfx2/source/sidebar/Panel.cxx |   17 -
 sfx2/source/sidebar/Panel.hxx |7 +-
 sfx2/source/sidebar/PanelTitleBar.cxx |   32 
++
 sfx2/source/sidebar/PanelTitleBar.hxx |7 +-
 sfx2/source/sidebar/SidebarController.cxx |   16 ++---
 sfx2/source/sidebar/SidebarController.hxx |3 
 svx/inc/svx/dialogs.hrc   |2 
 14 files changed, 100 insertions(+), 50 deletions(-)

New commits:
commit f9271166c2afcf9cad455aac13846bf460e03f3f
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Apr 25 17:23:46 2013 +

i121873 - Add file forgotten to commit with rev. 1471626

diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index 74db3aa..f852ed7 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -35,7 +35,7 @@
   node oor:name=Icon
 prop 
oor:name=NormalFileNamevalueprivate:graphicrepository/presenter/ButtonSlidePreviousNormal.png/value/prop
   /node
-  prop 
oor:name=Actionvaluevnd.com.sun.star.comp.PresenterScreen:PrevSlide/value/prop
+  prop 
oor:name=Actionvaluevnd.com.sun.star.presentation.PresenterScreen:PrevSlide/value/prop
   node oor:name=Font
 prop oor:name=Sizevalue12/value/prop
 prop oor:name=StylevalueBold/value/prop
@@ -65,7 +65,7 @@
   node oor:name=Icon
 prop 
oor:name=NormalFileNamevalueprivate:graphicrepository/presenter/ButtonEffectNextNormal.png/value/prop
   /node
-  prop 
oor:name=Actionvaluevnd.com.sun.star.comp.PresenterScreen:NextEffect/value/prop
+  prop 
oor:name=Actionvaluevnd.com.sun.star.presentation.PresenterScreen:NextEffect/value/prop
   node oor:name=Font
 prop oor:name=Sizevalue12/value/prop
 prop oor:name=StylevalueBold/value/prop
@@ -95,7 +95,7 @@
   node oor:name=Icon
 prop 
oor:name=NormalFileNamevalueprivate:graphicrepository/presenter/ButtonNotesNormal.png/value/prop
   /node
-  prop 
oor:name=Actionvaluevnd.com.sun.star.comp.PresenterScreen:ShowNotes/value/prop
+  prop 
oor:name=Actionvaluevnd.com.sun.star.presentation.PresenterScreen:ShowNotes/value/prop
   node oor:name=Font
 prop oor:name=Sizevalue12/value/prop
 prop oor:name=StylevalueBold/value/prop
@@ -118,7 +118,7 @@
   node oor:name=Font
 prop oor:name=ColorvalueFF/value/prop
   /node
-  prop 
oor:name=Actionvaluevnd.com.sun.star.comp.PresenterScreen:CloseNotes/value/prop
+  prop 
oor:name=Actionvaluevnd.com.sun.star.presentation.PresenterScreen:CloseNotes/value/prop
 /node
 node oor:name=Disabled
   node oor:name=Icon
@@ -134,7 +134,7 @@
   node oor:name=Icon
 prop 
oor:name=NormalFileNamevalueprivate:graphicrepository/presenter/ButtonSlideSorterNormal.png/value/prop
   /node
-  prop 
oor:name=Actionvaluevnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter/value/prop
+  prop 
oor:name=Actionvaluevnd.com.sun.star.presentation.PresenterScreen:ShowSlideSorter/value/prop
   node oor:name=Font
 prop oor:name=Sizevalue12/value/prop
 prop oor:name=StylevalueBold/value/prop
@@ -157,7 +157,7 @@
   node oor:name=Font
 prop oor:name=ColorvalueFF/value/prop
   /node
-  prop 
oor:name=Actionvaluevnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter/value/prop
+  prop 
oor:name=Actionvaluevnd.com.sun.star.presentation.PresenterScreen:CloseSlideSorter/value/prop
 /node
 node oor:name=Disabled
   node oor:name=Icon
@@ -225,7 +225,7 @@
   node oor:name=Icon
 prop 
oor:name=NormalFileNamevalueprivate:graphicrepository/presenter/ButtonHelpNormal.png/value/prop
   /node
-  prop

1 2 >

1 - 100 of 115 matches

Mail list logo