date:20140623

 svx/source/gallery2/gallery1.cxx |   38 ++
 1 file changed, 10 insertions(+), 28 deletions(-)

New commits:
commit 52613b9b632721ebb5167a4d9529c242a0b907da
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Jun 21 19:53:37 2014 +0200

Resolves: fdo#80327 Sound list box when non-English UI

Fallback strings are in English wheresas ImplGetThemeEntry expects 
localized strings
Let's put localized strings in fallback to make ImplGetThemeEntry happy

Cherry-picked from e4ca1f900a5585d35af04159bdd854f10b495355

Change-Id: I27dd992bac4f5aaf6e0e6237fe59dac990f11c92
Reviewed-on: https://gerrit.libreoffice.org/9845
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 09b1ded..d77122e 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -434,66 +434,48 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) 
const
 // try fallback, if no entry was found
 if( !pFound )
 {
-OString aFallback;
+OUString aFallback;
 
 switch( nThemeId )
 {
 case( GALLERY_THEME_3D ):
-aFallback = 3D;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_3D);
 break;
 case( GALLERY_THEME_BULLETS ):
-aFallback = Bullets;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_BULLETS);
 break;
 case( GALLERY_THEME_HOMEPAGE ):
-aFallback = Homepage;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_HOMEPAGE);
 break;
 case( GALLERY_THEME_POWERPOINT ):
-aFallback = private://gallery/hidden/imgppt;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_POWERPOINT);
 break;
 case( GALLERY_THEME_FONTWORK ):
-aFallback = private://gallery/hidden/fontwork;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK);
 break;
 case( GALLERY_THEME_FONTWORK_VERTICAL ):
-aFallback = private://gallery/hidden/fontworkvertical;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK_VERTICAL);
 break;
 case( GALLERY_THEME_SOUNDS ):
-aFallback = Sounds;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_SOUNDS);
 break;
 case( RID_GALLERYSTR_THEME_ARROWS ):
-aFallback = Arrows;
-break;
 case( RID_GALLERYSTR_THEME_COMPUTERS ):
-aFallback = Computers;
-break;
 case( RID_GALLERYSTR_THEME_DIAGRAMS ):
-aFallback = Diagrams;
-break;
 case( RID_GALLERYSTR_THEME_EDUCATION ):
-aFallback = Education;
-break;
 case( RID_GALLERYSTR_THEME_ENVIRONMENT ):
-aFallback = Environment;
-break;
 case( RID_GALLERYSTR_THEME_FINANCE ):
-aFallback = Finance;
-break;
 case( RID_GALLERYSTR_THEME_PEOPLE ):
-aFallback = People;
-break;
 case( RID_GALLERYSTR_THEME_SYMBOLS ):
-aFallback = Symbols;
-break;
 case( RID_GALLERYSTR_THEME_TRANSPORT ):
-aFallback = Transport;
-break;
 case( RID_GALLERYSTR_THEME_TXTSHAPES ):
-aFallback = Textshapes;
+aFallback = GAL_RESSTR(static_castsal_uInt32(nThemeId));
 break;
 default:
 break;
 }
 
-pFound = 
const_castGallery*(this)-ImplGetThemeEntry(OStringToOUString(aFallback, 
RTL_TEXTENCODING_ASCII_US));
+pFound = const_castGallery*(this)-ImplGetThemeEntry(aFallback);
 }
 
 return( pFound ? pFound-GetThemeName() : OUString() );
___
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/aqua vcl/unx

2014-06-23 Thread Herbert Dürr

 vcl/aqua/source/a11y/documentfocuslistener.cxx |   51 -
 vcl/unx/gtk/a11y/atkutil.cxx   |   42 ++--
 2 files changed, 48 insertions(+), 45 deletions(-)

New commits:
commit 4da0e442f0fd4838e93e7316c24cfeef9289207d
Author: Herbert DÃ¼rr h...@apache.org
Date:   Mon Jun 23 07:55:44 2014 +

#i124970# fix DocumentFocusListener::notifyEvent's handling of 
IndexOutOfBoundsException

the DocumentFocusListener::notifyEvent() throw list only allows a 
RuntimeException to
propagate. The methods called in notifyEvent() allow 
IndexOutOfBoundsException though,
so it must be handled in all cases to prevent C++ from invoking its 
unexpected() abort
mechanisms. Ceterum censeo, non-empty throw lists should be removed 
altogether...

diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx 
b/vcl/aqua/source/a11y/documentfocuslistener.cxx
index 3fbda71..b15d4f8 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx
@@ -65,10 +65,10 @@ void SAL_CALL
 DocumentFocusListener::notifyEvent( const AccessibleEventObject aEvent )
 throw( RuntimeException )
 {
-switch( aEvent.EventId )
-{
-case AccessibleEventId::STATE_CHANGED:
-try
+try {
+switch( aEvent.EventId )
+{
+case AccessibleEventId::STATE_CHANGED:
 {
 sal_Int16 nState = AccessibleStateType::INVALID;
 aEvent.NewValue = nState;
@@ -76,34 +76,35 @@ DocumentFocusListener::notifyEvent( const 
AccessibleEventObject aEvent )
 if( AccessibleStateType::FOCUSED == nState )
 m_aFocusTracker.setFocusedObject( getAccessible(aEvent) );
 }
-catch(IndexOutOfBoundsException e)
-{
-OSL_TRACE(Focused object has invalid index in parent);
-}
 break;
 
-case AccessibleEventId::CHILD:
-{
-Reference XAccessible  xChild;
-if( (aEvent.OldValue = xChild)  xChild.is() )
-detachRecursive(xChild);
+case AccessibleEventId::CHILD:
+{
+Reference XAccessible  xChild;
+if( (aEvent.OldValue = xChild)  xChild.is() )
+detachRecursive(xChild);
 
-if( (aEvent.NewValue = xChild)  xChild.is() )
-attachRecursive(xChild);
-}
+if( (aEvent.NewValue = xChild)  xChild.is() )
+attachRecursive(xChild);
+}
 break;
 
-case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
-{
-Reference XAccessible  xAccessible( getAccessible(aEvent) );
-detachRecursive(xAccessible);
-attachRecursive(xAccessible);
-}
-
+case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
+{
+Reference XAccessible  xAccessible( getAccessible(aEvent) );
+detachRecursive(xAccessible);
+attachRecursive(xAccessible);
+}
 OSL_TRACE( Invalidate all children called\n );
 break;
-default:
-break;
+
+default:
+break;
+}
+}
+catch(IndexOutOfBoundsException e)
+{
+OSL_TRACE(Focused object has invalid index in parent);
 }
 }
 
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 8a6d7fa..4fbe84b 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -202,10 +202,10 @@ void DocumentFocusListener::disposing( const 
lang::EventObject aEvent )
 void DocumentFocusListener::notifyEvent( const 
accessibility::AccessibleEventObject aEvent )
 throw( uno::RuntimeException )
 {
-switch( aEvent.EventId )
-{
-case accessibility::AccessibleEventId::STATE_CHANGED:
-try
+try {
+switch( aEvent.EventId )
+{
+case accessibility::AccessibleEventId::STATE_CHANGED:
 {
 sal_Int16 nState = accessibility::AccessibleStateType::INVALID;
 aEvent.NewValue = nState;
@@ -213,34 +213,36 @@ void DocumentFocusListener::notifyEvent( const 
accessibility::AccessibleEventObj
 if( accessibility::AccessibleStateType::FOCUSED == nState )
 atk_wrapper_focus_tracker_notify_when_idle( 
getAccessible(aEvent) );
 }
-catch(const lang::IndexOutOfBoundsException e)
-{
-g_warning(Focused object has invalid index in parent);
-}
 break;
 
-case accessibility::AccessibleEventId::CHILD:
-{
-uno::Reference accessibility::XAccessible  xChild;
-if( (aEvent.OldValue = xChild)  xChild.is() )
-detachRecursive(xChild);
+case accessibility::AccessibleEventId::CHILD:
+{

[Libreoffice-commits] core.git: Changes to 'feature/aoo-fillattribute'

New branch 'feature/aoo-fillattribute' available with the following commits:
commit 171d3cf83703085065b72bf756754375efd79372
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 20 16:03:03 2014 +0100

fix tests

Change-Id: Ia7099e87baa553ce6f5537908e1fb65c268d3940

commit 066b83430cef5c3f97c78bfa5c7955078cc97eeb
Author: Armin Le Grand a...@apache.org
Date:   Thu Jun 5 12:24:35 2014 +

Resolves: #i125045# For XMLPropertyMapper using TEXT_PROP_MAP_SHAPE_PARA...

hide the DrawingLayer FillStyle entries by moving them to the front of
aXMLParaPropMap and using a higher index for construction

(cherry picked from commit 35f3ceaf60f109f45aa7fef7077aead398bed53f)

Change-Id: I8244e4dc685a2aa35e4154a43455ff62c8ee58fe

commit 67d40b7d8333f0c5f27a386d5c1e46d50c0c9154
Author: Armin Le Grand a...@apache.org
Date:   Thu Jun 5 08:44:38 2014 +

Related: #i124638# Corrected relationship between DrawModel and...

DocShell in Writer, made SwDrawModel and handling more known

(includes suspicious removal of setting SID_ATTR_LINEEND_WIDTH_DEFAULT)

(cherry picked from commit a7ccadbf3b1ac378ca15d3630d48f48734700e5c)

Conflicts:
sw/inc/IDocumentDrawModelAccess.hxx
sw/inc/doc.hxx
sw/inc/docsh.hxx
sw/inc/dpage.hxx
sw/inc/drawdoc.hxx
sw/source/core/access/accmap.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docdesc.cxx
sw/source/core/doc/docdraw.cxx
sw/source/core/doc/docfly.cxx
sw/source/core/doc/doclay.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/draw/dpage.cxx
sw/source/core/draw/drawdoc.cxx
sw/source/core/frmedt/feshview.cxx
sw/source/core/layout/fly.cxx
sw/source/core/layout/frmtool.cxx
sw/source/core/layout/newfrm.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/undo/docundo.cxx
sw/source/core/undo/unattr.cxx
sw/source/core/unocore/unodraw.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/view/vdraw.cxx
sw/source/core/view/viewimp.cxx
sw/source/core/view/viewsh.cxx
sw/source/filter/html/htmldrawreader.cxx
sw/source/filter/rtf/rtffly.cxx
sw/source/filter/rtf/swparrtf.cxx
sw/source/filter/ww8/docxattributeoutput.cxx
sw/source/filter/ww8/rtfattributeoutput.cxx
sw/source/filter/ww8/wrtw8esh.cxx
sw/source/filter/ww8/wrtww8.cxx
sw/source/filter/ww8/ww8graf.cxx
sw/source/filter/xml/swxml.cxx
sw/source/filter/xml/xmlexp.cxx
sw/source/filter/xml/xmlimp.cxx
sw/source/ui/app/docshdrw.cxx
sw/source/ui/uiview/view.cxx
sw/source/ui/uno/unodefaults.cxx
sw/source/uibase/app/docst.cxx
sw/source/uibase/app/docstyle.cxx
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
sw/source/uibase/lingu/sdrhhcwrap.cxx
sw/source/uibase/shells/drwbassh.cxx
sw/source/uibase/shells/frmsh.cxx
sw/source/uibase/shells/grfsh.cxx
sw/source/uibase/shells/textsh1.cxx
sw/source/uibase/uno/unotxdoc.cxx
sw/source/uibase/utlui/content.cxx

Change-Id: Icb99eaa7bfb1eb8922a9fd928b5e4149821130dd

commit e1d734c71807b7c46bf00282442f40e0cf959896
Author: Armin Le Grand a...@apache.org
Date:   Tue Jun 3 16:43:56 2014 +

Related: #i124638# Corrected paints of Writer Frames...

with DrawingLayer FillAttributes for all systems and AA/nonAA

(cherry picked from commit fcc24448899577e220db70f265bad59f0ffa8428)

Change-Id: I1b3d66061132d1d276080f99e94c421b429de936

commit 5e37fbd36f706d6903857a176732eeead8ffa976
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 20 12:42:59 2014 +0100

hook up new drawing support to .uis

Change-Id: Id441a91e86b89bf8fe6bfd778ca09e732e054103

commit 57629920a81c99431d4b0f342fdbc3c1a4cbddd7
Author: Armin Le Grand a...@apache.org
Date:   Mon Jun 2 15:00:50 2014 +

Related: #i124638# Second step of DrawingLayer FillAttributes...

for Writer objects, now added support for Paragraph and PageStyle (including
Header and Footer) for direct attributes and style attributes

(cherry picked from commit cc25c58f7052827bfebdc9fbeec668c8fa29ed1b)

Conflicts:
cui/source/factory/dlgfact.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/bbdlg.hxx
cui/source/inc/cuires.hrc
cui/source/tabpages/bbdlg.cxx
cui/source/tabpages/bbdlg.src
cui/source/tabpages/page.cxx
cui/source/tabpages/tparea.cxx
include/svx/pagectrl.hxx
include/svx/svxdlg.hxx
include/svx/svxids.hrc
include/xmloff/PageMasterStyleMap.hxx
include/xmloff/prstylei.hxx
include/xmloff/txtprmap.hxx
svx/Package_inc.mk
svx/inc/svx/hdft.hxx

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - download.lst external/libcmis sw/Module_sw.mk

2014-06-23 Thread Mihai Varga

 download.lst |2 
 external/libcmis/StaticLibrary_cmis.mk   |   10 
 external/libcmis/UnpackedTarball_cmis.mk |4 
 external/libcmis/libcmis-0.4.1-empty-path.patch  |   13 
 external/libcmis/libcmis-0.4.1-properties-fix.patch  |  280 
--
 external/libcmis/libcmis-0.4.1-unreferenced-local-variable.patch |   96 ---
 external/libcmis/libcmis-0.4.1.patch |   95 ---
 external/libcmis/libcmis-libxml2_compatibility.patch |2 
 sw/Module_sw.mk  |1 
 9 files changed, 11 insertions(+), 492 deletions(-)

New commits:
commit 96ca0a1d816c679fd8fd78f78ff35899d69d59b0
Author: Mihai Varga mihai.m...@gmail.com
Date:   Mon Jun 23 11:44:40 2014 +0300

Updated libcmis sources in the tarball and tweaked the patches

Change-Id: I71d1f0a46a96266ade597007e43d51cc9c6c7234

diff --git a/download.lst b/download.lst
index 1ac844c..7bb1875 100644
--- a/download.lst
+++ b/download.lst
@@ -20,7 +20,7 @@ export CAIRO_TARBALL := 
f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
 export CDR_MD5SUM := 0e2f56934c8872ec4a254cd4bb1d7cf6
 export CDR_TARBALL := libcdr-0.1.0.tar.bz2
 export CLUCENE_TARBALL := 
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
-export CMIS_TARBALL := 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
+export CMIS_TARBALL := 08ab53543188ab7e0d184df81ece3025-libcmis-0.4.1.tar.gz
 export COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129
 export COINMP_TARBALL := CoinMP-1.7.6.tgz
 export COLLADA2GLTF_TARBALL := 
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
diff --git a/external/libcmis/StaticLibrary_cmis.mk 
b/external/libcmis/StaticLibrary_cmis.mk
index f87df26..4ac504d 100644
--- a/external/libcmis/StaticLibrary_cmis.mk
+++ b/external/libcmis/StaticLibrary_cmis.mk
@@ -46,14 +46,22 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,cmislib,\
UnpackedTarball/cmis/src/libcmis/gdrive-repository \
UnpackedTarball/cmis/src/libcmis/gdrive-session \
UnpackedTarball/cmis/src/libcmis/gdrive-utils \
+   UnpackedTarball/cmis/src/libcmis/http-session \
UnpackedTarball/cmis/src/libcmis/json-utils \
UnpackedTarball/cmis/src/libcmis/oauth2-data \
UnpackedTarball/cmis/src/libcmis/oauth2-handler \
UnpackedTarball/cmis/src/libcmis/oauth2-providers \
UnpackedTarball/cmis/src/libcmis/object \
UnpackedTarball/cmis/src/libcmis/object-type \
-   UnpackedTarball/cmis/src/libcmis/property-type \
+   UnpackedTarball/cmis/src/libcmis/onedrive-document \
+   UnpackedTarball/cmis/src/libcmis/onedrive-folder \
+   UnpackedTarball/cmis/src/libcmis/onedrive-object \
+   UnpackedTarball/cmis/src/libcmis/onedrive-property \
+   UnpackedTarball/cmis/src/libcmis/onedrive-repository \
+   UnpackedTarball/cmis/src/libcmis/onedrive-session \
+   UnpackedTarball/cmis/src/libcmis/onedrive-utils \
UnpackedTarball/cmis/src/libcmis/property \
+   UnpackedTarball/cmis/src/libcmis/property-type \
UnpackedTarball/cmis/src/libcmis/rendition \
UnpackedTarball/cmis/src/libcmis/repository \
UnpackedTarball/cmis/src/libcmis/session-factory \
diff --git a/external/libcmis/UnpackedTarball_cmis.mk 
b/external/libcmis/UnpackedTarball_cmis.mk
index 1ee253d..16d4400 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -14,11 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,cmis,$(CMIS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
-   
external/libcmis/libcmis-0.4.1.patch \
-   
external/libcmis/libcmis-0.4.1-empty-path.patch \
-   
external/libcmis/libcmis-0.4.1-properties-fix.patch \

external/libcmis/libcmis-libxml2_compatibility.patch \
-   
external/libcmis/libcmis-0.4.1-unreferenced-local-variable.patch \
 ))
 
 ifeq ($(OS)$(COM),WNTMSC)
diff --git a/external/libcmis/libcmis-0.4.1-empty-path.patch 
b/external/libcmis/libcmis-0.4.1-empty-path.patch
deleted file mode 100644
index c48265d2..000
--- a/external/libcmis/libcmis-0.4.1-empty-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git src/libcmis/document.cxx src/libcmis/document.cxx
-index 1af0d63..7ecfd24 100644
 src/libcmis/document.cxx
-+++ src/libcmis/document.cxx
-@@ -44,6 +44,8 @@ namespace libcmis
-  it != parents.end(); ++it )
- {
- string path = ( *it )-getPath( );
-+if ( path.empty() )
-+continue;
- if (

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

2014-06-23 Thread Matúš Kukan

 include/oox/core/xmlfilterbase.hxx|5 
 include/oox/drawingml/table/tablebackgroundstylecontext.hxx   |   47 
 include/oox/drawingml/table/tablecell.hxx |  115 --
 include/oox/drawingml/table/tablecellcontext.hxx  |   47 
 include/oox/drawingml/table/tablecontext.hxx  |   48 
 include/oox/drawingml/table/tablepartstylecontext.hxx |   46 
 include/oox/drawingml/table/tableproperties.hxx   |   80 --
 include/oox/drawingml/table/tablerow.hxx  |   49 
 include/oox/drawingml/table/tablerowcontext.hxx   |   48 
 include/oox/drawingml/table/tablestyle.hxx|   85 ---
 include/oox/drawingml/table/tablestylecellstylecontext.hxx|   46 
 include/oox/drawingml/table/tablestylecontext.hxx |   47 
 include/oox/drawingml/table/tablestylelist.hxx|   54 
 include/oox/drawingml/table/tablestylelistfragmenthandler.hxx |   56 
 include/oox/drawingml/table/tablestylepart.hxx|   73 --
 include/oox/drawingml/table/tablestyletextstylecontext.hxx|   47 
 oox/inc/drawingml/table/tablebackgroundstylecontext.hxx   |   47 
 oox/inc/drawingml/table/tablecell.hxx |  115 ++
 oox/inc/drawingml/table/tablecellcontext.hxx  |   47 
 oox/inc/drawingml/table/tablecontext.hxx  |   48 
 oox/inc/drawingml/table/tablepartstylecontext.hxx |   46 
 oox/inc/drawingml/table/tableproperties.hxx   |   80 ++
 oox/inc/drawingml/table/tablerow.hxx  |   49 
 oox/inc/drawingml/table/tablerowcontext.hxx   |   48 
 oox/inc/drawingml/table/tablestyle.hxx|   85 +++
 oox/inc/drawingml/table/tablestylecellstylecontext.hxx|   46 
 oox/inc/drawingml/table/tablestylecontext.hxx |   47 
 oox/inc/drawingml/table/tablestylelist.hxx|   54 
 oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx |   56 
 oox/inc/drawingml/table/tablestylepart.hxx|   73 ++
 oox/inc/drawingml/table/tablestyletextstylecontext.hxx|   47 
 oox/source/drawingml/graphicshapecontext.cxx  |2 
 oox/source/drawingml/shape.cxx|2 
 oox/source/drawingml/table/tablebackgroundstylecontext.cxx|2 
 oox/source/drawingml/table/tablecell.cxx  |4 
 oox/source/drawingml/table/tablecellcontext.cxx   |2 
 oox/source/drawingml/table/tablecontext.cxx   |8 
 oox/source/drawingml/table/tablepartstylecontext.cxx  |6 
 oox/source/drawingml/table/tableproperties.cxx|3 
 oox/source/drawingml/table/tablerow.cxx   |2 
 oox/source/drawingml/table/tablerowcontext.cxx|6 
 oox/source/drawingml/table/tablestyle.cxx |2 
 oox/source/drawingml/table/tablestylecellstylecontext.cxx |2 
 oox/source/drawingml/table/tablestylecontext.cxx  |6 
 oox/source/drawingml/table/tablestylelist.cxx |4 
 oox/source/drawingml/table/tablestylelistfragmenthandler.cxx  |4 
 oox/source/drawingml/table/tablestylepart.cxx |2 
 oox/source/drawingml/table/tablestyletextstylecontext.cxx |2 
 oox/source/ppt/pptimport.cxx  |2 
 oox/source/shape/ShapeFilterBase.hxx  |2 
 ucb/source/ucp/webdav/webdavcontent.cxx   |   16 -
 ucb/source/ucp/webdav/webdavcontent.hxx   |3 
 52 files changed, 936 insertions(+), 927 deletions(-)

New commits:
commit 96e23564e95d2ecc5483e55b022c8a4db04d116b
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Mon Jun 23 10:39:49 2014 +0200

webdav: Do not throw when saving new document.

Propagate information about !shouldAccessNetworkAfterException
from getResourceType out to getPropertyValues, to avoid further calls
which would result in cancelCommandExecution, when trying get properties
of document which does not exist yet, but we want to create it.

This was done in webdav-neon for other reasons as part of
0c3500115c4fd86284a027fc32be704afcf77061.

Change-Id: Ia434a707d2946a6982075f9bf53904b78dc07a5e

diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx 
b/ucb/source/ucp/webdav/webdavcontent.cxx
index b783e16..dbc13b7 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1371,14 +1371,12 @@ uno::Reference sdbc::XRow  Content::getPropertyValues(
 
 if ( !m_bTransient  !bHasAll )
 {
-
 // Obtain values from server...
 
 
 // First, identify whether resource is

[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk

 bridges/Library_cpp_uno.mk |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 94b2fe9b00c28e12bbd98ade8c5a31179c290da0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jun 23 10:54:19 2014 +0200

fdo#71000: Fix SOLARIS-INTEL case

Thanks to Dagobert Michelsen for noticing.

Change-Id: Ife333e74c145ad71c451cb60ba9a8ee4222a2183

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index c6ab9a0..d929c86 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -63,6 +63,9 @@ else ifeq ($(OS),MACOSX)
 bridges_SELECTED_BRIDGE := gcc3_macosx_intel
 bridge_asm_objects := call
 bridge_exception_objects := cpp2uno except uno2cpp
+else ifeq ($(OS),SOLARIS)
+bridges_SELECTED_BRIDGE := gcc3_solaris_intel
+bridge_exception_objects := cpp2uno except uno2cpp
 else ifeq ($(COM),MSC)
 bridges_SELECTED_BRIDGE := msvc_win32_intel
 bridge_exception_objects := cpp2uno dllinit uno2cpp
@@ -145,11 +148,6 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc
 bridge_noopt_objects := uno2cpp
 bridge_exception_objects := cpp2uno except
 
-else ifeq ($(OS)-$(CPUNAME),SOLARIS-INTEL)
-
-bridges_SELECTED_BRIDGE := gcc3_solaris_intel
-bridge_exception_objects := cpp2uno except uno2cpp
-
 else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC)
 
 bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-23 Thread Herbert Dürr

 vcl/osx/documentfocuslistener.cxx |   51 +++---
 vcl/unx/gtk/a11y/atkutil.cxx  |   40 +++--
 2 files changed, 47 insertions(+), 44 deletions(-)

New commits:
commit 5232d01ee5afea97b80da39b082012ee4c1a1409
Author: Herbert DÃ¼rr h...@apache.org
Date:   Mon Jun 23 07:55:44 2014 +

Resolves: #i124970# fix DocumentFocusListener::notifyEvent's...

handling of IndexOutOfBoundsException

the DocumentFocusListener::notifyEvent() throw list only allows a 
RuntimeException to
propagate. The methods called in notifyEvent() allow 
IndexOutOfBoundsException though,
so it must be handled in all cases to prevent C++ from invoking its 
unexpected() abort
mechanisms. Ceterum censeo, non-empty throw lists should be removed 
altogether...

(cherry picked from commit 4da0e442f0fd4838e93e7316c24cfeef9289207d)

Conflicts:
vcl/osx/documentfocuslistener.cxx
vcl/unx/gtk/a11y/atkutil.cxx

Change-Id: Ie0b783832314ee5ec376a0c3c2cd67e4a70e218b

diff --git a/vcl/osx/documentfocuslistener.cxx 
b/vcl/osx/documentfocuslistener.cxx
index 9087003..ee1e1f4 100644
--- a/vcl/osx/documentfocuslistener.cxx
+++ b/vcl/osx/documentfocuslistener.cxx
@@ -48,10 +48,10 @@ void SAL_CALL
 DocumentFocusListener::notifyEvent( const AccessibleEventObject aEvent )
 throw( RuntimeException, std::exception )
 {
-switch( aEvent.EventId )
-{
-case AccessibleEventId::STATE_CHANGED:
-try
+try {
+switch( aEvent.EventId )
+{
+case AccessibleEventId::STATE_CHANGED:
 {
 sal_Int16 nState = AccessibleStateType::INVALID;
 aEvent.NewValue = nState;
@@ -59,34 +59,35 @@ DocumentFocusListener::notifyEvent( const 
AccessibleEventObject aEvent )
 if( AccessibleStateType::FOCUSED == nState )
 m_aFocusTracker.setFocusedObject( getAccessible(aEvent) );
 }
-catch(const IndexOutOfBoundsException )
+break;
+
+case AccessibleEventId::CHILD:
 {
-OSL_TRACE(Focused object has invalid index in parent);
+Reference XAccessible  xChild;
+if( (aEvent.OldValue = xChild)  xChild.is() )
+detachRecursive(xChild);
+
+if( (aEvent.NewValue = xChild)  xChild.is() )
+attachRecursive(xChild);
 }
 break;
 
-case AccessibleEventId::CHILD:
-{
-Reference XAccessible  xChild;
-if( (aEvent.OldValue = xChild)  xChild.is() )
-detachRecursive(xChild);
-
-if( (aEvent.NewValue = xChild)  xChild.is() )
-attachRecursive(xChild);
-}
+case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
+{
+Reference XAccessible  xAccessible( getAccessible(aEvent) );
+detachRecursive(xAccessible);
+attachRecursive(xAccessible);
+}
+OSL_TRACE( Invalidate all children called\n );
 break;
 
-case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
-{
-Reference XAccessible  xAccessible( getAccessible(aEvent) );
-detachRecursive(xAccessible);
-attachRecursive(xAccessible);
+default:
+break;
 }
-
-OSL_TRACE( Invalidate all children called );
-break;
-default:
-break;
+}
+catch (const IndexOutOfBoundsException)
+{
+OSL_TRACE(Focused object has invalid index in parent);
 }
 }
 
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index f662bbd..96990c9 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -204,10 +204,10 @@ void DocumentFocusListener::disposing( const 
lang::EventObject aEvent )
 void DocumentFocusListener::notifyEvent( const 
accessibility::AccessibleEventObject aEvent )
 throw( uno::RuntimeException, std::exception )
 {
-switch( aEvent.EventId )
-{
-case accessibility::AccessibleEventId::STATE_CHANGED:
-try
+try {
+switch( aEvent.EventId )
+{
+case accessibility::AccessibleEventId::STATE_CHANGED:
 {
 sal_Int16 nState = accessibility::AccessibleStateType::INVALID;
 aEvent.NewValue = nState;
@@ -215,28 +215,30 @@ void DocumentFocusListener::notifyEvent( const 
accessibility::AccessibleEventObj
 if( accessibility::AccessibleStateType::FOCUSED == nState )
 atk_wrapper_focus_tracker_notify_when_idle( 
getAccessible(aEvent) );
 }
-catch (const lang::IndexOutOfBoundsException)
-{
-g_warning(Focused object has invalid index in parent);
-}
 break;
 
-case

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4d/a0e442f0fd4838e93e7316c24cfeef9289207d

 4d/a0e442f0fd4838e93e7316c24cfeef9289207d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4e0877c9aacd27731eb66c2e54e8ebd2ea73d467
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 23 09:57:58 2014 +0100

Notes added by 'git notes add'

diff --git a/4d/a0e442f0fd4838e93e7316c24cfeef9289207d 
b/4d/a0e442f0fd4838e93e7316c24cfeef9289207d
new file mode 100644
index 000..b549b75
--- /dev/null
+++ b/4d/a0e442f0fd4838e93e7316c24cfeef9289207d
@@ -0,0 +1 @@
+merged as: 5232d01ee5afea97b80da39b082012ee4c1a1409
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-3' - source/text

 source/text/shared/01/digitalsignatures.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0b7806643be3c273fced1417c71f184b1966bcc5
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Jun 22 16:15:56 2014 +0200

fdo#79733 fix icon's path

Change-Id: I5ff2dff8a98bff61fcc0adddb3d23aa6b5f81078
(cherry picked from commit 1fc42f217100d69c4cef6a72b63752da0fdca995)
Reviewed-on: https://gerrit.libreoffice.org/9855
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/shared/01/digitalsignatures.xhp 
b/source/text/shared/01/digitalsignatures.xhp
index 29dd143..d63dbe1 100644
--- a/source/text/shared/01/digitalsignatures.xhp
+++ b/source/text/shared/01/digitalsignatures.xhp
@@ -46,7 +46,7 @@
   paragraph xml-lang=en-US id=par_idN10566 role=paragraph 
l10n=NEWThe Signed icon
 image id=img_id4557023 src=xmlsecurity/res/certificate_16.png 
width=0.1665in height=0.1146inalt xml-lang=en-US 
id=alt_id4557023Icon/alt
/image indicates a valid digital signature, while the Exclamation 
mark icon
-image id=img_id249336 src=xmlsecurity/res/caution_11x16.png 
width=0.1665in height=0.1146inalt xml-lang=en-US 
id=alt_id249336Icon/alt
+image id=img_id249336 src=svx/res/caution_11x16.png width=0.1665in 
height=0.1146inalt xml-lang=en-US id=alt_id249336Icon/alt
/image indicates an invalid digital signature./paragraph
   paragraph xml-lang=en-US id=par_id0821200910573716 role=paragraph 
l10n=NEWSee also link 
href=text/shared/guide/digital_signatures.xhpDigital 
Signatures/link./paragraph
 bookmark xml-lang=en-US 
branch=hid/xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT 
id=bm_id7360759 localize=false/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - helpcontent2

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

New commits:
commit 3145c065107fd6f2fa44297494de229bdc2f8c47
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Jun 22 17:31:03 2014 +0200

Updated core
Project: help  49a0b078b1617755d60f90e9b5841afdc4c763c7

fdo#80200 use icons that are actually packed

Change-Id: Ia4f2ebff2c6ce7ffedb5a0522066590919f4d281
(cherry picked from commit e4208653997a7390b5129207a11e9fa6d4a8c070)
Reviewed-on: https://gerrit.libreoffice.org/9856
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index 0b78066..49a0b07 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0b7806643be3c273fced1417c71f184b1966bcc5
+Subproject commit 49a0b078b1617755d60f90e9b5841afdc4c763c7
commit 3426a4e31cee4166f4cbc2aeed6670e04a99a793
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Jun 22 16:15:56 2014 +0200

Updated core
Project: help  0b7806643be3c273fced1417c71f184b1966bcc5

fdo#79733 fix icon's path

Change-Id: I5ff2dff8a98bff61fcc0adddb3d23aa6b5f81078
(cherry picked from commit 1fc42f217100d69c4cef6a72b63752da0fdca995)
Reviewed-on: https://gerrit.libreoffice.org/9855
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index 0040595..0b78066 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0040595dcb207b21f81349af1b71fcd854f3b589
+Subproject commit 0b7806643be3c273fced1417c71f184b1966bcc5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-3' - 2 commits - source/text

 source/text/shared/05/0110.xhp   |6 +++---
 source/text/shared/05/0160.xhp   |6 +++---
 source/text/simpress/01/0211.xhp |2 +-
 source/text/swriter/01/0216.xhp  |8 
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit df7ec418465546ee71f8855a44759918b8f362db
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Jun 22 16:30:15 2014 +0200

fix icons' path

(cherry picked from commit 54c511cb993b426688136c1315a8a5a18f582f50)
(cherry picked from commit f8fe0e1b740032c18117c7fca9702823176d187e)

Change-Id: I6479ec571e2a3681dc44ba6f4fbeef9ea62227fc
Reviewed-on: https://gerrit.libreoffice.org/9857
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/simpress/01/0211.xhp 
b/source/text/simpress/01/0211.xhp
index 427190e..871d4d9 100644
--- a/source/text/simpress/01/0211.xhp
+++ b/source/text/simpress/01/0211.xhp
@@ -49,7 +49,7 @@
 tablerow
 tablecell colspan= rowspan=
 paragraph role=paragraph id=par_id3148729 xml-lang=en-US l10n=CHG
-image id=img_id3153034 src=sd/imagelst/nv02.png width=0.222inch 
height=0.222inchalt id=alt_id3153034 xml-lang=en-USIcon/alt
+image id=img_id3153034 src=sd/imglst/nv02.png width=0.222inch 
height=0.222inchalt id=alt_id3153034 xml-lang=en-USIcon/alt
/image/paragraph
 /tablecell
 tablecell colspan= rowspan=
diff --git a/source/text/swriter/01/0216.xhp 
b/source/text/swriter/01/0216.xhp
index 28b9bf5..2048c48 100644
--- a/source/text/swriter/01/0216.xhp
+++ b/source/text/swriter/01/0216.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  --
-   
+
 helpdocument version=1.0
 meta
 topic id=textswriter010216xml indexer=include status=PUBLISH
@@ -65,7 +65,7 @@
 tablerow
 tablecell colspan= rowspan=
 paragraph role=paragraph id=par_id3147420 xml-lang=en-US l10n=E
-image id=img_id3149551 src=sd/imagelst/nv03.png width=0.222inch 
height=0.222inchalt id=alt_id3149551 xml-lang=en-USIcon/alt
+image id=img_id3149551 src=sd/imglst/nv03.png width=0.222inch 
height=0.222inchalt id=alt_id3149551 xml-lang=en-USIcon/alt
/image/paragraph
 /tablecell
 tablecell colspan= rowspan=
@@ -81,7 +81,7 @@
 tablerow
 tablecell colspan= rowspan=
 paragraph role=paragraph id=par_id3153298 xml-lang=en-US l10n=E
-image id=img_id3153309 src=sd/imagelst/nv06.png width=0.222inch 
height=0.222inchalt id=alt_id3153309 xml-lang=en-USIcon/alt
+image id=img_id3153309 src=sd/imglst/nv06.png width=0.222inch 
height=0.222inchalt id=alt_id3153309 xml-lang=en-USIcon/alt
/image/paragraph
 /tablecell
 tablecell colspan= rowspan=
@@ -113,7 +113,7 @@
 tablerow
 tablecell colspan= rowspan=
 paragraph role=paragraph id=par_id3150677 xml-lang=en-US l10n=E
-image id=img_id3154020 src=sd/imagelst/nv05.png width=0.222inch 
height=0.222inchalt id=alt_id3154020 xml-lang=en-USIcon/alt
+image id=img_id3154020 src=sd/imglst/nv05.png width=0.222inch 
height=0.222inchalt id=alt_id3154020 xml-lang=en-USIcon/alt
/image/paragraph
 /tablecell
 tablecell colspan= rowspan=
commit 49a0b078b1617755d60f90e9b5841afdc4c763c7
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Jun 22 17:31:03 2014 +0200

fdo#80200 use icons that are actually packed

Change-Id: Ia4f2ebff2c6ce7ffedb5a0522066590919f4d281
(cherry picked from commit e4208653997a7390b5129207a11e9fa6d4a8c070)
Reviewed-on: https://gerrit.libreoffice.org/9856
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/shared/05/0110.xhp 
b/source/text/shared/05/0110.xhp
index d2e304d..d805f58 100644
--- a/source/text/shared/05/0110.xhp
+++ b/source/text/shared/05/0110.xhp
@@ -50,7 +50,7 @@
  tablerow
 tablecell
paragraph xml-lang=en-US id=par_id3152781 role=paragraph 
l10n=E
-image id=img_id3149811 src=res/sc06301.png width=0.222in 
height=0.222inalt xml-lang=en-US id=alt_id3149811Icon/alt
+image id=img_id3149811 src=cmd/sc_navigateback.png width=0.222in 
height=0.222inalt xml-lang=en-US id=alt_id3149811Icon/alt
/image/paragraph
 /tablecell
 tablecell
@@ -61,7 +61,7 @@
  tablerow
 tablecell
paragraph xml-lang=en-US id=par_id3149415 role=paragraph 
l10n=E
-image id=img_id3159399 src=cmd/sc_browseforward.png width=0.222in 
height=0.222inalt xml-lang=en-US id=alt_id3159399Icon/alt
+image id=img_id3159399 src=cmd/sc_navigateforward.png width=0.222in 
height=0.222inalt xml-lang=en-US id=alt_id3159399Icon/alt
/image/paragraph
 /tablecell
 tablecell
@@ -72,7 +72,7 @@
  tablerow
 tablecell
paragraph xml-lang=en-US id=par_id3149580 role=paragraph 
l10n=E
-image id=img_id3148642

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - helpcontent2

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

New commits:
commit 2e4d2d54fd64dcc1a39c3561078086718cbf52d4
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Jun 22 16:30:15 2014 +0200

Updated core
Project: help  df7ec418465546ee71f8855a44759918b8f362db

fix icons' path

(cherry picked from commit 54c511cb993b426688136c1315a8a5a18f582f50)
(cherry picked from commit f8fe0e1b740032c18117c7fca9702823176d187e)

Change-Id: I6479ec571e2a3681dc44ba6f4fbeef9ea62227fc
Reviewed-on: https://gerrit.libreoffice.org/9857
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index 49a0b07..df7ec41 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 49a0b078b1617755d60f90e9b5841afdc4c763c7
+Subproject commit df7ec418465546ee71f8855a44759918b8f362db
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 l10ntools/source/localize.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86f1daeacbae51f0f3fc6c7daa71ed29d6973696
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Jun 22 14:37:54 2014 +0200

fdo#80324 fix path of redline_tmpl.hrc

(cherry picked from commit 856b55ecf58b129ee9ce41fbb89057f2363084fc)

Change-Id: Ie1684fe456ea6f9cd4b93481aa73f5b51a20ba1b
Reviewed-on: https://gerrit.libreoffice.org/9853
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index a6a4502..6d7f086 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -96,7 +96,7 @@ bool passesPositiveList(const OUString rUrl) {
 /dbaccess/source/ui/inc/toolbox_tmpl.hrc) },
 { RTL_CONSTASCII_STRINGPARAM(/description.xml) },
 { RTL_CONSTASCII_STRINGPARAM(/svx/inc/globlmn_tmpl.hrc) },
-{ RTL_CONSTASCII_STRINGPARAM(/sw/source/ui/inc/redline_tmpl.hrc) }
+{ 
RTL_CONSTASCII_STRINGPARAM(/sw/source/core/uibase/inc/redline_tmpl.hrc) }
 };
 return matchList(rUrl, list, SAL_N_ELEMENTS(list));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/uiconfig

2014-06-23 Thread Joren De Cuyper

 chart2/uiconfig/ui/chartdatadialog.ui |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ea3afeb8d2390030af3d56832fe86d241d9e7fea
Author: Joren De Cuyper jore...@libreoffice.org
Date:   Fri Jun 20 22:35:34 2014 +0200

fdo#80295 - Mismatched icons in Chart Data Table dialog

Change-Id: I31d9ea145e8c01a0e81507534e2cf6c584174048
Reviewed-on: https://gerrit.libreoffice.org/9844
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/chart2/uiconfig/ui/chartdatadialog.ui 
b/chart2/uiconfig/ui/chartdatadialog.ui
index 8f7e6fc..3639b36 100644
--- a/chart2/uiconfig/ui/chartdatadialog.ui
+++ b/chart2/uiconfig/ui/chartdatadialog.ui
@@ -114,7 +114,7 @@
 property name=action_nameInsertTextColumn/property
 property name=label translatable=yesInsert Text 
Column/property
 property name=use_underlineTrue/property
-property 
name=icon_namechart2/res/dataeditor_icon03.png/property
+property 
name=icon_namechart2/res/dataeditor_icon07.png/property
   /object
   packing
 property name=expandFalse/property
@@ -128,7 +128,7 @@
 property name=action_nameRemoveRow/property
 property name=label translatable=yesDelete 
Row/property
 property name=use_underlineTrue/property
-property 
name=icon_namechart2/res/dataeditor_icon04.png/property
+property 
name=icon_namechart2/res/dataeditor_icon03.png/property
   /object
   packing
 property name=expandFalse/property
@@ -142,7 +142,7 @@
 property name=action_nameRemoveColumn/property
 property name=label translatable=yesDelete 
Series/property
 property name=use_underlineTrue/property
-property 
name=icon_namechart2/res/dataeditor_icon05.png/property
+property 
name=icon_namechart2/res/dataeditor_icon04.png/property
   /object
   packing
 property name=expandFalse/property
@@ -166,7 +166,7 @@
 property name=action_nameSwapColumn/property
 property name=label translatable=yesMove Series 
Right/property
 property name=use_underlineTrue/property
-property 
name=icon_namechart2/res/dataeditor_icon06.png/property
+property 
name=icon_namechart2/res/dataeditor_icon05.png/property
   /object
   packing
 property name=expandFalse/property
@@ -180,7 +180,7 @@
 property name=action_nameSwapRow/property
 property name=label translatable=yesMove Row 
Down/property
 property name=use_underlineTrue/property
-property 
name=icon_namechart2/res/dataeditor_icon07.png/property
+property 
name=icon_namechart2/res/dataeditor_icon06.png/property
   /object
   packing
 property name=expandFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-23 Thread Markus Mohrhard

 chart2/source/view/charttypes/BarChart.cxx |9 ++---
 chart2/source/view/charttypes/BubbleChart.cxx  |   18 --
 chart2/source/view/charttypes/GL3DBarChart.cxx |4 +++-
 chart2/source/view/charttypes/PieChart.cxx |9 ++---
 chart2/source/view/main/VDataSeries.cxx|2 +-
 5 files changed, 28 insertions(+), 14 deletions(-)

New commits:
commit 701f4543f316ff3fdccdab4f0ed9b393d2391d2f
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sun Jun 22 03:11:35 2014 +0200

don't try to set property mapping if there is no value

Change-Id: I422d651e303553e2ce30895b44b8d96664418c19
Reviewed-on: https://gerrit.libreoffice.org/9850
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/chart2/source/view/charttypes/BarChart.cxx 
b/chart2/source/view/charttypes/BarChart.cxx
index aa53db0..cf46db8 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -808,9 +808,12 @@ void BarChart::createShapes()
 
 if(bHasFillColorMapping)
 {
-uno::Reference beans::XPropertySet  xProps( 
xShape, uno::UNO_QUERY_THROW );
-xProps-setPropertyValue(FillColor, 
uno::makeAny(static_castsal_Int32(
-
pSeries-getValueByProperty(nPointIndex, FillColor;
+double nPropVal = 
pSeries-getValueByProperty(nPointIndex, FillColor);
+if(!rtl::math::isNan(nPropVal))
+{
+uno::Reference beans::XPropertySet  
xProps( xShape, uno::UNO_QUERY_THROW );
+xProps-setPropertyValue(FillColor, 
uno::makeAny(static_castsal_Int32(nPropVal)));
+}
 }
 //set name/classified ObjectID (CID)
 ShapeFactory::setShapeName(xShape
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx 
b/chart2/source/view/charttypes/BubbleChart.cxx
index c8c6db5..45d91a6 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -324,15 +324,21 @@ void BubbleChart::createShapes()
 
 if(bHasFillColorMapping)
 {
-uno::Reference beans::XPropertySet  xProps( 
xShape, uno::UNO_QUERY_THROW );
-xProps-setPropertyValue(FillColor, 
uno::makeAny(static_castsal_Int32(
-
pSeries-getValueByProperty(nIndex, FillColor;
+double nPropVal = 
pSeries-getValueByProperty(nIndex, FillColor);
+if(!rtl::math::isNan(nPropVal))
+{
+uno::Reference beans::XPropertySet  xProps( 
xShape, uno::UNO_QUERY_THROW );
+xProps-setPropertyValue(FillColor, 
uno::makeAny(static_castsal_Int32(nPropVal)));
+}
 }
 if(bHasBorderColorMapping)
 {
-uno::Reference beans::XPropertySet  xProps( 
xShape, uno::UNO_QUERY_THROW );
-xProps-setPropertyValue(LineColor, 
uno::makeAny(static_castsal_Int32(
-
pSeries-getValueByProperty(nIndex, LineColor;
+double nPropVal = 
pSeries-getValueByProperty(nIndex, LineColor);
+if(!rtl::math::isNan(nPropVal))
+{
+uno::Reference beans::XPropertySet  xProps( 
xShape, uno::UNO_QUERY_THROW );
+xProps-setPropertyValue(LineColor, 
uno::makeAny(static_castsal_Int32(nPropVal)));
+}
 }
 
 m_pShapeFactory-setShapeName( xShape, MarkHandles );
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 6b7054e..4c52dea 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -114,7 +114,9 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 {
 if(bMappedFillProperty)
 {
-nColor = 
static_castsal_uInt32(rDataSeries.getValueByProperty(nIndex, FillColor));
+double nPropVal = rDataSeries.getValueByProperty(nIndex, 
FillColor);
+if(!rtl::math::isNan(nPropVal))
+nColor = static_castsal_uInt32(nPropVal);
 }
 
 float nVal = rDataSeries.getYValue(nIndex);
diff

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

2014-06-23 Thread Markus Mohrhard

 oox/source/drawingml/chart/chartspacefragment.cxx |3 +--
 oox/source/drawingml/chart/chartspacemodel.cxx|2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e07eedd38062edfbe4998946b75f1a3d958e9615
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sun Jun 22 04:47:36 2014 +0200

use the correct default value, fdo#78080

Change-Id: I8b01bf22e8e3b98ef013b947f617905d558d3554
Reviewed-on: https://gerrit.libreoffice.org/9849
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx 
b/oox/source/drawingml/chart/chartspacefragment.cxx
index 6e19f77..eec0f1c 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -85,8 +85,7 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( 
sal_Int32 nElement, const
 switch( nElement )
 {
 case C_TOKEN( autoTitleDeleted ):
-// default is 'false', not 'true' as specified
-mrModel.mbAutoTitleDel = rAttribs.getBool( XML_val, false 
);
+mrModel.mbAutoTitleDel = rAttribs.getBool( XML_val, true );
 return 0;
 case C_TOKEN( backWall ):
 return new WallFloorContext( *this, 
mrModel.mxBackWall.create() );
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx 
b/oox/source/drawingml/chart/chartspacemodel.cxx
index cf71f14..d6e920d 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -28,7 +28,7 @@ namespace chart {
 ChartSpaceModel::ChartSpaceModel() :
 mnDispBlanksAs( XML_gap ),  // not zero as specified
 mnStyle( 2 ),
-mbAutoTitleDel( false ),
+mbAutoTitleDel( true ),
 mbPlotVisOnly( false ),
 mbShowLabelsOverMax( false ),
 mbPivotChart( false )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - instsetoo_native/inc_openoffice scp2/source

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |3 
 instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |5 -
 scp2/source/ooo/registryitem_ooo.scp   |   38 
--
 4 files changed, 2 insertions(+), 45 deletions(-)

New commits:
commit e7beb56826bf57de563ed70cea7043dccc33756d
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Jun 22 11:00:07 2014 +0200

fdo#80332 remove Support assistive technology tools checkbox from 
installer

Revert fdo#39833 add Support assistive technology tools option to 
Windows installer

This reverts commit 98fd8f345504e98e9ed16f4845d55f5b88b77a5e.

Conflicts:

instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt

Change-Id: I04cafd063bd06db37eadd13b58f7b7adfad2ca42
(cherry picked from commit 674db242c037020626050c8de06367808d94eaaa)
Reviewed-on: https://gerrit.libreoffice.org/9851
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index f2b6917..f4293a5 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -682,8 +682,5 @@ en-US = No applications have been selected for 
installation. Click OK, then sel
 [OOO_CONTROL_319]
 en-US  = Create a start link on desktop
 
-[OOO_CONTROL_320]
-en-US  = Support assistive technology tools
-
 [OOO_CONTROL_321]
 en-US  = Load [ProductName] during system start-up
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
index 85d191a..08463f4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
@@ -2,5 +2,4 @@ PropertyValue
 s72S64
 CheckBox   Property
 CREATEDESKTOPLINK  1
-ENABLEATTOOLS  1
 QUICKSTART 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index a9fc6d2..64ab818 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -195,7 +195,7 @@ PatchWelcomeTextLine2   Text135 54  
228 45  65539   OOO_CONTROL_162
 ReadyToInstall BackPushButton  164 243 66  17  3   
OOO_CONTROL_163 InstallNow  
 ReadyToInstall Banner  Bitmap  0   0   374 44  1   
BannerBmp   
 ReadyToInstall BannerLine  Line0   44  374 0   1   

-ReadyToInstall Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_166 DesktopLink 
+ReadyToInstall Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_166 Back
 ReadyToInstall DlgDesc Text21  23  272 25  65539   
OOO_CONTROL_167 
 ReadyToInstall DlgLine Line0   234 374 0   1   

 ReadyToInstall DlgText Text21  51  326 20  3   
OOO_CONTROL_168 
@@ -205,8 +205,7 @@ ReadyToInstall  DlgTitle2   Text13  6   
280 25  65538   OOO_CONTROL_171
 ReadyToInstall DlgTitle3   Text13  6   280 25  65538   
OOO_CONTROL_172 
 ReadyToInstall InstallNow  PushButton  230 243 66  17  
3   OOO_CONTROL_173 Cancel  
 ReadyToInstall DesktopLink CheckBox21  100 300 10  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableATTools   
-ReadyToInstall EnableATTools   CheckBox21  125 300 10  
3   ENABLEATTOOLS   OOO_CONTROL_320 EnableQuickstart
-ReadyToInstall EnableQuickstartCheckBox21  150 300 
10  3   QUICKSTART  OOO_CONTROL_321 Back
+ReadyToInstall EnableQuickstartCheckBox21  125 300 
10  3   QUICKSTART  OOO_CONTROL_321 Back
 ReadyToRemove  BackPushButton  164 243 66  17  3   
OOO_CONTROL_174 RemoveNow   
 ReadyToRemove  Banner  Bitmap  0   0   374 44  1   
BannerBmp   
 ReadyToRemove  BannerLine  Line0   44  374 0   1   

diff --git

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

 scripting/source/stringresource/stringresource.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41c4c5f08835d1774229d179804d43dafec605a4
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Jun 21 22:33:17 2014 +0200

Related fdo#58774 Alternative dialog Find  Replace for Writer

After having installed the extension from 
http://extensions.libreoffice.org/extension-center/alternative-dialog-find-replace-for-writer/releases/1.4
I had a crash, extract of bt:
5  0x2aaad3ee13df in rtl::OUString::copy (this=0x7fff2510, 
beginIndex=147, count=-15) at 
/home/julien/compile-libreoffice/libreoffice/include/rtl/ustring.hxx:1481
6  0x2aaad3edc10e in 
stringresource::StringResourcePersistenceImpl::implScanLocaleNames 
(this=0x8e2bba0, aContentSeq=uno::Sequence of length 24 = {...})
at 
/home/julien/compile-libreoffice/libreoffice/scripting/source/stringresource/stringresource.cxx:1728

So add a quick check to be sure iDot  iSlash

Cherry-picked from d59da701c67074a44abcfebcb7506792d12127ae

Change-Id: I944a852d6cc9a35c451985ac96032f0d848136e8
Reviewed-on: https://gerrit.libreoffice.org/9847
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/scripting/source/stringresource/stringresource.cxx 
b/scripting/source/stringresource/stringresource.cxx
index 983bd2c..ebb3495 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1724,7 +1724,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( 
const Sequence OUStrin
 OUString aExtension;
 sal_Int32 iDot = aCompleteName.lastIndexOf( '.' );
 sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' );
-if( iDot != -1 )
+if( iDot != -1  iDot  iSlash)
 {
 sal_Int32 iCopyFrom = (iSlash != -1) ? iSlash + 1 : 0;
 aPureName = aCompleteName.copy( iCopyFrom, iDot-iCopyFrom );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-23 Thread Maxim Monastirsky

 sw/source/core/uibase/shells/annotsh.cxx  |2 +-
 sw/source/core/uibase/shells/drwtxtex.cxx |2 +-
 sw/source/core/uibase/shells/textsh1.cxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bc7943390e0d629d5f7e319cc8044d191fcd4331
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Sun Jun 22 13:07:29 2014 +0300

sw: Fix SID_CHAR_DLG_EFFECT behavior

A regression from commit f41e7c70. The wrong tab is
opened (used in the sidebar underline popup). The
correct id is fonteffects not fonteffect.

Change-Id: Ic06fb3f93a033bcfe24b97eb124ceea082b4087f
(cherry picked from commit d8d18c3cc707d38d98463ed43ae08e1d6bc6e56f)
Reviewed-on: https://gerrit.libreoffice.org/9854
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/source/core/uibase/shells/annotsh.cxx 
b/sw/source/core/uibase/shells/annotsh.cxx
index 32b0e77..ad3f5eb 100644
--- a/sw/source/core/uibase/shells/annotsh.cxx
+++ b/sw/source/core/uibase/shells/annotsh.cxx
@@ -489,7 +489,7 @@ void SwAnnotationShell::Exec( SfxRequest rReq )
 OSL_ENSURE(pDlg, Dialogdiet fail!);
 if (nSlot == SID_CHAR_DLG_EFFECT)
 {
-pDlg-SetCurPageId(fonteffect);
+pDlg-SetCurPageId(fonteffects);
 }
 sal_uInt16 nRet = pDlg-Execute();
 if(RET_OK == nRet )
diff --git a/sw/source/core/uibase/shells/drwtxtex.cxx 
b/sw/source/core/uibase/shells/drwtxtex.cxx
index 775e2bf..df90ad6 100644
--- a/sw/source/core/uibase/shells/drwtxtex.cxx
+++ b/sw/source/core/uibase/shells/drwtxtex.cxx
@@ -327,7 +327,7 @@ void SwDrawTextShell::Execute( SfxRequest rReq )
 OSL_ENSURE(pDlg, Dialogdiet fail!);
 if (nSlot == SID_CHAR_DLG_EFFECT)
 {
-pDlg-SetCurPageId(fonteffect);
+pDlg-SetCurPageId(fonteffects);
 }
 sal_uInt16 nRet = pDlg-Execute();
 if(RET_OK == nRet )
diff --git a/sw/source/core/uibase/shells/textsh1.cxx 
b/sw/source/core/uibase/shells/textsh1.cxx
index 8200cc0..83b3661 100644
--- a/sw/source/core/uibase/shells/textsh1.cxx
+++ b/sw/source/core/uibase/shells/textsh1.cxx
@@ -179,7 +179,7 @@ void sw_CharDialog( SwWrtShell rWrtSh, bool bUseDialog, 
sal_uInt16 nSlot,const
 }
 if (pDlg  nSlot == SID_CHAR_DLG_EFFECT)
 {
-pDlg-SetCurPageId(fonteffect);
+pDlg-SetCurPageId(fonteffects);
 }
 else if (pDlg  nSlot == SID_ATTR_CHAR_FONT)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 scripting/source/stringresource/stringresource.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69987ea99a722cb4b3e2df3132b89bacd0a5b862
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Jun 21 22:33:17 2014 +0200

Related fdo#58774 Alternative dialog Find  Replace for Writer

After having installed the extension from 
http://extensions.libreoffice.org/extension-center/alternative-dialog-find-replace-for-writer/releases/1.4
I had a crash, extract of bt:
5  0x2aaad3ee13df in rtl::OUString::copy (this=0x7fff2510, 
beginIndex=147, count=-15) at 
/home/julien/compile-libreoffice/libreoffice/include/rtl/ustring.hxx:1481
6  0x2aaad3edc10e in 
stringresource::StringResourcePersistenceImpl::implScanLocaleNames 
(this=0x8e2bba0, aContentSeq=uno::Sequence of length 24 = {...})
at 
/home/julien/compile-libreoffice/libreoffice/scripting/source/stringresource/stringresource.cxx:1728

So add a quick check to be sure iDot  iSlash

Cherry-picked from d59da701c67074a44abcfebcb7506792d12127ae

Change-Id: I944a852d6cc9a35c451985ac96032f0d848136e8
Reviewed-on: https://gerrit.libreoffice.org/9848
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/scripting/source/stringresource/stringresource.cxx 
b/scripting/source/stringresource/stringresource.cxx
index ce814ef..f245f02 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1727,7 +1727,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( 
const Sequence OUStrin
 OUString aExtension;
 sal_Int32 iDot = aCompleteName.lastIndexOf( '.' );
 sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' );
-if( iDot != -1 )
+if( iDot != -1  iDot  iSlash)
 {
 sal_Int32 iCopyFrom = (iSlash != -1) ? iSlash + 1 : 0;
 aPureName = aCompleteName.copy( iCopyFrom, iDot-iCopyFrom );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-23 Thread Miklos Vajna

 sw/inc/fesh.hxx|4 ++--
 sw/source/core/frmedt/feshview.cxx |8 
 sw/source/uibase/utlui/content.cxx |8 
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 26fb5883bbc663eceb7c53bd17c1b0ca01abb016
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Jun 23 11:34:21 2014 +0200

SwContentType::FillMemberList: ignore TextFrames which are used as TextBoxes

SwDoc could already filter them out, but not SwFEShell. This makes them
not shown in the Navigator window.

Change-Id: I343ab005513198c30970bfdec4e871fbccdebc01

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 5d23fde..9c2e89d 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -370,8 +370,8 @@ public:
 { return GotoObj( false, eType); }
 
/// Iterate over flys  - for Basic-collections.
-sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL ) const;
-const SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = 
FLYCNTTYPE_ALL) const;
+sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool 
bIgnoreTextBoxes = false ) const;
+const SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = 
FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const;
 
 /// If a fly is selected, it draws cursor into the first CntntFrm.
 const SwFrmFmt* SelFlyGrabCrsr();
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 904f901..e1655e8 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2221,14 +2221,14 @@ bool SwFEShell::GotoFly( const OUString rName, 
FlyCntType eType, bool bSelFrm )
 return bRet;
 }
 
-sal_uInt16 SwFEShell::GetFlyCount( FlyCntType eType ) const
+sal_uInt16 SwFEShell::GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes ) 
const
 {
-return GetDoc()-GetFlyCount(eType);
+return GetDoc()-GetFlyCount(eType, bIgnoreTextBoxes);
 }
 
-const SwFrmFmt*  SwFEShell::GetFlyNum(sal_uInt16 nIdx, FlyCntType eType ) const
+const SwFrmFmt*  SwFEShell::GetFlyNum(sal_uInt16 nIdx, FlyCntType eType, bool 
bIgnoreTextBoxes ) const
 {
-return GetDoc()-GetFlyNum(nIdx, eType );
+return GetDoc()-GetFlyNum(nIdx, eType, bIgnoreTextBoxes);
 }
 
 // show the current selected object
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 57634f0..faf3371 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -251,7 +251,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 eType = FLYCNTTYPE_GRF;
 sTypeToken = graphic;
 }
-nMemberCount = pWrtShell-GetFlyCount(eType);
+nMemberCount = pWrtShell-GetFlyCount(eType, 
/*bIgnoreTextBoxes=*/true);
 bEdit = true;
 }
 break;
@@ -548,13 +548,13 @@ voidSwContentType::FillMemberList(bool* 
pbLevelOrVisibilityChanged)
 eType = FLYCNTTYPE_OLE;
 else if(nContentType == CONTENT_TYPE_GRAPHIC)
 eType = FLYCNTTYPE_GRF;
-OSL_ENSURE(nMemberCount ==  pWrtShell-GetFlyCount(eType),
+OSL_ENSURE(nMemberCount ==  pWrtShell-GetFlyCount(eType, 
/*bIgnoreTextBoxes=*/true),
 MemberCount differs);
 Point aNullPt;
-nMemberCount = pWrtShell-GetFlyCount(eType);
+nMemberCount = pWrtShell-GetFlyCount(eType, 
/*bIgnoreTextBoxes=*/true);
 for(sal_uInt16 i = 0; i  nMemberCount; i++)
 {
-const SwFrmFmt* pFrmFmt = pWrtShell-GetFlyNum(i,eType);
+const SwFrmFmt* pFrmFmt = 
pWrtShell-GetFlyNum(i,eType,/*bIgnoreTextBoxes=*/true);
 const OUString sFrmName = pFrmFmt-GetName();
 
 SwContent* pCnt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools tools/source

 include/tools/urlobj.hxx |   50 +++--
 tools/source/fsys/urlobj.cxx |  237 ---
 2 files changed, 133 insertions(+), 154 deletions(-)

New commits:
commit 9ede5cd987a0e9287575875c53f0a10f6412236f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jun 23 11:52:14 2014 +0200

Remove unused INetURLObject::PART_* values

Change-Id: Icebdf0cad5306ae42a30de0b4f997e3b611675eb

diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index cd10405..aee3aea 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -866,37 +866,25 @@ public:
 
 enum Part
 {
-PART_OBSOLETE_NORMAL = 0x001, // Obsolete, do not use!
-PART_OBSOLETE_FILE = 0x002, // Obsolete, do not use!
-PART_OBSOLETE_PARAM = 0x004, // Obsolete, do not use!
-PART_USER_PASSWORD = 0x008,
-PART_IMAP_ACHAR = 0x010,
-PART_VIM = 0x020,
-PART_HOST_EXTRA = 0x040,
-PART_FPATH = 0x080,
-PART_AUTHORITY = 0x100,
-PART_PATH_SEGMENTS_EXTRA = 0x200,
-PART_REL_SEGMENT_EXTRA = 0x400,
-PART_URIC = 0x800,
-PART_HTTP_PATH = 0x1000,
-PART_FILE_SEGMENT_EXTRA = 0x2000, // Obsolete, do not use!
-PART_MESSAGE_ID = 0x4000,
-PART_MESSAGE_ID_PATH = 0x8000,
-PART_MAILTO = 0x1,
-PART_PATH_BEFORE_QUERY = 0x2,
-PART_PCHAR = 0x4,
-PART_FRAGMENT = 0x8, // Obsolete, do not use!
-PART_VISIBLE = 0x10,
-PART_VISIBLE_NONSPECIAL = 0x20,
-PART_CREATEFRAGMENT = 0x40,
-PART_UNO_PARAM_VALUE = 0x80,
-PART_UNAMBIGUOUS = 0x100,
-PART_URIC_NO_SLASH = 0x200,
-PART_HTTP_QUERY = 0x400, //TODO! unused?
-PART_NEWS_ARTICLE_LOCALPART = 0x800,
-max_part = 0x8000
-// Do not use!  Only there to allow compatible changes in the
-// future.
+PART_USER_PASSWORD  = 0x1,
+PART_IMAP_ACHAR = 0x2,
+PART_VIM= 0x4,
+PART_FPATH  = 0x8,
+PART_AUTHORITY  = 0x00010,
+PART_REL_SEGMENT_EXTRA  = 0x00020,
+PART_URIC   = 0x00040,
+PART_HTTP_PATH  = 0x00080,
+PART_MESSAGE_ID_PATH= 0x00100,
+PART_MAILTO = 0x00200,
+PART_PATH_BEFORE_QUERY  = 0x00400,
+PART_PCHAR  = 0x00800,
+PART_VISIBLE= 0x01000,
+PART_VISIBLE_NONSPECIAL = 0x02000,
+PART_UNO_PARAM_VALUE= 0x04000,
+PART_UNAMBIGUOUS= 0x08000,
+PART_URIC_NO_SLASH  = 0x1,
+PART_HTTP_QUERY = 0x2, //TODO! unused?
+PART_NEWS_ARTICLE_LOCALPART = 0x4
 };
 
 enum EscapeType
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 55a5ddd..91fffad 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -441,134 +441,125 @@ namespace unnamed_tools_urlobj {
 
 enum
 {
-PA = INetURLObject::PART_OBSOLETE_NORMAL,
-PB = INetURLObject::PART_OBSOLETE_FILE,
-PC = INetURLObject::PART_OBSOLETE_PARAM,
-PD = INetURLObject::PART_USER_PASSWORD,
-PE = INetURLObject::PART_IMAP_ACHAR,
-PF = INetURLObject::PART_VIM,
-PG = INetURLObject::PART_HOST_EXTRA,
-PH = INetURLObject::PART_FPATH,
-PI = INetURLObject::PART_AUTHORITY,
-PJ = INetURLObject::PART_PATH_SEGMENTS_EXTRA,
-PK = INetURLObject::PART_REL_SEGMENT_EXTRA,
-PL = INetURLObject::PART_URIC,
-PM = INetURLObject::PART_HTTP_PATH,
-PN = INetURLObject::PART_FILE_SEGMENT_EXTRA,
-PO = INetURLObject::PART_MESSAGE_ID,
-PP = INetURLObject::PART_MESSAGE_ID_PATH,
-PQ = INetURLObject::PART_MAILTO,
-PR = INetURLObject::PART_PATH_BEFORE_QUERY,
-PS = INetURLObject::PART_PCHAR,
-PT = INetURLObject::PART_FRAGMENT,
-PU = INetURLObject::PART_VISIBLE,
-PV = INetURLObject::PART_VISIBLE_NONSPECIAL,
-PW = INetURLObject::PART_CREATEFRAGMENT,
-PX = INetURLObject::PART_UNO_PARAM_VALUE,
-PY = INetURLObject::PART_UNAMBIGUOUS,
-PZ = INetURLObject::PART_URIC_NO_SLASH,
-P1 = INetURLObject::PART_HTTP_QUERY,
-P2 = INetURLObject::PART_NEWS_ARTICLE_LOCALPART
+PA = INetURLObject::PART_USER_PASSWORD,
+PB = INetURLObject::PART_IMAP_ACHAR,
+PC = INetURLObject::PART_VIM,
+PD = INetURLObject::PART_FPATH,
+PE = INetURLObject::PART_AUTHORITY,
+PF = INetURLObject::PART_REL_SEGMENT_EXTRA,
+PG = INetURLObject::PART_URIC,
+PH = INetURLObject::PART_HTTP_PATH,
+PI = INetURLObject::PART_MESSAGE_ID_PATH,
+PJ = INetURLObject::PART_MAILTO,
+PK = INetURLObject::PART_PATH_BEFORE_QUERY,
+PL = INetURLObject::PART_PCHAR,
+PM = INetURLObject::PART_VISIBLE,
+PN = INetURLObject::PART_VISIBLE_NONSPECIAL,
+PO =

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

2014-06-23 Thread Takeshi Abe

 helpcontent2|2 +-
 svx/source/core/extedit.cxx |5 ++---
 svx/source/form/fmshimp.cxx |8 +++-
 svx/source/xoutdev/_xoutbmp.cxx |   18 --
 svx/source/xoutdev/xexch.cxx|5 ++---
 svx/source/xoutdev/xtabdash.cxx |7 ---
 svx/source/xoutdev/xtabgrdt.cxx |7 ---
 svx/source/xoutdev/xtabhtch.cxx |7 ---
 svx/source/xoutdev/xtablend.cxx |7 ---
 9 files changed, 32 insertions(+), 34 deletions(-)

New commits:
commit b9019d2920e44842926c3fe77c14c14f0af71c90
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Jun 23 14:26:08 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: I0cea121c8a8dbbc7b9f44ab712ff692243889816

diff --git a/helpcontent2 b/helpcontent2
index e420865..d2a1a4f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e4208653997a7390b5129207a11e9fa6d4a8c070
+Subproject commit d2a1a4fa5f1f45b6d137e9792bb3259e062cc3ff
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 24e93f9..12864cc 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -24,6 +24,7 @@
 #include unotools/ucbstreamhelper.hxx
 #include comphelper/processfactory.hxx
 #include boost/bind.hpp
+#include boost/scoped_ptr.hpp
 
 #include com/sun/star/system/SystemShellExecute.hpp
 #include com/sun/star/system/SystemShellExecuteFlags.hpp
@@ -45,15 +46,13 @@ void ExternalToolEdit::HandleCloseEvent(ExternalToolEdit* 
pData)
 Graphic newGraphic;
 
 //import the temp file image stream into the newGraphic
-SvStream* pStream = utl::UcbStreamHelper::CreateStream(pData-m_aFileName, 
STREAM_READ);
+boost::scoped_ptrSvStream 
pStream(utl::UcbStreamHelper::CreateStream(pData-m_aFileName, STREAM_READ));
 if(pStream)
 {
 GraphicConverter::Import(*pStream, newGraphic);
 
 // Now update the Graphic in the shell by re-reading from the 
newGraphic
 pData-Update( newGraphic );
-
-delete(pStream);
 }
 }
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 0c53aec..73f2f17 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -101,6 +101,7 @@
 #include functional
 #include map
 #include vector
+#include boost/scoped_ptr.hpp
 
 // wird fuer Invalidate verwendet - mitpflegen
 static const sal_uInt16 DatabaseSlotMap[] =
@@ -285,10 +286,10 @@ namespace
 {
 SdrObject* pCurrent = _rMarkList.GetMark( i )-GetMarkedSdrObj();
 
-SdrObjListIter* pGroupIterator = NULL;
+boost::scoped_ptrSdrObjListIter pGroupIterator;
 if ( pCurrent-IsGroupObject() )
 {
-pGroupIterator = new SdrObjListIter( *pCurrent-GetSubList() );
+pGroupIterator.reset(new SdrObjListIter( 
*pCurrent-GetSubList() ));
 pCurrent = pGroupIterator-IsMore() ? pGroupIterator-Next() : 
NULL;
 }
 
@@ -307,9 +308,6 @@ namespace
 // next element
 pCurrent = pGroupIterator  pGroupIterator-IsMore() ? 
pGroupIterator-Next() : NULL;
 }
-
-if ( pGroupIterator )
-delete pGroupIterator;
 }
 }
 
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index b7adb4f..da0ca01 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -31,6 +31,7 @@
 #include vcl/graphicfilter.hxx
 #include vcl/cvtgrf.hxx
 #include sax/tools/converter.hxx
+#include boost/scoped_array.hpp
 
 #define FORMAT_BMP  OUString(bmp)
 #define FORMAT_GIF  OUString(gif)
@@ -506,16 +507,16 @@ Polygon XOutBitmap::GetCountour( const Bitmap rBmp, 
const sal_uIntPtr nFlags,
 const long  nStartY1 = aWorkRect.Top() + 1L;
 const long  nEndY1 = aWorkRect.Bottom();
 const long  nStartY2 = nEndY1 - 1L;
-Point*  pPoints1 = NULL;
-Point*  pPoints2 = NULL;
+boost::scoped_arrayPoint pPoints1;
+boost::scoped_arrayPoint pPoints2;
 longnX, nY;
 sal_uInt16  nPolyPos = 0;
 const BitmapColor   aBlack = pAcc-GetBestMatchingColor( Color( 
COL_BLACK ) );
 
 if( nFlags  XOUTBMP_CONTOUR_VERT )
 {
-pPoints1 = new Point[ nWidth ];
-pPoints2 = new Point[ nWidth ];
+pPoints1.reset(new Point[ nWidth ]);
+pPoints2.reset(new Point[ nWidth ]);
 
 for( nX = nStartX1; nX  nEndX1; nX++ )
 {
@@ -551,8 +552,8 @@ Polygon XOutBitmap::GetCountour( const Bitmap rBmp, const 
sal_uIntPtr nFlags,
 }
 else
 {
-pPoints1 = new Point[ nHeight ];
-pPoints2 = new Point[ nHeight ];
+pPoints1.reset(new Point[ nHeight ]);
+pPoints2.reset(new

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - editeng/source scripting/source

 editeng/source/editeng/impedit2.cxx|1 -
 scripting/source/stringresource/stringresource.cxx |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b03e66797565a4a7854e22a316037d62fde2cb17
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Jun 21 22:33:17 2014 +0200

Related fdo#58774 Alternative dialog Find  Replace for Writer

After having installed the extension from 
http://extensions.libreoffice.org/extension-center/alternative-dialog-find-replace-for-writer/releases/1.4
I had a crash, extract of bt:
5  0x2aaad3ee13df in rtl::OUString::copy (this=0x7fff2510, 
beginIndex=147, count=-15) at 
/home/julien/compile-libreoffice/libreoffice/include/rtl/ustring.hxx:1481
6  0x2aaad3edc10e in 
stringresource::StringResourcePersistenceImpl::implScanLocaleNames 
(this=0x8e2bba0, aContentSeq=uno::Sequence of length 24 = {...})
at 
/home/julien/compile-libreoffice/libreoffice/scripting/source/stringresource/stringresource.cxx:1728

So add a quick check to be sure iDot  iSlash

Cherry-picked from d59da701c67074a44abcfebcb7506792d12127ae

Change-Id: I944a852d6cc9a35c451985ac96032f0d848136e8
Reviewed-on: https://gerrit.libreoffice.org/9848
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/scripting/source/stringresource/stringresource.cxx 
b/scripting/source/stringresource/stringresource.cxx
index ce814ef..f245f02 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1727,7 +1727,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( 
const Sequence OUStrin
 OUString aExtension;
 sal_Int32 iDot = aCompleteName.lastIndexOf( '.' );
 sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' );
-if( iDot != -1 )
+if( iDot != -1  iDot  iSlash)
 {
 sal_Int32 iCopyFrom = (iSlash != -1) ? iSlash + 1 : 0;
 aPureName = aCompleteName.copy( iCopyFrom, iDot-iCopyFrom );
commit f10a1384cea79afd3e569a7143113fa349efc3b0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jun 18 13:27:45 2014 +0100

Related: fdo#80140 a11y crash on changing text via spellchecker in impress

i.e. with French dictionary available, open test case of fdo#80140, open
spell checking dialog and choose correct on the first example.

Every version of LibreOffice crashes on this, so its an old bug.

As can be seen from the following bt, if a11y is enabled then on calling
ImpEditEngine::ImpInsertText from ImpEditEngine::ImpDeleteSelection then
FormatDoc may be called and throw away all the old portions so the following
ParaPortion* pPortion = FindParaPortion(aStartPaM.GetNode()) will get the 
new
ParaPortion, not the old one, and so the MarkInvalid that uses the old
ParaPortion invalid range is not correct anymore.

Seeing as the only caller of ImpRemoveChars is ImpDeleteSelection and
ImpDeleteSelection calls TextModified after ImpRemoveChars and after the 
use of
MarkInvalid, it seems safe and logical to remove the TextModified from
ImpRemoveChars and rely on the ImpDeleteSelection TextModified.

 #0  TextPortion::TextPortion (this=0x30bd020, nL=5) at 
/home/caolan/LibreOffice/core/editeng/source/editeng/editdoc.hxx:401
 #1  0x7fffd93f4d5a in ImpEditEngine::CreateTextPortions 
(this=0x3f42700, pParaPortion=0x3584930, rStart=@0x7fffa234: 0)
 at 
/home/caolan/LibreOffice/core/editeng/source/editeng/impedit3.cxx:2372
 #2  0x7fffd93ed087 in ImpEditEngine::CreateLines (this=0x3f42700, 
nPara=0, nStartPosY=0)
 at 
/home/caolan/LibreOffice/core/editeng/source/editeng/impedit3.cxx:687
 #3  0x7fffd93ebb3b in ImpEditEngine::FormatDoc (this=0x3f42700)
 at 
/home/caolan/LibreOffice/core/editeng/source/editeng/impedit3.cxx:394
 #4  0x7fffd93fd239 in ImpEditEngine::FormatAndUpdate (this=0x3f42700, 
pCurView=0x0)
 at 
/home/caolan/LibreOffice/core/editeng/source/editeng/impedit3.cxx:4156
 #5  0x7fffd937c3f4 in EditEngine::GetDocPosTopLeft (this=0x3f42690, 
nParagraph=0)
 at 
/home/caolan/LibreOffice/core/editeng/source/editeng/editeng.cxx:1920
 #6  0x7fffd94d298a in Outliner::GetDocPosTopLeft (this=0x3f42390, 
nParagraph=0)
 at 
/home/caolan/LibreOffice/core/editeng/source/outliner/outlin2.cxx:429
 #7  0x7fffd951c2d3 in SvxOutlinerForwarder::GetParaBounds 
(this=0x36015a0, nPara=0)
 at /home/caolan/LibreOffice/core/editeng/source/uno/unoforou.cxx:344
 #8  0x7fffd950efe5 in SvxAccessibleTextAdapter::GetParaBounds 
(this=0x3394e88, nPara=0)
 at /home/caolan/LibreOffice/core/editeng/source/uno/unoedprx.cxx:798
 #9  0x7fffd9aa25b5 in 
accessibility::AccessibleTextHelper_Impl::UpdateVisibleChildren 
(this=0x3394e00,

GAMMA.DIST

2014-06-23 Thread Olivier Hallot

Hi

With respect to several new Calc features, such as

http://cgit.freedesktop.org/libreoffice/core/commit/?id=8539039e0c108da7d0306c37962415ce7e271c84

I noticed that there are no help pages for the set of new functions
introduced in 4.3. and before.

Is there a text somewhere that I can use to start to build a help page
for them? I'd like to avoid going to Excel pages for that, for obvious
reasons.

On the same note, I opened bugs

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

that concerns the fact that many LibreOffice features have no help and
user guide pages.

Regards,
-- 
Olivier Hallot
Comunidade LibreOffice
http://ask.libreoffice.org/pt-br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: I need to better understand our css::uno::Reference


On 06/18/2014 10:58 PM, Lionel Elie Mamane wrote:

On Wed, Jun 18, 2014 at 05:04:02PM +0200, Stephan Bergmann wrote:

Short answer (from just browsing the top of FOO.patch):  Use
css::uno::ReferenceX only for (C++ classes representing) UNO interfaces,
and use rtl::ReferenceC for C++ classes implementing UNO objects.


Aha. This works. If you feel like explaining the C++-technical reason
behind why we need different Reference implementations for the two
cases... Feel free.


As C++ UNO for largely historic reasons does not use virtual 
inheritance, a css::uno::Reference for a multiple-inheritance interface 
type like css.uri.XVndSunStarExpandUrlReference (deriving from both 
css.uri.XUriReference and css.uri.XVndSunStarExpandUrl, each in turn 
deriving from css.uno.XInterface) faces a problem.  The Reference ctor 
has a pointer pInterface to css::uri::XVndSunStarExpandUrlReference and 
needs to call css::uno::XInterface::acquire through it.  But 
css::uno::XInterface is an ambiguous base class of 
css::uri::XVndSunStarExpandUrlReference, so calling 
pInterface-acquire() will not compile.


The trick is that we know that all compilers lay out the vtables in 
roughly the same way:  No matter how many types a given type X derives 
from, a pointer to X points to a vtable containing function pointers for 
X's first base (if any) followed by function pointers for X's own 
members (if any).  So as long as X represents any UNO interface type, 
the css::uno::ReferenceX ctor can do that dirty trick of 
reinterpret-casting pInterface to css::uno::XInterface* and calling 
acquire through that reinterpret-casted pointer and be sure it hits a 
vtable slot that calls the object's implementation of acquire (without 
needing adjustment of the this pointer).  All to allow for a single 
generic implementation of the css::uno::ReferenceX ctor that compiles 
fine regardless of X.


Now, if you break the assumption that X represents a UNO interface type, 
that reinterpret_cast trick potentially breaks down. 
connectivity::odbc::OResult derives from comphelper::OBaseMutex, 
connectivity::IResultSetHelper, OResultSet_BASE (aka 
cppu::WeakComponentImplHelper12 through which it derives from the 
various UNO interface types it implements), etc., in that order, so the 
vtable layout differs from that of a UNO interface type, and starts with 
vtables for comphelper::OBaseMutex and connectivity::IResultSetHelper. 
And the slot the reinterpret_cast hack mis-computes happens to be the 
slot for connectivity::IResultSetHelper::getDriverPos.


An alternative solution for the dilemma of a generic css::uno:Reference 
implementation could be to let cppumaker emit additional type-trait 
information how to cast between XInterface and any emitted interface 
type, and use that in the generic css::uno::Reference implementation. 
That could probably make a bad css::uno::Reference of an 
implementation class either silently do the right thing or cause a 
compilation error.



I assume I can mix-and-match both, they will use the same (shared)
counters for reference counting?


Yes, both css::uno::ReferenceT and rtl::ReferenceT rely on T's 
acquire and release functions.



I see there is no rtl::WeakReference, and no automatic conversion from
rtl::Reference to css::uno::(Weak)Reference; oh well, I can add
.get() here and there.


Yes, use .get() for that.  (Theoretically, there could be implicit 
conversion between css::uno::Reference and rtl::Reference, but nobody 
ever bothered to add it.  Or there was a catch I momentarily can't 
remember.)


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

[Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit smoketest/libtest.cxx

2014-06-23 Thread Andrzej Hunt

 desktop/source/lib/init.cxx   |   11 ++-
 include/LibreOfficeKit/LibreOfficeKit.h   |7 ++-
 include/LibreOfficeKit/LibreOfficeKit.hxx |   10 ++
 smoketest/libtest.cxx |   10 --
 4 files changed, 6 insertions(+), 32 deletions(-)

New commits:
commit 707a648eb3d8b8c216d4ee1d1f738552c6ac50a0
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Tue Jun 17 19:33:34 2014 +0100

LOK: kill saveAsWithOptions.

The saveAsWithOptions/saveAs split existed for reasons of historical
API compatibility. Since we're breaking the API currently we can
now get a clean start, and get rid of the redundant saveAs, and
make saveAsWithOptions the standard saveAs function.

Change-Id: Ia3e2294a8604cab08e95b07544c9d10d42dd1152

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index eed7831..710b474 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -153,8 +153,7 @@ extern C
 {
 
 static void doc_destroy(LibreOfficeKitDocument* pThis);
-static int  doc_saveAs(LibreOfficeKitDocument* pThis, const char* pUrl, const 
char* pFormat);
-static int  doc_saveAsWithOptions(LibreOfficeKitDocument* pThis, const char* 
pUrl, const char* pFormat, const char* pFilterOptions);
+static int  doc_saveAs(LibreOfficeKitDocument* pThis, const char* pUrl, const 
char* pFormat, const char* pFilterOptions);
 
 struct LibLODocument_Impl : public _LibreOfficeKitDocument
 {
@@ -172,7 +171,6 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument
 
 m_pDocumentClass-destroy = doc_destroy;
 m_pDocumentClass-saveAs = doc_saveAs;
-m_pDocumentClass-saveAsWithOptions = doc_saveAsWithOptions;
 
 gDocumentClass = m_pDocumentClass;
 }
@@ -254,12 +252,7 @@ static LibreOfficeKitDocument* 
lo_documentLoad(LibreOfficeKit* pThis, const char
 return NULL;
 }
 
-static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const 
char* pFormat)
-{
-return doc_saveAsWithOptions(pThis, sUrl, pFormat, NULL);
-}
-
-static int doc_saveAsWithOptions(LibreOfficeKitDocument* pThis, const char* 
sUrl, const char* pFormat, const char* pFilterOptions)
+static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const 
char* pFormat, const char* pFilterOptions)
 {
 LibLODocument_Impl* pDocument = static_castLibLODocument_Impl*(pThis);
 
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 63c2c22..33b5872 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -58,11 +58,8 @@ struct _LibreOfficeKitDocumentClass
   void (*destroy)   (LibreOfficeKitDocument* pThis);
   int (*saveAs) (LibreOfficeKitDocument* pThis,
  const char *pUrl,
- const char *pFormat);
-  int (*saveAsWithOptions) (LibreOfficeKitDocument* pThis,
-const char *pUrl,
-const char *pFormat,
-const char *pFilterOptions);
+ const char *pFormat,
+ const char *pFilterOptions);
 };
 
 LibreOfficeKit* lok_init (const char* pInstallPath);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f1db388..51a8578 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -36,15 +36,9 @@ public:
 mpDoc-pClass-destroy(mpDoc);
 }
 
-// Save as the given format, if format is NULL sniff from ext'n
-inline bool saveAs(const char* pUrl, const char* pFormat = NULL)
+inline bool saveAs(const char* pUrl, const char* pFormat = NULL, const 
char* pFilterOptions = NULL)
 {
-return mpDoc-pClass-saveAs(mpDoc, pUrl, pFormat);
-}
-
-inline bool saveAsWithOptions(const char* pUrl, const char* pFormat = 
NULL, const char* pFilterOptions = NULL)
-{
-return mpDoc-pClass-saveAsWithOptions(mpDoc, pUrl, pFormat, 
pFilterOptions);
+return mpDoc-pClass-saveAs(mpDoc, pUrl, pFormat, pFilterOptions);
 }
 inline LibreOfficeKitDocument *get() { return mpDoc; }
 };
diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
index 211d056..8a0b724 100644
--- a/smoketest/libtest.cxx
+++ b/smoketest/libtest.cxx
@@ -69,16 +69,6 @@ int main (int argc, char **argv)
 return -1;
 }
 
-if (!LIBREOFFICEKIT_DOCUMENT_HAS(pDocument-get(), saveAsWithOptions))
-{
-fprintf( stderr, using obsolete LibreOffice % SAL_PRI_SIZET d + % 
SAL_PRI_SIZET d vs. % SAL_PRI_SIZET d\n,
- (size_t)((unsigned char *)((LibreOfficeKitDocumentClass *) 
0)-saveAsWithOptions),
- sizeof ((LibreOfficeKitDocumentClass *) 0)-saveAsWithOptions,
- pDocument-get()-pClass-nSize );
-return -1;
-}
-
-
 end = getTimeMS();
 fprintf( stderr, load time: %ld

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - desktop/source include/LibreOfficeKit smoketest/libtest.cxx

2014-06-23 Thread Andrzej Hunt

 desktop/source/lib/init.cxx   |   11 ++-
 include/LibreOfficeKit/LibreOfficeKit.h   |7 ++-
 include/LibreOfficeKit/LibreOfficeKit.hxx |   10 ++
 smoketest/libtest.cxx |   10 --
 4 files changed, 6 insertions(+), 32 deletions(-)

New commits:
commit 204bcc4d891ce1882ed1847decd9cc36c8c5f164
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Tue Jun 17 19:33:34 2014 +0100

LOK: kill saveAsWithOptions.

The saveAsWithOptions/saveAs split existed for reasons of historical
API compatibility. Since we're breaking the API currently we can
now get a clean start, and get rid of the redundant saveAs, and
make saveAsWithOptions the standard saveAs function.

Change-Id: Ia3e2294a8604cab08e95b07544c9d10d42dd1152
Signed-off-by: Michael Meeks michael.me...@collabora.com

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index eed7831..710b474 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -153,8 +153,7 @@ extern C
 {
 
 static void doc_destroy(LibreOfficeKitDocument* pThis);
-static int  doc_saveAs(LibreOfficeKitDocument* pThis, const char* pUrl, const 
char* pFormat);
-static int  doc_saveAsWithOptions(LibreOfficeKitDocument* pThis, const char* 
pUrl, const char* pFormat, const char* pFilterOptions);
+static int  doc_saveAs(LibreOfficeKitDocument* pThis, const char* pUrl, const 
char* pFormat, const char* pFilterOptions);
 
 struct LibLODocument_Impl : public _LibreOfficeKitDocument
 {
@@ -172,7 +171,6 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument
 
 m_pDocumentClass-destroy = doc_destroy;
 m_pDocumentClass-saveAs = doc_saveAs;
-m_pDocumentClass-saveAsWithOptions = doc_saveAsWithOptions;
 
 gDocumentClass = m_pDocumentClass;
 }
@@ -254,12 +252,7 @@ static LibreOfficeKitDocument* 
lo_documentLoad(LibreOfficeKit* pThis, const char
 return NULL;
 }
 
-static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const 
char* pFormat)
-{
-return doc_saveAsWithOptions(pThis, sUrl, pFormat, NULL);
-}
-
-static int doc_saveAsWithOptions(LibreOfficeKitDocument* pThis, const char* 
sUrl, const char* pFormat, const char* pFilterOptions)
+static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const 
char* pFormat, const char* pFilterOptions)
 {
 LibLODocument_Impl* pDocument = static_castLibLODocument_Impl*(pThis);
 
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 63c2c22..33b5872 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -58,11 +58,8 @@ struct _LibreOfficeKitDocumentClass
   void (*destroy)   (LibreOfficeKitDocument* pThis);
   int (*saveAs) (LibreOfficeKitDocument* pThis,
  const char *pUrl,
- const char *pFormat);
-  int (*saveAsWithOptions) (LibreOfficeKitDocument* pThis,
-const char *pUrl,
-const char *pFormat,
-const char *pFilterOptions);
+ const char *pFormat,
+ const char *pFilterOptions);
 };
 
 LibreOfficeKit* lok_init (const char* pInstallPath);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f1db388..51a8578 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -36,15 +36,9 @@ public:
 mpDoc-pClass-destroy(mpDoc);
 }
 
-// Save as the given format, if format is NULL sniff from ext'n
-inline bool saveAs(const char* pUrl, const char* pFormat = NULL)
+inline bool saveAs(const char* pUrl, const char* pFormat = NULL, const 
char* pFilterOptions = NULL)
 {
-return mpDoc-pClass-saveAs(mpDoc, pUrl, pFormat);
-}
-
-inline bool saveAsWithOptions(const char* pUrl, const char* pFormat = 
NULL, const char* pFilterOptions = NULL)
-{
-return mpDoc-pClass-saveAsWithOptions(mpDoc, pUrl, pFormat, 
pFilterOptions);
+return mpDoc-pClass-saveAs(mpDoc, pUrl, pFormat, pFilterOptions);
 }
 inline LibreOfficeKitDocument *get() { return mpDoc; }
 };
diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
index 211d056..8a0b724 100644
--- a/smoketest/libtest.cxx
+++ b/smoketest/libtest.cxx
@@ -69,16 +69,6 @@ int main (int argc, char **argv)
 return -1;
 }
 
-if (!LIBREOFFICEKIT_DOCUMENT_HAS(pDocument-get(), saveAsWithOptions))
-{
-fprintf( stderr, using obsolete LibreOffice % SAL_PRI_SIZET d + % 
SAL_PRI_SIZET d vs. % SAL_PRI_SIZET d\n,
- (size_t)((unsigned char *)((LibreOfficeKitDocumentClass *) 
0)-saveAsWithOptions),
- sizeof ((LibreOfficeKitDocumentClass *) 0)-saveAsWithOptions,
- pDocument-get()-pClass-nSize );
-return -1;
-}
-
-

Re: I need to better understand our css::uno::Reference

2014-06-23 Thread julien2412

Hello,

Sorry for this certainly naive and humble (because I wouldn't be able at all
to help here) question, but just by curiosity, is there some plan to rewrite
partly/clean UNO in order to:
- not depend on vtables implementation
- avoid to use of reinterpret_cast (and therefore possibly detect errors
during build)
- more generally make things clearer/simplify
- (multiple inheritance but do we want/need it?)
?

Of course I know that historical can have a huge impact so I would
understand easily there's no plan for the moment.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/I-need-to-better-understand-our-css-uno-Reference-tp4112779p4113340.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: I need to better understand our css::uno::Reference

[Julien, please make sure you reply in such a way that I don't receive 
multiple unrelated copies of your reply via multiple mails that do not 
indicate in any way that you sent your reply to multiple recipients]


On 06/23/2014 01:44 PM, julien2412 wrote:

Sorry for this certainly naive and humble (because I wouldn't be able at all
to help here) question, but just by curiosity, is there some plan to rewrite
partly/clean UNO in order to:
- not depend on vtables implementation


No.


- avoid to use of reinterpret_cast (and therefore possibly detect errors
during build)


See the paragraph starting An alternative solution ... of my previous 
mail.



- more generally make things clearer/simplify


No.


- (multiple inheritance but do we want/need it?)


We do need multiple inheritance, for good reasons.  (See 
http://www.openoffice.org/marketing/ooocon2004/presentations/friday/shinyhappyuno.pdf 
for details.)


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - translations

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

New commits:
commit c80f0e1848b10f5e2d2114391a067142c9ad2394
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Jun 23 14:06:15 2014 +0200

Updated core
Project: translations  7c998fb6c4688730bb292c92e90be08c5d4e10ad

diff --git a/translations b/translations
index 6c0c118..7c998fb 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 6c0c1183e1a18a66db59681dcf5c09420256ef0e
+Subproject commit 7c998fb6c4688730bb292c92e90be08c5d4e10ad
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: GAMMA.DIST

2014-06-23 Thread Winfried Donkers

Hi Olivier,

GAMMA.DIST and quite a lot of other renamed and new Excel 2010 functions have
been added, all connected to metabug fdo70798.
This will at least give information which function have been added.
In the metabug is also a link to a MS-page which describes all these new and
renamed functions.
Also, the website excelfunctions.net (see e.g.
http://www.excelfunctions.net/Excel-Gamma-Dist-Function.html ) provides
explanations of the functions. I don't know about copyrights of this site.
though.

HTH,

Winfried

-Oorspronkelijk bericht-
Van: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Namens
Olivier Hallot
Verzonden: maandag 23 juni 2014 12:59
Aan: LO-dev
Onderwerp: GAMMA.DIST

With respect to several new Calc features, such as

http://cgit.freedesktop.org/libreoffice/core/commit/?id=8539039e0c108da7d0306c37962415ce7e271c84

I noticed that there are no help pages for the set of new functions introduced
in 4.3. and before.

Is there a text somewhere that I can use to start to build a help page for
them? I'd like to avoid going to Excel pages for that, for obvious reasons.

On the same note, I opened bugs

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

that concerns the fact that many LibreOffice features have no help and user
guide pages.

Regards,
--
Olivier Hallot
Comunidade LibreOffice
http://ask.libreoffice.org/pt-br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sw/uiconfig/swriter/ui/formattablepage.ui |2 +-
 sw/uiconfig/swriter/ui/inserttable.ui |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit caf2d6543a8c1b5b90ca59c7669b27ed339614e2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 23 13:19:39 2014 +0100

dangling TableNameEdits

Change-Id: I261540e6d80440dede7d185717c776a8ab6a22cb

diff --git a/sw/uiconfig/swriter/ui/formattablepage.ui 
b/sw/uiconfig/swriter/ui/formattablepage.ui
index 85d0838..b1a2abf 100644
--- a/sw/uiconfig/swriter/ui/formattablepage.ui
+++ b/sw/uiconfig/swriter/ui/formattablepage.ui
@@ -86,7 +86,7 @@
   /packing
 /child
 child
-  object class=swlo-TableNameEdit id=name
+  object class=GtkEntry id=name
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=hexpandTrue/property
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui 
b/sw/uiconfig/swriter/ui/inserttable.ui
index c7c98be..c2da2c3 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -105,10 +105,9 @@
 property name=row_spacing6/property
 property name=column_spacing12/property
 child
-  object class=swlo-TableNameEdit id=nameedit
+  object class=GtkEntry id=nameedit
 property name=visibleTrue/property
 property name=can_focusTrue/property
-property name=invisible_charâ¢/property
 property name=shadow_typeout/property
   /object
   packing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Where are the base declarations for 'Point', 'sal_uInt16', 'sal_uInt32' etc?

2014-06-23 Thread Rob Collins




I have downloaded the libreoffice code source files and loaded them  
into KDevelop. I also downloaded the Libreoffice SDK.


However, I can't find the declarations for many basic types.

I have searched using a search tool but cannot find them. Also  
KDevelop does not highlight the Types - so it cannot find them either.


What am I missing? Where do I need to look to find the declaration of  
these types? Am I missing some declaration files maybe?


Rob


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

[Libreoffice-commits] core.git: Branch 'feature/refactor-god-objects' - sw/inc sw/Library_sw.mk sw/source

2014-06-23 Thread Valentin Kettner

 sw/Library_sw.mk|1 
 sw/inc/doc.hxx  |   23 
 sw/source/core/doc/DocumentListItemsManager.cxx |  121 
 sw/source/core/doc/doc.cxx  |   12 ++
 sw/source/core/doc/docnew.cxx   |7 -
 sw/source/core/doc/docnum.cxx   |   79 ---
 sw/source/core/docnode/node.cxx |2 
 sw/source/core/inc/DocumentListItemsManager.hxx |   69 +
 sw/source/core/view/viewsh.cxx  |2 
 9 files changed, 212 insertions(+), 104 deletions(-)

New commits:
commit f8cfacc479decff61beb892df6714d77351a2fb0
Author: Valentin Kettner vakevk+libreoff...@gmail.com
Date:   Mon Jun 23 14:56:59 2014 +0200

Refactored IDocumentListItems out of SwDoc.

Into the new class DocumentListItemsManager.

Change-Id: Ic86200280caa1b6e2c940bb12149235223ed0cd2

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 2980476..c28c6ed 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -190,6 +190,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 sw/source/core/doc/DocumentChartDataProviderManager \
 sw/source/core/doc/DocumentTimerManager \
 sw/source/core/doc/DocumentLinksAdministrationManager \
+sw/source/core/doc/DocumentListItemsManager \
 sw/source/core/doc/extinput \
 sw/source/core/doc/fmtcol \
 sw/source/core/doc/ftnidx \
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 69b2fd7..6694ec1 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -31,7 +31,6 @@
 #include IDocumentState.hxx
 #include IDocumentLayoutAccess.hxx
 #include IDocumentOutlineNodes.hxx
-#include IDocumentListItems.hxx
 
 #include IDocumentListsAccess.hxx
 class SwList;
@@ -195,6 +194,7 @@ class IDocumentDrawModelAccess;
 class IDocumentChartDataProviderAccess;
 class IDocumentTimerAccess;
 class IDocumentLinksAdministration;
+class IDocumentListItems;
 class _SetGetExpFlds;
 
 namespace sw { namespace mark {
@@ -210,6 +210,7 @@ namespace sw {
 class DocumentChartDataProviderManager;
 class DocumentTimerManager;
 class DocumentLinksAdministrationManager;
+class DocumentListItemsManager;
 }
 
 namespace com { namespace sun { namespace star {
@@ -255,7 +256,6 @@ class SW_DLLPUBLIC SwDoc :
 public IDocumentStatistics,
 public IDocumentState,
 public IDocumentLayoutAccess,
-public IDocumentListItems,
 public IDocumentOutlineNodes,
 public IDocumentListsAccess,
 public IDocumentExternalData
@@ -291,6 +291,7 @@ class SW_DLLPUBLIC SwDoc :
 ::boost::scoped_ptr ::sw::DocumentDeviceManager  m_pDeviceAccess;
 const ::boost::scoped_ptr ::sw::DocumentTimerManager  
m_pDocumentTimerManager;
 const ::boost::scoped_ptr ::sw::DocumentLinksAdministrationManager  
m_pDocumentLinksAdministrationManager;
+const ::boost::scoped_ptr ::sw::DocumentListItemsManager  
m_pDocumentListItemsManager;
 
 // Pointer
 SwFrmFmt*mpDfltFrmFmt;   // Default formats.
@@ -368,17 +369,8 @@ class SW_DLLPUBLIC SwDoc :
 rtl::ReferenceSvxForbiddenCharactersTable mxForbiddenCharsTable;
 com::sun::star::uno::Reference 
com::sun::star::script::vba::XVBAEventProcessor  mxVbaEvents;
 com::sun::star::uno::Referencecom::sun::star::container::XNameContainer 
m_xTemplateToProjectCache;
-public:
-struct lessThanNodeNum
-{
-bool operator()( const SwNodeNum* pNodeNumOne,
- const SwNodeNum* pNodeNumTwo ) const;
-};
 
-typedef ::std::set const SwNodeNum*, lessThanNodeNum  
tImplSortedNodeNumList;
 private:
-tImplSortedNodeNumList* mpListItemsList;
-
 ::std::auto_ptr ::sfx2::IXmlIdRegistry  m_pXmlIdRegistry;
 
 // other
@@ -774,13 +766,8 @@ public:
 IDocumentChartDataProviderAccess  getIDocumentChartDataProviderAccess();
 
 // IDocumentListItems
-virtual void addListItem( const SwNodeNum rNodeNum ) SAL_OVERRIDE;
-virtual void removeListItem( const SwNodeNum rNodeNum ) SAL_OVERRIDE;
-virtual OUString getListItemText( const SwNodeNum rNodeNum,
-const bool bWithNumber = true,
-const bool bWithSpacesForLevel = false ) 
const SAL_OVERRIDE;
-virtual void getListItems( IDocumentListItems::tSortedNodeNumList 
orNodeNumList ) const SAL_OVERRIDE;
-virtual void getNumItems( IDocumentListItems::tSortedNodeNumList 
orNodeNumList ) const SAL_OVERRIDE;
+IDocumentListItems const  getIDocumentListItems() const;
+IDocumentListItems  getIDocumentListItems();
 
 // IDocumentOutlineNodes
 virtual sal_Int32 getOutlineNodesCount() const SAL_OVERRIDE;
diff --git a/sw/source/core/doc/DocumentListItemsManager.cxx 
b/sw/source/core/doc/DocumentListItemsManager.cxx
new file mode 100644
index 000..5844fd2
--- /dev/null
+++ b/sw/source/core/doc/DocumentListItemsManager.cxx
@@ -0,0 +1,121 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode:

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

 sd/inc/helpids.h   |   11 ---
 sd/source/ui/dlg/dlgass.cxx|   28 +++-
 sd/uiconfig/simpress/ui/assistentdialog.ui |   18 +-
 3 files changed, 24 insertions(+), 33 deletions(-)

New commits:
commit 43b0a48596b5ad25dfdb2020a28580a41b7a05f0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 23 13:36:37 2014 +0100

can't have bare english strings in .cxx

Change-Id: I1a14e37f3362c082bc460895ffd0b949c636b8ea

diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 2641b1a..51421d0 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -24,12 +24,6 @@
 #define HID_SDGRAPHICVIEWSHELL  
SD_HID_SDGRAPHICVIEWSHELL
 #define HID_SDOUTLINEVIEWSHELL  
SD_HID_SDOUTLINEVIEWSHELL
 #define HID_SD_OPTIONS_SNAP 
SD_HID_SD_OPTIONS_SNAP
-#define HID_SD_AUTOPILOT_PAGE1  
SD_HID_SD_AUTOPILOT_PAGE1
-#define HID_SD_AUTOPILOT_PAGE2  
SD_HID_SD_AUTOPILOT_PAGE2
-#define HID_SD_AUTOPILOT_PAGE3  
SD_HID_SD_AUTOPILOT_PAGE3
-#define HID_SD_AUTOPILOT_PAGE4  
SD_HID_SD_AUTOPILOT_PAGE4
-#define HID_SD_AUTOPILOT_PAGE5  
SD_HID_SD_AUTOPILOT_PAGE5
-#define HID_SD_AUTOPILOT_PAGE6  
SD_HID_SD_AUTOPILOT_PAGE6
 #define HID_SD_CBX_ONLYSELECTED 
SD_HID_SD_CBX_ONLYSELECTED
 #define HID_SD_BTN_FILTERDIALOG 
SD_HID_SD_BTN_FILTERDIALOG
 #define HID_SD_BTN_PAGE 
SD_HID_SD_BTN_PAGE
@@ -87,11 +81,6 @@
 
 #define HID_FM_CTL_SELECTION
SD_HID_FM_CTL_SELECTION
 
-#define HID_SD_AUTOPILOT_REGION 
SD_HID_SD_AUTOPILOT_REGION
-#define HID_SD_AUTOPILOT_TEMPLATES  
SD_HID_SD_AUTOPILOT_TEMPLATES
-#define HID_SD_AUTOPILOT_OPEN   
SD_HID_SD_AUTOPILOT_OPEN
-#define HID_SD_AUTOPILOT_PAGETEMPLATES  
SD_HID_SD_AUTOPILOT_PAGETEMPLATES
-
 #define HID_SD_TABBAR_PAGES 
SD_HID_SD_TABBAR_PAGES
 #define HID_SD_TABBAR_LAYERS
SD_HID_SD_TABBAR_LAYERS
 
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 1f919c1..0837eb5 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -77,17 +77,6 @@ using namespace ::sd;
 using ::std::vector;
 
 
-const char* PageHelpIds[] =
-{
-HID_SD_AUTOPILOT_PAGE1,
-HID_SD_AUTOPILOT_PAGE2,
-HID_SD_AUTOPILOT_PAGE3,
-HID_SD_AUTOPILOT_PAGE4,
-HID_SD_AUTOPILOT_PAGE5
-};
-
-
-
 class PasswordEntry
 {
 public:
@@ -260,6 +249,9 @@ public:
 DECL_LINK( SelectEffectHdl, void* );
 DECL_LINK( OpenButtonHdl, Button * );
 
+OUStringmaCreateStr;
+OUStringmaOpenStr;
+
 // Common
 Assistent   maAssistentFunc;
 CheckBox*   mpPreviewFlag;
@@ -353,6 +345,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, 
const Link rFinishLink,
 assDlg-get(mpStartWithFlag, startWithCheckbutton);
 assDlg-get(mpLastPageButton, lastPageButton);
 assDlg-get(mpFinishButton, finishButton);
+maCreateStr = mpFinishButton-GetText();
+maOpenStr = assDlg-getPushButton(open)-GetText();
 assDlg-get(mpPreview, previewControl);
 assDlg-get(mpPage1235, page1235Box);
 mpNextPageButton = new NextButton( pWindow );
@@ -894,9 +888,9 @@ void AssistentDlgImpl::SetStartType( StartType eType )
 mpPage1OpenPB-Show(eType == ST_OPEN);
 
 if (eType == ST_OPEN)
-mpFinishButton-SetText(~Open);
+mpFinishButton-SetText(maOpenStr);
 else
-mpFinishButton-SetText(~Create);
+mpFinishButton-SetText(maCreateStr);
 }
 
 StartType AssistentDlgImpl::GetStartType()
@@ -1036,13 +1030,6 @@ void AssistentDlgImpl::ChangePage()
 mpNextPageButton-Enable(!maAssistentFunc.IsLastPage());
 mpLastPageButton-Enable(!maAssistentFunc.IsFirstPage());
 
-sal_uInt16 nPage = (sal_uInt16)maAssistentFunc.GetCurrentPage();
-
-if( mpWindow )
-{
-mpWindow-SetHelpId( PageHelpIds[nPage-1]);
-}
-
 UpdatePage();
 
 if( mpNextPageButton-IsEnabled() )
@@ -1819,7 +1806,6 @@ AssistentDlg::~AssistentDlg()
 delete mpImpl;
 }
 
-
 SfxObjectShellLock AssistentDlg::GetDocument()
 {
 return mpImpl-GetDocument();
diff --git a/sd/uiconfig/simpress/ui/assistentdialog.ui 
b/sd/uiconfig/simpress/ui/assistentdialog.ui
index 8ba229d..5c1dc0b 100644
--- a/sd/uiconfig/simpress/ui/assistentdialog.ui
+++ b/sd/uiconfig/simpress/ui/assistentdialog.ui
@@ -113,6 +113,22 @@
 property name=position5/property
   /packing
 /child
+child
+

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 31c406187412e1efa16cc31813961650fd7f5e49
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 23 13:56:08 2014 +0100

Updated core
Project: help  c18a4da59f386b125bf65adc0238a4fa712910a5

diff --git a/helpcontent2 b/helpcontent2
index d2a1a4f..c18a4da 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d2a1a4fa5f1f45b6d137e9792bb3259e062cc3ff
+Subproject commit c18a4da59f386b125bf65adc0238a4fa712910a5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 helpers/help_hid.lst   |   11 --
 source/text/shared/autopi/01050100.xhp |   36 -
 source/text/shared/autopi/01050200.xhp |   26 +++
 source/text/shared/autopi/01050300.xhp |   32 ++---
 source/text/shared/autopi/01050400.xhp |   14 ++--
 source/text/shared/autopi/01050500.xhp |6 ++---
 6 files changed, 57 insertions(+), 68 deletions(-)

New commits:
commit c18a4da59f386b125bf65adc0238a4fa712910a5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 23 13:56:08 2014 +0100

update helpids for impress wizard .ui conversion

Change-Id: I9c611a8b336396140f092f76c76c68d0cbc0a110

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f96074c..5d70b29 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2708,16 +2708,6 @@ HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL,59926,
 HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY,59927,
 HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW,59928,
 HID_SD_ANNOTATIONS,59969,
-HID_SD_AUTOPILOT_OPEN,59887,
-HID_SD_AUTOPILOT_PAGE1,59771,
-HID_SD_AUTOPILOT_PAGE2,59772,
-HID_SD_AUTOPILOT_PAGE3,59773,
-HID_SD_AUTOPILOT_PAGE4,59774,
-HID_SD_AUTOPILOT_PAGE5,59775,
-HID_SD_AUTOPILOT_PAGE6,59776,
-HID_SD_AUTOPILOT_PAGETEMPLATES,59888,
-HID_SD_AUTOPILOT_REGION,59885,
-HID_SD_AUTOPILOT_TEMPLATES,59886,
 HID_SD_BTN_DRAW,59782,
 HID_SD_BTN_FILTERDIALOG,59778,
 HID_SD_BTN_HANDOUT,59786,
@@ -4581,7 +4571,6 @@ SID_SC_EDIT_OBJECT,26234,.uno:EditObject
 SID_SC_RANGE,26585,.uno:Range
 SID_SC_SELECTION,26586,.uno:Selection
 SID_SC_SETTEXT,26617,.uno:PutCell
-SID_SD_AUTOPILOT,10425,.uno:AutoPilotPresentations
 SID_SD_EDITOPTIONS,10434,.uno:SdEditOptions
 SID_SD_GRAPHIC_OPTIONS,10447,.uno:SdGraphicOptions
 SID_SEARCH_DLG,5961,.uno:SearchDialog
diff --git a/source/text/shared/autopi/01050100.xhp 
b/source/text/shared/autopi/01050100.xhp
index 8dc225f..3914595 100644
--- a/source/text/shared/autopi/01050100.xhp
+++ b/source/text/shared/autopi/01050100.xhp
@@ -33,39 +33,39 @@ dedr: fixed #i31165#/lastedited
 /meta
 body
 section id=autopilotseite1
-bookmark xml-lang=en-US branch=hid/SD_HID_SD_AUTOPILOT_PAGE1 
id=bm_id3155364 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/assistentdialog/page1Box id=bm_id3155364 
localize=false/
 paragraph role=heading id=hd_id3155320 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/autopi/01050100.xhp 
name=Presentation Wizard Page 1Presentation Wizard Page 1/link/paragraph
-paragraph role=paragraph id=par_id3152594 xml-lang=en-US l10n=U 
oldref=14ahelp hid=HID_SD_AUTOPILOT_PAGE1Specifies the presentation type 
and allows you to select a template./ahelp/paragraph
+paragraph role=paragraph id=par_id3152594 xml-lang=en-US l10n=U 
oldref=14ahelp hid=modules/simpress/ui/assistentdialog/page1BoxSpecifies 
the presentation type and allows you to select a template./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/shared/00/0401.xhp#dtapse/
 /section
 paragraph role=heading id=hd_id3145090 xml-lang=en-US level=2 
l10n=U oldref=15Type/paragraph
 paragraph role=paragraph id=par_id3153684 xml-lang=en-US l10n=U 
oldref=23You can determine the presentation type in this area./paragraph
-bookmark xml-lang=en-US branch=hid/sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY 
id=bm_id3153749 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/assistentdialog/emptyRadiobutton 
id=bm_id3153749 localize=false/
 paragraph role=heading id=hd_id3153527 xml-lang=en-US level=3 
l10n=U oldref=16Empty presentation/paragraph
-paragraph role=paragraph id=par_id3149388 xml-lang=en-US l10n=U 
oldref=24ahelp hid=SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_EMPTYCreates a new 
(empty) presentation./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE id=bm_id3153346 
localize=false/
+paragraph role=paragraph id=par_id3149388 xml-lang=en-US l10n=U 
oldref=24ahelp 
hid=modules/simpress/ui/assistentdialog/emptyRadiobuttonCreates a new 
(empty) presentation./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/assistentdialog/templateRadiobutton 
id=bm_id3153346 localize=false/
 paragraph role=heading id=hd_id3147008 xml-lang=en-US level=3 
l10n=U oldref=17From template/paragraph
-paragraph role=paragraph id=par_id3154318 xml-lang=en-US l10n=U 
oldref=25ahelp hid=SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_TEMPLATEOpens a list 
box containing various modifiable presentations./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN 
id=bm_id3166460 localize=false/
+paragraph role=paragraph id=par_id3154318 xml-lang=en-US l10n=U 
oldref=25ahelp 
hid=modules/simpress/ui/assistentdialog/templateRadiobuttonOpens a list box 
containing various modifiable presentations./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/assistentdialog/openRadiobutton 
id=bm_id3166460 localize=false/
 paragraph role=heading id=hd_id3153662

Re: Where are the base declarations for 'Point', 'sal_uInt16', 'sal_uInt32' etc?

2014-06-23 Thread Noel Grandin


On 2014-06-23 02:49 PM, Rob Collins wrote:


I have downloaded the libreoffice code source files and loaded them into 
KDevelop. I also downloaded the Libreoffice SDK.

However, I can't find the declarations for many basic types.

I have searched using a search tool but cannot find them. Also KDevelop does not highlight the Types - so it cannot 
find them either.


What am I missing? Where do I need to look to find the declaration of these types? Am I missing some declaration files 
maybe?






Stuff like sal_uInt16 is in
include/sal/types.h

http://opengrok.libreoffice.org/ is very useful for finding stuff in the LO 
codebase.

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


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

[GSoC] Improved Color Selection, Week 5

2014-06-23 Thread Krisztian Pinter

Hi All!

Last week I was able to prototype working for loading document colors from
a Writer file, with a GUI and everything. (Thanks for Maxim Monastirsky for
nudging me in the right direction!)
I also started getting the code ready for loading multiple palettes.
I started working on doing the same for Calc, which I hope to finish this
week.

Also, I'll have to implement loading GIMP/Inkscape palettes, which should
be pretty easy (I have already looked at how the format works).
The only thing I don't know is where to put the implementation in the
codebase.

If anyone has any insights, please share them! Thank you!

All the best,
Krisztian Pinter
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Where are the base declarations for 'Point', 'sal_uInt16', 'sal_uInt32' etc?

2014-06-23 Thread Maxim Monastirsky

Hi Rob,

On Monday 23 June 2014 13:49:39 Rob Collins wrote:
 Also KDevelop does not highlight the Types - so it cannot find them either.
To make it work you should first run make kdevelop-ide-integration. Also keep 
in mind that the UNO api headers are generated during the build, so to get 
highlighting/auto-completion for them, you need to build libreoffice at least 
once.

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

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

2014-06-23 Thread Herbert Dürr

 l10ntools/source/export2.cxx |   31 +--
 1 file changed, 17 insertions(+), 14 deletions(-)

New commits:
commit b4c9dd86123180e7ca5ffade6cc5d41ce54c7885
Author: Herbert DÃ¼rr h...@apache.org
Date:   Mon Jun 23 12:48:27 2014 +

#i125143# use bulk-copying instead of line-wise in helpex Export::CopyFile()

This simple change has been measured to speed up the helpex by almost 30%.

diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index 34df550..1608a09 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -339,7 +339,7 @@ void Export::RemoveUTF8ByteOrderMarkerFromFile( const 
ByteString rFilename ){
 bool Export::CopyFile( const ByteString source , const ByteString dest )
 {
 //cout  CopyFile(   source.GetBuffer()   ,   dest.GetBuffer() 
  )\n;
-const int BUFFERSIZE= 8192;
+static const int BUFFERSIZE = 0x10;
 char buf[ BUFFERSIZE ];
 
 FILE* IN_FILE = fopen( source.GetBuffer() , r );
@@ -357,27 +357,30 @@ bool Export::CopyFile( const ByteString source , const 
ByteString dest )
 return false;
 }
 
-while( fgets( buf , BUFFERSIZE , IN_FILE ) != NULL )
+bool bOk = true;
+while( bOk )
 {
-if( fputs( buf , OUT_FILE ) == EOF )
+if( feof( IN_FILE ) )
+break;
+const size_t nBytesRead = fread( buf, 1, BUFFERSIZE, IN_FILE );
+if( nBytesRead = 0 )
+{
+if( ferror( IN_FILE ) )
+{
+cerr  Export::CopyFile WARNING: Read problems   
dest.GetBuffer()  \n;
+bOk = false;
+}
+}
+else if( fwrite( buf, 1, nBytesRead, OUT_FILE ) = 0 )
 {
 cerr  Export::CopyFile WARNING: Write problems   
source.GetBuffer()  \n;
-fclose( IN_FILE );
-fclose( OUT_FILE );
-return false;
+bOk = false;
 }
 }
-if( ferror( IN_FILE ) )
-{
-cerr  Export::CopyFile WARNING: Read problems   dest.GetBuffer() 
 \n;
-fclose( IN_FILE );
-fclose( OUT_FILE );
-return false;
-}
 fclose ( IN_FILE );
 fclose ( OUT_FILE );
 
-return true;
+return bOk;
 }
 
 /*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSOC] Personas - Weekly Report #5

2014-06-23 Thread Rachit Gupta

Hello all,

This week, I completed the following things:

+ Some code clean up.
+ Kendy fixed some UI quirks.
+ Functionality to apply default themes.
+ Improved search, the images are displayed as they are available.
+ Some default search terms are available for searching directly.

Over the next week, my focus will be on:

- Applying the personas as extensions
- Mid term evaluations :-)

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

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bc07cce52470f08872bba75411d88543c4cbd0f
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Jun 23 16:10:11 2014 +0200

fdo#80332 followup fix

Change-Id: If44dd2ab33128c0432e6db655dfbc07f9be4ca51

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 64ab818..e05c835 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -204,7 +204,7 @@ ReadyToInstall  DlgTitleText13  6   
280 25  65538   OOO_CONTROL_170
 ReadyToInstall DlgTitle2   Text13  6   280 25  65538   
OOO_CONTROL_171 
 ReadyToInstall DlgTitle3   Text13  6   280 25  65538   
OOO_CONTROL_172 
 ReadyToInstall InstallNow  PushButton  230 243 66  17  
3   OOO_CONTROL_173 Cancel  
-ReadyToInstall DesktopLink CheckBox21  100 300 10  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableATTools   
+ReadyToInstall DesktopLink CheckBox21  100 300 10  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 EnableQuickstart
 ReadyToInstall EnableQuickstartCheckBox21  125 300 
10  3   QUICKSTART  OOO_CONTROL_321 Back
 ReadyToRemove  BackPushButton  164 243 66  17  3   
OOO_CONTROL_174 RemoveNow   
 ReadyToRemove  Banner  Bitmap  0   0   374 44  1   
BannerBmp   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - instsetoo_native/inc_openoffice