date:20140610

 Repository.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 82f96aeb778456dd2f253aaaf626cf4229e1d674
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sun Jun 8 21:46:53 2014 +0200

gbuild: move vclplug_kde* to the kde section

Change-Id: Ia2b5df76be4d5a376fb28c2460f286e3f2b4acc0
(cherry picked from commit 4d5de8092404bc82391d6bf98b5389ecc232fda8)

diff --git a/Repository.mk b/Repository.mk
index 700d9f5..9a56d6a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -209,6 +209,10 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
$(if $(ENABLE_KDE),kdebe1) \
$(if $(ENABLE_KDE4),kde4be1) \
+   $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+   $(if $(ENABLE_KDE),vclplug_kde) \
+   $(if $(ENABLE_KDE4),vclplug_kde4) \
+   ) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
@@ -366,8 +370,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
vclplug_gen \
$(if $(ENABLE_TDE),vclplug_tde) \
-   $(if $(ENABLE_KDE),vclplug_kde) \
-   $(if $(ENABLE_KDE4),vclplug_kde4) \
$(if $(ENABLE_HEADLESS),,vclplug_svp) \
) \
writerperfect \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerfilter/CustomTarget_source.mk writerfilter/source

 writerfilter/CustomTarget_source.mk  |   11 +--
 writerfilter/source/ooxml/fasttokens.py  |   74 ++
 writerfilter/source/ooxml/fasttokens.xsl |  103 ---
 3 files changed, 80 insertions(+), 108 deletions(-)

New commits:
commit f3160a7effe70f10c669b085c840bfc77b8ef671
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Jun 10 09:08:50 2014 +0200

writerfilter: convert fasttokens to Python

It's shorter and f9bf15e19ec823a58ee32bf94da81f3bb1a147bc (writerfilter:
initial strict DOCX support, 2014-03-07) shows it's a pain to do anything
non-trivial with XSLT 1.0 -- in that case black magic was needed to do a 
simple
unique sort.

Change-Id: Icf4e7b580ce1db6826989500dbf4a012d79acdb9

diff --git a/writerfilter/CustomTarget_source.mk 
b/writerfilter/CustomTarget_source.mk
index 98da398..c4ad0a4 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -13,6 +13,7 @@ writerfilter_WORK := $(call 
gb_CustomTarget_get_workdir,writerfilter/source)
 writerfilter_SRC := $(SRCDIR)/writerfilter/source
 
 writerfilter_XSLTCOMMAND := $(call gb_ExternalExecutable_get_command,xsltproc)
+writerfilter_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
 
 writerfilter_OOXMLNAMESPACES= \
dml-baseStylesheet \
@@ -75,7 +76,7 @@ 
writerfilter_SRC_model_NamespacePreprocess=$(writerfilter_SRC)/resourcemodel/nam
 
writerfilter_SRC_ooxml_Analyze_model_xsl=$(writerfilter_SRC)/ooxml/analyzemodel.xsl
 
writerfilter_SRC_ooxml_FactoryTools_xsl=$(writerfilter_SRC)/ooxml/factorytools.xsl
 
writerfilter_SRC_ooxml_FactoryValues_xsl=$(writerfilter_SRC)/ooxml/factory_values.xsl
-writerfilter_SRC_ooxml_FastTokens_xsl=$(writerfilter_SRC)/ooxml/fasttokens.xsl
+writerfilter_SRC_ooxml_FastTokens_py=$(writerfilter_SRC)/ooxml/fasttokens.py
 
writerfilter_SRC_ooxml_GperfFastTokenHandler_xsl=$(writerfilter_SRC)/ooxml/gperffasttokenhandler.xsl
 writerfilter_SRC_ooxml_Model=$(writerfilter_SRC)/ooxml/model.xml
 
writerfilter_SRC_ooxml_NamespaceIds_xsl=$(writerfilter_SRC)/ooxml/namespaceids.xsl
@@ -95,9 +96,9 @@ $(writerfilter_GEN_ooxml_FactoryValues_hxx) : 
$(writerfilter_SRC_ooxml_FactoryVa
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) 
$(writerfilter_SRC_ooxml_FactoryValues_xsl) 
$(writerfilter_GEN_ooxml_Model_processed))  $@
 
-$(writerfilter_GEN_ooxml_FastTokens_hxx) : 
$(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml) | 
$(writerfilter_WORK)/ooxml/.dir
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
-   $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) 
$(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml))  
$@
+$(writerfilter_GEN_ooxml_FastTokens_hxx) : 
$(writerfilter_SRC_ooxml_FastTokens_py) $(writerfilter_GEN_ooxml_Token_xml) | 
$(writerfilter_WORK)/ooxml/.dir
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
+   $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) 
$(writerfilter_SRC_ooxml_FastTokens_py) $(writerfilter_GEN_ooxml_Token_xml))  
$@
 
 $(writerfilter_GEN_ooxml_GperfFastToken_hxx) : 
$(writerfilter_SRC_ooxml_GperfFastTokenHandler_xsl) 
$(writerfilter_GEN_ooxml_Token_xml)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
@@ -149,6 +150,6 @@ $(writerfilter_WORK)/OOXMLFactory%.hxx : 
$(writerfilter_SRC)/ooxml/factory_ns.xs
 
 $(call gb_CustomTarget_get_target,writerfilter/source) : $(writerfilter_ALL)
 
-$(writerfilter_ALL) :| $(call gb_ExternalExecutable_get_dependencies,xsltproc) 
$(writerfilter_WORK)/.dir
+$(writerfilter_ALL) :| $(call gb_ExternalExecutable_get_dependencies,xsltproc) 
$(call gb_ExternalExecutable_get_dependencies,python) $(writerfilter_WORK)/.dir
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerfilter/source/ooxml/fasttokens.py 
b/writerfilter/source/ooxml/fasttokens.py
new file mode 100644
index 000..c8c2ca0
--- /dev/null
+++ b/writerfilter/source/ooxml/fasttokens.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from __future__ import print_function
+import xml.sax
+import sys
+
+
+class ContentHandler(xml.sax.handler.ContentHandler):
+def __init__(self):
+self.inFasttoken = False
+self.counter = 0
+
+def startElement(self, name, attrs):
+if name == fasttoken:
+self.inFasttoken = True
+
+def endElement(self, name):
+if name == fasttoken:
+self.inFasttoken = False
+
+def characters(self, characters):
+if self.inFasttoken:
+print(const Token_t OOXML_%s = %s; % (characters.replace('-',

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

2014-06-10 Thread Vinaya Mandke

 sw/qa/extras/ooxmlimport/data/fdo78939.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   12 
 writerfilter/source/dmapper/NumberingManager.cxx |8 +---
 3 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit e49d2b31fb2020d065b4ad940d1031d07b10f32b
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date:   Fri Jun 6 14:12:48 2014 +0530

fdo#78939 [DOCX] Hang while opening due to incorrect modification of Style


http://opengrok.libreoffice.org/xref/core/sw/source/core/unocore/unosett.cxx#1884
Modifies the refernced style of the numbering rule to use the current 
numbering rule.
Actually the refernced style is not supposed to be modified.
As the numbering level formatonly uses that properties particular style,
which may or may not be a numbering style

For this Particular document the numbering format refers the Default 
Style (Normal).
Almost all of the styles in style.xml are based on it. Normal was modified,
and as a result the whole document was bulletized; Which caused the hang 
while opening

Removed the addition of style as a PARA_STYLE, as the properties of the
refernced style are already added in ListLevel::AddParaProperties

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Reviewed on:
https://gerrit.libreoffice.org/9668

Change-Id: I8cc143805a38613908d2e2cb4827882d4cf40a78

diff --git a/sw/qa/extras/ooxmlimport/data/fdo78939.docx 
b/sw/qa/extras/ooxmlimport/data/fdo78939.docx
new file mode 100644
index 000..2fc3198
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo78939.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ea1910b..1102c29 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2198,6 +2198,18 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeTrackedchanges, 
groupshape-trackedchange
 CPPUNIT_ASSERT_EQUAL(OUString( Inserted), xShape-getString());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testFdo78939, fdo78939.docx)
+{
+// fdo#78939 : LO hanged while opening issue document
+
+// Whenever a para-style was applied to a Numbering format level,
+// LO incorrectly also changed the para-style..
+
+// check that file opens and does not hang while opening and also
+// check that an incorrect numbering style is not applied ...
+CPPUNIT_ASSERT_EQUAL(OUString(), getPropertyOUString(getParagraph(1), 
NumberingStyleName));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 65f6a66..66e9d65 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -643,13 +643,6 @@ void ListDef::CreateNumberingRules( DomainMapper rDMapper,
 
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 1] = 
MAKE_PROPVAL( PROP_POSITION_AND_SPACE_MODE,
 sal_Int16( 
text::PositionAndSpaceMode::LABEL_ALIGNMENT ) );
 
-StyleSheetEntryPtr pParaStyle = pAbsLevel-GetParaStyle( );
-if( pParaStyle.get())
-{
-aLvlProps.realloc( aLvlProps.getLength() + 1 );
-
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 1] = 
MAKE_PROPVAL( PROP_PARAGRAPH_STYLE_NAME,
-pParaStyle-sConvertedStyleName );
-}
 
 // Replace the numbering rules for the level
 m_xNumRules-replaceByIndex( nLevel, uno::makeAny( aLvlProps ) 
);
@@ -662,6 +655,7 @@ void ListDef::CreateNumberingRules( DomainMapper rDMapper,
 uno::Reference container::XIndexReplace  xOutlineRules =
 xOutlines-getChapterNumberingRules( );
 
+StyleSheetEntryPtr pParaStyle = pAbsLevel-GetParaStyle( );
 aLvlProps.realloc( aLvlProps.getLength() + 1 );
 
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 1] = 
MAKE_PROPVAL( PROP_HEADING_STYLE_NAME,
 pParaStyle-sConvertedStyleName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/doc/doc.cxx   |9 -
 sw/source/core/doc/docbm.cxx |   36 
 sw/source/core/doc/docedt.cxx|   18 --
 sw/source/core/docnode/ndtbl.cxx |   26 ++
 sw/source/core/inc/mvsave.hxx|   19 ---
 sw/source/core/txtnode/ndtxt.cxx |   16 
 sw/source/core/undo/untbl.cxx|   12 +---
 7 files changed, 83 insertions(+), 53 deletions(-)

New commits:
commit a72ea67d52bf083034756332bf5f7e5c1c416129
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jun 10 10:14:22 2014 +0200

decouple CntntStore so it can be refactored

Change-Id: I26554a0e269d63830fd84b37a4323f40c80fc014

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index b6340d8..effc0bd 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -383,17 +383,16 @@ bool SwDoc::SplitNode( const SwPosition rPos, bool 
bChkTableStart )
 }
 }
 
-   const boost::shared_ptrsw::mark::CntntIdxStore 
aBkmkArr(sw::mark::CreateCntntIdxStore());
-_SaveCntntIdx( this, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(),
-*aBkmkArr.get(), SAVEFLY_SPLIT );
+const boost::shared_ptrsw::mark::CntntIdxStore 
pCntntStore(sw::mark::CntntIdxStore::Create());
+pCntntStore-Save( this, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), 
SAVEFLY_SPLIT );
 // FIXME: only SwTxtNode has a valid implementation of SplitCntntNode!
 OSL_ENSURE(pNode-IsTxtNode(), splitting non-text node?);
 pNode = pNode-SplitCntntNode( rPos );
 if (pNode)
 {
 // move all bookmarks, TOXMarks, FlyAtCnt
-if( !aBkmkArr.get()-empty() )
-_RestoreCntntIdx( this, *aBkmkArr.get(), rPos.nNode.GetIndex()-1, 
0, true );
+if( !pCntntStore-Empty() )
+pCntntStore-Restore( this, rPos.nNode.GetIndex()-1, 0, true );
 
 // To-Do - add 'SwExtraRedlineTbl' also ?
 if( IsRedlineOn() || (!IsIgnoreRedline()  !mpRedlineTbl-empty() ))
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index ea560b7..271096c 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1503,10 +1503,6 @@ void _DelBookmarks(
 }
 }
 
-boost::shared_ptr ::sw::mark::CntntIdxStore sw::mark::CreateCntntIdxStore()
-{
-return boost::shared_ptr ::sw::mark::CntntIdxStore(new 
sw::mark::CntntIdxStore());
-}
 
 void _SaveCntntIdx(SwDoc* pDoc,
 sal_uLong nNode,
@@ -2054,4 +2050,39 @@ void _RestoreCntntIdx(std::vectorsal_uLong rSaveArr,
 }
 }
 
+namespace
+{
+struct CntntIdxStoreImpl : sw::mark::CntntIdxStore
+{
+std::vectorsal_uLong aSaveArr;
+virtual void Clear()
+{
+aSaveArr.clear();
+}
+virtual bool Empty()
+{
+return aSaveArr.empty();
+}
+virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, 
sal_uInt8 nSaveFly=0)
+{
+return _SaveCntntIdx(pDoc, nNode, nCntnt, aSaveArr, nSaveFly);
+}
+virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 
nOffset=0, bool bAuto = false)
+{
+return _RestoreCntntIdx(pDoc, aSaveArr, nNode, nOffset, bAuto);
+}
+virtual void Restore(SwNode rNd, sal_Int32 nLen, sal_Int32 nCorrLen)
+{
+return _RestoreCntntIdx(aSaveArr, rNd, nLen, nCorrLen);
+}
+virtual ~CntntIdxStoreImpl(){};
+};
+}
+
+namespace sw { namespace mark {
+boost::shared_ptrCntntIdxStore CntntIdxStore::Create()
+{
+   return boost::shared_ptrCntntIdxStore(new CntntIdxStoreImpl());
+}
+}}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index c83aefa..2ce11ac 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -905,14 +905,13 @@ bool SwDoc::MoveRange( SwPaM rPaM, SwPosition rPos, 
SwMoveFlags eMvFlags )
 bSplit = true;
 const sal_Int32 nMkCntnt = rPaM.GetMark()-nContent.GetIndex();
 
-const boost::shared_ptrsw::mark::CntntIdxStore 
aBkmkArr(sw::mark::CreateCntntIdxStore());
-_SaveCntntIdx( this, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(),
-*aBkmkArr.get(), SAVEFLY_SPLIT );
+const boost::shared_ptrsw::mark::CntntIdxStore 
pCntntStore(sw::mark::CntntIdxStore::Create());
+pCntntStore-Save( this, rPos.nNode.GetIndex(), 
rPos.nContent.GetIndex(), SAVEFLY_SPLIT );
 
 pTNd = static_castSwTxtNode*(pTNd-SplitCntntNode( rPos ));
 
-if( !aBkmkArr.get()-empty() )
-_RestoreCntntIdx( this, *aBkmkArr.get(), rPos.nNode.GetIndex()-1, 
0, true );
+if( !pCntntStore-Empty() )
+pCntntStore-Restore( this, rPos.nNode.GetIndex()-1, 0, true );
 
 // correct the PaM!
 if( rPos.nNode == rPaM.GetMark()-nNode )
@@ -1328,9 +1327,8

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/Configuration_filter.mk

2014-06-10 Thread David Tardon

 filter/Configuration_filter.mk |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit fae8abd19f2017d5e34bdce3ce5705d744a3f348
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 9 11:53:00 2014 +0200

rhbz#1105376 move FlatODF filter config to right place

This has been broken since 3.3(!), when the old XSLT based import/export
was replaced by a library.

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

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 847db50..fe84350 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -318,6 +318,7 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
writer_MS_Word_95_Vorlage \
writer_MS_Word_97 \
writer_MS_Word_97_Vorlage \
+   writer_ODT_FlatXML \
writer_Rich_Text_Format \
writer_StarOffice_XML_Writer \
writer_WordPerfect_Document \
@@ -378,6 +379,7 @@ $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
MS_Word_95_Vorlage \
MS_Word_97 \
MS_Word_97_Vorlage \
+   ODT_FlatXML \
Rich_Text_Format \
StarOffice_XML__Writer_ \
WordPerfect \
@@ -511,6 +513,7 @@ $(call 
filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
 # fcfg_calc
 $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\
calc_DIF \
+   calc_ODS_FlatXML \
generic_HTML \
generic_Text \
calc_Lotus \
@@ -542,6 +545,7 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/s
 $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filter/source/config/fragments/filters,\
DIF \
HTML__StarCalc_ \
+   ODS_FlatXML \
Lotus \
QPro \
MS_Excel_4_0 \
@@ -592,6 +596,7 @@ $(call 
filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
 
 # fcfg_draw
 $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/source/config/fragments/types,\
+   draw_ODG_FlatXML \
draw_StarOffice_XML_Draw \
draw_StarOffice_XML_Draw_Template \
pdf_Portable_Document_Format \
@@ -606,6 +611,7 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
 )
 
 $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\
+   ODG_FlatXML \
StarOffice_XML__Draw_ \
draw_StarOffice_XML_Draw_Template \
draw_pdf_Export \
@@ -633,6 +639,7 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filte
impress_MS_PowerPoint_97 \
impress_MS_PowerPoint_97_AutoPlay \
impress_MS_PowerPoint_97_Vorlage \
+   impress_ODP_FlatXML \
impress_StarOffice_XML_Impress \
impress_StarOffice_XML_Impress_Template \
pdf_Portable_Document_Format \
@@ -654,6 +661,7 @@ $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filters.xcu,f
MS_PowerPoint_97_AutoPlay \
MS_PowerPoint_97_Vorlage \
impress_StarOffice_XML_Draw \
+   ODP_FlatXML \
StarOffice_XML__Impress_ \
impress_StarOffice_XML_Impress_Template \
impress_pdf_Export \
@@ -953,11 +961,7 @@ $(call 
filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_internalgrap
 
 # fcfg_xslt
 $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/source/config/fragments/types,\
-   calc_ODS_FlatXML \
-   draw_ODG_FlatXML \
-   impress_ODP_FlatXML \
writer_DocBook_File \
-   writer_ODT_FlatXML \
XHTML_File \
Unified_Office_Format_text \
Unified_Office_Format_spreadsheet \
@@ -966,10 +970,6 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/s
 
 $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_xslt_filters.xcu,filter/source/config/fragments/filters,\
DocBook_File \
-   ODG_FlatXML \
-   ODP_FlatXML \
-   ODS_FlatXML \
-   ODT_FlatXML \
XHTML_Calc_File \
XHTML_Draw_File \
XHTML_Impress_File \
___
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-5' - sw/source

2014-06-10 Thread Elie Roux

 sw/source/core/unocore/unoframe.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f62c625c96bcff3694ceeeab989a4080f6d0982c
Author: Elie Roux elie.r...@telecom-bretagne.eu
Date:   Sun Jun 8 22:28:18 2014 +0200

fix fdo#40073 : look for translated frame styles

LO was looking for untranslated frame styles,
while at this step, the style list contains only the
translated ones.

Change-Id: I36173fc871582f974184fc95bb4d1a82cd3de783
Reviewed-on: https://gerrit.libreoffice.org/9683
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 6f6673c5d1b4e6ea4982621f2817eb5d5dc10377)
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit dc59f010248fbb95d7a67ccb914e86c457dcea3a)
Reviewed-on: https://gerrit.libreoffice.org/9692
Reviewed-by: David Tardon dtar...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 43520a7..e2093aa 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -616,6 +616,7 @@ bool SwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, 
SfxItemSet rSet, SfxItem
 {
 OUString sStyle;
 *pStyleName = sStyle;
+SwStyleNameMapper::FillUIName(sStyle, sStyle, 
nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, true);
 pStyle = 
(SwDocStyleSheet*)pDoc-GetDocShell()-GetStyleSheetPool()-Find(sStyle,
 SFX_STYLE_FAMILY_FRAME);
 }
___
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' - include/oox oox/source sd/qa

2014-06-10 Thread Zolnai Tamás

 include/oox/drawingml/graphicshapecontext.hxx |2 +
 include/oox/ppt/pptshapegroupcontext.hxx  |3 --
 oox/source/drawingml/graphicshapecontext.cxx  |   14 +++--
 oox/source/ppt/pptshapegroupcontext.cxx   |7 --
 sd/qa/unit/data/pptx/bnc880763.pptx   |binary
 sd/qa/unit/data/xml/n819614_0.xml |   18 
 sd/qa/unit/import-tests.cxx   |   28 +-
 7 files changed, 51 insertions(+), 21 deletions(-)

New commits:
commit 5e04f1b373a288d7804253113bb28796a67dc67f
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Jun 6 18:00:36 2014 +0200

bnc#880763: PPTX import: wrong z-order becuause of wrong import order

importExtDrawings() must be called as soon as possible,
before parser starts to parse the next shape.
Call it when graphicFrame tag is closed. This tag include
the reference to the SmartArt.

Plus fix up import tests.

(cherry picked from commit 46d682eec92bb241f4604a4b6ab42a3859cd0d48)

Conflicts:
oox/source/drawingml/graphicshapecontext.cxx
sd/qa/unit/data/xml/n819614_0.xml
sd/qa/unit/import-tests.cxx

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

diff --git a/include/oox/drawingml/graphicshapecontext.hxx 
b/include/oox/drawingml/graphicshapecontext.hxx
index 322f08e..a228f86 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -44,9 +44,11 @@ public:
 GraphicalObjectFrameContext( ::oox::core::ContextHandler2Helper rParent, 
ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart );
 
 virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 
Element, const ::oox::AttributeList rAttribs ) SAL_OVERRIDE;
+virtual void onEndElement() SAL_OVERRIDE;
 
 private:
 boolmbEmbedShapesInChart;
+::oox::core::ContextHandler2Helper* mpParent;
 };
 
 // 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index 847d9b6..5cae54d 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -32,7 +32,6 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
 
-voidimportExtDrawings();
 voidapplyFontRefColor(oox::drawingml::ShapePtr pShape, 
const oox::drawingml::Color rFontRefColor);
 
 public:
@@ -46,7 +45,7 @@ public:
 virtual ::oox::core::ContextHandlerRef
 onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList 
rAttribs ) SAL_OVERRIDE;
 
-virtual void onEndElement() SAL_OVERRIDE;
+void importExtDrawings();
 
 protected:
 
diff --git a/oox/source/drawingml/graphicshapecontext.cxx 
b/oox/source/drawingml/graphicshapecontext.cxx
index e0818ac..cd4e75d 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -36,6 +36,7 @@
 #include oox/drawingml/transform2dcontext.hxx
 #include oox/helper/binaryinputstream.hxx
 #include oox/helper/binaryoutputstream.hxx
+#include oox/ppt/pptshapegroupcontext.hxx
 #include comphelper/processfactory.hxx
 
 using namespace ::com::sun::star;
@@ -103,7 +104,8 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( 
sal_Int32 aElementToken,
 
 GraphicalObjectFrameContext::GraphicalObjectFrameContext( 
ContextHandler2Helper rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, 
bool bEmbedShapesInChart ) :
 ShapeContext( rParent, pMasterShapePtr, pShapePtr ),
-mbEmbedShapesInChart( bEmbedShapesInChart )
+mbEmbedShapesInChart( bEmbedShapesInChart ),
+mpParent(rParent)
 {
 }
 
@@ -146,7 +148,15 @@ ContextHandlerRef 
GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
 return ShapeContext::onCreateContext( aElementToken, rAttribs );
 }
 
-// 
+void GraphicalObjectFrameContext::onEndElement()
+{
+if( getCurrentElement() == PPT_TOKEN( graphicFrame )  mpParent )
+{
+oox::ppt::PPTShapeGroupContext* pParent = 
dynamic_castoox::ppt::PPTShapeGroupContext*(mpParent);
+if( pParent )
+pParent-importExtDrawings();
+}
+}
 
 OleObjectGraphicDataContext::OleObjectGraphicDataContext( 
ContextHandler2Helper rParent, ShapePtr xShape ) :
 ShapeContext( rParent, ShapePtr(), xShape ),
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index 0fd517f..9bf3d2b 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -109,8

Re: minutes of ESC call ...

On Mon, Jun 09, 2014 at 10:31:35PM +0200, Arnaud Versini wrote:
 2014-06-08 18:27 GMT+02:00 Arnaud Versini arnaud.vers...@gmail.com:
 
   Le 05/06/2014 17:20, Michael Meeks a écrit :
 
  * Hackfests (Bjoern)
  + Paris Hackfest:
  + June 27-28th
  + please add yourself to the wiki:
  + https://wiki.documentfoundation.org/Hackfest/Paris2014
  + new candidate - Toulouse ...
  + hope to have a November/December hack-fest there.
 
 
   Confirmed we have one room on 15th and 16th November. I'm ready to start
  wiki and preparation if accepted.
 
 
 Bjoern, any objection for starting wiki and organizing ?

Not at all: Go ahead!

Best,

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

[Libreoffice-commits] core.git: config_host.mk.in configure.ac Makefile.in

 Makefile.in   |9 +
 config_host.mk.in |1 +
 configure.ac  |   38 +-
 3 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit 8ff6bfb75de0fb073a7e38941fd8f10c855d3825
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 6 18:51:48 2014 +0300

Add --enable-macosx-package-signing

Change-Id: I355158f6cb584d252a21dfbce6e7cea6c70bba99

diff --git a/Makefile.in b/Makefile.in
index 7d2de76..8379be5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -299,6 +299,15 @@ endif
 endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
 
+mac-app-store-package: test-install
+ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+   mv $(TESTINSTALLDIR)/$(PRODUCTNAME).app $(MACOSX_APP_NAME).app
+   productbuild --component $(MACOSX_APP_NAME).app /Applications --sign 
$(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo $(MACOSX_APP_NAME) | tr ' ' 
'-').pkg
+else
+   @echo You did not provide an installer signing identity with 
--enable-macosx-package-signing
+   @exit 1
+endif
+
 distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration
diff --git a/config_host.mk.in b/config_host.mk.in
index 1bc0da0..b7e5b6c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -362,6 +362,7 @@ export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
 export MACOSX_APP_NAME=@MACOSX_APP_NAME@
 export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
+export MACOSX_PACKAGE_SIGNING_IDENTITY=@MACOSX_PACKAGE_SIGNING_IDENTITY@
 export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
 export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@
 export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@
diff --git a/configure.ac b/configure.ac
index 3ef3ce2..63e9667 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1280,12 +1280,19 @@ AC_ARG_ENABLE(macosx-retina,
 ,)
 
 AC_ARG_ENABLE(macosx-code-signing,
-AS_HELP_STRING([--enable-macosx-code-signing=identity],
+AS_HELP_STRING([--enable-macosx-code-signing=identity],
 [Sign executables, dylibs, frameworks and the app bundle. If you
  don't provide an identity the first suitable certificate
  in your keychain is used.]),
 ,)
 
+AC_ARG_ENABLE(macosx-package-signing,
+AS_HELP_STRING([--enable-macosx-package-signing=identity],
+[Create a .pkg suitable for uploading to the Mac App Store and sign
+ it. If you don't provide an identity the first suitable certificate
+ in your keychain is used.]),
+,)
+
 AC_ARG_ENABLE(macosx-sandbox,
 AS_HELP_STRING([--enable-macosx-sandbox],
 [Make the app bundle run in a sandbox. Requires code signing.
@@ -2984,6 +2991,34 @@ if test $_os = Darwin; then
 AC_MSG_RESULT([no])
 fi
 
+AC_MSG_CHECKING([whether to create a Mac App Store package])
+
+if test -n $enable_macosx_package_signing -a -z 
$MACOSX_CODESIGNING_IDENTITY; then
+AC_MSG_ERROR([You forgot --enable-macosx-code-signing])
+elif test $enable_macosx_package_signing = yes; then
+# By default use the first suitable certificate.
+# It should be a 3rd Party Mac Developer Installer one
+
+identity=`security find-identity -v 2/dev/null | grep '3rd Party Mac 
Developer Installer:' | awk '{print $2}' |head -1`
+if test -n $identity; then
+MACOSX_PACKAGE_SIGNING_IDENTITY=$identity
+pretty_name=`security find-identity -v | grep 
$MACOSX_PACKAGE_SIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'`
+AC_MSG_RESULT([yes, using the identity 
$MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name])
+else
+AC_MSG_ERROR([Could not find any suitable '3rd Party Mac Developer 
Installer' certificate])
+fi
+elif test -n $enable_macosx_package_signing; then
+MACOSX_PACKAGE_SIGNING_IDENTITY=$enable_macosx_package_signing
+pretty_name=`security find-identity -v | grep 
$MACOSX_PACKAGE_SIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'`
+AC_MSG_RESULT([yes, using the identity 
$MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name])
+else
+AC_MSG_RESULT([no])
+fi
+
+if test -n $MACOSX_CODESIGNING_IDENTITY -a -n 
$MACOSX_PACKAGE_SIGNING_IDENTITY -a $MACOSX_CODESIGNING_IDENTITY = 
$MACOSX_PACKAGE_SIGNING_IDENTITY; then
+AC_MSG_ERROR([You should not use the same identity for code and 
package signing])
+fi
+
 AC_MSG_CHECKING([whether to sandbox the application])
 
 if test -z $MACOSX_CODESIGNING_IDENTITY -a $enable_macosx_sandbox = 
yes; then
@@ -3022,6 +3057,7 @@ AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
 AC_SUBST(INSTALL_NAME_TOOL)
 AC_SUBST(LIBTOOL) # Note that the OS X libtool command is unrelated to GNU 
libtool
 AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
+AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY)
 AC_SUBST(ENABLE_MACOSX_SANDBOX)

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

 UnoControls/source/controls/progressmonitor.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit dc0b96639f54acc2bbc9583265aac27d4566c89f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 10 10:53:46 2014 +0200

-Werror,-Wtautological-undefined-compare

Change-Id: If546680f4c16ccd733188a65d82129ec2358017b

diff --git a/UnoControls/source/controls/progressmonitor.cxx 
b/UnoControls/source/controls/progressmonitor.cxx
index 93be6b9..908687c 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -884,12 +884,8 @@ bool ProgressMonitor::impl_debug_checkParameter (
 const OUString rText,
 bool /*bbeforeProgress*/
 ) {
-// Check rTopic
-if ( rTopic==  NULL) return false;// NULL-pointer for 
reference ???!!!
 if ( rTopic.isEmpty()   ) return false;// 
 
-// Check rText
-if ( rText ==  NULL) return false;// NULL-pointer for 
reference ???!!!
 if ( rText.isEmpty()   ) return false;// 
 
 // bbeforeProgress is valid in everyway!
@@ -901,8 +897,6 @@ bool ProgressMonitor::impl_debug_checkParameter (
 // removeText
 bool ProgressMonitor::impl_debug_checkParameter ( const OUString rTopic, bool 
/*bbeforeProgress*/ )
 {
-// Check rTopic
-if ( rTopic==  NULL) return false;// NULL-pointer for 
reference ???!!!
 if ( rTopic.isEmpty()  ) return false;// 
 
 // bbeforeProgress is valid in everyway!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Quantifying the time overhead of Cygwin make

Hi,

On Mon, Jun 09, 2014 at 11:47:41PM +0200, Michael Stahl wrote:
 IV. Conclusion
 
 Using a native Win32 GNU make provides faster from-scratch rebuilds than
 any previous attempt to improve build performance, and significantly
 reduces the incremental re-build overhead of make on Windows by a factor
 of 2x-3x.
 
 Since there are not many developers using Windows anyway, i'd propose to
 have a flag day to switch to requiring Win32 make on master, dropping
 support for Cygwin make.
 
 This gerrit patch does the switch:
 https://gerrit.libreoffice.org/#/c/9698/
 
 Of course, this first requires preparing tinderboxes, and testing by
 others if the Win32 make works well everywhere; please do so if you are
 able to do a Windows build of LO.

first off: thanks for the excellent analysis! I know this stuff is a lot of
boring work when done properly. It seems switching to a native GNU make on
Windows is the right way to go, but of course leave the ultimate decision about
a flagday to those working primarily on that platform.

In the long run we might add our local patches to the native make again, if its
worth it (maybe?), but that can be done incrementally. Also incrementally, we
might reduce our dependency on cygwin in general (you are still using it as a
POSIX environment, are you?) and slowly move to use/be able to use something
smaller and selfcontained[1] like GnuWin32 or even busybox. Apart from possibly
simplifying build env setup, its always good to have the build system not to
depend too hard on one implementation (cygwin).

Best,

Bjoern

[1] And thus easier to maintain for upstream.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 accessibility/source/extended/AccessibleGridControlBase.cxx  |2 +-
 accessibility/source/extended/AccessibleGridControlTableCell.cxx |6 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 2da7ce3ba8e5838b782fe4f9e26a29c1c7face54
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 10 11:24:05 2014 +0200

-Werror,-Wundefined-bool-conversion

Change-Id: I373d795951120d19bc7664282741d956d1ec3768

diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx 
b/accessibility/source/extended/AccessibleGridControlBase.cxx
index f79d64c..dafe083 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -320,7 +320,7 @@ bool AccessibleGridControlBase::implIsShowing()
 bool AccessibleGridControlBase::isAlive() const
 {
 ::osl::MutexGuard g(m_aMutex); // guards rBHelper members
-return !rBHelper.bDisposed  !rBHelper.bInDispose  m_aTable;
+return !rBHelper.bDisposed  !rBHelper.bInDispose;
 }
 
 void AccessibleGridControlBase::ensureIsAlive() const
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx 
b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 08cfe0b..f55f1cb 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -145,11 +145,7 @@ namespace accessibility
 if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
 throw IndexOutOfBoundsException();
 
-::com::sun::star::awt::Rectangle aRect;
-
-if ( m_aTable )
-aRect = AWTRectangle( m_aTable.GetFieldCharacterBounds( 
getRowPos(), getColumnPos(), nIndex ) );
-return aRect;
+return AWTRectangle( m_aTable.GetFieldCharacterBounds( getRowPos(), 
getColumnPos(), nIndex ) );
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const 
::com::sun::star::awt::Point _aPoint ) throw (RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

هل تبحث عن دخل اضافي عبر الانترنت

2014-06-10 Thread الاخ عنان قسيس

 

[If you do not see this email please click 
here](http://www.mail6srv.com/107691507-6de2acbcef8ac949064e63c3d12828f4-data-xtLgkOTf.htm)
 

السلام عليكم ورحمة الله وبركاته

تحية طيبه وبعد,

لا شك بأنك سمعت عن أناس كثيرين يشغلون انفسهم في العمل من البيت لمدة دقائق في 
اليوم ويكسبون الكثير من الفلوس.

أحد الطرق لذلك هي التجارة في الاسواق العالمية والتجارة بالخيارات الثنائية فهي 
ليست مكلفة وبالمقابل مربحة جدا.

ان لم يكن لديك اي خبرة فلا داعي للقلق لأن هناك كتب مجانية وأيضا خبراء مختصين 
للمساعدة.

*** مدير حساب شخصي.

*** اخبار مباشرة وتحليل يومي للسوق.

*** كتب تعليم الكترونية, دروس تعليمية ومحاضرات الكترونية لتعزيز الارباح.

*** بونوص ترحيبي بقيمة 30%.

 

 

[يمكنكم تسجيل تفاصيلكم لتلقي المعلومات الكاملة وكل ذلك مجانا !!! فقط اضغط 
هنا](http://www.mail6srv.com/107691507-6de2acbcef8ac949064e63c3d12828f4-data-qGxW0Zok.htm)

نتمنى لكم النجاح

 

 

This message was sent to libreoffice@lists.freedesktop.org By 
anan.kas...@gmail.com
 
[Unsubscribe](http://www.mail6srv.com/107691507-6de2acbcef8ac949064e63c3d12828f4-data-vWK49nBN.htm)
 from this list
 

gcc forex leasd · pob 60 · Mi'ilya

Email marketing software by 
[InfoMail](http://public.inforu.co.il/%D7%93%D7%99%D7%95%D7%95%D7%A8-%D7%91%D7%93%D7%95%D7%90%D7%A8-%D7%90%D7%9C%D7%A7%D7%98%D7%A8%D7%95%D7%A0%D7%99-infomail/?utm_source=InforuMailutm_medium=emailutm_campaign=%D8%AF%D8%AE%D9%84+%D8%A7%D8%B6%D8%A7%D9%81%D9%8A)

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

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

2014-06-10 Thread Takeshi Abe

 sw/source/uibase/shells/drwbassh.cxx   |   20 +++-
 sw/source/uibase/shells/drwtxtex.cxx   |   16 +++-
 sw/source/uibase/shells/drwtxtsh.cxx   |   13 +
 sw/source/uibase/shells/frmsh.cxx  |   27 +++
 sw/source/uibase/shells/grfsh.cxx  |6 +++---
 sw/source/uibase/shells/langhelper.cxx |4 ++--
 6 files changed, 35 insertions(+), 51 deletions(-)

New commits:
commit ed9d32908dca5740109f0d9f3233721aa3a49775
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Tue Jun 10 17:31:26 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: I0cb10efaa3ab08d2cf1338963917d89bdab15289

diff --git a/sw/source/uibase/shells/drwbassh.cxx 
b/sw/source/uibase/shells/drwbassh.cxx
index a03492d..b17d41b 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -64,6 +64,7 @@
 #include com/sun/star/text/RelOrientation.hpp
 
 #include IDocumentDrawModelAccess.hxx
+#include boost/scoped_ptr.hpp
 
 using namespace ::com::sun::star;
 
@@ -152,7 +153,7 @@ void SwDrawBaseShell::Execute(SfxRequest rReq)
 SwAbstractDialogFactory* pFact = 
SwAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, SwAbstractDialogFactory fail!);
 
-SfxAbstractDialog* pDlg = pFact-CreateSwWrapDlg( 
GetView().GetWindow(), aSet, pSh, true, RC_DLG_SWWRAPDLG );
+boost::scoped_ptrSfxAbstractDialog 
pDlg(pFact-CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, true, 
RC_DLG_SWWRAPDLG ));
 OSL_ENSURE(pDlg, Dialogdiet fail!);
 
 if (pDlg-Execute() == RET_OK)
@@ -170,7 +171,6 @@ void SwDrawBaseShell::Execute(SfxRequest rReq)
 
 pSh-SetObjAttr(*pOutSet);
 }
-delete pDlg;
 }
 }
 }
@@ -187,7 +187,7 @@ void SwDrawBaseShell::Execute(SfxRequest rReq)
 if( rMarkList.GetMark(0) != 0 )
 {
 SdrObject* pObj = 
rMarkList.GetMark(0)-GetMarkedSdrObj();
-SfxAbstractTabDialog *pDlg=NULL;
+boost::scoped_ptrSfxAbstractTabDialog pDlg;
 bool bCaption = false;
 
 // Allowed anchorages:
@@ -207,7 +207,7 @@ void SwDrawBaseShell::Execute(SfxRequest rReq)
 AbstractSvxCaptionDialog* pCaptionDlg =
 pFact-CreateCaptionDialog( NULL, 
pSdrView, nAllowedAnchors );
 pCaptionDlg-SetValidateFramePosLink( LINK(this, 
SwDrawBaseShell, ValidatePosition) );
-pDlg = pCaptionDlg;
+pDlg.reset(pCaptionDlg);
 }
 else
 {
@@ -215,7 +215,7 @@ void SwDrawBaseShell::Execute(SfxRequest rReq)
 AbstractSvxTransformTabDialog* pTransform =
 pFact-CreateSvxTransformTabDialog( 
NULL, NULL, pSdrView, nAllowedAnchors );
 pTransform-SetValidateFramePosLink( LINK(this, 
SwDrawBaseShell, ValidatePosition) );
-pDlg = pTransform;
+pDlg.reset(pTransform);
 }
 SfxItemSet aNewAttr(pSdrView-GetGeoAttrFromMarked());
 
@@ -347,8 +347,6 @@ void SwDrawBaseShell::Execute(SfxRequest rReq)
 
 pSh-EndAllAction();
 }
-delete pDlg;
-
 }
 }
 else
@@ -529,7 +527,7 @@ void SwDrawBaseShell::Execute(SfxRequest rReq)
 
 SvxAbstractDialogFactory* pFact = 
SvxAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, Dialogdiet fail!);
-AbstractSvxObjectNameDialog* pDlg = 
pFact-CreateSvxObjectNameDialog(NULL, aName);
+boost::scoped_ptrAbstractSvxObjectNameDialog 
pDlg(pFact-CreateSvxObjectNameDialog(NULL, aName));
 OSL_ENSURE(pDlg, Dialogdiet fail!);
 
 pDlg-SetCheckNameHdl(LINK(this, SwDrawBaseShell, 
CheckGroupShapeNameHdl));
@@ -540,8 +538,6 @@ void SwDrawBaseShell::Execute(SfxRequest rReq)
 pSelected-SetName(aName);
 pSh-SetModified();
 }
-
-delete pDlg;
 }
 
 break;
@@ -561,7 +557,7 @@ void SwDrawBaseShell::Execute(SfxRequest rReq)
 
 SvxAbstractDialogFactory* pFact = 
SvxAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, Dialogdiet fail!);
-AbstractSvxObjectTitleDescDialog* pDlg = 
pFact-CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription);
+boost::scoped_ptrAbstractSvxObjectTitleDescDialog

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

 framework/inc/helper/ocomponentenumeration.hxx|8 --
 framework/source/dispatch/menudispatcher.cxx  |   59 +-
 framework/source/helper/ocomponentenumeration.cxx |   41 ---
 framework/source/services/urltransformer.cxx  |   13 +---
 4 files changed, 8 insertions(+), 113 deletions(-)

New commits:
commit dd90d9b6d7149c68f931805beaa7dbeee8074d3f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 10 11:41:08 2014 +0200

-Werror,-Wtautological-undefined-compare

Change-Id: Ibd738b91d35a1b82e1e7b078ef73c6f6076dc08a

diff --git a/framework/inc/helper/ocomponentenumeration.hxx 
b/framework/inc/helper/ocomponentenumeration.hxx
index 6c4b0a4..8dfff63 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -161,14 +161,6 @@ class OComponentEnumeration :   public 
::cppu::WeakImplHelper2 ::com::sun::star
 
 private:
 
-static bool impldbg_checkParameter_OComponentEnumerationCtor(   
const   css::uno::Sequence css::uno::Reference css::lang::XComponent   
seqComponents   );
-static bool impldbg_checkParameter_disposing(   
const   css::lang::EventObject 
aEvent  );
-
-//  variables
-//  (should be private everyway!)
-
-private:
-
 sal_uInt32 
 m_nPosition;   /// current position in enumeration
 css::uno::Sequence css::uno::Reference css::lang::XComponent   
 m_seqComponents;   /// list of current components
 
diff --git a/framework/source/dispatch/menudispatcher.cxx 
b/framework/source/dispatch/menudispatcher.cxx
index f4206e4..3305dc9 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -58,13 +58,6 @@ using namespace ::cppu;
 
 const sal_uInt16 SLOTID_MDIWINDOWLIST = 5610;
 
-static bool impldbg_checkParameter_MenuDispatcher  (   const   
css::uno::Reference css::uno::XComponentContext  xContext,
-   const   
css::uno::Reference css::frame::XFrame   xOwner  );
-static bool impldbg_checkParameter_addStatusListener(   const   
css::uno::Reference css::frame::XStatusListener  xControl,
-const   
css::util::URL aURL);
-static bool impldbg_checkParameter_removeStatusListener (   const   
css::uno::Reference css::frame::XStatusListener  xControl,
-const   
css::util::URL aURL);
-
 //  constructor
 
 MenuDispatcher::MenuDispatcher(   const   uno::Reference XComponentContext  
 xContext,
@@ -78,7 +71,7 @@ MenuDispatcher::MenuDispatcher(   const   uno::Reference 
XComponentContext 
 {
 // Safe impossible cases
 // We need valid information about our owner for work.
-SAL_WARN_IF( !impldbg_checkParameter_MenuDispatcher( xContext, xOwner ), 
fwk, MenuDispatcher::MenuDispatcher()\nInvalid parameter detected! );
+SAL_WARN_IF( !( xContext.is()  xOwner.is() ), fwk, 
MenuDispatcher::MenuDispatcher()\nInvalid parameter detected! );
 
 m_bActivateListener = true;
 xOwner-addFrameActionListener( uno::Reference XFrameActionListener ( 
(OWeakObject *)this, UNO_QUERY ));
@@ -108,7 +101,7 @@ void SAL_CALL MenuDispatcher::addStatusListener(   const   
uno::Reference XStat
 SolarMutexGuard g;
 // Safe impossible cases
 // Method not defined for all incoming parameter
-SAL_WARN_IF( !impldbg_checkParameter_addStatusListener( xControl, aURL ), 
fwk, MenuDispatcher::addStatusListener(): Invalid parameter detected. );
+SAL_WARN_IF( !xControl.is() || aURL.Complete.isEmpty(), fwk, 
MenuDispatcher::addStatusListener(): Invalid parameter detected. );
 // Add listener to container.
 m_aListenerContainer.addInterface( aURL.Complete, xControl );
 }
@@ -121,7 +114,7 @@ void SAL_CALL MenuDispatcher::removeStatusListener(
const   uno::Reference X
 SolarMutexGuard g;
 // Safe impossible cases
 // Method not defined for all incoming parameter
-SAL_WARN_IF( !impldbg_checkParameter_removeStatusListener( xControl, aURL 
), fwk, MenuDispatcher::removeStatusListener(): Invalid parameter detected. 
);
+SAL_WARN_IF( !xControl.is() || aURL.Complete.isEmpty(), fwk, 
MenuDispatcher::removeStatusListener(): Invalid parameter detected. );
 // Add listener to container.
 m_aListenerContainer.removeInterface( aURL.Complete, xControl );
 }
@@ -287,52 +280,6 @@ bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, 
bool bMenuFromResource
 return false;
 }
 
-static bool impldbg_checkParameter_MenuDispatcher(   const   uno::Reference 
XComponentContext   xContext,

Re: Quantifying the time overhead of Cygwin make

Are you sure GnuWin32 actually is something even worth considering?
Cygwin at least has a semi-decent package management even if it is a
bit slower.

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

[Libreoffice-commits] core.git: 14 commits - chart2/source editeng/source include/svx sc/inc sc/source sd/source sfx2/source svx/source sw/source ucb/source vcl/generic vcl/source

 chart2/source/model/main/ChartModel_Persistence.cxx |7 ++
 chart2/source/view/main/GL3DRenderer.cxx|5 ++
 editeng/source/items/textitem.cxx   |3 -
 include/svx/fmdpage.hxx |2 
 include/svx/unoapi.hxx  |3 -
 include/svx/unopage.hxx |2 
 sc/inc/pageuno.hxx  |8 +--
 sc/source/ui/unoobj/pageuno.cxx |3 -
 sd/source/ui/dlg/docprev.cxx|4 -
 sfx2/source/doc/docfile.cxx |2 
 sfx2/source/doc/objxtor.cxx |   49 +++-
 svx/source/form/fmdpage.cxx |2 
 svx/source/unodraw/unopage.cxx  |5 +-
 sw/source/core/doc/DocumentDrawModelManager.cxx |   13 -
 ucb/source/ucp/tdoc/tdoc_content.cxx|3 -
 ucb/source/ucp/tdoc/tdoc_content.hxx|5 +-
 vcl/generic/fontmanager/fontmanager.cxx |2 
 vcl/source/fontsubset/sft.cxx   |2 
 18 files changed, 75 insertions(+), 45 deletions(-)

New commits:
commit ea93714e9427e6802e843c4585871aeef0a5e28d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 10:20:53 2014 +0100

coverity#735616 Division or modulo by float zero

Change-Id: I5aaad2cd80e6930cbca57b4df2bfee3a6989ca41

diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index cd015cd..c939d18 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -90,9 +90,9 @@ void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, 
Size rSize, Point rP
 if( nHeight  0 ) nHeight = 0;
 
 double dRatio=((double)aTmpSize.Width())/aTmpSize.Height();
-double dRatioPreV=((double) nWidth ) / nHeight;
+double dRatioPreV = nHeight ? (((double) nWidth ) / nHeight) : 0.0;
 
-if (dRatiodRatioPreV)
+if (dRatio  dRatioPreV)
 {
 rSize=Size(nWidth, (sal_uInt16)(nWidth/dRatio));
 rPoint=Point( 0, (sal_uInt16)((nHeight-rSize.Height())/2));
commit d7cd613067dbc07eae0dd1aa5a4a72ae40090325
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 10:19:11 2014 +0100

titchy tweak

Change-Id: Ia28447cf35ceb550778297dc515746e93c7d86e4

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 267afd4..aca8885 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2116,7 +2116,7 @@ static void DumpSfnts(FILE *outf, sal_uInt8 *sfntP, 
sal_uInt32 sfntLen)
 
 sal_uInt32 tag = GetUInt32(sfntP, 12 + 16 * i, 1);
 sal_uInt32 off = GetUInt32(sfntP, 12 + 16 * i + 8, 1);
-sal_uInt32 len = GetUInt32(sfntP, 12 + 16 * i + 12, 1);
+sal_uInt32 len = GetUInt32(sfntP, nLargestFixedOffsetPos, 1);
 
 if (tag != T_glyf) {
 HexFmtBlockWrite(h, sfntP + off, len);
commit 91101dc0437c68b1993e8772f31922661ef0be2a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 10:14:02 2014 +0100

coverity#441139 Explicit null dereferenced

Change-Id: I015125fca5cd3e4c1ac2407c0449fe641991f8f6

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index ec0ebbe..3eaf8e3 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2785,7 +2785,7 @@ void SfxMedium::CompleteReOpen()
 if ( pImp-pTempFile )
 pImp-m_aName = pImp-pTempFile-GetFileName();
 }
-else
+else if (pTmpFile)
 {
 pTmpFile-EnableKillingFile( true );
 delete pTmpFile;
commit e123213f46eb1b1e278bc816a97e51f0f3a2ac86
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 10:10:30 2014 +0100

coverity#735422 Logically dead code

Change-Id: I5639746f25024b0808e9c4e620bb0fa9f1a2c0b6

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index e4b5b8d..eb7aaec 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -832,8 +832,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any rVal, 
sal_uInt8 nMemberId ) const
 // CONVERT_TWIPS is not set.
 if( bConvert )
 {
-long nTwips = bConvert ? nHeight : convertMm100ToTwip(nHeight);
-aFontHeight.Height = (float)( nTwips / 20.0 );
+aFontHeight.Height = (float)( nHeight / 20.0 );
 }
 else
 {
commit 8f49a83b3c41dfe846a93d6220f27c75ef2fb0b2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 10:07:49 2014 +0100

coverity#1213562 Uninitialized scalar field

Change-Id: I0161cbe1aeebb1fdc8e19ab5b627b319c4c9f7eb

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index fa793d0..dc3 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -93,6

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

 sfx2/source/sidebar/Panel.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 0721f167a199c2bb2fa52f985665583598b68274
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 10 11:49:41 2014 +0200

-Werror,-Wtautological-undefined-compare

Change-Id: I2e05bcf91c534d2aed6e296fe03d367c4c1b7212

diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 1641254..04c8c97 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -154,10 +154,7 @@ void Panel::SetExpanded (const bool bIsExpanded)
 
 bool Panel::HasIdPredicate (const ::rtl::OUString rsId) const
 {
-if (this == NULL)
-return false;
-else
-return msPanelId.equals(rsId);
+return msPanelId.equals(rsId);
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 70357] Sort and clean Wiki pages!

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

Dennis Roczek dennisroc...@gmail.com changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillInfra  |SkillInfra TopicWiki

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

[Bug 70357] Sort and clean Wiki pages!

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

Dennis Roczek dennisroc...@gmail.com changed:

   What|Removed |Added

 Depends on||71761

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

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

 include/svx/svdmrkv.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 16889f355d1f7157bad84b42ad5a1b2b715ae767
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 10 11:52:56 2014 +0200

-Werror,-Wtautological-undefined-compare

Change-Id: Id73628a33ea4fe4cd749ebeef7b3cd0a87ff4118

diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 84c04a6..02e695c 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -336,7 +336,7 @@ public:
 bool MarkPoints(const Rectangle rRect, bool bUnmark=false) { return 
MarkPoints(rRect,bUnmark); }
 bool UnmarkPoint(SdrHdl rHdl) { return MarkPoint(rHdl,true); }
 bool UnMarkPoint(SdrHdl rHdl) { return MarkPoint(rHdl,true); }
-bool IsPointMarked(const SdrHdl rHdl) const { ForceUndirtyMrkPnt(); 
return rHdl!=NULL  rHdl.IsSelected(); }
+bool IsPointMarked(const SdrHdl rHdl) const { ForceUndirtyMrkPnt(); 
return rHdl.IsSelected(); }
 bool MarkAllPoints() { return MarkPoints(NULL,false); }
 bool UnmarkAllPoints() { return MarkPoints(NULL,true); }
 bool UnMarkAllPoints() { return MarkPoints(NULL,true); }
@@ -393,7 +393,7 @@ public:
 // Get the Hdl (handle) of a marked GluePoint. Non-marked
 // GluePoints don`t have handles
 SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const;
-bool IsGluePoint(const SdrHdl rHdl) const { return rHdl!=NULL  
rHdl.GetKind()==HDL_GLUE; }
+bool IsGluePoint(const SdrHdl rHdl) const { return 
rHdl.GetKind()==HDL_GLUE; }
 
 // Mark all points within this rectangular (View coordinates)
 bool MarkGluePoints(const Rectangle rRect) { return 
MarkGluePoints(rRect,false); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 Makefile.in  |2 +-
 solenv/bin/ooinstall |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7826428cf80364099a3f351e7fec44043d88b05a
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Jun 10 12:34:10 2014 +0300

Make test-install work also in the non-release-build case

In the (default) --disable-release-build case the -p option to
make_installer.pl should be LibreOffice_Dev, not LibreOffice. See
instsetoo_native/util/openoffice.lst.in.

Also, the pathname passed to solenv/bin/macosx-codesign-app-bundle
needs to adapt to ENABLE_RELEASE_BUILD, either LibreOffice.app or
LibreOfficeDev.app.

Change-Id: If2b8efee096339f9c0cf52e663826d0086b1e35e

diff --git a/Makefile.in b/Makefile.in
index 8379be5..3ec5622 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,7 +294,7 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
@ooinstall $(TESTINSTALLDIR)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-   @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app
+   @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if 
$(ENABLE_RELASE_BUILD),,Dev).app
 endif
 endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 70763c9..cf4d3db 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -98,7 +98,7 @@ system (cd $ENV{SRC_ROOT}/instsetoo_native/util ;  .
 perl  .
 (scalar keys(%DB::sub) ? -d  : ) .
 -w $ENV{SRCDIR}/solenv/bin/make_installer.pl  .
--f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice  .
+-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice . ($ENV{ENABLE_RELEASE_BUILD} ?  : _Dev) .   .
 -u $tmp_dir  .
 -buildid $BUILD $destdir $strip $msi  .
 -simple $path)  die Failed to install: $!;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Quantifying the time overhead of Cygwin make

Hi,

On Tue, Jun 10, 2014 at 12:43:05PM +0300, Tor Lillqvist wrote:
 Are you sure GnuWin32 actually is something even worth considering?
 Cygwin at least has a semi-decent package management even if it is a
 bit slower.

IMHO, the build system shouldnt go much beyond coreutils with its expectation
on the baseline, everything else needless risk for the future. AFAIK we are
still (apart from some historic perl crap) mostly clean wrt that in gbuild.

Or to put it in another way: If we depend too hard on a semi-decent package
management system for our baseline, we (the build system) are doing it wrong.

Imagine a future Windows version breaking cygwin fundamentally (or needing to
be ported ~again from scratch, possibly taking years) -- not entirely
impossible, given how deep in the bowels of the OS it plays around.

Best,

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

localized daily build

2014-06-10 Thread Regina Henschel


Hi all,

does any of the Windows daily build bots produce a localized build? I 
want to test the solution of fdo#40073 LO fails to import standard 
frame styles properly when UI is not english, which obviously needs a 
non-English UI. If not yet available, would it be possible to set one 
buildbot to produce a version with English and at least one another 
UI-language, e.g German ;) ?


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

Re: Quantifying the time overhead of Cygwin make

 IMHO, the build system shouldnt go much beyond coreutils with its expectation
 on the baseline,

You mean cmd.exe + coreutils should be enough?

Probably bash or some other POSIX shell too, surely?. Is there a
non-Cygwin such that actually would support all the shell constructs
we use? Is its complexity that much less than Cygwin's?

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

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

2014-06-10 Thread Andras Timar

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

New commits:
commit 692eab310020bd7217646ec7ccb40ee9c1a5a895
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Jun 10 12:36:06 2014 +0200

Updated core
Project: translations  39d7f4de22068fc9bb2e604f4dd3389dd494bba0

diff --git a/translations b/translations
index 3cf4932..39d7f4d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3cf4932b322fbcc49c053cfce814340db663c636
+Subproject commit 39d7f4de22068fc9bb2e604f4dd3389dd494bba0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: memcheck results for import/export


On 06/09/2014 12:59 PM, Markus Mohrhard wrote:

The logs can be found as zip at
http://dev-builds.libreoffice.org/crashtest/memcheck.zip . Note that you
still need to grep for a memcheck string as it contains all the log
files for all files. Some of the strings that I use and that work are
Invalid and Conditional jump.


(grep -l 'ERROR SUMMARY: [^0]' * identifies 220 out of the 19491 log 
files as reporting errors)



I hope that it helps fix some nasty memory problems.


a minor improvement for any subsequent runs would be to set environment 
variable VALGRIND_OPTS=--fullpath-after=/home/moggi/devel/libo


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

Re: Quantifying the time overhead of Cygwin make

Hi,

On Tue, Jun 10, 2014 at 01:22:16PM +0300, Tor Lillqvist wrote:
 You mean cmd.exe + coreutils should be enough?

Ideally yes, plus some POSIX shell.

 Probably bash or some other POSIX shell too, surely?

Yeah. Note that e.g. busybox already includes the ash shell.

 Is there a non-Cygwin such that actually would support all the shell
 constructs we use? Is its complexity that much less than Cygwin's?

busybox, msys, there are quite a few standalone bash ports.

Note that I am not saying we should stop all other work and kill additional
dependencies now, but keeping an eye on not needlessly introducing hard
dependencies to keep our options is a Good Thing(tm) IMHO.

Best,

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

Re: Quantifying the time overhead of Cygwin make

On 10/06/14 12:47, Bjoern Michaelsen wrote:
 Hi,
 
 On Tue, Jun 10, 2014 at 01:22:16PM +0300, Tor Lillqvist wrote:
 You mean cmd.exe + coreutils should be enough?
 
 Ideally yes, plus some POSIX shell.

and i want a pony.

there's a long list of Cygwin packages that are currently needed, and
likely Cygwin is the most convenient way to install all this stuff:

setup-x86.exe -P autoconf -P automake -P bison -P cabextract -P doxygen
-P flex -P gcc-g++ -P git -P gnupg -P gperf -P libxml2-devel -P
libpng12-devel -P make -P mintty -P openssh -P openssl -P patch -P perl
-P perl_vendor -P pkg-config -P python -P readline -P rsync -P unzip -P
vim -P wget -P zip

https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies

well a few of those look spurious, e.g. gcc-g++ is no longer needed, and
i wonder why gnupg or openssh or rsync are on the list...

 Probably bash or some other POSIX shell too, surely?
 
 Yeah. Note that e.g. busybox already includes the ash shell.
 
 Is there a non-Cygwin such that actually would support all the shell
 constructs we use? Is its complexity that much less than Cygwin's?
 
 busybox, msys, there are quite a few standalone bash ports.

it's possible that Msys has a lot of the things we need, but perhaps not
things like cabextract, doxygen, gperf, perl, python.



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

Re: Quantifying the time overhead of Cygwin make

 it's possible that Msys has a lot of the things we need,

Technically MSYS is a fork of Cygwin, though. Faster? Assume so, yes,
why else would they have bothered. More immune to the Imagine a
future Windows version breaking cygwin fundamentally effect? No idea.

I did use MSYS quite a lot some years ago, but I have forgotten
exactly what the differences to Cygwin were.

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

Re: Quantifying the time overhead of Cygwin make

On 10/06/14 11:04, Bjoern Michaelsen wrote:
 
 In the long run we might add our local patches to the native make again, if 
 its
 worth it (maybe?), but that can be done incrementally. Also incrementally, we

maybe they would provide some additional speedup, although i never liked
the built-in cp patch much  :)

well the most important thing for now is that other people can
successfully build with native Win32 make, so we can switch.

 might reduce our dependency on cygwin in general (you are still using it as a
 POSIX environment, are you?) and slowly move to use/be able to use something
 smaller and selfcontained[1] like GnuWin32 or even busybox. Apart from 
 possibly
 simplifying build env setup, its always good to have the build system not to
 depend too hard on one implementation (cygwin).

perhaps using a native Win32 shell would provide some additional
speed-up over Cygwin's bash... as long as it doesn't require another
significant tweak to the quoting in the commands...


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

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

László Németh nem...@numbertext.org changed:

   What|Removed |Added

 Depends on||75137

--- Comment #157 from László Németh nem...@numbertext.org ---
Bug 75137 (Can't Move Cursor Between Footnotes with Up/Down Arrow Keys. Need to
Click with Mouse) is a very frustrating regression for heavy users of
footnotes.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - config_host.mk.in configure.ac Makefile.in solenv/bin

 Makefile.in  |   11 ++-
 config_host.mk.in|1 +
 configure.ac |   38 +-
 solenv/bin/ooinstall |2 +-
 4 files changed, 49 insertions(+), 3 deletions(-)

New commits:
commit 172bfad385f914a94ce22b4ba71ce23d8839aa16
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Jun 10 12:34:10 2014 +0300

Make test-install work also in the non-release-build case

In the (default) --disable-release-build case the -p option to
make_installer.pl should be LibreOffice_Dev, not LibreOffice. See
instsetoo_native/util/openoffice.lst.in.

Also, the pathname passed to solenv/bin/macosx-codesign-app-bundle
needs to adapt to ENABLE_RELEASE_BUILD, either LibreOffice.app or
LibreOfficeDev.app.

Change-Id: If2b8efee096339f9c0cf52e663826d0086b1e35e

diff --git a/Makefile.in b/Makefile.in
index f3142be..09b9465 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,7 +294,7 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
@ooinstall $(TESTINSTALLDIR)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-   @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app
+   @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if 
$(ENABLE_RELASE_BUILD),,Dev).app
 endif
 endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 70763c9..cf4d3db 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -98,7 +98,7 @@ system (cd $ENV{SRC_ROOT}/instsetoo_native/util ;  .
 perl  .
 (scalar keys(%DB::sub) ? -d  : ) .
 -w $ENV{SRCDIR}/solenv/bin/make_installer.pl  .
--f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice  .
+-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice . ($ENV{ENABLE_RELEASE_BUILD} ?  : _Dev) .   .
 -u $tmp_dir  .
 -buildid $BUILD $destdir $strip $msi  .
 -simple $path)  die Failed to install: $!;
commit e8f47c367a6ab9009bc758c9e0f3a14fdd473c1c
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 6 18:51:48 2014 +0300

Add --enable-macosx-package-signing

Change-Id: I355158f6cb584d252a21dfbce6e7cea6c70bba99

diff --git a/Makefile.in b/Makefile.in
index f63dbe0..f3142be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -299,6 +299,15 @@ endif
 endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
 
+mac-app-store-package: test-install
+ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+   mv $(TESTINSTALLDIR)/$(PRODUCTNAME).app $(MACOSX_APP_NAME).app
+   productbuild --component $(MACOSX_APP_NAME).app /Applications --sign 
$(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo $(MACOSX_APP_NAME) | tr ' ' 
'-').pkg
+else
+   @echo You did not provide an installer signing identity with 
--enable-macosx-package-signing
+   @exit 1
+endif
+
 distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration
diff --git a/config_host.mk.in b/config_host.mk.in
index 1bc0da0..b7e5b6c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -362,6 +362,7 @@ export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
 export MACOSX_APP_NAME=@MACOSX_APP_NAME@
 export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
+export MACOSX_PACKAGE_SIGNING_IDENTITY=@MACOSX_PACKAGE_SIGNING_IDENTITY@
 export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
 export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@
 export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@
diff --git a/configure.ac b/configure.ac
index 785fc52..7d27e92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1280,12 +1280,19 @@ AC_ARG_ENABLE(macosx-retina,
 ,)
 
 AC_ARG_ENABLE(macosx-code-signing,
-AS_HELP_STRING([--enable-macosx-code-signing=identity],
+AS_HELP_STRING([--enable-macosx-code-signing=identity],
 [Sign executables, dylibs, frameworks and the app bundle. If you
  don't provide an identity the first suitable certificate
  in your keychain is used.]),
 ,)
 
+AC_ARG_ENABLE(macosx-package-signing,
+AS_HELP_STRING([--enable-macosx-package-signing=identity],
+[Create a .pkg suitable for uploading to the Mac App Store and sign
+ it. If you don't provide an identity the first suitable certificate
+ in your keychain is used.]),
+,)
+
 AC_ARG_ENABLE(macosx-sandbox,
 AS_HELP_STRING([--enable-macosx-sandbox],
 [Make the app bundle run in a sandbox. Requires code signing.
@@ -3004,6 +3011,34 @@ if test $_os = Darwin; then
 AC_MSG_RESULT([no])
 fi
 
+AC_MSG_CHECKING([whether to create a Mac App Store package])
+
+if test -n $enable_macosx_package_signing -a -z 
$MACOSX_CODESIGNING_IDENTITY; then
+AC_MSG_ERROR([You forgot --enable-macosx-code-signing])
+elif test $enable_macosx_package_signing =

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

2014-06-10 Thread Matúš Kukan

 sc/source/core/data/column2.cxx  |   12 
 sc/source/core/data/postit.cxx   |6 +++---
 sc/source/ui/drawfunc/fuins2.cxx |2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit e7a3aacff7d28577dee371ed5b27317522db7b3b
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Mon Jun 9 22:43:01 2014 +0200

fdo#76324: Make pasting a lot of cell notes faster by disabling 
broadcasting.

Change-Id: If76e80af8dcecf70e4ea624a7f538023c48a5108

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 763e658..f72c99e 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -22,6 +22,7 @@
 #include formulacell.hxx
 #include document.hxx
 #include docpool.hxx
+#include drwlayer.hxx
 #include attarray.hxx
 #include patattr.hxx
 #include cellform.hxx
@@ -1697,8 +1698,19 @@ public:
 void ScColumn::CopyCellNotesToDocument(
 SCROW nRow1, SCROW nRow2, ScColumn rDestCol, bool bCloneCaption, SCROW 
nRowOffsetDest ) const
 {
+ScDrawLayer *pDrawLayer = rDestCol.GetDoc().GetDrawLayer();
+bool bWasLocked;
+if (pDrawLayer)
+{
+// Avoid O(n^2) by temporary locking SdrModel which disables 
broadcasting.
+// Each cell note adds undo listener, and all of them would be woken 
up in ScPostIt::CreateCaption.
+bWasLocked = pDrawLayer-isLocked();
+pDrawLayer-setLock(true);
+}
 CopyCellNotesHandler aFunc(*this, rDestCol, nRowOffsetDest, bCloneCaption);
 sc::ParseNote(maCellNotes.begin(), maCellNotes, nRow1, nRow2, aFunc);
+if (pDrawLayer)
+pDrawLayer-setLock(bWasLocked);
 }
 
 void ScColumn::DuplicateNotes(SCROW nStartRow, size_t nDataSize, ScColumn 
rDestCol, sc::ColumnBlockPosition maDestBlockPos,
commit 1ea62b87abc64bd280b35ac683be6aad47e155ba
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Mon Jun 9 15:04:08 2014 +0200

Do not use GetSdrUndoFactory() in sc.

Change-Id: Ib1753203a8ca99d9a62b765bbe6e39f567064033

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 703dc8a..09b6f51 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -333,7 +333,7 @@ void ScCaptionCreator::UpdateCaptionPos( const Rectangle* 
pVisRect )
 {
 // create drawing undo action
 if( pDrawLayer  pDrawLayer-IsRecording() )
-pDrawLayer-AddCalcUndo( 
pDrawLayer-GetSdrUndoFactory().CreateUndoGeoObject( *mpCaption ) );
+pDrawLayer-AddCalcUndo( new SdrUndoGeoObj( *mpCaption ) );
 // calculate new caption rectangle (#i98141# handle LTR-RTL switch 
correctly)
 Rectangle aCaptRect = mpCaption-GetLogicRect();
 long nDiffX = (rOldTailPos.X() = 0) ? (aCaptRect.Left() - 
rOldTailPos.X()) : (rOldTailPos.X() - aCaptRect.Right());
@@ -733,7 +733,7 @@ void ScPostIt::CreateCaption( const ScAddress rPos, const 
SdrCaptionObj* pCapti
 // create undo action
 if( ScDrawLayer* pDrawLayer = mrDoc.GetDrawLayer() )
 if( pDrawLayer-IsRecording() )
-pDrawLayer-AddCalcUndo( 
pDrawLayer-GetSdrUndoFactory().CreateUndoNewObject( *maNoteData.mpCaption ) );
+pDrawLayer-AddCalcUndo( new SdrUndoNewObj( 
*maNoteData.mpCaption ) );
 }
 }
 
@@ -755,7 +755,7 @@ void ScPostIt::RemoveCaption()
 // create drawing undo action (before removing the object to have 
valid draw page in undo action)
 bool bRecording = ( pDrawLayer  pDrawLayer-IsRecording() );
 if( bRecording )
-pDrawLayer-AddCalcUndo( 
pDrawLayer-GetSdrUndoFactory().CreateUndoDeleteObject( *maNoteData.mpCaption ) 
);
+pDrawLayer-AddCalcUndo( new SdrUndoDelObj( 
*maNoteData.mpCaption ) );
 // remove the object from the drawing page, delete if undo is 
disabled
 SdrObject* pObj = pDrawPage-RemoveObject( 
maNoteData.mpCaption-GetOrdNum() );
 if( !bRecording )
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 4e7b0dc..09a866a 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -779,7 +779,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, 
Window* pWin, ScDrawView*
 {
 // add undo action the same way as in SdrEditView::InsertObjectAtView
 // (using UndoActionHdl etc.)
-pView-AddUndo(pDoc-GetSdrUndoFactory().CreateUndoNewObject(*pObj));
+pView-AddUndo(new SdrUndoNewObj(*pObj));
 }
 
 // BM/IHA --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Quantifying the time overhead of Cygwin make

Hi,

On Tue, Jun 10, 2014 at 01:06:11PM +0200, Michael Stahl wrote:
 setup-x86.exe ...

 autoconf automake pkg-config

Yeah, those are a pain to port (ironically -- as their original purpose was to
provide portability -- to now obsolete systems). I was only half joking when I
considered CMake to be a decent autoconf replacement that got out of control.

 bison doxygen flex gperf patch

Those are mostly *nix natives -- but it should be possible to have them in
external/ like so many other things if really needed.

 cabextract

windows specific -- could also live in external as its surely is available 
natively.

 libxml2-devel libpng12-devel

Seems those would be saner as natives external/ too if needed.

 mintty openssh openssl vim gnupg git rsync

Wat? Seem like convenience to me, not hard deps.

 zip unzip wget

Widely available on win32. Also the functionality is trivially implemented in
python oneliners, we already ship python.

 python readline

We are shipping those ourselves on win32 arent we?

 perl perl_vendor

I already commented on those.

 make

Doh, would be gone with a native make.

 gcc-g++
 
Used for bootstrapping concat-deps? Likely not too hard to do with a native 
compiler.

 it's possible that Msys has a lot of the things we need, but perhaps not
 things like cabextract, doxygen, gperf, perl, python.

OTOH, as said above, some of those might just end up in external/ then (or
already are) ...

Best,

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

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

2014-06-10 Thread Matúš Kukan

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

New commits:
commit 6188a7197aae39a21ef80d1b177f5be613dc9808
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Mon Jun 9 22:43:01 2014 +0200

fdo#76324: Make pasting a lot of cell notes faster by disabling 
broadcasting.

Change-Id: If76e80af8dcecf70e4ea624a7f538023c48a5108
(cherry picked from commit e7a3aacff7d28577dee371ed5b27317522db7b3b)

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 763e658..f72c99e 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -22,6 +22,7 @@
 #include formulacell.hxx
 #include document.hxx
 #include docpool.hxx
+#include drwlayer.hxx
 #include attarray.hxx
 #include patattr.hxx
 #include cellform.hxx
@@ -1697,8 +1698,19 @@ public:
 void ScColumn::CopyCellNotesToDocument(
 SCROW nRow1, SCROW nRow2, ScColumn rDestCol, bool bCloneCaption, SCROW 
nRowOffsetDest ) const
 {
+ScDrawLayer *pDrawLayer = rDestCol.GetDoc().GetDrawLayer();
+bool bWasLocked;
+if (pDrawLayer)
+{
+// Avoid O(n^2) by temporary locking SdrModel which disables 
broadcasting.
+// Each cell note adds undo listener, and all of them would be woken 
up in ScPostIt::CreateCaption.
+bWasLocked = pDrawLayer-isLocked();
+pDrawLayer-setLock(true);
+}
 CopyCellNotesHandler aFunc(*this, rDestCol, nRowOffsetDest, bCloneCaption);
 sc::ParseNote(maCellNotes.begin(), maCellNotes, nRow1, nRow2, aFunc);
+if (pDrawLayer)
+pDrawLayer-setLock(bWasLocked);
 }
 
 void ScColumn::DuplicateNotes(SCROW nStartRow, size_t nDataSize, ScColumn 
rDestCol, sc::ColumnBlockPosition maDestBlockPos,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/doc/docbm.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c3c959ee5dfeace7ba00e82e1247394ad4d4aeed
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jun 10 13:34:12 2014 +0200

some SAL_OVERRIDEs

Change-Id: I4fe27420606aa0a9a413e08225e9f3be6ee9aca6

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 271096c..676b669 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -2055,23 +2055,23 @@ namespace
 struct CntntIdxStoreImpl : sw::mark::CntntIdxStore
 {
 std::vectorsal_uLong aSaveArr;
-virtual void Clear()
+virtual void Clear() SAL_OVERRIDE
 {
 aSaveArr.clear();
 }
-virtual bool Empty()
+virtual bool Empty() SAL_OVERRIDE
 {
 return aSaveArr.empty();
 }
-virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, 
sal_uInt8 nSaveFly=0)
+virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, 
sal_uInt8 nSaveFly=0) SAL_OVERRIDE
 {
 return _SaveCntntIdx(pDoc, nNode, nCntnt, aSaveArr, nSaveFly);
 }
-virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 
nOffset=0, bool bAuto = false)
+virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 
nOffset=0, bool bAuto = false) SAL_OVERRIDE
 {
 return _RestoreCntntIdx(pDoc, aSaveArr, nNode, nOffset, bAuto);
 }
-virtual void Restore(SwNode rNd, sal_Int32 nLen, sal_Int32 nCorrLen)
+virtual void Restore(SwNode rNd, sal_Int32 nLen, sal_Int32 nCorrLen) 
SAL_OVERRIDE
 {
 return _RestoreCntntIdx(aSaveArr, rNd, nLen, nCorrLen);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit c83f56a10f81e066f15445f044e4b349d9ed9605
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 10 13:46:02 2014 +0200

chart2: MSVC does not like override on destructor

Change-Id: Ib0b00ae64d76e3f867b63d0c16a7095f1aed3ca7

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index efc5c10..da62d13 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -158,7 +158,7 @@ class GL2DRenderer : public IRenderer
 {
 public:
 GL2DRenderer(ChartView* pView);
-virtual ~GL2DRenderer() SAL_OVERRIDE;
+virtual ~GL2DRenderer();
 
 virtual void update() SAL_OVERRIDE;
 virtual void clickedAt(const Point rPos, sal_uInt16 nButton) SAL_OVERRIDE;
___
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' - 8 commits - cui/source editeng/source framework/source include/svtools include/vcl sc/source starmath/source svtools/source svx/source sw/sou

2014-06-10 Thread Markus Mohrhard

 cui/source/options/fontsubs.cxx   |2 
 cui/source/tabpages/chardlg.cxx   |   18 +++---
 cui/source/tabpages/numpages.cxx  |2 
 editeng/source/editeng/editview.cxx   |2 
 framework/source/uielement/fontsizemenucontroller.cxx |2 
 include/svtools/ctrlbox.hxx   |6 +-
 include/svtools/ctrltool.hxx  |   40 +++---
 include/svtools/stdmenu.hxx   |6 +-
 include/vcl/metric.hxx|   14 ++---
 include/vcl/outdev.hxx|7 +-
 sc/source/core/data/column.cxx|4 -
 sc/source/filter/excel/excrecds.cxx   |3 -
 sc/source/filter/excel/xecontent.cxx  |2 
 sc/source/filter/excel/xehelper.cxx   |2 
 sc/source/filter/excel/xistyle.cxx|2 
 sc/source/filter/inc/pivotcachebuffer.hxx |2 
 sc/source/filter/oox/pivotcachebuffer.cxx |2 
 sc/source/filter/xcl97/XclExpChangeTrack.cxx  |3 -
 sc/source/filter/xml/xmldpimp.cxx |2 
 starmath/source/dialog.cxx|2 
 svtools/source/control/ctrlbox.cxx|   12 +---
 svtools/source/control/ctrltool.cxx   |   50 +-
 svtools/source/control/stdmenu.cxx|4 -
 svx/source/mnuctrls/fntszctl.cxx  |2 
 svx/source/sidebar/nbdtmg.cxx |   44 +++
 svx/source/tbxctrls/tbcontrl.cxx  |4 -
 svx/source/tbxctrls/tbunocontroller.cxx   |2 
 sw/source/core/uibase/docvw/srcedtw.cxx   |2 
 sw/source/core/unocore/unocrsrhelper.cxx  |2 
 sw/source/core/unocore/unosett.cxx|2 
 sw/source/core/unocore/unostyle.cxx   |2 
 sw/source/filter/html/svxcss1.cxx |2 
 sw/source/filter/html/swhtml.cxx  |2 
 sw/source/ui/config/optpage.cxx   |6 +-
 sw/source/ui/dialog/ascfldlg.cxx  |2 
 vcl/source/gdi/metric.cxx |   12 ++--
 vcl/source/outdev/font.cxx|6 +-
 vcl/workben/svptest.cxx   |2 
 38 files changed, 133 insertions(+), 148 deletions(-)

New commits:
commit 5ae32a6977207ca05c62186411a2f5e83b16d8f2
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed Jun 4 04:09:34 2014 +0200

fix new[]/delete mismatch

As seen by ooo90105-1.ods with memcheck

Change-Id: Ib976632aa52556132b3d05ebb33e8fb64d8d9890

diff --git a/sc/source/filter/xml/xmldpimp.cxx 
b/sc/source/filter/xml/xmldpimp.cxx
index 1714256..3840a78 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -1471,7 +1471,7 @@ 
ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport rIm
 
 ScXMLDataPilotSubTotalsContext::~ScXMLDataPilotSubTotalsContext()
 {
-delete pFunctions;
+delete[] pFunctions;
 }
 
 SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( 
sal_uInt16 nPrefix,
commit 0245bda7c3850171ce68ec61dbe6745e32b8f4a2
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed Jun 4 23:37:40 2014 +0200

make that variable protected again

Change-Id: I17235397e490458c250165c36bec97bf1ce326d7

diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index c452edf..d937b59 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -34,9 +34,10 @@ namespace vcl {
 // avoid problems where poppler's FontInfo is picked up
 class VCL_DLLPUBLIC FontInfo : public Font
 {
-friend class OutputDevice;
+friend class ::OutputDevice;
 
 protected:
+ImplFontMetric* mpImplMetric;// Implementation
 
 public:
 FontInfo();
@@ -49,7 +50,6 @@ public:
 booloperator==( const FontInfo ) const;
 booloperator!=( const FontInfo rInfo ) const
 { return !operator==( rInfo ); }
-ImplFontMetric* mpImplMetric;// Implementation
 };
 
 }
commit 2980f4986d1349cb83b13794d60c85950b3b9d6d
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed Jun 4 07:48:15 2014 +0200

avoid problems with poppler's and vcl's FontInfo during runtime

Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8

Conflicts:
include/vcl/metric.hxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/stdmenu.cxx
svx/source/sidebar/nbdtmg.cxx

diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 868c6e1..efe9f71 100644
--- a/cui/source/options/fontsubs.cxx
+++

[Libreoffice-commits] core.git: Branch 'private/jmux/for-iggi' - 0 commits -

2014-06-10 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/jmux/sorted-pagedesc+spzfrmfmts'

2014-06-10 Thread Jan-Marek Glogowski

New branch 'private/jmux/sorted-pagedesc+spzfrmfmts' available with the 
following commits:
commit c7cae77dd724389afb6b7c5e790824e767ca783c
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jun 10 12:32:32 2014 +0200

Optimize lcl_GetUniqueFlyName

Change-Id: Ic894ee471982496ac82dc426c803aba92b8554c2

commit 5ae5d3db81dc19a387c1aa1879cf339df1a2e8c7
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Jun 10 11:40:43 2014 +0200

Optimize FindFlyByName

Change-Id: I004226f8aded4e7909a104ec0ba405223f2d7e0e

commit 4a96084456eb4d11076cbb552e1894cc18a7d1c0
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Mon Jun 9 17:31:49 2014 +0200

.gitignore /.gdb_history

Change-Id: I254c0104010cc1a1c12bbf1af048966de66924e6

commit 343b6508a2baafbf73f2b52569225c0f200b2ac5
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Jun 8 19:41:53 2014 +0200

Convert SwFrmFmts to a o3tl::sorted_vector

Change-Id: I6ca87d3dd9a3b7067380bb7ebaef306b87516dfb

commit 353c47a535aa014bc953ca91575a73631559f9ee
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Jun 8 01:59:29 2014 +0200

Catchall prepare sorted SwFrmFmts

Change-Id: I2e91cb4d650b1c46c531885869d201edba84e5a6

commit cd2059a635baee9671f17e6f307073b96ad91005
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sun Jun 8 01:57:54 2014 +0200

Add sorted vector special case for delete all

Specializes DeleteAndDestroyAll() to optionally keep the default
item.

Change-Id: I570fc6614a59fcf08c4569d44873ed79f4af5eda

commit 4fe496bd04d1dac023b4f1941c48d193ffe890e0
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Thu May 22 14:25:32 2014 +0200

Merge common code of sw format lists

Moves the common code into an intermediate template class, which
still provides an SwFmtsBase interface.

The only changes are some dropped explicit const casts.

Change-Id: I8894fbc53e7b1ac1b1e590bba932a9f9cc33f448

commit 726e6bd430250e31496692186c27bc230a213a38
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Mon Jun 2 17:46:39 2014 +0200

Optimize AppendAllObjs for vectors

Removing items from large vectors, especially from the front, is
very expensive. For a large mail merge job it took most of the time
to memmove the descending vector items.

Instead of remove, this simply overwrites the current with the last
element.

Change-Id: I12395388f4e315009602984acb443382fcce9f44

commit 815a1bce3389415f8a4dbc9eae6015b168176909
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Fri Jun 6 09:44:34 2014 +0200

Directly convert frame name tails to Int32

This is a little optimization for large mail merge jobs with many
frames. The current alorithm doesn't only try to produce unique but
also reasonable names for the frames.

Per se the algorithm is horrible ineffective for large numbers of
frames, but this is impossible to fix without changing the
underlying vector of frames to a sorted one to find and check just
the correctly prefixed frames.

This patch directly converts the frame names tail instead of
creating substring of the number tail, which saves billions of
malloc and free calls seen with my sample document.

Change-Id: Iefdee4053480f40f106c49867bc5a64ec207ba1b

commit 18b689525b8f87ff987484d748b2e7d04c5fe081
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Wed Jun 4 17:28:09 2014 +0200

MM: Don't special case the first document

Change-Id: Ied152af4a6c325b80fa80ae5fcb3f7a8897107e1

commit a0419a337705eabdaee8afc86f4c9b97b577548a
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Fri May 16 23:42:32 2014 +0200

Convert SwPageDescs to a o3tl::sorted_vector

Originally I planned to use a boost::container::flat_map, but there
seem to be no way to directly access the indexed vector.

And since this already needs the first item is default special
handling, o3tl::sorted_vector is used with the offset.

Change-Id: Idfb79af8ddfd5f5e2e6ca312b46d30e3ddc166d9

commit 653bceb8065a6f420505694ae48131e02ab04c4c
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Mon May 12 18:55:58 2014 +0200

Fixup vector stuff (catchall)

Fixup many occations of broken vector = sorted_vector stuff and
duplicated code.

This drops a simple optimization from the ww8 filter. I'm not
sure it's worth just to register and update the new styles.

Change-Id: Ia10a5672e882799ee0cb7f14382558f836bc1128

commit 8cc7b7ffcc31defe579fe86de629726f15e7adb7
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Mon May 12 16:30:34 2014 +0200

Change MakePageDesc return type

Almost everybody except SwDoc::ClearDoc just use the index once
to get the SwPageDesc pointer.

As the index will be instable for delete and insert, this
just adds an additional lookup to ClearDoc and

Re: Quantifying the time overhead of Cygwin make


On 06/10/2014 01:36 PM, Bjoern Michaelsen wrote:

OTOH, as said above, some of those might just end up in external/ then (or
already are) ...


...except for those needed by external itself (into which category 
probably falls wget)


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

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source

2014-06-10 Thread sk94

 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/indexdialog.cxx |  263 
 dbaccess/source/ui/dlg/indexdialog.hrc |   42 ---
 dbaccess/source/ui/dlg/indexdialog.src |  131 --
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx  |   17 -
 dbaccess/source/ui/inc/indexdialog.hxx |   21 -
 dbaccess/source/ui/inc/indexfieldscontrol.hxx  |4 
 dbaccess/uiconfig/ui/indexdesigndialog.ui  |  316 +
 extras/source/glade/libreoffice-catalog.xml.in |7 
 9 files changed, 457 insertions(+), 345 deletions(-)

New commits:
commit bf6a770dfe81dfc2567d2f3386d5946c7a6a31ef
Author: sk94 eszka...@gmail.com
Date:   Mon Jun 9 18:27:43 2014 +0200

DLG_INDEXDESIGN conversion to .ui

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

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 4244e55..8919127 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/generalpagedialog \
 dbaccess/uiconfig/ui/generalpagewizard \
 dbaccess/uiconfig/ui/generatedvaluespage \
+dbaccess/uiconfig/ui/indexdesigndialog \
 dbaccess/uiconfig/ui/joindialog \
 dbaccess/uiconfig/ui/password \
 dbaccess/uiconfig/ui/queryfilterdialog \
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx 
b/dbaccess/source/ui/dlg/indexdialog.cxx
index 6857e2b..3c5cfac 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -24,7 +24,6 @@
 #include indexdialog.hxx
 #include dbu_dlg.hrc
 #include dbaccess_helpid.hrc
-#include indexdialog.hrc
 #include indexfieldscontrol.hxx
 #include indexcollection.hxx
 #include vcl/msgbox.hxx
@@ -36,6 +35,13 @@
 #include browserids.hxx
 #include connectivity/dbtools.hxx
 #include osl/diagnose.h
+
+const char INDEX_NEW_CMD[] = .index:createNew;
+const char INDEX_DROP_CMD[] = .index:dropCurrent;
+const char INDEX_RENAME_CMD[] = .index:renameCurrent;
+const char INDEX_SAVE_CMD[] = .index:saveCurrent;
+const char INDEX_RESET_CMD[] = .index:resetCurrent;
+
 namespace dbaui
 {
 
@@ -81,8 +87,8 @@ namespace dbaui
 }
 
 // DbaIndexList
-DbaIndexList::DbaIndexList(Window* _pParent, const ResId _rId)
-:SvTreeListBox(_pParent, _rId)
+DbaIndexList::DbaIndexList(Window* _pParent, WinBits nWinBits)
+:SvTreeListBox(_pParent, nWinBits)
 ,m_bSuspendSelectHdl(false)
 {
 }
@@ -152,43 +158,46 @@ namespace dbaui
 return bReturn;
 }
 
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexList(Window 
*pParent, VclBuilder::stringmap )
+{
+return new DbaIndexList (pParent, WB_BORDER);
+}
+
 // DbaIndexDialog
 DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence OUString 
 _rFieldNames,
 const Reference XNameAccess  _rxIndexes,
 const Reference XConnection  
_rxConnection,
 const Reference XComponentContext  
_rxContext,sal_Int32 _nMaxColumnsInIndex)
-:ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN))
+:ModalDialog( _pParent, IndexDesignDialog, 
dbaccess/ui/indexdesigndialog.ui)
 ,m_xConnection(_rxConnection)
 ,m_aGeometrySettings(E_DIALOG, 
OUString(dbaccess.tabledesign.indexdialog))
-,m_aActions (this, ModuleRes(TLB_ACTIONS))
-,m_aIndexes (this, ModuleRes(CTR_INDEXLIST))
-,m_aIndexDetails(this, ModuleRes(FL_INDEXDETAILS))
-,m_aDescriptionLabel(this, ModuleRes(FT_DESC_LABEL))
-,m_aDescription (this, ModuleRes(FT_DESCRIPTION))
-,m_aUnique  (this, ModuleRes(CB_UNIQUE))
-,m_aFieldsLabel (this, ModuleRes(FT_FIELDS))
-,m_pFields(new IndexFieldsControl   (this, 
ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting(
 m_xConnection, AddIndexAppendix )))
-,m_aClose   (this, ModuleRes(PB_CLOSE))
-,m_aHelp(this, ModuleRes(HB_HELP))
 ,m_pIndexes(NULL)
 ,m_pPreviousSelection(NULL)
 ,m_bEditAgain(false)
 ,m_xContext(_rxContext)
 {
+get(m_pActions, ACTIONS);
+get(m_pIndexList, INDEX_LIST);
+get(m_pIndexDetails, INDEX_DETAILS);
+get(m_pDescriptionLabel, DESC_LABEL);
+get(m_pDescription, DESCRIPTION);
+get(m_pUnique, UNIQUE);
+get(m_pFieldsLabel, FIELDS_LABEL);
+get(m_pFields, FIELDS);
+get(m_pClose, CLOSE);
 
-FreeResource();
-

[Libreoffice-commits] core.git: 2 commits - dbaccess/inc dbaccess/source dbaccess/uiconfig include/dbaccess reportdesign/source sc/inc sc/source

 dbaccess/inc/dbaccess_helpid.hrc |7 
 dbaccess/source/ui/dlg/indexdialog.cxx   |   75 +--
 dbaccess/source/ui/inc/indexdialog.hxx   |   31 ++-
 dbaccess/source/ui/misc/ToolBoxHelper.cxx|5 
 dbaccess/uiconfig/ui/indexdesigndialog.ui|  260 +--
 include/dbaccess/ToolBoxHelper.hxx   |9 
 reportdesign/source/ui/dlg/AddField.cxx  |4 
 reportdesign/source/ui/dlg/Condition.cxx |5 
 reportdesign/source/ui/dlg/Condition.hxx |4 
 reportdesign/source/ui/dlg/GroupsSorting.cxx |5 
 reportdesign/source/ui/inc/AddField.hxx  |4 
 reportdesign/source/ui/inc/GroupsSorting.hxx |4 
 sc/inc/cellsuno.hxx  |2 
 sc/source/ui/unoobj/cellsuno.cxx |5 
 14 files changed, 274 insertions(+), 146 deletions(-)

New commits:
commit 0dc13e9c06bf5bc188b427f0760d0dc2eee8f75e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 12:32:03 2014 +0100

tweak things to allow switching between small and large toolbar icons

Change-Id: Ife4da4c6f4acc3b3f9fde18cdfc09635cf9b6776

diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 407c414..873e657 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -126,12 +126,6 @@
 #define HID_DSADMIN_MOZILLA_PROFILE_NAME  
DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME
 #define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME  
DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME
 
-#define HID_DLGIDX_NEWINDEX   
DBACCESS_HID_DLGIDX_NEWINDEX
-#define HID_DLGIDX_DROPINDEX  
DBACCESS_HID_DLGIDX_DROPINDEX
-#define HID_DLGIDX_RENAMEINDEX
DBACCESS_HID_DLGIDX_RENAMEINDEX
-#define HID_DLGIDX_SAVEINDEX  
DBACCESS_HID_DLGIDX_SAVEINDEX
-#define HID_DLGIDX_RESETINDEX 
DBACCESS_HID_DLGIDX_RESETINDEX
-#define HID_DLGIDX_INDEXLIST  
DBACCESS_HID_DLGIDX_INDEXLIST
 #define UID_DLGINDEX_INDEXDETAILS_BACK
DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK
 #define UID_DLGINDEX_INDEXDETAILS_MAIN
DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN
 #define HID_DLGINDEX_INDEXDETAILS_FIELD   
DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD
@@ -249,7 +243,6 @@
 
 #define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE   
DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE
 #define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE  
DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_BROWSE
-#define HID_INDEX_DIALOG_ACTION_TB
DBACCESS_HID_INDEX_DIALOG_ACTION_TB
 
 #define HID_DLG_DATABASE_WIZARD   
DBACCESS_HID_DLG_DATABASE_WIZARD
 
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx 
b/dbaccess/source/ui/dlg/indexdialog.cxx
index 3c5cfac..7de55fa 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -177,14 +177,38 @@ namespace dbaui
 ,m_xContext(_rxContext)
 {
 get(m_pActions, ACTIONS);
+
+mnNewCmdId = m_pActions-GetItemId(INDEX_NEW_CMD);
+mnDropCmdId = m_pActions-GetItemId(INDEX_DROP_CMD);
+mnRenameCmdId = m_pActions-GetItemId(INDEX_RENAME_CMD);
+mnSaveCmdId = m_pActions-GetItemId(INDEX_SAVE_CMD);
+mnResetCmdId = m_pActions-GetItemId(INDEX_RESET_CMD);
+
+maScNewCmdImg = m_pActions-GetItemImage(mnNewCmdId);
+maScDropCmdImg = m_pActions-GetItemImage(mnDropCmdId);
+maScRenameCmdImg = m_pActions-GetItemImage(mnRenameCmdId);
+maScSaveCmdImg = m_pActions-GetItemImage(mnSaveCmdId);
+maScResetCmdImg = m_pActions-GetItemImage(mnResetCmdId);
+maLcNewCmdImg = getFixedImage(image1)-GetImage();
+maLcDropCmdImg = getFixedImage(image2)-GetImage();
+maLcRenameCmdImg = getFixedImage(image3)-GetImage();
+maLcSaveCmdImg = getFixedImage(image4)-GetImage();
+maLcResetCmdImg = getFixedImage(image5)-GetImage();
+
 get(m_pIndexList, INDEX_LIST);
+Size aSize(LogicToPixel(Size(70, 97), MAP_APPFONT));
+m_pIndexList-set_width_request(aSize.Width());
+m_pIndexList-set_height_request(aSize.Height());
 get(m_pIndexDetails, INDEX_DETAILS);
 get(m_pDescriptionLabel, DESC_LABEL);
 get(m_pDescription, DESCRIPTION);
 get(m_pUnique, UNIQUE);
 get(m_pFieldsLabel, FIELDS_LABEL);
 get(m_pFields, FIELDS);
-get(m_pClose, CLOSE);
+aSize = LogicToPixel(Size(128, 61), MAP_APPFONT);
+m_pFields-set_width_request(aSize.Width());
+m_pFields-set_height_request(aSize.Height());
+get(m_pClose, close);
 
 m_pActions-SetSelectHdl(LINK(this, DbaIndexDialog, OnIndexAction));
 
@@ -242,7 +266,7 @@ namespace dbaui
 
 void DbaIndexDialog::updateToolbox()
 {
-

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 47/10644c94f552347529e9852727373460f1f12a

 47/10644c94f552347529e9852727373460f1f12a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 226ced5d0d97798a7557993e1c3ef551bb00c77b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 13:24:59 2014 +0100

Notes added by 'git notes add'

diff --git a/47/10644c94f552347529e9852727373460f1f12a 
b/47/10644c94f552347529e9852727373460f1f12a
new file mode 100644
index 000..25cc96f
--- /dev/null
+++ b/47/10644c94f552347529e9852727373460f1f12a
@@ -0,0 +1 @@
+ignore: ooxml module
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-10 Thread Valentin Kettner

 sw/inc/doc.hxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit dfa1173e55580923be283e32f2f5dcacbaed028b
Author: Valentin Kettner vakevk+libreoff...@gmail.com
Date:   Tue Jun 10 14:25:10 2014 +0200

Removed unneeded includes in doc.hxx .

Also removed two members which I forgot to delete after refactoring
IDocumentChartDataProviderAccess.

Change-Id: Iaba35ff6ec45c4019ca36a2bb1ef8a9206c598d3

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index c28624d..ad58225 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -54,13 +54,9 @@ class SwList;
 #include chcmprse.hxx
 #include com/sun/star/linguistic2/XSpellChecker1.hpp
 #include com/sun/star/linguistic2/XHyphenatedWord.hpp
-#include rtl/ref.hxx
-#include svx/svdtypes.hxx
 #include sfx2/objsh.hxx
 #include svl/style.hxx
 #include editeng/numitem.hxx
-#include comphelper/implementationreference.hxx
-#include com/sun/star/chart2/data/XDataProvider.hpp
 #include com/sun/star/linguistic2/XProofreadingIterator.hpp
 #include com/sun/star/script/vba/XVBAEventProcessor.hpp
 
@@ -365,11 +361,6 @@ class SW_DLLPUBLIC SwDoc :
 SwModify *mpUnoCallBack;
 IGrammarContact *mpGrammarContact;   // for grammar checking in 
paragraphs during editing
 
-mutable  comphelper::ImplementationReference SwChartDataProvider
-, ::com::sun::star::chart2::data::XDataProvider 
-maChartDataProviderImplRef;
-SwChartLockController_Helper  *mpChartControllerHelper;
-
 // table of forbidden characters of this document
 rtl::ReferenceSvxForbiddenCharactersTable mxForbiddenCharsTable;
 com::sun::star::uno::Reference 
com::sun::star::script::vba::XVBAEventProcessor  mxVbaEvents;
___
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  |3 -
 source/text/shared/explorer/database/05010100.xhp |   34 +++---
 2 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 1730831c4ee7c46ecc58c43c157ff0eb85119d35
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 13:30:36 2014 +0100

update help ids for index design dialog .ui conversion

Change-Id: I947a451bf222bae76672e293b00a8a3657cdf6d1

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1efe17a..2e7e0aa 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5074,7 +5074,6 @@ chart2_TabPage_TP_LAYOUT,551731200,
 chart2_TabPage_TP_LOCATION,551829504,
 chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120,
 chart2_TabPage_TP_YERRORBAR,551927808,
-dbaccess_CheckBox_DLG_INDEXDESIGN_CB_UNIQUE,1388626945,
 dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
 dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
@@ -5109,7 +5108,6 @@ dbaccess_ListBox_DLG_PARAMETERS_LB_ALLPARAMS,1388400129,
 dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST,851447299,
 dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536,
 dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840,
-dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920,
 dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624,
 dbaccess_ModalDialog_DLG_PARAMETERS,1388396544,
 dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528,
@@ -5122,7 +5120,6 @@ 
dbaccess_NumericField_PAGE_ADABAS_NF_DATA_INCREMENT,851531777,
 dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153,
 dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697,
 dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE,1388761603,
-dbaccess_PushButton_DLG_INDEXDESIGN_PB_CLOSE,1388630529,
 dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158,
 dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241,
 dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION,851546626,
diff --git a/source/text/shared/explorer/database/05010100.xhp 
b/source/text/shared/explorer/database/05010100.xhp
index 00f9184..1fb529a 100644
--- a/source/text/shared/explorer/database/05010100.xhp
+++ b/source/text/shared/explorer/database/05010100.xhp
@@ -30,7 +30,7 @@
 /meta
 body
 section id=indexentwurf
-bookmark xml-lang=en-US branch=hid/dbaccess:ModalDialog:DLG_INDEXDESIGN 
id=bm_id3156410 localize=false/
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/indexdesigndialog/IndexDesignDialog id=bm_id3156410 
localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:DBIndexDesign id=bm_id3149828 
localize=false/paragraph role=heading id=hd_id3153311 xml-lang=en-US 
level=1 l10n=U oldref=1link 
href=text/shared/explorer/database/05010100.xhp name=Index designIndex 
design/link/paragraph
 paragraph role=paragraph id=par_id3166460 xml-lang=en-US l10n=U 
oldref=2ahelp hid=.uno:DBIndexDesignThe emphIndex Design /emphdialog 
allows you edit the indexes for the current table./ahelp/paragraph
 /section
@@ -38,29 +38,29 @@
   embed href=text/shared/00/0450.xhp#indexentwurf/
 /section
 embed href=text/shared/guide/data_tabledefine.xhp#data_tabledefine/
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_INDEXLIST 
id=bm_id3148473 localize=false/paragraph role=heading id=hd_id3149578 
xml-lang=en-US level=2 l10n=U oldref=3Index list/paragraph
-paragraph role=paragraph id=par_id3155342 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=HID_DLGIDX_INDEXLISTDisplays the available indexes. 
Select an index from the list to edit. The details of the selected index are 
displayed in the dialog./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_NEWINDEX 
id=bm_id3158430 localize=false/paragraph role=heading id=hd_id3149795 
xml-lang=en-US level=3 l10n=U oldref=5New Index/paragraph
-paragraph role=paragraph id=par_id3150085 xml-lang=en-US l10n=U 
oldref=6ahelp hid=HID_DLGIDX_NEWINDEXCreates a new 
index./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_DROPINDEX 
id=bm_id3148642 localize=false/paragraph role=heading id=hd_id3145317 
xml-lang=en-US level=3 l10n=U oldref=7Delete Current Index/paragraph
-paragraph role=paragraph id=par_id3154860 xml-lang=en-US l10n=U 
oldref=8ahelp hid=HID_DLGIDX_DROPINDEXDeletes the current 
index./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_RENAMEINDEX 
id=bm_id3154285 localize=false/paragraph role=heading id=hd_id3150986 
xml-lang=en-US level=3 l10n=U oldref=9Rename Current Index/paragraph
-paragraph role=paragraph id=par_id3148685 xml-lang=en-US l10n=U 
oldref=10ahelp hid=HID_DLGIDX_RENAMEINDEXRenames the current 
index./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_SAVEINDEX 
id=bm_id3151245 localize=false/paragraph role=heading id=hd_id3153628 
xml-lang=en-US level=3 l10n=U oldref=11Save Current Index/paragraph
-paragraph role=paragraph id=par_id3148563 xml-lang=en-US l10n=U 
oldref=12ahelp

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 8f88c3237d71407f50c70736863439a978c8ec2f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 13:30:36 2014 +0100

Updated core
Project: help  1730831c4ee7c46ecc58c43c157ff0eb85119d35

diff --git a/helpcontent2 b/helpcontent2
index 2a3ca82..1730831 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2a3ca8223d8669fe1f00445af80d7b84bfd73b00
+Subproject commit 1730831c4ee7c46ecc58c43c157ff0eb85119d35
___
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-5' - svl/source

2014-06-10 Thread Eike Rathke

 svl/source/numbers/zforfind.cxx |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 22f06514c987f50ce15fba42b0cf8de44d6c1c9d
Author: Eike Rathke er...@redhat.com
Date:   Fri Jun 6 13:31:03 2014 +0200

resolved fdo#79719 recognize ##-MMM-## as date even if ambiguous

Force ##-MMM-## to be ##-MMM- if the first number is a day value.

Note that the previous implementation of
(bDay1  bDay2  ((bYear1  !bYear2) || (!bYear1  bYear2)))
never matched anyway as the detection of bDay1 and bDay2 were changed to
only yield true if bYear1==false or bYear2==false.

Change-Id: If6bb6d3e1757015552eaa81c1f58d53c0794846e
(cherry picked from commit a6992cd0d7c085ba05877e6f68ac0650dd09010f)
Reviewed-on: https://gerrit.libreoffice.org/9667
Reviewed-by: David Tardon dtar...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 9c8bb1c..2302540 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1152,14 +1152,9 @@ bool ImpSvNumberInputScan::MayBeMonthDate()
 }
 else if (bDay1  bDay2)
 {
-if (bYear1  !bYear2)
-{
-nMayBeMonthDate = 3;// yy-month-dd
-}
-else if (!bYear1  bYear2)
-{
-nMayBeMonthDate = 2;// dd-month-yy
-}
+// Ambiguous ##-MMM-## date, but some big vendor's database
+// reports write this crap, assume this always to be
+nMayBeMonthDate = 2;// dd-month-yy
 }
 }
 }
___
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' - sd/source svx/source

2014-06-10 Thread Armin Le Grand

 sd/source/ui/func/fuinsert.cxx |8 
 svx/source/svdraw/svdedtv.cxx  |   23 +++
 2 files changed, 31 insertions(+)

New commits:
commit b8de5aa4195fbb2f1fbf1312cb8a6e6c3c8b9852
Author: Armin Le Grand a...@apache.org
Date:   Mon Feb 17 15:48:54 2014 +

Resolves: fdo#78404 #i123468# Added SdrEndTextEdit before replacing...

EmptyPresObj, also secured ReplaceObjectAtView to check for active TextEdit,
assert this and make an emergency correction

(cherry picked from commit 623cd778689bd0851652b2db00b24c308dfb657a)

Conflicts:
svx/source/svdraw/svdedtv.cxx

(cherry picked from commit 3b729ab35b5064dcd21f125dfd0aa7d7e709fd9f)

Change-Id: I0e9ae1b1cd84e04c37c4de38aca7752804782384
Reviewed-on: https://gerrit.libreoffice.org/9482
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 9f50702..886be34 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -338,6 +338,14 @@ void FuInsertOLE::DoExecute( SfxRequest rReq )
 pPage-InsertPresObj( pOleObj, ePresObjKind );
 pOleObj-SetUserCall(pPickObj-GetUserCall());
 }
+
+// #i123468# we need to end text edit before replacing the 
object. There cannot yet
+// being text typed (else it would not be an EmptyPresObj 
anymore), but it may be
+// in text edit mode
+if (mpView-IsTextEdit())
+{
+mpView-SdrEndTextEdit();
+}
 }
 
 bool bRet = true;
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index a872d42..602bf19 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -33,6 +33,7 @@
 #include svx/svdglob.hxx
 #include svx/e3dsceneupdater.hxx
 #include rtl/strbuf.hxx
+#include svx/svdview.hxx
 
 // #i13033#
 #include clonelist.hxx
@@ -987,6 +988,28 @@ sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, 
SdrPageView rPV, sal_
 
 void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView rPV, 
SdrObject* pNewObj, sal_Bool bMark)
 {
+if(IsTextEdit())
+{
+#ifdef DBG_UTIL
+if(pOldObj  dynamic_cast SdrTextObj* (pOldObj)  static_cast 
SdrTextObj* (pOldObj)-IsTextEditActive())
+{
+OSL_ENSURE(false, OldObject is in TextEdit mode, this has to be 
ended before replacing it usnig SdrEndTextEdit (!));
+}
+
+if(pNewObj  dynamic_cast SdrTextObj* (pNewObj)  static_cast 
SdrTextObj* (pNewObj)-IsTextEditActive())
+{
+OSL_ENSURE(false, NewObject is in TextEdit mode, this has to be 
ended before replacing it usnig SdrEndTextEdit (!));
+}
+#endif
+
+// #i123468# emergency repair situation, needs to cast up to a class 
derived from
+// this one; (aw080 has a mechanism for that and the view hierarchy is 
secured to
+// always be a SdrView)
+SdrView *pSdrView = dynamic_castSdrView*(this);
+if (pSdrView)
+pSdrView-SdrEndTextEdit();
+}
+
 SdrObjList* pOL=pOldObj-GetObjList();
 const bool bUndo = IsUndoEnabled();
 if( bUndo  )
___
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' - include/sfx2 sc/source sd/source sfx2/source sw/source

 include/sfx2/app.hxx|3 --
 include/sfx2/templdlg.hxx   |   19 --
 sc/source/ui/view/formatsh.cxx  |   17 ++--
 sd/source/ui/view/drviewsf.cxx  |   38 +
 sd/source/ui/view/outlnvsh.cxx  |8 ---
 sd/source/ui/view/viewshe3.cxx  |   10 ++---
 sfx2/source/appl/appmisc.cxx|   11 --
 sfx2/source/dialog/templdlg.cxx |   41 
 sfx2/source/inc/templdgi.hxx|   16 ---
 sw/source/ui/app/docst.cxx  |   11 +++---
 10 files changed, 79 insertions(+), 95 deletions(-)

New commits:
commit f2ba5e290b6b751995427b7610ef75d67e674d75
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 29 11:16:47 2014 +0100

Resolves: fdo#79360 impress hangs on using sidebar new style

because those styles are pseudo-styles and a new one cannot be
added. The possibility is supposed to be disabled, and it is
disabled in the floating stylelist. The old code assumes there
can only be one of these stylelists and when a stylelist
queries if the new should be disabled the callback asks
the stylelist what family is selected, but only asks the floating one.

So, floating closed, sidebar open, the new is not disabled.
Implement the ancient TODO now that we have to. Instead of asking
the stylelist what family is selected, query the frame for what
is the current SID_STYLE_FAMILY as set by whatever is the active
stylelist.

What's disturbing is the SID_STYLE_FAMILY values are not SfxStyleFamily, but
indexes that have to be mapped to SfxStyleFamily. I bet there are a pile of
bugs around that, especially with little islands of different conversion
codesites

(cherry picked from commit 7a211e834fc271d3f28d7f8c49197c925242d862)

Conflicts:
sfx2/source/appl/appmisc.cxx

convert from NId to FamilyId instead of FamilyId to NId

should be equivalent for comparison purposes

(cherry picked from commit f48f5138ecedd3bb9ec0b454b9fe216001610156)

remove unused virtual method, slim this down initially

(cherry picked from commit fa551c422426962194b6bff4234f12eb5bdf57ca)

(cherry picked from commit 3988f17d14ee28b4bb117ca9961708ad3a867fb1)

Conflicts:
sd/source/ui/view/drviewsf.cxx
sfx2/source/appl/appmisc.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/inc/templdgi.hxx
sw/source/core/uibase/app/docst.cxx

Change-Id: I85c8032d7c26ae6eea245685748f89b2a860e767
Reviewed-on: https://gerrit.libreoffice.org/9573
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 6827ce6..ad48f2e 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -171,9 +171,6 @@ public:
 SfxTemplateDialog*  GetTemplateDialog();
 Window* GetTopWindow() const;
 
-// TODO/CLEANUP: make currently selected family a view property and so we 
don't need to query the status from the TemplateCommon
-ISfxTemplateCommon* GetCurrentTemplateCommon( SfxBindings );
-
 // members
 SfxFilterMatcher   GetFilterMatcher();
 SfxProgress*GetProgress() const;
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 7373c23..ca494c6 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -30,20 +30,7 @@
 
 class SfxTemplateDialog_Impl;
 
-// class ISfxTemplateCommon --
-
-class ISfxTemplateCommon
-{
-public:
-virtual SfxStyleFamily GetActualFamily() const = 0;
-virtual OUString GetSelectedEntry() const = 0;
-
-protected:
-~ISfxTemplateCommon() {}
-};
-
 // class SfxTemplateDialog ---
-
 class SfxTemplateDialog : public SfxDockingWindow
 {
 private:
@@ -63,8 +50,12 @@ public:
 
 virtual voidUpdate();
 
-ISfxTemplateCommon* GetISfxTemplateCommon();
 voidSetParagraphFamily();
+
+// converts from SFX_STYLE_FAMILY Ids to 1-5
+static sal_uInt16 SFX2_DLLPUBLIC SfxFamilyIdToNId(SfxStyleFamily nFamily);
+// converts from 1-5 to SFX_STYLE_FAMILY Ids
+static SfxStyleFamily SFX2_DLLPUBLIC NIdToSfxFamilyId(sal_uInt16 nId);
 };
 
 // class SfxTemplateDialogWrapper 
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 3ddb49a..e357a44 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -213,9 +213,12 @@ void ScFormatShell::GetStyleState( SfxItemSet rSet )
 
 case SID_STYLE_UPDATE_BY_EXAMPLE:
 {
-ISfxTemplateCommon* pDesigner = SFX_APP()-
-

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

2014-06-10 Thread PriyankaGaikwad

 sw/qa/extras/ooxmlexport/data/fdo79822.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   10 ++
 sw/source/filter/ww8/docxsdrexport.cxx  |4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 178550923533b7c015e29d957a2fc3857ba73eb3
Author: PriyankaGaikwad priyanka.gaik...@synerzip.com
Date:   Tue Jun 10 14:53:40 2014 +0530

fdo#79822 : Crash:LO Crashes while Saving the DOCX containing smartart

Decription :
- Docx file contain smartart and it was created in MS word 2007.
- MS word 2007 does not create any drawing.xml for smartart
- So in DocxSdrExport::writeDiagram() diagramDrawing was not set in this 
case.
- File crashing at diagramDrawing[0] = drawingDom as diagramDrawing is 
empty.

Change-Id: I6bc38e702f731ad8074b562572fd50f2e29a41b7
Reviewed-on: https://gerrit.libreoffice.org/9706
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/sw/qa/extras/ooxmlexport/data/fdo79822.docx 
b/sw/qa/extras/ooxmlexport/data/fdo79822.docx
new file mode 100644
index 000..2844671
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79822.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 27abde4..df61c77 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3485,6 +3485,16 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78907,fdo78907.docx)
 assertXPath ( pXmlDoc1, 
/w:ftr[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl, 0 );
 }
 
+DECLARE_OOXMLEXPORT_TEST(testfdo79822, fdo79822.docx)
+{
+/* File getting crash while saving in LO.
+ * The Docx contain smartart and the file was created in ms word 2007
+ */
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index b86fc6e..ac69745 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1021,12 +1021,14 @@ void DocxSdrExport::writeDiagram(const SdrObject* 
sdrObject, const SwFrmFmt rFr
 else if (propName == OOXColor)
 propList[nProp].Value = colorDom;
 else if (propName == OOXDrawing)
+{
 propList[nProp].Value = diagramDrawing;
+diagramDrawing[0] = drawingDom; // if there is OOXDrawing 
property then set drawingDom here only.
+}
 else if (propName == OOXDiagramDataRels)
 propList[nProp].Value = xDataRelSeq;
 }
 
-diagramDrawing[0] = drawingDom;
 // check that we have the 4 mandatory XDocuments
 // if not, there was an error importing and we won't output anything
 if (!dataDom.is() || !layoutDom.is() || !styleDom.is() || !colorDom.is())
___
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/qa sw/source

2014-06-10 Thread PriyankaGaikwad

 sw/qa/extras/ooxmlexport/data/fdo79822.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   10 ++
 sw/source/filter/ww8/docxsdrexport.cxx  |4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 713c639ce5ba6371e9c0d9ff51be7cf4c68d3d4c
Author: PriyankaGaikwad priyanka.gaik...@synerzip.com
Date:   Tue Jun 10 14:53:40 2014 +0530

fdo#79822 : Crash:LO Crashes while Saving the DOCX containing smartart

Decription :
- Docx file contain smartart and it was created in MS word 2007.
- MS word 2007 does not create any drawing.xml for smartart
- So in DocxSdrExport::writeDiagram() diagramDrawing was not set in this 
case.
- File crashing at diagramDrawing[0] = drawingDom as diagramDrawing is 
empty.

Change-Id: I6bc38e702f731ad8074b562572fd50f2e29a41b7
Reviewed-on: https://gerrit.libreoffice.org/9706
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 178550923533b7c015e29d957a2fc3857ba73eb3)

diff --git a/sw/qa/extras/ooxmlexport/data/fdo79822.docx 
b/sw/qa/extras/ooxmlexport/data/fdo79822.docx
new file mode 100644
index 000..2844671
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79822.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index fd98235..a87ddef 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3468,6 +3468,16 @@ DECLARE_OOXMLEXPORT_TEST(testWordArtWithinDraingtool, 
testWordArtWithinDraingto
 
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]/w:txbxContent[1],1);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testfdo79822, fdo79822.docx)
+{
+/* File getting crash while saving in LO.
+ * The Docx contain smartart and the file was created in ms word 2007
+ */
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 29c1195..2e77418 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -945,12 +945,14 @@ void DocxSdrExport::writeDiagram(const SdrObject* 
sdrObject, const SwFrmFmt rFr
 else if (propName == OOXColor)
 propList[nProp].Value = colorDom;
 else if (propName == OOXDrawing)
+{
 propList[nProp].Value = diagramDrawing;
+diagramDrawing[0] = drawingDom; // if there is OOXDrawing 
property then set drawingDom here only.
+}
 else if (propName == OOXDiagramDataRels)
 propList[nProp].Value = xDataRelSeq;
 }
 
-diagramDrawing[0] = drawingDom;
 // check that we have the 4 mandatory XDocuments
 // if not, there was an error importing and we won't output anything
 if (!dataDom.is() || !layoutDom.is() || !styleDom.is() || !colorDom.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Quantifying the time overhead of Cygwin make

Hi,

On Tue, Jun 10, 2014 at 02:21:04PM +0200, Stephan Bergmann wrote:
 On 06/10/2014 01:36 PM, Bjoern Michaelsen wrote:
 OTOH, as said above, some of those might just end up in external/ then (or
 already are) ...
 
 ...except for those needed by external itself (into which category
 probably falls wget)

I thought we had an Easy Hack for that (a la make a click through Wizard that
installs all build deps on Windows), but all I found was:

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

if not, someone(1) should recreate such a easy hack -- installing deps on
Windows is easier than it used to be, but far from being a painfree for a
newcomer.

Best,

Bjoern


(1) being able to mentor on Windows
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 8 commits - basic/source chart2/source sc/qa sc/source vcl/source

2014-06-10 Thread Markus Mohrhard

 basic/source/uno/namecont.cxx|7 +
 chart2/source/view/inc/GL3DRenderer.hxx  |2 
 chart2/source/view/main/GL3DRenderer.cxx |   19 +++--
 sc/qa/unit/opencl-test.cxx   |5 +
 sc/source/core/opencl/formulagroupcl.cxx |  114 ---
 sc/source/core/opencl/op_logical.cxx |   37 ++
 sc/source/core/opencl/op_logical.hxx |7 +
 sc/source/core/opencl/op_math.cxx|   93 +
 sc/source/core/opencl/op_spreadsheet.cxx |   49 +++--
 sc/source/core/opencl/op_spreadsheet.hxx |1 
 sc/source/core/opencl/op_statistical.cxx |   92 ++---
 sc/source/core/opencl/opbase.cxx |   10 +-
 sc/source/core/opencl/opbase.hxx |8 +-
 vcl/source/opengl/OpenGLContext.cxx  |2 
 14 files changed, 305 insertions(+), 141 deletions(-)

New commits:
commit a903cac829f0c607b5895cbaae51ab4951ed8567
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Jun 10 15:57:59 2014 +0200

fix assert

Change-Id: I55627efdf50bea4c1371b6c54df67cc71d5fce2f

diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 951f4b5..ee6b2e3 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -3870,7 +3870,10 @@ void ScOpenclTest::testMathFormulaMod()
 {
 double fLibre = pDoc-GetValue(ScAddress(2,i,0));
 double fExcel = pDocRes-GetValue(ScAddress(2,i,0));
-CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+if(fExcel == 0.0f)
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, 1e-10);
+else
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
 }
 xDocSh-DoClose();
 xDocShRes-DoClose();
commit 7cfc80cb1663c1f4b4e813ab90c95fae01d1afc1
Author: haochen haoc...@multicorewarein.com
Date:   Sat May 31 14:28:22 2014 +0800

GPU Calc:Support default 2nd parameter in ROUND

Change-Id: I003ba9c945dbc3c6417d0502902610c0eaff2bda

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 9b45c91..5f6b4ff 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1487,7 +1487,9 @@ public:
 
 #ifdef UNROLLING_FACTOR
 ss  \tint i;\n\t;
-ss  int currentCount0, currentCount1;\n\t;
+ss  int currentCount0;\n;
+for ( unsigned i = 0; i  vSubArguments.size()-1; i++)
+ss  int currentCounti+1;\n;
 std::stringstream temp3,temp4;
 int outLoopSize = UNROLLING_FACTOR;
 if (nCurWindowSize/outLoopSize != 0){
diff --git a/sc/source/core/opencl/op_math.cxx 
b/sc/source/core/opencl/op_math.cxx
index 36c94f6..555da592 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -1707,11 +1707,17 @@ void 
OpRound::GenSlidingWindowFunction(std::stringstream ss,
 ss  int singleIndex =  gid0;\n;
 GenTmpVariables(ss,vSubArguments);
 CheckAllSubArgumentIsNan(ss,vSubArguments);
-ss  for(int i=0;itmp1;i++)\n;
-ss  tmp0 = tmp0 * 10;\n;
+if(vSubArguments.size() ==2)
+{
+ss  for(int i=0;itmp1;i++)\n;
+ss  tmp0 = tmp0 * 10;\n;
+}
 ss  double tmp=round(tmp0);\n;
-ss  for(int i=0;itmp1;i++)\n;
-ss  tmp = tmp / 10;\n;
+if(vSubArguments.size() ==2)
+{
+ss  for(int i=0;itmp1;i++)\n;
+ss  tmp = tmp / 10;\n;
+}
 ss  return tmp;\n;
 ss  };
 }
commit c0ea62fcb7f2bd809eea0fd45fb71e31ffba871a
Author: haochen haoc...@multicorewareinc.com
Date:   Sat May 31 13:54:22 2014 +0800

GPU Calc:Support 3rd parameter in FLOOR

Change-Id: Ie3a265f34a5f589d41e802b63df4be6a64989b05

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 91a54f4..9b45c91 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -419,7 +419,7 @@ size_t DynamicKernelStringArgument::Marshal(cl_kernel k, 
int argno, int, cl_prog
 if (CL_SUCCESS != err)
 throw OpenCLError(err, __FILE__, __LINE__);
 
-cl_uint *pHashBuffer = (cl_uint*)clEnqueueMapBuffer(
+pHashBuffer = (cl_uint*)clEnqueueMapBuffer(
 kEnv.mpkCmdQueue, mpClmem, CL_TRUE, CL_MAP_WRITE, 0,
 szHostBuffer, 0, NULL, NULL, err);
 if (CL_SUCCESS != err)
diff --git a/sc/source/core/opencl/op_math.cxx 
b/sc/source/core/opencl/op_math.cxx
index 4a960b3..36c94f6 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -424,14 +424,6 @@ void OpEven::GenSlidingWindowFunction(std::stringstream 
ss,
 void OpMod::GenSlidingWindowFunction(std::stringstream ss,
 const std::string sSymName, SubArguments vSubArguments)
 {
-#ifdef ISNAN
-FormulaToken *tmpCur0 = vSubArguments[0]-GetFormulaToken();
-const

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

2014-06-10 Thread Jürgen Schmidt

 idlc/source/options.cxx |   54 +++-
 1 file changed, 53 insertions(+), 1 deletion(-)

New commits:
commit 6e370ddd6b532e7bf12df3aa52f93913f4ea8348
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Tue Jun 10 13:18:31 2014 +

#122368# convert inc paths into short form on windows to avoid problem with 
ucpp

diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 567b6e4..2033df4 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -30,6 +30,28 @@
 #include rtl/string.hxx
 #include rtl/strbuf.hxx
 
+#include rtl/ustring.hxx
+#include osl/file.hxx
+
+#ifdef WNT
+#   include windows.h
+#endif
+
+/*
+#ifndef WIN32_LEAN_AND_MEAN
+#   define WIN32_LEAN_AND_MEAN
+# ifdef _MSC_VER
+#   pragma warning(push,1)
+# endif
+#   include windows.h
+# ifdef _MSC_VER
+#   pragma warning(pop)
+# endif
+#   include tchar.h
+#   undef WIN32_LEAN_AND_MEAN
+#endif
+*/
+
 #include stdio.h
 #include string.h
 
@@ -182,6 +204,28 @@ bool Options::setOption(char const * option, std::string 
const  rArg)
 return (result);
 }
 
+#ifdef WNT
+/* Helper functiopn to convert windows paths including spaces, brackets etc. 
into
+   a windows short Url. The ucpp preprocessor has problems with such paths and 
returns
+   with error.
+*/
+OString convertIncPathtoShortWindowsPath(const OString incPath) {
+rtl::OUString path = OStringToOUString(incPath, RTL_TEXTENCODING_UTF8);
+
+std::vectorsal_Unicode vec(path.getLength() + 1);
+//GetShortPathNameW only works if the file can be found!
+const DWORD len = GetShortPathNameW(
+reinterpret_castLPCWSTR(path.getStr()), 
reinterpret_castLPWSTR(vec[0]), path.getLength() + 1);
+
+rtl::OUString ret = rtl::OUString(vec[0], len);
+
+if (len  0)
+return OUStringToOString(ret, RTL_TEXTENCODING_UTF8);
+
+return incPath;
+}
+#endif
+
 bool Options::initOptions(std::vector std::string   rArgs) 
throw(IllegalArgument)
 {
 std::vector std::string ::const_iterator first = rArgs.begin(), last = 
rArgs.end();
@@ -225,7 +269,15 @@ bool Options::initOptions(std::vector std::string   
rArgs) throw(IllegalArgum
 sal_Int32 k = 0;
 do
 {
-OStringBuffer token; token.append(-I); 
token.append(param.getToken(0, ';', k));
+OStringBuffer token;
+token.append(-I);
+#ifdef WNT
+rtl::OString incpath = 
convertIncPathtoShortWindowsPath(param.getToken(0, ';', k));
+#else
+rtl::OString incpath = param.getToken(0, ';', k);
+#endif
+token.append(incpath);
+//token.append(param.getToken(0, ';', k));
 if (buffer.getLength()  0)
 buffer.append(' ');
 buffer.append(token);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - chart2/inc chart2/source offapi/com qadevOOo/runner sc/source sd/source sfx2/qa sw/source

 chart2/inc/ChartModel.hxx   |4 
 chart2/source/model/main/ChartModel.cxx |6 ++
 chart2/source/model/main/ChartModel_Persistence.cxx |   16 ++--
 offapi/com/sun/star/chart2/XChartDocument.idl   |4 
 qadevOOo/runner/util/SOfficeFactory.java|9 +++--
 sc/source/ui/drawfunc/fuins2.cxx|5 +
 sd/source/ui/func/fuinsert.cxx  |   10 ++
 sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java|4 
 sw/source/ui/table/tablemgr.cxx |8 
 9 files changed, 58 insertions(+), 8 deletions(-)

New commits:
commit 90ffbc8582ec1a6edc647b8ab222e60e6dedc66f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Jun 10 09:36:54 2014 -0400

fdo#79676: Fix the Java UNO API test with regard to chart tests.

The Java tests rely on the undocumented behavior that, when loading an 
empty
chart document, the chart automaticallly created a default chart which is 
a
column chart with many of its properties filled.  Unfortunately this 
behavior
caused ugly side effects when loading documents with charts via flat ODF
filter.

I believe fixing the test this way is the right fix.

Change-Id: If3e6c8979da9d0731346ebeedc23c0d3363e83fd
(cherry picked from commit d44b58beed743871df03909e7d9545e488f3d7c8)

diff --git a/qadevOOo/runner/util/SOfficeFactory.java 
b/qadevOOo/runner/util/SOfficeFactory.java
index 2a0f0ed..f464ea8 100644
--- a/qadevOOo/runner/util/SOfficeFactory.java
+++ b/qadevOOo/runner/util/SOfficeFactory.java
@@ -225,7 +225,12 @@ public class SOfficeFactory {
 
 if (oDoc != null) {
 DesktopTools.bringWindowToFront(oDoc);
-return UnoRuntime.queryInterface(XChartDocument.class, oDoc);
+XChartDocument xChartDoc = 
UnoRuntime.queryInterface(XChartDocument.class, oDoc);
+// Create a default chart which many chart tests rely on.
+com.sun.star.chart2.XChartDocument xCD2 =
+
UnoRuntime.queryInterface(com.sun.star.chart2.XChartDocument.class, oDoc);
+xCD2.createDefaultChart();
+return xChartDoc;
 } else {
 return null;
 }
@@ -616,4 +621,4 @@ public class SOfficeFactory {
 }
 return null;
 } // finish queryXServiceInfo
-}
\ No newline at end of file
+}
diff --git a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java 
b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
index 3eb7d4e..75981d7 100644
--- a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
+++ b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
@@ -74,6 +74,10 @@ public class ChartDocumentTest implements DocumentTest
 
 // retrieve the chart model
 XChartDocument chartDoc = UnoRuntime.queryInterface( 
XChartDocument.class, shapeProps.getPropertyValue( Model ) );
+// insert default chart for the test to use.
+com.sun.star.chart2.XChartDocument xCD2 =
+
UnoRuntime.queryInterface(com.sun.star.chart2.XChartDocument.class, chartDoc);
+xCD2.createDefaultChart();
 m_chartDocument = new OfficeDocument( i_orb, chartDoc );
 
 // actually activate the object
commit 1eccdc5c39587d4019cb4c88f8483b1fe14d5dda
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Jun 9 14:32:53 2014 -0400

fdo#79676: Initialize with a default chart only from the UI.

When creating an embedded chart object during import, we don't want to
create a default chart which would only mess up the chart data.

With this change, ChartModel::initNew() is a no-op.

(cherry picked from commit c5539bb585370f095cb6c09e38a7dd005d237295)

Conflicts:
chart2/source/model/main/ChartModel_Persistence.cxx
sc/source/ui/drawfunc/fuins2.cxx
sw/source/uibase/table/tablemgr.cxx

Change-Id: Id29659c3885ec1e06bed26d2c851123fb63072cc

diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index c8f992a..028ce0e 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -221,6 +221,8 @@ private:
 void impl_adjustAdditionalShapesPositionAndSize(
 const ::com::sun::star::awt::Size aVisualAreaSize );
 
+void insertDefaultChart();
+
 public:
 //no default constructor
 ChartModel(::com::sun::star::uno::Reference
@@ -432,6 +434,8 @@ public:
 getPageBackground()
 throw (::com::sun::star::uno::RuntimeException);
 
+virtual void SAL_CALL createDefaultChart() throw 
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
 //  XDataReceiver (public API) 
 virtual void SAL_CALL
 attachDataProvider( const ::com::sun::star::uno::Reference
diff --git a/chart2/source/model/main/ChartModel.cxx 
b/chart2/source/model/main/ChartModel.cxx
index c29a10e..170019f 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++

[Libreoffice-commits] core.git: 38 commits - chart2/source connectivity/source helpcompiler/inc helpcompiler/source include/comphelper sc/source sd/source sw/source vcl/source writerfilter/source

 chart2/source/controller/dialogs/ObjectNameProvider.cxx|4 
 chart2/source/controller/dialogs/res_LegendPosition.cxx|4 
 chart2/source/controller/main/ChartController_Insert.cxx   |8 
 chart2/source/controller/main/ChartController_Position.cxx |4 
 chart2/source/controller/main/ChartController_Tools.cxx|   10 -
 chart2/source/controller/main/ChartModelClone.cxx  |4 
 chart2/source/tools/InternalDataProvider.cxx   |5 
 chart2/source/view/main/DummyXShape.cxx|   12 -
 chart2/source/view/main/OpenglShapeFactory.cxx |   12 -
 connectivity/source/drivers/odbc/OStatement.cxx|3 
 connectivity/source/inc/odbc/OStatement.hxx|3 
 helpcompiler/inc/HelpCompiler.hxx  |3 
 helpcompiler/source/HelpCompiler.cxx   |3 
 include/comphelper/ChainablePropertySet.hxx|8 
 sc/source/filter/excel/xepivot.cxx |3 
 sc/source/ui/vba/vbarange.cxx  |3 
 sc/source/ui/vba/vbarange.hxx  |2 
 sd/source/ui/inc/unosrch.hxx   |2 
 sd/source/ui/unoidl/unosrch.cxx|2 
 sw/source/core/inc/unoport.hxx |6 
 sw/source/core/unocore/unoport.cxx |2 
 sw/source/filter/html/htmlcss1.cxx |   17 -
 sw/source/ui/vba/vbafield.cxx  |4 
 sw/source/uibase/docvw/FrameControlsManager.cxx|   14 -
 sw/source/uibase/inc/unomod.hxx|   14 +
 sw/source/uibase/uno/unomod.cxx|   10 -
 vcl/source/bitmap/bitmapscalesuper.cxx |  117 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |   11 -
 28 files changed, 183 insertions(+), 107 deletions(-)

New commits:
commit fa8c1752ee05eaef5019d9c00d53bbb585fe1130
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 15:54:55 2014 +0100

coverity#704261 Logically dead code

Change-Id: I382750af7a3570ac8c9b53179db8ede873bf82af

diff --git a/sc/source/filter/excel/xepivot.cxx 
b/sc/source/filter/excel/xepivot.cxx
index e7a3d20..dbb2653 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -1734,6 +1734,8 @@ void XclExpPivotTable::WriteQsiSxTag( XclExpStream rStrm 
) const
 // Feature-specific options.  The value differs depending on the table
 // type, but we assume the table type is always pivot table.
 sal_uInt32 nOptions = 0x;
+#if 0
+// documentation for which bit is for what
 bool bNoStencil = false;
 bool bHideTotal = false;
 bool bEmptyRows = false;
@@ -1742,6 +1744,7 @@ void XclExpPivotTable::WriteQsiSxTag( XclExpStream rStrm 
) const
 if (bHideTotal) nOptions |= 0x0002;
 if (bEmptyRows) nOptions |= 0x0008;
 if (bEmptyCols) nOptions |= 0x0010;
+#endif
 rStrm  nOptions;
 
 enum ExcelVersion
commit 470843ff2dde15c39189f9d221a136c1a6a50401
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 15:48:46 2014 +0100

coverity#705043 Unchecked dynamic_cast

Change-Id: I554cda341894bbf35c16cdf0d9eb77ffea32f5e2

diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index e40779d..3b27aa3 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -338,8 +338,8 @@ SwVbaFields::Add( const css::uno::Reference 
::ooo::vba::word::XRange  Range,
 throw uno::RuntimeException(Not implemented );
 }
 
-SwVbaRange* pVbaRange = dynamic_cast SwVbaRange* ( Range.get() );
-uno::Reference text::XTextRange  xTextRange = pVbaRange-getXTextRange();
+SwVbaRange rVbaRange = dynamic_castSwVbaRange(*Range.get());
+uno::Reference text::XTextRange  xTextRange = rVbaRange.getXTextRange();
 uno::Reference text::XText  xText = xTextRange-getText();
 xText-insertTextContent( xTextRange, xTextField, true );
 return uno::Reference word::XField ( new SwVbaField( mxParent, 
mxContext, uno::Reference text::XTextDocument ( mxModel, uno::UNO_QUERY_THROW 
), uno::Reference text::XTextField ( xTextField, uno::UNO_QUERY_THROW ) ) );
commit c44c569aeba043fad7ed1a3b7e676d9cde79bfb1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 15:45:01 2014 +0100

coverity#735983 Unchecked dynamic_cast

Change-Id: Id8a2f30e12115049ba107b2e2485ec7206123b08

diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx 
b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 2842a5d..7cd0e7f 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -121,11 +121,11 @@ void SwFrameControlsManager::SetHeaderFooterControl( 
const SwPageFrm* pPageFrm,
 
 Rectangle aPageRect = m_pEditWin-LogicToPixel(

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

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   35 +++
 1 file changed, 26 insertions(+), 9 deletions(-)

New commits:
commit 147d3f61c4730ac1e545b02888a043f88dc8e3ad
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Jun 10 16:33:39 2014 +0200

CppunitTest_sw_ooxmlexport: port testTextFrameBorders to textboxes

Change-Id: Idf837c1eecc3a5e0d6c82126685e4720e78b4481

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index df61c77..33556d1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -522,17 +522,34 @@ DECLARE_OOXMLEXPORT_TEST(testTextFrameBorders, 
textframe-borders.docx)
 {
 uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
-uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), getPropertysal_Int32(xFrame, 
BackColor));
+if (xIndexAccess-getCount())
+{
+// After import, a TextFrame is created by the VML import.
+uno::Referencebeans::XPropertySet 
xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), 
getPropertysal_Int32(xFrame, BackColor));
 
-table::BorderLine2 aBorder = getPropertytable::BorderLine2(xFrame, 
TopBorder);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aBorder.Color);
-CPPUNIT_ASSERT_EQUAL(sal_uInt32(35), aBorder.LineWidth);
+table::BorderLine2 aBorder = getPropertytable::BorderLine2(xFrame, 
TopBorder);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aBorder.Color);
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(35), aBorder.LineWidth);
 
-table::ShadowFormat aShadowFormat = 
getPropertytable::ShadowFormat(xFrame, ShadowFormat);
-CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_BOTTOM_RIGHT, 
aShadowFormat.Location);
-CPPUNIT_ASSERT_EQUAL(sal_Int16(48), aShadowFormat.ShadowWidth);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0x622423), aShadowFormat.Color);
+table::ShadowFormat aShadowFormat = 
getPropertytable::ShadowFormat(xFrame, ShadowFormat);
+CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_BOTTOM_RIGHT, 
aShadowFormat.Location);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(48), aShadowFormat.ShadowWidth);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x622423), aShadowFormat.Color);
+}
+else
+{
+// After export and import, the result is a shape.
+uno::Referencebeans::XPropertySet xShape(getShape(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), 
getPropertysal_Int32(xShape, FillColor));
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), 
getPropertysal_Int32(xShape, LineColor));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(35), getPropertysal_Int32(xShape, 
LineWidth));
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(48), getPropertysal_Int32(xShape, 
ShadowXDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(48), getPropertysal_Int32(xShape, 
ShadowYDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x622423), 
getPropertysal_Int32(xShape, ShadowColor));
+}
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTextframeGradient, textframe-gradient.docx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-10 Thread Jürgen Schmidt

 idlc/source/options.cxx |   52 +++-
 1 file changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 2c5b3e7764d7d3213d3448c3c6c424a19d0c837c
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Tue Jun 10 13:18:31 2014 +

Resolves: #i122368# convert inc paths into short form on windows...

to avoid problem with ucpp

(cherry picked from commit 6e370ddd6b532e7bf12df3aa52f93913f4ea8348)

Conflicts:
idlc/source/options.cxx

Change-Id: Ia8c7dc3a9a7df68a483dd106cd47c8624952aeae

diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index c04603d..9a15ea7 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -24,6 +24,28 @@
 #include rtl/string.hxx
 #include rtl/strbuf.hxx
 
+#include rtl/ustring.hxx
+#include osl/file.hxx
+
+#ifdef WNT
+#   include windows.h
+#endif
+
+/*
+#ifndef WIN32_LEAN_AND_MEAN
+#   define WIN32_LEAN_AND_MEAN
+# ifdef _MSC_VER
+#   pragma warning(push,1)
+# endif
+#   include windows.h
+# ifdef _MSC_VER
+#   pragma warning(pop)
+# endif
+#   include tchar.h
+#   undef WIN32_LEAN_AND_MEAN
+#endif
+*/
+
 #include stdio.h
 #include string.h
 
@@ -169,6 +191,29 @@ bool Options::setOption(char const * option, std::string 
const  rArg)
   return (result);
 }
 
+#ifdef WNT
+/* Helper functiopn to convert windows paths including spaces, brackets etc. 
into
+   a windows short Url. The ucpp preprocessor has problems with such paths and 
returns
+   with error.
+*/
+OString convertIncPathtoShortWindowsPath(const OString incPath) {
+OUString path = OStringToOUString(incPath, RTL_TEXTENCODING_UTF8);
+
+std::vectorsal_Unicode vec(path.getLength() + 1);
+//GetShortPathNameW only works if the file can be found!
+const DWORD len = GetShortPathNameW(
+reinterpret_castLPCWSTR(path.getStr()), 
reinterpret_castLPWSTR(vec[0]), path.getLength() + 1);
+
+if (len  0)
+{
+OUString ret(vec[0], len);
+return OUStringToOString(ret, RTL_TEXTENCODING_UTF8);
+}
+
+return incPath;
+}
+#endif
+
 bool Options::initOptions(std::vector std::string   rArgs) 
throw(IllegalArgument)
 {
   std::vector std::string ::const_iterator first = rArgs.begin(), last = 
rArgs.end();
@@ -225,7 +270,12 @@ bool Options::initOptions(std::vector std::string   
rArgs) throw(IllegalArgum
 if (!buffer.isEmpty())
   buffer.append(' ');
 //  buffer.append(-I\);
-buffer.append(param.getToken(0, ';', k));
+#ifdef WNT
+OString incpath = 
convertIncPathtoShortWindowsPath(param.getToken(0, ';', k));
+#else
+OString incpath = param.getToken(0, ';', k);
+#endif
+buffer.append(incpath);
 //  buffer.append(\);
   } while (k != -1);
   param = buffer.makeStringAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6e/370ddd6b532e7bf12df3aa52f93913f4ea8348

 6e/370ddd6b532e7bf12df3aa52f93913f4ea8348 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1c0a2f5db315e0ec1dc64e3c3f61e74a3d894492
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 10 16:27:03 2014 +0100

Notes added by 'git notes add'

diff --git a/6e/370ddd6b532e7bf12df3aa52f93913f4ea8348 
b/6e/370ddd6b532e7bf12df3aa52f93913f4ea8348
new file mode 100644
index 000..cc4edb4
--- /dev/null
+++ b/6e/370ddd6b532e7bf12df3aa52f93913f4ea8348
@@ -0,0 +1 @@
+merged as: 2c5b3e7764d7d3213d3448c3c6c424a19d0c837c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 oox/source/export/shapes.cxx |1 +
 oox/source/shape/WpsContext.cxx  |3 +++
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   23 ++-
 sw/source/filter/ww8/docxsdrexport.cxx   |   12 ++--
 4 files changed, 28 insertions(+), 11 deletions(-)

New commits:
commit 2b076a0d91ade62e678d42eb61153bf4de4531a2
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Jun 10 17:00:49 2014 +0200

DOCX drawingML export of textboxes: write wps:bodyPr in oox

It's possible to write this tag in oox (so it represents the properties
of the shape) or in sw (so it represents the properties of the shape's
textbox). Do the previous, as the textbox is really just a container in
this use case, nothing more.

If we are at it, also fix the default value of wps:bodyPr's l/r/t/bIns
attributes.

Change-Id: I0571b9d8ea7dc0acd5c61f3e28e18400d305eab3

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 7c3627e..02b005b 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -822,6 +822,7 @@ ShapeExport ShapeExport::WriteTextBox( Reference 
XInterface  xIface, sal_Int3
 if (xPropertySetInfo-hasPropertyByName(TextBox)  
xPropertySet-getPropertyValue(TextBox).getbool())
 {
 
GetTextExport()-WriteTextBox(uno::Referencedrawing::XShape(xIface, 
uno::UNO_QUERY_THROW));
+WriteText( xIface, /*bBodyPr=*/true, /*bText=*/false, 
/*nXmlNamespace=*/nXmlNamespace );
 return *this;
 }
 }
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 90628b2..0163a50 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -86,6 +86,9 @@ oox::core::ContextHandlerRef 
WpsContext::onCreateContext(sal_Int32 nElementToken
 OptValueOUString oValue = rAttribs.getString(aInsets[i]);
 if (oValue.has())
 oInsets[i] = 
oox::drawingml::GetCoordinate(oValue.get());
+else
+// Defaults from the spec: left/right: 91440 EMU, 
top/bottom: 45720 EMU
+oInsets[i] = (aInsets[i] == XML_lIns || aInsets[i] == 
XML_rIns) ? 254 : 127;
 }
 OUString aProps[] = { OUString(LeftBorderDistance), 
OUString(TopBorderDistance), OUString(RightBorderDistance), 
OUString(BottomBorderDistance) };
 OUString aShapeProps[] = { OUString(TextLeftDistance), 
OUString(TextUpperDistance), OUString(TextRightDistance), 
OUString(TextLowerDistance) };
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 33556d1..c106f3c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -900,11 +900,24 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66929, fdo66929.docx)
 // This is wrong because the original node denotes a specific 'left' 
inset, and a default 'top','right','bottom' inset
 uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
-uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 )  , getProperty sal_Int32 ( xFrame, 
LeftBorderDistance ) );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 127 ), getProperty sal_Int32 ( xFrame, 
TopBorderDistance ) );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 254 ), getProperty sal_Int32 ( xFrame, 
RightBorderDistance ) );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 127 ), getProperty sal_Int32 ( xFrame, 
BottomBorderDistance ) );
+if (xIndexAccess-getCount())
+{
+// VML import - TextFrame
+uno::Referencebeans::XPropertySet 
xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 )  , getProperty sal_Int32 ( 
xFrame, LeftBorderDistance ) );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 127 ), getProperty sal_Int32 ( 
xFrame, TopBorderDistance ) );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 254 ), getProperty sal_Int32 ( 
xFrame, RightBorderDistance ) );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 127 ), getProperty sal_Int32 ( 
xFrame, BottomBorderDistance ) );
+}
+else
+{
+// drawingML import - shape with TextBox
+uno::Referencebeans::XPropertySet xShape(getShape(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xShape, 
TextLeftDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(127), getPropertysal_Int32(xShape, 
TextUpperDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(254), getPropertysal_Int32(xShape, 
TextRightDistance));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(127), getPropertysal_Int32(xShape, 
TextLowerDistance));
+}
 }

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

2014-06-10 Thread Oliver-Rainer Wittmann

 sw/source/core/unocore/unoframe.cxx |  121 +++-
 1 file changed, 66 insertions(+), 55 deletions(-)

New commits:
commit 4a76d7f700da112a553ec9d9811731e645581a7f
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Jun 10 14:49:06 2014 +

125072: method SwGraphicProperties_Impl::AnyToItemSet(..) - map given 
style name to corresponding UI name before searching for it.

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 8fd6b3f..0765c03 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -991,23 +991,24 @@ inline void lcl_FillMirror ( SfxItemSet rToSet, const :: 
SfxItemSet rFromSet,
 }
 }
 
-sal_BoolSwGraphicProperties_Impl::AnyToItemSet(
-SwDoc* pDoc,
-SfxItemSet rFrmSet,
-SfxItemSet rGrSet,
-sal_Bool rSizeFound)
-{
-//Properties fuer alle Frames
-sal_Bool bRet;
-const ::uno::Any *pStyleName;
-SwDocStyleSheet* pStyle = NULL;
+sal_Bool SwGraphicProperties_Impl::AnyToItemSet(
+SwDoc* pDoc,
+SfxItemSet rFrmSet,
+SfxItemSet rGrSet,
+sal_Bool rSizeFound )
+{
+sal_Bool bRet = sal_False;
 
-if ( GetProperty ( FN_UNO_FRAME_STYLE_NAME, 0, pStyleName ) )
+SwDocStyleSheet* pStyle = NULL;
+const ::uno::Any *pStyleName;
+if ( GetProperty( FN_UNO_FRAME_STYLE_NAME, 0, pStyleName ) )
 {
-OUString sStyle;
-*pStyleName = sStyle;
-pStyle = 
(SwDocStyleSheet*)pDoc-GetDocShell()-GetStyleSheetPool()-Find(sStyle,
-SFX_STYLE_FAMILY_FRAME);
+OUString sTmpStylename;
+*pStyleName = sTmpStylename;
+String sStylename;
+SwStyleNameMapper::FillUIName( String(sTmpStylename), sStylename, 
nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, sal_True );
+pStyle =
+(SwDocStyleSheet*) pDoc-GetDocShell()-GetStyleSheetPool()-Find( 
sStylename, SFX_STYLE_FAMILY_FRAME );
 }
 
 const ::uno::Any* pHEvenMirror = 0;
@@ -1017,24 +1018,22 @@ sal_BoolSwGraphicProperties_Impl::AnyToItemSet(
 GetProperty(RES_GRFATR_MIRRORGRF, MID_MIRROR_HORZ_ODD_PAGES, pHOddMirror);
 GetProperty(RES_GRFATR_MIRRORGRF, MID_MIRROR_VERT, pVMirror);
 
-if ( pStyle )
+if ( pStyle != NULL )
 {
 rtl::Reference SwDocStyleSheet  xStyle( new SwDocStyleSheet(*pStyle) 
);
 const :: SfxItemSet *pItemSet = xStyle-GetItemSet();
-//Begin Bug 119922
 sal_Bool bOasis = sal_False;
 {
 const SfxMedium* pMedium = pDoc-GetDocShell()-GetMedium();
-const SfxFilter * pFilter = pMedium
-? pMedium-GetFilter()
-: NULL;
-if ( pMedium  pFilter )
+const SfxFilter * pFilter = pMedium != NULL
+? pMedium-GetFilter()
+: NULL;
+if ( pFilter != NULL )
 {
 bOasis = pFilter-GetVersion()  SOFFICE_FILEFORMAT_60;
 }
 }
 bRet = FillBaseProperties( rFrmSet, *pItemSet, rSizeFound, bOasis );
-//End Bug 119922
 lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, 
pVMirror, bRet );
 }
 else
@@ -1044,8 +1043,7 @@ sal_BoolSwGraphicProperties_Impl::AnyToItemSet(
 lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, 
pVMirror, bRet );
 }
 
-
-static const :: sal_uInt16 nIDs[] =
+static const ::sal_uInt16 nIDs[] =
 {
 RES_GRFATR_CROPGRF,
 RES_GRFATR_ROTATION,
@@ -1061,14 +1059,14 @@ sal_BoolSwGraphicProperties_Impl::AnyToItemSet(
 0
 };
 const ::uno::Any* pAny;
-for(sal_Int16 nIndex = 0; nIDs[nIndex]; nIndex++)
+for ( sal_Int16 nIndex = 0; nIDs[nIndex]; nIndex++ )
 {
-sal_uInt8 nMId = RES_GRFATR_CROPGRF == nIDs[nIndex] ? CONVERT_TWIPS : 
0;
-if(GetProperty(nIDs[nIndex], nMId, pAny ))
+const sal_uInt8 nMId = RES_GRFATR_CROPGRF == nIDs[nIndex] ? 
CONVERT_TWIPS : 0;
+if ( GetProperty( nIDs[nIndex], nMId, pAny ) )
 {
 SfxPoolItem* pItem = ::GetDfltAttr( nIDs[nIndex] )-Clone();
-bRet = pItem-PutValue(*pAny, nMId );
-rGrSet.Put(*pItem);
+bRet = pItem-PutValue( *pAny, nMId );
+rGrSet.Put( *pItem );
 delete pItem;
 }
 }
@@ -1076,6 +1074,7 @@ sal_BoolSwGraphicProperties_Impl::AnyToItemSet(
 return bRet;
 }
 
+
 class SwOLEProperties_Impl : public SwFrameProperties_Impl
 {
 public:
@@ -1086,17 +1085,22 @@ public:
 virtual sal_BoolAnyToItemSet( SwDoc* pDoc, SfxItemSet rFrmSet, 
SfxItemSet rSet, sal_Bool rSizeFound);
 };
 
-sal_Bool  SwOLEProperties_Impl::AnyToItemSet(
-SwDoc* pDoc, SfxItemSet rFrmSet, SfxItemSet rSet, sal_Bool 
rSizeFound)
+
+sal_Bool SwOLEProperties_Impl::AnyToItemSet(
+SwDoc* pDoc,
+

Re: LibreOficce

2014-06-10 Thread Jacobo Aragunde Pérez

El 06/06/14 18:02, Otilio Zea Espinoza escribió:
 Buen Día me gustaría participar en la comunidad libreoffice, si pudiese
 hacerme llegar los requerimientos para poder ser miembro.
 
 saludos.
 

Hola Otilio,

la comunidad de LibreOffice es totalmente abierta, no necesitas ser un
miembro para contribuir :)

En la web tienes algunas ideas para empezar, dependiendo de tu perfil
(desarrollo, diseño, control de calidad, traducción...), con links de
interés para cada área:

http://www.libreoffice.org/community/get-involved/

Finalmente, aunque algunos podemos responder en español, esta lista de
correo funciona principalmente en inglés. Si es posible, plantea tus
dudas en inglés para obtener respuesta más rápido :)

Un saludo,
-- 
Jacobo Aragunde
Software Engineer at Igalia
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gtkbmptiledviewer' - 2 commits - desktop/source include/basebmp

2014-06-10 Thread Andrzej Hunt

 desktop/source/lib/init.cxx |   17 -
 include/basebmp/rgbmaskpixelformats.hxx |   10 ++
 2 files changed, 10 insertions(+), 17 deletions(-)

New commits:
commit cd2b3d50447efe38bf3a7dae14079c2b48549c12
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Tue Jun 10 17:15:49 2014 +0100

Add base value to set alpha channel for 32 bit colourspaces.

Currently the alpha channel is completely ignored by basebmp.
However this results in completely transparent output, meaning
the client has to manually overwrite the alpha channel -- instead
we now set it automatically when writing colourdata.

Unfortunately this doesn't quite work -- it seems that drawing
a non-opaque bitmap/image on top of the existing bitmap can
erase the alpha channel information (i.e. these areas will
once again be transparent -- for example document borders seem
to have a transition effect overlayed onto them): presumably
there is some method that bypasses our RGBMaskSetter (probably
some form of direct manipulation of raw values?).
manipulation in basebmp

Change-Id: Ia4be6a748cc30191a4422121f9ec347d9198b225

diff --git a/include/basebmp/rgbmaskpixelformats.hxx 
b/include/basebmp/rgbmaskpixelformats.hxx
index d1d9b84..696f35a 100644
--- a/include/basebmp/rgbmaskpixelformats.hxx
+++ b/include/basebmp/rgbmaskpixelformats.hxx
@@ -148,6 +148,7 @@ template typename PixelType,
 
 template typename PixelType,
   typename ColorType,
+  unsigned int BaseValue,
   unsigned int RedMask,
   unsigned int GreenMask,
   unsigned int BlueMask,
@@ -174,6 +175,7 @@ template typename PixelType,
 const typename base_type::unsigned_pixel_type blue (c.getBlue());
 
 typename base_type::unsigned_pixel_type res(
+BaseValue |
 (shiftLeft(red,
base_type::red_shift-8*
(signed)sizeof(typename base_type::component_type)+
@@ -194,6 +196,7 @@ template typename PixelType,
 
 
 template typename PixelType,
+  unsigned int BaseValue,
   unsigned int RedMask,
   unsigned int GreenMask,
   unsigned int BlueMask,
@@ -209,6 +212,7 @@ template typename PixelType,
   SwapBytesgetter_type;
 typedef RGBMaskSetterpixel_type,
   Color,
+  BaseValue,
   RedMask,
   GreenMask,
   BlueMask,
@@ -256,6 +260,7 @@ template typename PixelType,
 // 16bpp MSB RGB
 typedef PixelFormatTraitsTemplate_RGBMask
 sal_uInt16,
+0,
 0xF800,
 0x07E0,
 0x001F,
@@ -266,6 +271,7 @@ 
BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_RGB16_565_MSB::getter_type,
 // 16bpp LSB RGB
 typedef PixelFormatTraitsTemplate_RGBMask
 sal_uInt16,
+0,
 0xF800,
 0x07E0,
 0x001F,
@@ -286,6 +292,7 @@ 
BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_RGB16_565_LSB::getter_type,
 
 typedef PixelFormatTraitsTemplate_RGBMask
 sal_uInt32,
+0xFF00,
 0x00FF,
 0xFF00,
 0x00FF,
@@ -297,6 +304,7 @@ 
BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGRX32_::getter_type,
 
 typedef PixelFormatTraitsTemplate_RGBMask
 sal_uInt32,
+0xFF00,
 0x00FF,
 0xFF00,
 0x00FF,
@@ -308,6 +316,7 @@ 
BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_XRGB32_::getter_type,
 
 typedef PixelFormatTraitsTemplate_RGBMask
 sal_uInt32,
+0x00FF,
 0xFF00,
 0x00FF,
 0xFF00,
@@ -317,6 +326,7 @@ 
BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_XBGR32_::getter_type,
 
 typedef PixelFormatTraitsTemplate_RGBMask
 sal_uInt32,
+0x00FF,
 0xFF00,
 0x00FF,
 0xFF00,
commit 37a9f11e0894de9b2de0128034095c14aec5c3c6
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Sun May 25 18:30:00 2014 +0100

Get rid of outdated comments.

We can now set the colourspace as desired, and we return the rowstride too.

Change-Id: Idf1e55a67b9e9ab58e82d7ed0be2813b682ec2ff

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fcdc358..2905949 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -381,23 +381,6 @@ static void doc_setPart(LibreOfficeDocument* pThis, int 
nPart)
 (void) nPart;
 }
 
-// TODO: Not 100% sure about the bitmap buffer format yet -- it appears
-// to just be RGB, 8 bits per sample, and vertically mirrored compared
-// to what gtk expects.
-// The BitmapDevice actually supports various formats, as detailed in
-// basebmp/scanlineformat.hxx -- for svp SVP_DEFAULT_BITMAP_FORMAT is 
seemingly used
-// (see creation in svpvd.cxx) -- which is simply FORMAT_TWENTYFOUR_BIT_TC_MASK
-// for now -- we could probably adjust this as necessary to get

[Bug 75025] LibreOffice 4.3 most annoying bugs

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

Bug 75025 depends on bug 79818, which changed state.

Bug 79818 Summary: DOCX DATALOSS: Line breaks lost after edit-and-save
https://bugs.freedesktop.org/show_bug.cgi?id=79818

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

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

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

2014-06-10 Thread Ravindra Vidhate

 sw/qa/extras/ooxmlexport/data/fdo78887.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   11 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |   11 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 637a96d1e7875043c28a93c9a543f33a862497cb
Author: Ravindra Vidhate ravindra.vidh...@synerzip.com
Date:   Wed May 21 14:54:35 2014 +0530

fdo#78887 w:br tag is not being preserved after export.

When we have w:br tag continuous like in the following cases...

Title: Superstition\v\vComposer: Stevie Wonder\v\v
or \vLyrics: \v

where \n is internally replaced by \v LO.

Before text \v or after text multiple \v is not preserved.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9420

(cherry picked from commit 8555c24e069dc00071eaad23c711f1d1375e5afc)
Signed-off-by: Michael Stahl mst...@redhat.com

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Change-Id: I2a6d0a7d2382dfbc2f0ab04f150653c9b17bbfd1

diff --git a/sw/qa/extras/ooxmlexport/data/fdo78887.docx 
b/sw/qa/extras/ooxmlexport/data/fdo78887.docx
new file mode 100644
index 000..db92fe4
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78887.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a87ddef..668caa3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3180,6 +3180,17 @@ DECLARE_OOXMLEXPORT_TEST(testFDO77890 , fdo77890.docx)
 assertXPath(pXmlDoc, /w:document/w:body/w:p[2]/w:r[2]/w:br, type, 
page);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFDO78887, fdo78887.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc, /w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:br[1], 1);
+assertXPathContent(pXmlDoc, 
/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:t[1], Lyrics: );
+assertXPath(pXmlDoc, /w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:br[2], 1);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testNumberedList,NumberedList.docx)
 {
 //fdo74150:In document.xml, for pStyle = NumberedList1, iLvl and numId 
was not preserved
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f16fdf6..3eba470 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1680,6 +1680,8 @@ void DocxAttributeOutput::RunText( const OUString rText, 
rtl_TextEncoding /*eCh
 if ( m_pRedlineData  m_pRedlineData-GetType() == 
nsRedlineType_t::REDLINE_DELETE )
 nTextToken = XML_delText;
 
+sal_Unicode prevUnicode = *pBegin;
+
 for ( const sal_Unicode *pIt = pBegin; pIt  pEnd; ++pIt )
 {
 switch ( *pIt )
@@ -1687,20 +1689,26 @@ void DocxAttributeOutput::RunText( const OUString 
rText, rtl_TextEncoding /*eCh
 case 0x09: // tab
 impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
 m_pSerializer-singleElementNS( XML_w, XML_tab, FSEND );
+prevUnicode = *pIt;
 break;
 case 0x0b: // line break
 {
-if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin, 
pIt ))
+if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin, 
pIt ) || (prevUnicode == *pIt))
+{
 m_pSerializer-singleElementNS( XML_w, XML_br, FSEND );
+prevUnicode = *pIt;
+}
 }
 break;
 case 0x1E: //non-breaking hyphen
 impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
 m_pSerializer-singleElementNS( XML_w, XML_noBreakHyphen, 
FSEND );
+prevUnicode = *pIt;
 break;
 case 0x1F: //soft (on demand) hyphen
 impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
 m_pSerializer-singleElementNS( XML_w, XML_softHyphen, FSEND );
+prevUnicode = *pIt;
 break;
 default:
 if ( *pIt  0x0020 ) // filter out the control codes
@@ -1708,6 +1716,7 @@ void DocxAttributeOutput::RunText( const OUString rText, 
rtl_TextEncoding /*eCh
 impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt 
);
 OSL_TRACE( Ignored control code %x in a text run., *pIt 
);
 }
+prevUnicode = *pIt;
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 6 commits - cui/source editeng/source framework/source include/svtools include/vcl sc/source starmath/source svtools/source svx/sourc

2014-06-10 Thread Markus Mohrhard

 cui/source/options/fontsubs.cxx   |2 
 cui/source/tabpages/chardlg.cxx   |   18 ++---
 cui/source/tabpages/numpages.cxx  |2 
 editeng/source/editeng/editview.cxx   |2 
 framework/source/uielement/fontsizemenucontroller.cxx |2 
 include/svtools/ctrlbox.hxx   |6 -
 include/svtools/ctrltool.hxx  |   24 +++
 include/svtools/stdmenu.hxx   |6 +
 include/vcl/metric.hxx|   13 +---
 include/vcl/outdev.hxx|7 +-
 sc/source/filter/excel/excrecds.cxx   |3 
 sc/source/filter/excel/xecontent.cxx  |2 
 sc/source/filter/excel/xehelper.cxx   |2 
 sc/source/filter/excel/xistyle.cxx|2 
 sc/source/filter/inc/pivotcachebuffer.hxx |2 
 sc/source/filter/oox/pivotcachebuffer.cxx |2 
 sc/source/filter/xml/xmldpimp.cxx |1 
 starmath/source/dialog.cxx|2 
 svtools/source/control/ctrlbox.cxx|   12 +--
 svtools/source/control/ctrltool.cxx   |   58 +-
 svtools/source/control/stdmenu.cxx|4 -
 svx/source/mnuctrls/fntszctl.cxx  |2 
 svx/source/sidebar/nbdtmg.cxx |   44 ++---
 svx/source/sidebar/text/SvxSBFontNameBox.cxx  |2 
 svx/source/sidebar/text/TextPropertyPanel.cxx |2 
 svx/source/tbxctrls/tbcontrl.cxx  |4 -
 svx/source/tbxctrls/tbunocontroller.cxx   |2 
 sw/source/core/unocore/unocrsrhelper.cxx  |2 
 sw/source/core/unocore/unosett.cxx|2 
 sw/source/core/unocore/unostyle.cxx   |2 
 sw/source/filter/html/svxcss1.cxx |2 
 sw/source/filter/html/swhtml.cxx  |2 
 sw/source/ui/config/optpage.cxx   |6 -
 sw/source/ui/dialog/ascfldlg.cxx  |2 
 sw/source/ui/docvw/srcedtw.cxx|2 
 vcl/source/gdi/metric.cxx |   12 ++-
 vcl/workben/svptest.cxx   |2 
 37 files changed, 121 insertions(+), 141 deletions(-)

New commits:
commit cb69529953b90581d06d4f1ce4c988bd43eac300
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed Jun 4 23:37:40 2014 +0200

make that variable protected again

Change-Id: I17235397e490458c250165c36bec97bf1ce326d7

diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 1836cce..e746e57 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -33,9 +33,10 @@ namespace vcl {
 
 class VCL_DLLPUBLIC FontInfo : public Font
 {
-friend class OutputDevice;
+friend class ::OutputDevice;
 
 protected:
+ImplFontMetric* mpImplMetric;// Implementation
 
 public:
 FontInfo();
@@ -48,7 +49,6 @@ public:
 sal_Booloperator==( const FontInfo ) const;
 sal_Booloperator!=( const FontInfo rInfo ) const
 { return !operator==( rInfo ); }
-ImplFontMetric* mpImplMetric;// Implementation
 };
 
 }
commit d4029e62e7e3e7f58840753b368b20ef87cb3c11
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed Jun 4 07:48:15 2014 +0200

avoid problems with poppler's and vcl's FontInfo during runtime

Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8

Conflicts:
include/vcl/metric.hxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/stdmenu.cxx
svx/source/sidebar/nbdtmg.cxx

Conflicts:
include/svtools/ctrltool.hxx
include/vcl/metric.hxx
include/vcl/outdev.hxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/stdmenu.cxx
svx/source/sidebar/nbdtmg.cxx
sw/source/core/uibase/docvw/srcedtw.cxx
vcl/source/gdi/metric.cxx
vcl/source/outdev/font.cxx

diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 06afeb5..00a84b3 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -326,7 +326,7 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, 
pBox)
 sal_uInt16 nFontCount = aFntLst.GetFontNameCount();
 for(sal_uInt16 nFont = 0; nFont  nFontCount; nFont++)
 {
-const FontInfo rInfo = aFntLst.GetFontName( nFont );
+const vcl::FontInfo rInfo = aFntLst.GetFontName( nFont );
 if(!bNonPropOnly || rInfo.GetPitch() == PITCH_FIXED)
 m_pFontNameLB-InsertEntry(rInfo.GetName());
 }
diff --git

[Libreoffice-commits] core.git: 2 commits - sw/qa

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   33 +--
 1 file changed, 27 insertions(+), 6 deletions(-)

New commits:
commit ab4279d7f2e613f69d21eef1e3ba6bf09b708b00
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Jun 10 18:27:16 2014 +0200

CppunitTest_sw_ooxmlexport: port testTableFloating to textboxes

Change-Id: Ie20e0ca939139c952f3524c7dae494e24bc7cab7

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 50703c0..8bf3a58 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1084,11 +1084,24 @@ DECLARE_OOXMLEXPORT_TEST(testTableFloating, 
table-floating.docx)
 
 uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
-uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), 
uno::UNO_QUERY);
-// This was 0, should be the the opposite of (left margin + half of the 
border width).
-CPPUNIT_ASSERT_EQUAL(sal_Int32(-199), getPropertysal_Int32(xFrame, 
HoriOrientPosition));
-// Was 0 as well, should be the right margin.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(250), getPropertysal_Int32(xFrame, 
RightMargin));
+if (xIndexAccess-getCount())
+{
+// After import, table is inside a TextFrame.
+uno::Referencebeans::XPropertySet 
xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY);
+// This was 0, should be the the opposite of (left margin + half of 
the border width).
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-199), getPropertysal_Int32(xFrame, 
HoriOrientPosition));
+// Was 0 as well, should be the right margin.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(250), getPropertysal_Int32(xFrame, 
RightMargin));
+}
+else
+{
+// After import, table is inside a TextFrame.
+uno::Referencebeans::XPropertySet xShape(getShape(1), 
uno::UNO_QUERY);
+// This was 0, should be the the opposite of (left margin + half of 
the border width).
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-198), getPropertysal_Int32(xShape, 
HoriOrientPosition));
+// Was 0 as well, should be the right margin.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(250), getPropertysal_Int32(xShape, 
RightMargin));
+}
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFdo44689_start_page_0, 
fdo44689_start_page_0.docx)
commit 13f7b89c2c74bfe9afa43a4d2187b848aaa5c94d
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Jun 10 18:05:08 2014 +0200

CppunitTest_sw_ooxmlexport: port testFdo60990 to textboxes

Change-Id: I5871ca0c3eea931e2144d7a469844cf3a69d0038

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c106f3c..50703c0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -984,9 +984,17 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66781, fdo66781.docx)
 
 DECLARE_OOXMLEXPORT_TEST(testFdo60990, fdo60990.odt)
 {
+// TODO TextBox: remove this when TextBox is enabled by default
+uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+bool bTextBox = xIndexAccess-getCount() == 0;
+
 // The shape had no background, no paragraph adjust and no font color.
 uno::Referencebeans::XPropertySet xShape(getShape(1), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00CFE7F5), getPropertysal_Int32(xShape, 
BackColor));
+if (bTextBox)
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00CFE7F5), 
getPropertysal_Int32(xShape, FillColor));
+else
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00CFE7F5), 
getPropertysal_Int32(xShape, BackColor));
 uno::Referencetext::XText xText = 
uno::Referencetext::XTextRange(xShape, uno::UNO_QUERY)-getText();
 uno::Referencetext::XTextRange xParagraph = getParagraphOfText(1, xText);
 CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, 
static_caststyle::ParagraphAdjust(getPropertysal_Int16(xParagraph, 
ParaAdjust)));
___
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-5' - translations

2014-06-10 Thread Christian Lohmaier

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

New commits:
commit 0435ab72ef3a552be99c811e74a5dbd596059a5c
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Tue Jun 10 18:30:07 2014 +0200

Updated core
Project: translations  1bda7282ad445ea158421ffeb43776ea8fb1b779

diff --git a/translations b/translations
index 406327a..1bda728 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 406327a908ebc52f11058a14803ae0516b3f0008
+Subproject commit 1bda7282ad445ea158421ffeb43776ea8fb1b779
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ba/200f7255e3275044c0fa69219ad24aa3fd9d80

 ba/200f7255e3275044c0fa69219ad24aa3fd9d80 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 14a7a6ee0f3501c27f0454f5b5a6d9fac36ae2f5
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 10 19:02:46 2014 +0200

Notes added by 'git notes add'

diff --git a/ba/200f7255e3275044c0fa69219ad24aa3fd9d80 
b/ba/200f7255e3275044c0fa69219ad24aa3fd9d80
new file mode 100644
index 000..0768628
--- /dev/null
+++ b/ba/200f7255e3275044c0fa69219ad24aa3fd9d80
@@ -0,0 +1 @@
+prefer: 6f6673c5d1b4e6ea4982621f2817eb5d5dc10377
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 75ebb553bf6523e9548e48262f12d2cbd3dc
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Jun 10 19:00:51 2014 +0200

CppunitTest_sw_ooxmlexport: port testTextBoxGradientAngle to textboxes

Change-Id: Id17c7d4cf9c9bcb81d0da486c9bce44abb04b6cd

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8bf3a58..4b5de65 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1791,8 +1791,8 @@ DECLARE_OOXMLEXPORT_TEST(testHyperlineIsEnd, 
hyperlink.docx)
 
 DECLARE_OOXMLEXPORT_TEST(testTextBoxGradientAngle, fdo65295.docx)
 {
-uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(8), xIndexAccess-getCount());
 
 // Angle of frame#1 is 135 degrees, but 'aGradient.Angle' holds value in 
1/10 of a degree
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-10 Thread Zolnai Tamás

 dev/null|binary
 oox/source/drawingml/textbodyproperties.cxx |6 +--
 oox/source/drawingml/transform2dcontext.cxx |   56 +++-
 sd/qa/unit/data/pptx/bnc862510_5.pptx   |binary
 sd/qa/unit/import-tests.cxx |   44 +++---
 5 files changed, 57 insertions(+), 49 deletions(-)

New commits:
commit 98dd0f2bb5801f974374ef341037e094e4275cbb
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Tue Jun 10 18:19:30 2014 +0200

Related bnc#862510: extend handling of txXfrm

We don't actually need to check mbAnchorCtr to change
text spacing. This txXfrm workaround works only with rectangles,
because other shapes' text area can be smaller then the shape
size. So add some condition to avoid using it for
other shapes.

Plus fix typos cause regression introduced in:
53c376d35b7223d53e8c9403390afe53d1f69089

Change-Id: I87917b8e0b2bb97ae1bba773e7dda7f81682736f

diff --git a/oox/source/drawingml/textbodyproperties.cxx 
b/oox/source/drawingml/textbodyproperties.cxx
index 9899fbb..dfa3d60 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -81,9 +81,9 @@ void TextBodyProperties::pushRotationAdjustments( sal_Int32 
nRotation )
 // Hack for n#760986
 // TODO: Preferred method would be to have a textbox on top
 // of the shape and the place it according to the (off,ext)
-if( nOff == 0  moTextOffLeft  mbAnchorCtr ) nVal = *moTextOffLeft;
-if( nOff == 1  moTextOffUpper ) nVal = *moTextOffLeft;
-if( nOff == 2  moTextOffRight  mbAnchorCtr ) nVal = 
*moTextOffRight;
+if( nOff == 0  moTextOffLeft  ) nVal = *moTextOffLeft;
+if( nOff == 1  moTextOffUpper ) nVal = *moTextOffUpper;
+if( nOff == 2  moTextOffRight ) nVal = *moTextOffRight;
 if( nOff == 3  moTextOffLower ) nVal = *moTextOffLower;
 if( nVal  0 ) nVal = 0;
 
diff --git a/oox/source/drawingml/transform2dcontext.cxx 
b/oox/source/drawingml/transform2dcontext.cxx
index c036b50..d3f7f5e 100644
--- a/oox/source/drawingml/transform2dcontext.cxx
+++ b/oox/source/drawingml/transform2dcontext.cxx
@@ -55,37 +55,43 @@ ContextHandlerRef Transform2DContext::onCreateContext( 
sal_Int32 aElementToken,
 {
 if( mbtxXfrm )
 {
-switch( aElementToken )
+// Workaround: only for rectangles
+const sal_Int32 nType = 
mrShape.getCustomShapeProperties()-getShapePresetType();
+if( nType == XML_rect || nType == XML_roundRect )
 {
-case A_TOKEN( off ):
-{
-OUString sXValue = rAttribs.getString( XML_x ).get();
-OUString sYValue = rAttribs.getString( XML_y ).get();
-if( !sXValue.isEmpty() )
-
mrShape.getTextBody()-getTextProperties().moTextOffUpper = GetCoordinate( 
sXValue.toInt32() - mrShape.getPosition().X );
-if( !sYValue.isEmpty() )
-
mrShape.getTextBody()-getTextProperties().moTextOffLeft = GetCoordinate( 
sYValue.toInt32() - mrShape.getPosition().Y );
-}
-break;
-case A_TOKEN( ext ):
-{
-const OUString sXValue = rAttribs.getString( XML_cx 
).get();
-const OUString sYValue = rAttribs.getString( XML_cy 
).get();
-if( !sXValue.isEmpty() )
+switch( aElementToken )
+{
+case A_TOKEN( off ):
 {
-
mrShape.getTextBody()-getTextProperties().moTextOffRight = 
GetCoordinate(mrShape.getSize().Width - sXValue.toInt32());
-if( 
mrShape.getTextBody()-getTextProperties().moTextOffLeft )
-   
*mrShape.getTextBody()-getTextProperties().moTextOffRight -=  
*mrShape.getTextBody()-getTextProperties().moTextOffLeft;
+const OUString sXValue = rAttribs.getString( XML_x 
).get();
+const OUString sYValue = rAttribs.getString( XML_y 
).get();
+if( !sXValue.isEmpty()  nType == XML_rect )
+
mrShape.getTextBody()-getTextProperties().moTextOffLeft = GetCoordinate( 
sXValue.toInt32() - mrShape.getPosition().X );
+if( !sYValue.isEmpty() )
+
mrShape.getTextBody()-getTextProperties().moTextOffUpper = GetCoordinate( 
sYValue.toInt32() - mrShape.getPosition().Y );
 }
-if( !sYValue.isEmpty() )
+break;
+case A_TOKEN( ext ):
 {
-
mrShape.getTextBody()-getTextProperties().moTextOffLower = 
GetCoordinate(mrShape.getSize().Height - sYValue.toInt32());
-if( 
mrShape.getTextBody()-getTextProperties().moTextOffUpper )
-

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

 sc/source/core/opencl/formulagroupcl.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6519665576343f8a6f6d3bf2ccc57212ff4e2a59
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 10 19:17:47 2014 +0200

loplugin:bodynotinblock

Change-Id: Ia403e6c6c6747479adfc5d77b1306d9383b3e706

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 5f6b4ff..07900ad 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -411,7 +411,7 @@ size_t DynamicKernelStringArgument::Marshal(cl_kernel k, 
int argno, int, cl_prog
 else
 {
 if (nStrings == 0)
-szHostBuffer = sizeof(cl_int); // a dummy small value
+szHostBuffer = sizeof(cl_int); // a dummy small value
 // Marshal as a buffer of NANs
 mpClmem = clCreateBuffer(kEnv.mpkContext,
 (cl_mem_flags) CL_MEM_READ_ONLY|CL_MEM_ALLOC_HOST_PTR,
@@ -419,7 +419,7 @@ size_t DynamicKernelStringArgument::Marshal(cl_kernel k, 
int argno, int, cl_prog
 if (CL_SUCCESS != err)
 throw OpenCLError(err, __FILE__, __LINE__);
 
-pHashBuffer = (cl_uint*)clEnqueueMapBuffer(
+pHashBuffer = (cl_uint*)clEnqueueMapBuffer(
 kEnv.mpkCmdQueue, mpClmem, CL_TRUE, CL_MAP_WRITE, 0,
 szHostBuffer, 0, NULL, NULL, err);
 if (CL_SUCCESS != err)
@@ -1489,7 +1489,7 @@ public:
 ss  \tint i;\n\t;
 ss  int currentCount0;\n;
 for ( unsigned i = 0; i  vSubArguments.size()-1; i++)
-ss  int currentCounti+1;\n;
+ss  int currentCounti+1;\n;
 std::stringstream temp3,temp4;
 int outLoopSize = UNROLLING_FACTOR;
 if (nCurWindowSize/outLoopSize != 0){
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93152e2633c3da2b1993c69857baf11edada705e
Author: Baptiste Daroussin b...@freebsd.org
Date:   Tue Jun 10 18:22:53 2014 +0200

On FreeBSD x86_64 is named amd64

Change-Id: I14c653f8b3fe0dc9855aa51643cfc40cbccb763e
Reviewed-on: https://gerrit.libreoffice.org/9714
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/configure.ac b/configure.ac
index 63e9667..65dd75e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4209,7 +4209,7 @@ freebsd*)
 PLATFORMID=freebsd_x86
 OUTPATH=unxfbsdi
 ;;
-x86_64)
+x86_64|amd64)
 CPUNAME=X86_64
 RTL_ARCH=X86_64
 PLATFORMID=freebsd_x86_64
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-10 Thread Adam Co

 include/oox/export/utils.hxx  |
4 
 oox/source/drawingml/lineproperties.cxx   |   
15 +-
 oox/source/drawingml/linepropertiescontext.cxx|   
46 +++
 oox/source/export/drawingml.cxx   |   
51 +---
 sw/qa/extras/ooxmlexport/data/dashed_line_custdash_1000th_of_percent.docx 
|binary
 sw/qa/extras/ooxmlexport/data/dashed_line_custdash_percentage.docx
|binary
 sw/qa/extras/ooxmlexport/data/dashed_line_preset.docx 
|binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx   |   
62 ++
 8 files changed, 155 insertions(+), 23 deletions(-)

New commits:
commit 2211a67cc5e577f8abdcc96c9c63865be5fb988d
Author: Adam Co rattles2...@gmail.com
Date:   Sun Jun 8 16:35:32 2014 +0300

Rewrite import and export of custom dashes in ooxml filter (fix)

The import mechanism of custom-dash (a:custDash) was wrong, and imported
wrong values, which causes that if you would import-export-import-export -
you would get inflated values, which might cause a corruption.

The attributes for custom-dash nodes (a:ds) are of type 
'PositivePercentage'.
Office will read percentages formatted with a trailing percent sign or
formatted as 1000th of a percent without a trailing percent sign, but only
write percentages as 1000th's of a percent without a trailing percent sign.

During import - LO did not check if it was in '%' format or in
'1000th of a percent' format. So that was fixed. Also - when exporting -
it always exports now in '1000th of a percent' format.

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

diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 06ddfe3..b6bafdd 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -49,9 +49,9 @@ static inline sal_Int64 TwipsToEMU( sal_Int32 nTwips )
 }
 
 template typename T
-OString writePercentage(T number)
+OString write1000thOfAPercent(T number)
 {
-return OString::number(number) + %;
+return OString::number( number * 1000 );
 }
 
 #endif
diff --git a/oox/source/drawingml/lineproperties.cxx 
b/oox/source/drawingml/lineproperties.cxx
index 2044095..372740b 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -107,19 +107,26 @@ void lclConvertCustomDash( LineDash orLineDash, const 
LineProperties::DashStopV
 sal_Int16 nDashes = 0;
 sal_Int32 nDashLen = 0;
 sal_Int32 nDistance = 0;
+sal_Int32 nConvertedLen = 0;
+sal_Int32 nConvertedDistance = 0;
 for( LineProperties::DashStopVector::const_iterator aIt = 
rCustomDash.begin(), aEnd = rCustomDash.end(); aIt != aEnd; ++aIt )
 {
-if( aIt-first = 2 )
+// Get from 1000th of percent == percent == multiplier
+nConvertedLen  = aIt-first  / 1000 / 100;
+nConvertedDistance = aIt-second / 1000 / 100;
+
+// Check if it is a dot (100% = dot)
+if( nConvertedLen == 1 )
 {
 ++nDots;
-nDotLen += aIt-first;
+nDotLen += nConvertedLen;
 }
 else
 {
 ++nDashes;
-nDashLen += aIt-first;
+nDashLen += nConvertedLen;
 }
-nDistance += aIt-second;
+nDistance += nConvertedDistance;
 }
 orLineDash.DotLen = (nDots  0) ? ::std::max sal_Int32 ( nDotLen / 
nDots, 1 ) : 0;
 orLineDash.Dots = nDots;
diff --git a/oox/source/drawingml/linepropertiescontext.cxx 
b/oox/source/drawingml/linepropertiescontext.cxx
index 3195e56..ee49fba 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -66,8 +66,50 @@ ContextHandlerRef LinePropertiesContext::onCreateContext( 
sal_Int32 nElement, co
 return this;
 break;
 case A_TOKEN( ds ):
-mrLineProperties.maCustomDash.push_back( LineProperties::DashStop(
-rAttribs.getInteger( XML_d, 0 ), rAttribs.getInteger( XML_sp, 
0 ) ) );
+{
+// 'a:ds' has 2 attributes : 'd' and 'sp'
+// both are of type 'a:ST_PositivePercentage'
+// according to the specs Office will read percentages formatted 
with a trailing percent sign
+// or formatted as 1000th of a percent without a trailing percent 
sign, but only write percentages
+// as 1000th's of a percent without a trailing percent sign.
+// The code below takes care of both scenarios by converting to 
'1000th of a percent' always
+OUString aStr;
+sal_Int32 nDash = 0;
+aStr = rAttribs.getString( XML_d,  );
+if (

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

 bin/distro-install-desktop-integration |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 098b0bf8630f233fe7d3eba49c85a98929ce9929
Author: Baptiste Daroussin b...@freebsd.org
Date:   Tue Jun 10 18:58:19 2014 +0200

Do not hard code bash path

Change-Id: I24ee2599ffe8029c3d3888de49cff8bfd0a368e0
Reviewed-on: https://gerrit.libreoffice.org/9723
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index 18107e0..40ad98c 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -115,7 +115,7 @@ sed -i \
 export KDEMAINDIR=$PREFIXDIR
 export GNOMEDIR=$PREFIXDIR
 export GNOME_MIME_THEME=hicolor
-/bin/bash ./create_tree.sh
+bash ./create_tree.sh
 )
 cd -
 rm -rf $sysui_temp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk extensions/Library_npsoplugin.mk vcl/Executable_xid_fullscreen_on_all_monitors.mk

 bridges/Library_cpp_uno.mk   |2 +-
 extensions/Library_npsoplugin.mk |2 ++
 vcl/Executable_xid_fullscreen_on_all_monitors.mk |2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit a5a17ccdbc870b475e6a2dc076a780b55e16ccab
Author: Baptiste Daroussin b...@freebsd.org
Date:   Tue Jun 10 18:32:51 2014 +0200

Filter out OS not needing -ldl

Change-Id: I5863de6d8b1f0fe2419ea7419b1ff90087bb513d
Reviewed-on: https://gerrit.libreoffice.org/9715
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index f56a1d3..c6ab9a0 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -199,7 +199,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
 ))
 
-ifeq ($(filter ANDROID WNT,$(OS)),)
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 $(eval $(call gb_Library_add_libs,gcc3_uno,\
-ldl \
 ))
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 4f385d9..9178a9d 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -23,9 +23,11 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
 
 ifneq ($(OS),WNT)
 
+ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 $(eval $(call gb_Library_add_libs,npsoplugin,\
-ldl \
 ))
+endif
 
 $(eval $(call gb_Library_use_external,npsoplugin,gtk))
 
diff --git a/vcl/Executable_xid_fullscreen_on_all_monitors.mk 
b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
index 5f9c127..ee17162 100644
--- a/vcl/Executable_xid_fullscreen_on_all_monitors.mk
+++ b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
@@ -9,9 +9,11 @@
 
 $(eval $(call gb_Executable_Executable,xid-fullscreen-on-all-monitors))
 
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 $(eval $(call gb_Executable_add_libs,xid-fullscreen-on-all-monitors,\
 -ldl \
 ))
+endif
 
 $(eval $(call gb_Executable_add_cobjects,xid-fullscreen-on-all-monitors,\
 vcl/unx/gtk/window/xid_fullscreen_on_all_monitors \
___
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' - 3 commits - bin/distro-install-desktop-integration bridges/Library_cpp_uno.mk configure.ac extensions/Library_npsoplugin.mk vcl/Executable_xi

 bin/distro-install-desktop-integration   |2 +-
 bridges/Library_cpp_uno.mk   |2 +-
 configure.ac |2 +-
 extensions/Library_npsoplugin.mk |2 ++
 vcl/Executable_xid_fullscreen_on_all_monitors.mk |2 ++
 5 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 560e41d50a946c2c548671f4e0a0c6f5dcd4066c
Author: Baptiste Daroussin b...@freebsd.org
Date:   Tue Jun 10 18:32:51 2014 +0200

Filter out OS not needing -ldl

Change-Id: I5863de6d8b1f0fe2419ea7419b1ff90087bb513d
Reviewed-on: https://gerrit.libreoffice.org/9715
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit a5a17ccdbc870b475e6a2dc076a780b55e16ccab)

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index f56a1d3..c6ab9a0 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -199,7 +199,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
 ))
 
-ifeq ($(filter ANDROID WNT,$(OS)),)
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 $(eval $(call gb_Library_add_libs,gcc3_uno,\
-ldl \
 ))
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 4f385d9..9178a9d 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -23,9 +23,11 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
 
 ifneq ($(OS),WNT)
 
+ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 $(eval $(call gb_Library_add_libs,npsoplugin,\
-ldl \
 ))
+endif
 
 $(eval $(call gb_Library_use_external,npsoplugin,gtk))
 
diff --git a/vcl/Executable_xid_fullscreen_on_all_monitors.mk 
b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
index 5f9c127..ee17162 100644
--- a/vcl/Executable_xid_fullscreen_on_all_monitors.mk
+++ b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
@@ -9,9 +9,11 @@
 
 $(eval $(call gb_Executable_Executable,xid-fullscreen-on-all-monitors))
 
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 $(eval $(call gb_Executable_add_libs,xid-fullscreen-on-all-monitors,\
 -ldl \
 ))
+endif
 
 $(eval $(call gb_Executable_add_cobjects,xid-fullscreen-on-all-monitors,\
 vcl/unx/gtk/window/xid_fullscreen_on_all_monitors \
commit 476eec28198379c9279febc1ec2d07f4f2369c27
Author: Baptiste Daroussin b...@freebsd.org
Date:   Tue Jun 10 18:58:19 2014 +0200

Do not hard code bash path

Change-Id: I24ee2599ffe8029c3d3888de49cff8bfd0a368e0
Reviewed-on: https://gerrit.libreoffice.org/9723
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 098b0bf8630f233fe7d3eba49c85a98929ce9929)

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index 18107e0..40ad98c 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -115,7 +115,7 @@ sed -i \
 export KDEMAINDIR=$PREFIXDIR
 export GNOMEDIR=$PREFIXDIR
 export GNOME_MIME_THEME=hicolor
-/bin/bash ./create_tree.sh
+bash ./create_tree.sh
 )
 cd -
 rm -rf $sysui_temp
commit cba10428496f6685d71b6ffecefc4f4bfce088d5
Author: Baptiste Daroussin b...@freebsd.org
Date:   Tue Jun 10 18:22:53 2014 +0200

On FreeBSD x86_64 is named amd64

Change-Id: I14c653f8b3fe0dc9855aa51643cfc40cbccb763e
Reviewed-on: https://gerrit.libreoffice.org/9714
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 93152e2633c3da2b1993c69857baf11edada705e)

diff --git a/configure.ac b/configure.ac
index 7d27e92..d2ffa7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4235,7 +4235,7 @@ freebsd*)
 PLATFORMID=freebsd_x86
 OUTPATH=unxfbsdi
 ;;
-x86_64)
+x86_64|amd64)
 CPUNAME=X86_64
 RTL_ARCH=X86_64
 PLATFORMID=freebsd_x86_64
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - filter/qa filter/source include/sal include/test test/source vcl/qa

2014-06-10 Thread Jan Holesovsky

 filter/qa/cppunit/data/pict/clipping-problem.pct |binary
 filter/qa/cppunit/filters-pict-test.cxx  |   35 +++
 filter/source/graphicfilter/ipict/ipict.cxx  |   69 ---
 filter/source/graphicfilter/ipict/ipict.hxx  |   25 
 include/sal/log-areas.dox|1 
 include/test/mtfxmldump.hxx  |   13 +++-
 include/test/xmltesttools.hxx|5 +
 test/source/mtfxmldump.cxx   |   44 +-
 vcl/qa/cppunit/wmf/wmfimporttest.cxx |   30 ++
 9 files changed, 179 insertions(+), 43 deletions(-)

New commits:
commit 71457cb2cb61f20ef569d1600b430ef41a878ec9
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Jun 10 19:27:40 2014 +0200

pct import: Unit test for the clipping import fix.

Change-Id: I8f9df1d92c86c087e37f77209f413ff8c1c6358f

diff --git a/filter/qa/cppunit/data/pict/clipping-problem.pct 
b/filter/qa/cppunit/data/pict/clipping-problem.pct
new file mode 100644
index 000..37fe66c
Binary files /dev/null and b/filter/qa/cppunit/data/pict/clipping-problem.pct 
differ
diff --git a/filter/qa/cppunit/filters-pict-test.cxx 
b/filter/qa/cppunit/filters-pict-test.cxx
index 7ba0145..0512b9b 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -10,12 +10,17 @@
 #include unotest/filters-test.hxx
 #include test/bootstrapfixture.hxx
 #include vcl/FilterConfigItem.hxx
+#include test/mtfxmldump.hxx
+#include test/xmltesttools.hxx
 #include tools/stream.hxx
 #include vcl/graph.hxx
+#include vcl/metaactiontypes.hxx
 
 #include osl/file.hxx
 #include osl/process.h
 
+#include ../../source/graphicfilter/ipict/ipict.hxx
+
 extern C
 {
 SAL_DLLPUBLIC_EXPORT bool SAL_CALL
@@ -30,6 +35,7 @@ using namespace ::com::sun::star;
 class PictFilterTest
 : public test::FiltersTest
 , public test::BootstrapFixture
+, public XmlTestTools
 {
 public:
 PictFilterTest() : BootstrapFixture(true, false) {}
@@ -38,13 +44,21 @@ public:
 const OUString rURL, const OUString ,
 unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
 
+OUString pictURL()
+{
+return getURLFromSrc(/filter/qa/cppunit/data/pict/);
+}
+
 /**
  * Ensure CVEs remain unbroken
  */
 void testCVEs();
 
+void testDontClipTooMuch();
+
 CPPUNIT_TEST_SUITE(PictFilterTest);
 CPPUNIT_TEST(testCVEs);
+CPPUNIT_TEST(testDontClipTooMuch);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -60,10 +74,29 @@ bool PictFilterTest::load(const OUString ,
 void PictFilterTest::testCVEs()
 {
 testDir(OUString(),
-getURLFromSrc(/filter/qa/cppunit/data/pict/),
+pictURL(),
 OUString());
 }
 
+void PictFilterTest::testDontClipTooMuch()
+{
+SvFileStream aFileStream(pictURL() + clipping-problem.pct, STREAM_READ);
+GDIMetaFile aGDIMetaFile;
+pict::ReadPictFile(aFileStream, aGDIMetaFile);
+
+MetafileXmlDump dumper;
+dumper.filterAllActionTypes();
+dumper.filterActionType(META_CLIPREGION_ACTION, false);
+xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile);
+
+CPPUNIT_ASSERT (pDoc);
+
+assertXPath(pDoc, /metafile/clipregion[5], top, 0);
+assertXPath(pDoc, /metafile/clipregion[5], left, 0);
+assertXPath(pDoc, /metafile/clipregion[5], bottom, -32767);
+assertXPath(pDoc, /metafile/clipregion[5], right, -32767);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(PictFilterTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx 
b/filter/source/graphicfilter/ipict/ipict.cxx
index e130429..8d3af9e 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include string.h
 #include osl/thread.h
 #include vcl/bmpacc.hxx
@@ -26,6 +25,7 @@
 #include vcl/virdev.hxx
 #include math.h
 
+#include ipict.hxx
 #include shape.hxx
 #include boost/scoped_array.hpp
 
@@ -1940,5 +1940,14 @@ GraphicImport( SvStream rIStm, Graphic  rGraphic, 
FilterConfigItem* )
 return bRet;
 }
 
+namespace pict {
+
+SAL_DLLPUBLIC_EXPORT void ReadPictFile(SvStream rStreamPict, GDIMetaFile 
rGDIMetaFile)
+{
+PictReader aPictReader;
+aPictReader.ReadPict(rStreamPict, rGDIMetaFile);
+}
+
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/ipict/ipict.hxx 
b/filter/source/graphicfilter/ipict/ipict.hxx
new file mode 100644
index 000..1ba3dbe
--- /dev/null
+++ b/filter/source/graphicfilter/ipict/ipict.hxx
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at

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

 lotuswordpro/source/filter/lwplayout.hxx |1 
 sc/source/ui/inc/optload.hxx |   59 ---
 sw/inc/IMark.hxx |2 
 sw/source/core/crsr/bookmrk.cxx  |   14 +++---
 sw/source/core/crsr/crossrefbookmark.cxx |4 -
 sw/source/core/doc/docbm.cxx |   34 +++
 sw/source/core/doc/docdde.cxx|2 
 sw/source/core/doc/docedt.cxx|4 -
 sw/source/core/doc/swserv.cxx|2 
 sw/source/core/docnode/ndcopy.cxx|4 -
 sw/source/core/fields/reffld.cxx |2 
 sw/source/core/inc/bookmrk.hxx   |   12 ++---
 sw/source/core/inc/crossrefbookmark.hxx  |2 
 sw/source/core/undo/rolbck.cxx   |6 +-
 sw/source/core/undo/undobj.cxx   |8 +--
 sw/source/core/unocore/unobkm.cxx|4 -
 sw/source/core/unocore/unoobj2.cxx   |2 
 sw/source/filter/writer/writer.cxx   |8 +--
 sw/source/filter/ww8/docxattributeoutput.cxx |2 
 sw/source/filter/ww8/wrtww8.cxx  |2 
 sw/source/uibase/utlui/content.cxx   |   10 +---
 21 files changed, 60 insertions(+), 124 deletions(-)

New commits:
commit 9a171514a1287adf17cba2a177c0563f81b2b1db
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 10 19:43:40 2014 +0200

Duplicate #include

Change-Id: If83bcfb0e39c0b41ea5323b0ad3832bd65185c6c

diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 6571b73..38c6673 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -83,7 +83,6 @@
 #include xfilter/xfpagemaster.hxx
 #include xfilter/xfcolumns.hxx
 #include xfilter/xfborders.hxx
-#include xfilter/xffont.hxx
 #include xfilter/xfframestyle.hxx
 #include xfilter/xfframe.hxx
 #include xfilter/xfbgimage.hxx
commit dcf0ac048ce745774f401ada72b051757298c559
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 10 19:21:16 2014 +0200

Change sw::mark::IMark::GetOtherMarkPos return type from ref to pointer

...so CrossRefBookmark::GetOtherMarkPos can legitimately return a null 
pointer

Change-Id: I88774cf0d139d017d67d6727ee01214997a73636

diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 13c1e00..72cdad1 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -41,7 +41,7 @@ namespace sw { namespace mark
 virtual const SwPosition GetMarkPos() const =0;
 // GetOtherMarkPos() is only guaranteed to return a valid
 // reference if IsExpanded() returned true
-virtual const SwPosition GetOtherMarkPos() const =0;
+virtual const SwPosition* GetOtherMarkPos() const =0;
 virtual const SwPosition GetMarkStart() const =0;
 virtual const SwPosition GetMarkEnd() const =0;
 virtual const OUString GetName() const =0;
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 5bd6dc9..124aaec 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -311,7 +311,7 @@ namespace sw { namespace mark
 
 void Fieldmark::SetMarkStartPos( const SwPosition rNewStartPos )
 {
-if ( GetMarkPos( ) = GetOtherMarkPos( ) )
+if ( GetMarkPos( ) = *GetOtherMarkPos( ) )
 return SetMarkPos( rNewStartPos );
 else
 return SetOtherMarkPos( rNewStartPos );
@@ -319,7 +319,7 @@ namespace sw { namespace mark
 
 void Fieldmark::SetMarkEndPos( const SwPosition rNewEndPos )
 {
-if ( GetMarkPos( ) = GetOtherMarkPos( ) )
+if ( GetMarkPos( ) = *GetOtherMarkPos( ) )
 return SetOtherMarkPos( rNewEndPos );
 else
 return SetMarkPos( rNewEndPos );
@@ -330,15 +330,15 @@ namespace sw { namespace mark
 return Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): (  + 
m_aName + , 
 + m_aFieldname + , [  + OUString::number( 
GetMarkPos().nNode.GetIndex( ) )
 + ,  + OUString::number( GetMarkPos( ).nContent.GetIndex( ) ) + 
 ], [
-+ OUString::number( GetOtherMarkPos().nNode.GetIndex( ) ) + , 
-+ OUString::number( GetOtherMarkPos( ).nContent.GetIndex( ) ) +  
] ) ;
++ OUString::number( GetOtherMarkPos()-nNode.GetIndex( ) ) + , 
++ OUString::number( GetOtherMarkPos( )-nContent.GetIndex( ) ) +  
] ) ;
 }
 
 void Fieldmark::Invalidate( )
 {
 // TODO: Does exist a better solution to trigger a format of the
 //   fieldmark portion? If yes, please use it.
-SwPaM aPaM( this-GetMarkPos(), this-GetOtherMarkPos() );
+SwPaM aPaM( this-GetMarkPos(), *this-GetOtherMarkPos() );
 aPaM.InvalidatePaM();
 }
 
@@ -405,8 +405,8 @@ namespace sw { namespace mark
 + m_aName + ,  + GetFieldname() + , [ 
 +

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

 chart2/qa/extras/chart2export.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 6f6d81c3b6f83956e7e01f99cc0314c675e56ffa
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Jun 10 14:08:45 2014 -0400

Consistent naming please.

Change-Id: I8a7e1d0a42aacdc7dcaeda0f7e51db78727f4b54

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index c75b5c2..4443b06 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -57,9 +57,9 @@ public:
 void testGapWidthXLSX();
 void testSmoothedLines();
 void testLabelStringODS();
-void testfdo78290_Line_Chart_Marker_x();
-void testfdo78290_Scatter_Chart_Marker_x();
-void testfdo78290_Combination_Chart_Marker_x();
+void testFdo78290LineChartMarkerX();
+void testFdo78290ScatterChartMarkerX();
+void testFdo78290CombinationChartMarkerX();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(test);
@@ -89,9 +89,9 @@ public:
 CPPUNIT_TEST(testGapWidthXLSX);
 CPPUNIT_TEST(testSmoothedLines);
 CPPUNIT_TEST(testLabelStringODS);
-CPPUNIT_TEST(testfdo78290_Line_Chart_Marker_x);
-CPPUNIT_TEST(testfdo78290_Scatter_Chart_Marker_x);
-CPPUNIT_TEST(testfdo78290_Combination_Chart_Marker_x);
+CPPUNIT_TEST(testFdo78290LineChartMarkerX);
+CPPUNIT_TEST(testFdo78290ScatterChartMarkerX);
+CPPUNIT_TEST(testFdo78290CombinationChartMarkerX);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -637,7 +637,7 @@ void Chart2ExportTest::testFdo74115WallBitmapFill()
 
 //The below test case tests the built in marker 'x' for Office 2010 in Line 
charts
 
-void Chart2ExportTest::testfdo78290_Line_Chart_Marker_x()
+void Chart2ExportTest::testFdo78290LineChartMarkerX()
 {
 load(/chart2/qa/extras/data/docx/, fdo78290_Line_Chart_Marker_x.docx);
 xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML 
Text);
@@ -648,7 +648,7 @@ void Chart2ExportTest::testfdo78290_Line_Chart_Marker_x()
 
 // We can also use the built in marker 'x' in scatter chart, hence writing the 
test case for the same.
 
-void Chart2ExportTest::testfdo78290_Scatter_Chart_Marker_x()
+void Chart2ExportTest::testFdo78290ScatterChartMarkerX()
 {
 load(/chart2/qa/extras/data/docx/, 
fdo78290_Scatter_Chart_Marker_x.docx);
 xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML 
Text);
@@ -660,7 +660,7 @@ void Chart2ExportTest::testfdo78290_Scatter_Chart_Marker_x()
 // Also in a combination of charts like a column chart and line chart, we can 
use the built in marker 'x'
 // for the line chart too. hence put a test case for the combination chart 
also.
 
-void Chart2ExportTest::testfdo78290_Combination_Chart_Marker_x()
+void Chart2ExportTest::testFdo78290CombinationChartMarkerX()
 {
 load(/chart2/qa/extras/data/docx/, 
fdo78290_Combination_Chart_Marker_x.docx);
 xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML 
Text);
___
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/qa

 chart2/qa/extras/chart2export.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit d373afca4fc43259e39eac01f679f28411271905
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Jun 10 14:08:45 2014 -0400

Consistent naming please.

Change-Id: I8a7e1d0a42aacdc7dcaeda0f7e51db78727f4b54
(cherry picked from commit 6f6d81c3b6f83956e7e01f99cc0314c675e56ffa)

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index c75b5c2..4443b06 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -57,9 +57,9 @@ public:
 void testGapWidthXLSX();
 void testSmoothedLines();
 void testLabelStringODS();
-void testfdo78290_Line_Chart_Marker_x();
-void testfdo78290_Scatter_Chart_Marker_x();
-void testfdo78290_Combination_Chart_Marker_x();
+void testFdo78290LineChartMarkerX();
+void testFdo78290ScatterChartMarkerX();
+void testFdo78290CombinationChartMarkerX();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(test);
@@ -89,9 +89,9 @@ public:
 CPPUNIT_TEST(testGapWidthXLSX);
 CPPUNIT_TEST(testSmoothedLines);
 CPPUNIT_TEST(testLabelStringODS);
-CPPUNIT_TEST(testfdo78290_Line_Chart_Marker_x);
-CPPUNIT_TEST(testfdo78290_Scatter_Chart_Marker_x);
-CPPUNIT_TEST(testfdo78290_Combination_Chart_Marker_x);
+CPPUNIT_TEST(testFdo78290LineChartMarkerX);
+CPPUNIT_TEST(testFdo78290ScatterChartMarkerX);
+CPPUNIT_TEST(testFdo78290CombinationChartMarkerX);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -637,7 +637,7 @@ void Chart2ExportTest::testFdo74115WallBitmapFill()
 
 //The below test case tests the built in marker 'x' for Office 2010 in Line 
charts
 
-void Chart2ExportTest::testfdo78290_Line_Chart_Marker_x()
+void Chart2ExportTest::testFdo78290LineChartMarkerX()
 {
 load(/chart2/qa/extras/data/docx/, fdo78290_Line_Chart_Marker_x.docx);
 xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML 
Text);
@@ -648,7 +648,7 @@ void Chart2ExportTest::testfdo78290_Line_Chart_Marker_x()
 
 // We can also use the built in marker 'x' in scatter chart, hence writing the 
test case for the same.
 
-void Chart2ExportTest::testfdo78290_Scatter_Chart_Marker_x()
+void Chart2ExportTest::testFdo78290ScatterChartMarkerX()
 {
 load(/chart2/qa/extras/data/docx/, 
fdo78290_Scatter_Chart_Marker_x.docx);
 xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML 
Text);
@@ -660,7 +660,7 @@ void Chart2ExportTest::testfdo78290_Scatter_Chart_Marker_x()
 // Also in a combination of charts like a column chart and line chart, we can 
use the built in marker 'x'
 // for the line chart too. hence put a test case for the combination chart 
also.
 
-void Chart2ExportTest::testfdo78290_Combination_Chart_Marker_x()
+void Chart2ExportTest::testFdo78290CombinationChartMarkerX()
 {
 load(/chart2/qa/extras/data/docx/, 
fdo78290_Combination_Chart_Marker_x.docx);
 xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML 
Text);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-10 Thread Jan Holesovsky

 filter/CppunitTest_filter_pict_test.mk  |5 -
 filter/Library_ipt.mk   |4 
 filter/source/graphicfilter/ipict/ipict.cxx |2 +-
 filter/source/graphicfilter/ipict/ipict.hxx |   11 ++-
 4 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit ad2cc2323fb887c438031d863ab16df7afd49fb8
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Jun 10 20:17:53 2014 +0200

pct import: Fix build on Windows.

Change-Id: Iddd0299f2229383c0d8368d117e6175887931978

diff --git a/filter/CppunitTest_filter_pict_test.mk 
b/filter/CppunitTest_filter_pict_test.mk
index 1742745..1e4e0be 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -8,7 +8,10 @@
 #
 $(eval $(call gb_CppunitTest_CppunitTest,filter_pict_test))
 
-$(eval $(call gb_CppunitTest_use_external,filter_pict_test,boost_headers))
+$(eval $(call gb_CppunitTest_use_externals,filter_pict_test,\
+   boost_headers \
+   libxml2 \
+))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,filter_pict_test, \
 filter/qa/cppunit/filters-pict-test \
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
index 68e913c..bad878a 100644
--- a/filter/Library_ipt.mk
+++ b/filter/Library_ipt.mk
@@ -23,6 +23,10 @@ $(eval $(call gb_Library_use_external,ipt,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipt))
 
+$(eval $(call gb_Library_add_defs,ipt,\
+   -DPCT_DLLIMPLEMENTATION \
+))
+
 $(eval $(call gb_Library_use_libraries,ipt,\
vcl \
tl \
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx 
b/filter/source/graphicfilter/ipict/ipict.cxx
index 8d3af9e..c0f1955 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1942,7 +1942,7 @@ GraphicImport( SvStream rIStm, Graphic  rGraphic, 
FilterConfigItem* )
 
 namespace pict {
 
-SAL_DLLPUBLIC_EXPORT void ReadPictFile(SvStream rStreamPict, GDIMetaFile 
rGDIMetaFile)
+void ReadPictFile(SvStream rStreamPict, GDIMetaFile rGDIMetaFile)
 {
 PictReader aPictReader;
 aPictReader.ReadPict(rStreamPict, rGDIMetaFile);
diff --git a/filter/source/graphicfilter/ipict/ipict.hxx 
b/filter/source/graphicfilter/ipict/ipict.hxx
index 1ba3dbe..a7ca2bf 100644
--- a/filter/source/graphicfilter/ipict/ipict.hxx
+++ b/filter/source/graphicfilter/ipict/ipict.hxx
@@ -10,13 +10,22 @@
 #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IPICT_HXX
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IPICT_HXX
 
+#include sal/config.h
+#include sal/types.h
+
+#if defined PCT_DLLIMPLEMENTATION
+#define PCT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define PCT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
 class GDIMetaFile;
 class SvStream;
 
 namespace pict {
 
 /// Function to access PictReader::ReadPict for unit testing.
-void ReadPictFile(SvStream rStreamPict, GDIMetaFile rGDIMetaFile);
+PCT_DLLPUBLIC void ReadPictFile(SvStream rStreamPict, GDIMetaFile 
rGDIMetaFile);
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Adding KACST font to libreoffice

2014-06-10 Thread Faisal M. Alotaibi

Hi all,

we want to add KACST font to LibreOffice, and become a default font for Arabic.
So if it's ok to add it, what we need to do to the fonts before added to
libreoffice?

Regards,

Faisal M. Al-Otaibi.
Programmer, KACST
Warning: This message and its attachment, if any, are confidential and may
contain information protected by law. If you are not the intended recipient,
please contact the sender immediately and delete the message and its
attachment, if any. You should not copy the message and its attachment, if any,
or disclose its contents to any other person or use it for any purpose.
Statements and opinions expressed in this e-mail and its attachment, if any,
are those of the sender, and do not necessarily reflect those of King Abdulaziz
city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST
accepts no liability for any damage caused by this email.

تحذير: هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي على
معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب عليك
تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا يجوز لك
نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو البوح
بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة ومرفقاتها (ان
وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك عبدالعزيز للعلوم
والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي مسئولية عن الأضرار
الناتجة عن ما قد يحتويه هذا البريد.

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

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

2014-06-10 Thread Valentin Kettner

 sw/Library_sw.mk|1 
 sw/inc/doc.hxx  |   19 ++-
 sw/source/core/attr/format.cxx  |3 -
 sw/source/core/doc/DocumentTimerManager.cxx |   71 
 sw/source/core/doc/doc.cxx  |   38 +-
 sw/source/core/doc/docchart.cxx |9 ---
 sw/source/core/doc/doclay.cxx   |   32 
 sw/source/core/doc/docnew.cxx   |   10 +--
 sw/source/core/inc/DocumentTimerManager.hxx |   64 +
 sw/source/core/inc/docfld.hxx   |3 -
 sw/source/core/inc/rootfrm.hxx  |5 +
 sw/source/core/layout/frmtool.cxx   |5 +
 12 files changed, 179 insertions(+), 81 deletions(-)

New commits:
commit 68fdc42941f669546afc06819c965d93c4f7adbd
Author: Valentin Kettner vakevk+libreoff...@gmail.com
Date:   Tue Jun 10 20:57:05 2014 +0200

Refactored IDocumentTimerAccess in SwDoc into DocumentTimerManager.

Change-Id: Idb39ef2cdc34e0c0e7853de0a656f579ca3528da

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index df08692..dceca91 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -189,6 +189,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 sw/source/core/doc/DocumentSettingManager \
 sw/source/core/doc/DocumentDrawModelManager \
 sw/source/core/doc/DocumentChartDataProviderManager \
+sw/source/core/doc/DocumentTimerManager \
 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 ad58225..8b9ff6b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -31,7 +31,6 @@
 #include IDocumentStatistics.hxx
 #include IDocumentState.hxx
 #include IDocumentLayoutAccess.hxx
-#include IDocumentTimerAccess.hxx
 #include IDocumentOutlineNodes.hxx
 #include IDocumentListItems.hxx
 
@@ -204,6 +203,7 @@ namespace sw {
 class DocumentDeviceManager;
 class DocumentDrawModelManager;
 class DocumentChartDataProviderManager;
+class DocumentTimerManager;
 }
 
 namespace com { namespace sun { namespace star {
@@ -250,7 +250,6 @@ class SW_DLLPUBLIC SwDoc :
 public IDocumentStatistics,
 public IDocumentState,
 public IDocumentLayoutAccess,
-public IDocumentTimerAccess,
 public IDocumentListItems,
 public IDocumentOutlineNodes,
 public IDocumentListsAccess,
@@ -268,7 +267,6 @@ class SW_DLLPUBLIC SwDoc :
 /* @@@MAINTAINABILITY-HORROR@@@
Timer should not be members of the model
 */
-Timer   maIdleTimer; // Own IdleTimer
 Timer   maOLEModifiedTimer;  // Timer for update modified 
OLE-Objecs
 Timer   maStatsUpdateTimer;  // Timer for asynchronous stats 
calculation
 SwDBDatamaDBData;// database descriptor
@@ -286,6 +284,7 @@ class SW_DLLPUBLIC SwDoc :
 const ::boost::scoped_ptr ::sw::DocumentSettingManager  
m_pDocumentSettingManager;
 const ::boost::scoped_ptr ::sw::DocumentChartDataProviderManager  
m_pDocumentChartDataProviderManager;
 ::boost::scoped_ptr ::sw::DocumentDeviceManager  m_pDeviceAccess;
+const ::boost::scoped_ptr ::sw::DocumentTimerManager  
m_pDocumentTimerManager;
 
 // Pointer
 SwFrmFmt*mpDfltFrmFmt;   // Default formats.
@@ -392,7 +391,6 @@ private:
 sal_uInt32  mnRsidRoot;  // session ID when the document was 
created
 
 sal_Int32   mReferenceCount;
-sal_Int32   mIdleBlockCount;
 sal_Int8mnLockExpFld;// If != 0 UpdateExpFlds() has no effect!
 
 bool mbGlossDoc  : 1;// TRUE: glossary document.
@@ -437,8 +435,6 @@ private:
 //   Thus, certain adjustment needed during formatting for these kind 
of anchored objects.
 bool mbContainsAtPageObjWithContentAnchor : 1;
 
-bool mbStartIdleTimer;// idle timer mode start/stop
-
 static SwAutoCompleteWord *mpACmpltWords;  // List of all words for 
AutoComplete
 
 // private methods
@@ -510,8 +506,6 @@ private:
 bool _SelectNextRubyChars( SwPaM rPam, SwRubyListEntry rRubyEntry,
 sal_uInt16 nMode );
 
-// Our own 'IdleTimer' calls the following method
-DECL_LINK( DoIdleJobs, Timer * );
 // CharTimer calls this method.
 void DoUpdateAllCharts();
 DECL_LINK( DoUpdateModifiedOLE, Timer * );
@@ -776,11 +770,10 @@ public:
 void ClearSwLayouterEntries();
 
 // IDocumentTimerAccess
-virtual void StartIdling() SAL_OVERRIDE;
-virtual void StopIdling() SAL_OVERRIDE;
-virtual void BlockIdling() SAL_OVERRIDE;
-virtual void UnblockIdling() SAL_OVERRIDE;
-virtual void StartBackgroundJobs() SAL_OVERRIDE;
+// Our own 'IdleTimer' calls the following method
+DECL_LINK( DoIdleJobs, Timer * );
+IDocumentTimerAccess const  getIDocumentTimerAccess() const;
+IDocumentTimerAccess  getIDocumentTimerAccess();
 
 //

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - download.lst

2014-06-10 Thread Andras Timar

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

New commits:
commit 2f926a476b73a7c06a4579f422a4458ac3e789a1
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Jun 10 22:30:07 2014 +0200

openssl-0.9.8za -- fixes multiple CVEs

Change-Id: Id4a2d2af49518317511da194a582d3bb18c346f7

diff --git a/download.lst b/download.lst
index e745e9e..c1c27a1 100644
--- a/download.lst
+++ b/download.lst
@@ -80,7 +80,7 @@ export NEON_TARBALL := 
ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := 
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 export ODFGEN_TARBALL := 
8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_TARBALL := 
51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
+export OPENSSL_TARBALL := 
2f989915f8fea49aa1bc37aa58500cce-openssl-0.9.8za.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - download.lst

2014-06-10 Thread Andras Timar

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

New commits:
commit fa08121159c2d84f567784ae3e05412ec29ddbd4
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Jun 10 22:30:07 2014 +0200

openssl-0.9.8za -- fixes multiple CVEs

Change-Id: Id4a2d2af49518317511da194a582d3bb18c346f7

diff --git a/download.lst b/download.lst
index c85a213..3c96880 100644
--- a/download.lst
+++ b/download.lst
@@ -63,7 +63,7 @@ export MYTHES_TARBALL := 
46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := 
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_TARBALL := 
51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
+export OPENSSL_TARBALL := 
2f989915f8fea49aa1bc37aa58500cce-openssl-0.9.8za.tar.gz
 export ORCUS_TARBALL := 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-10 Thread Valentin Kettner

Rebased ref, commits from common ancestor:
commit 78321f0dabcbc124d22d28c791a535a06333
Author: Valentin Kettner vakevk+libreoff...@gmail.com
Date:   Tue Jun 10 20:57:05 2014 +0200

Refactored IDocumentTimerAccess in SwDoc into DocumentTimerManager.

Change-Id: Idb39ef2cdc34e0c0e7853de0a656f579ca3528da

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index df08692..dceca91 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -189,6 +189,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 sw/source/core/doc/DocumentSettingManager \
 sw/source/core/doc/DocumentDrawModelManager \
 sw/source/core/doc/DocumentChartDataProviderManager \
+sw/source/core/doc/DocumentTimerManager \
 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 ad58225..237a515 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -31,7 +31,6 @@
 #include IDocumentStatistics.hxx
 #include IDocumentState.hxx
 #include IDocumentLayoutAccess.hxx
-#include IDocumentTimerAccess.hxx
 #include IDocumentOutlineNodes.hxx
 #include IDocumentListItems.hxx
 
@@ -204,6 +203,7 @@ namespace sw {
 class DocumentDeviceManager;
 class DocumentDrawModelManager;
 class DocumentChartDataProviderManager;
+class DocumentTimerManager;
 }
 
 namespace com { namespace sun { namespace star {
@@ -250,7 +250,6 @@ class SW_DLLPUBLIC SwDoc :
 public IDocumentStatistics,
 public IDocumentState,
 public IDocumentLayoutAccess,
-public IDocumentTimerAccess,
 public IDocumentListItems,
 public IDocumentOutlineNodes,
 public IDocumentListsAccess,
@@ -268,7 +267,6 @@ class SW_DLLPUBLIC SwDoc :
 /* @@@MAINTAINABILITY-HORROR@@@
Timer should not be members of the model
 */
-Timer   maIdleTimer; // Own IdleTimer
 Timer   maOLEModifiedTimer;  // Timer for update modified 
OLE-Objecs
 Timer   maStatsUpdateTimer;  // Timer for asynchronous stats 
calculation
 SwDBDatamaDBData;// database descriptor
@@ -286,6 +284,7 @@ class SW_DLLPUBLIC SwDoc :
 const ::boost::scoped_ptr ::sw::DocumentSettingManager  
m_pDocumentSettingManager;
 const ::boost::scoped_ptr ::sw::DocumentChartDataProviderManager  
m_pDocumentChartDataProviderManager;
 ::boost::scoped_ptr ::sw::DocumentDeviceManager  m_pDeviceAccess;
+const ::boost::scoped_ptr ::sw::DocumentTimerManager  
m_pDocumentTimerManager;
 
 // Pointer
 SwFrmFmt*mpDfltFrmFmt;   // Default formats.
@@ -392,7 +391,6 @@ private:
 sal_uInt32  mnRsidRoot;  // session ID when the document was 
created
 
 sal_Int32   mReferenceCount;
-sal_Int32   mIdleBlockCount;
 sal_Int8mnLockExpFld;// If != 0 UpdateExpFlds() has no effect!
 
 bool mbGlossDoc  : 1;// TRUE: glossary document.
@@ -437,8 +435,6 @@ private:
 //   Thus, certain adjustment needed during formatting for these kind 
of anchored objects.
 bool mbContainsAtPageObjWithContentAnchor : 1;
 
-bool mbStartIdleTimer;// idle timer mode start/stop
-
 static SwAutoCompleteWord *mpACmpltWords;  // List of all words for 
AutoComplete
 
 // private methods
@@ -510,8 +506,6 @@ private:
 bool _SelectNextRubyChars( SwPaM rPam, SwRubyListEntry rRubyEntry,
 sal_uInt16 nMode );
 
-// Our own 'IdleTimer' calls the following method
-DECL_LINK( DoIdleJobs, Timer * );
 // CharTimer calls this method.
 void DoUpdateAllCharts();
 DECL_LINK( DoUpdateModifiedOLE, Timer * );
@@ -776,11 +770,9 @@ public:
 void ClearSwLayouterEntries();
 
 // IDocumentTimerAccess
-virtual void StartIdling() SAL_OVERRIDE;
-virtual void StopIdling() SAL_OVERRIDE;
-virtual void BlockIdling() SAL_OVERRIDE;
-virtual void UnblockIdling() SAL_OVERRIDE;
-virtual void StartBackgroundJobs() SAL_OVERRIDE;
+// Our own 'IdleTimer' calls the following method
+IDocumentTimerAccess const  getIDocumentTimerAccess() const;
+IDocumentTimerAccess  getIDocumentTimerAccess();
 
 // IDocumentChartDataProviderAccess
 IDocumentChartDataProviderAccess const  
getIDocumentChartDataProviderAccess() const;
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 6996523..99de194 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -19,6 +19,7 @@
 
 #include doc.hxx
 #include DocumentSettingManager.hxx //For SwFmt::getIDocumentSettingAccess()
+#include IDocumentTimerAccess.hxx
 #include fmtcolfunc.hxx
 #include frame.hxx
 #include format.hxx
@@ -759,7 +760,7 @@ const IDocumentDrawModelAccess* 
SwFmt::getIDocumentDrawModelAccess() const { ret
 IDocumentDrawModelAccess* SwFmt::getIDocumentDrawModelAccess() { return  
GetDoc()-getIDocumentDrawModelAccess(); }
 const IDocumentLayoutAccess* SwFmt::getIDocumentLayoutAccess()

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

--- Comment #158 from Nemo Inis nemoi...@hotmail.com ---
Nominate Bug 74834 : Option to disable documents thumbnails on the New Start
Screen

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

[Libreoffice-commits] core.git: chart2/CppunitTest_chart2_export.mk chart2/qa

 chart2/CppunitTest_chart2_export.mk   |   16 ++-
 chart2/qa/extras/chart2export.cxx |   46 ++
 chart2/qa/extras/charttest.hxx|   33 +++
 chart2/qa/extras/data/odg/scatter-plot-labels.odg |binary
 4 files changed, 93 insertions(+), 2 deletions(-)

New commits:
commit 81d2c208a4e6f9df87e2ee70c6e6da146742178a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Jun 10 19:46:37 2014 -0400

New unit test for Draw document with chart.  Disabled due to weird crash.

No idea why it crashes whatsoever

Change-Id: Ic46d5a98f21cacb03adb3bc0d6da239bde5d8ce2

diff --git a/chart2/CppunitTest_chart2_export.mk 
b/chart2/CppunitTest_chart2_export.mk
index b2bf0a0..c6bf682 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,chart2_export))
 
 $(eval $(call gb_CppunitTest_use_externals,chart2_export, \
boost_headers \
-libxml2 \
+   libxml2 \
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,chart2_export, \
@@ -21,6 +21,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,chart2_export, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
+$(call gb_Helper_optional,AVMEDIA,avmedia) \
 basegfx \
 comphelper \
 cppu \
@@ -31,12 +32,15 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
 forui \
 i18nlangtag \
 msfilter \
+vcl \
 oox \
 sal \
 salhelper \
 sax \
 sb \
 sc \
+sw \
+sd \
 sfx \
 sot \
 svl \
@@ -50,7 +54,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
 unotest \
 utl \
 vbahelper \
-vcl \
 xo \
 sw \
 $(gb_UWINAPI) \
@@ -70,15 +73,20 @@ $(eval $(call gb_CppunitTest_use_vcl,chart2_export))
 
 $(eval $(call gb_CppunitTest_use_components,chart2_export,\
 basic/util/sb \
+animations/source/animcore/animcore \
 chart2/source/controller/chartcontroller \
 chart2/source/chartcore \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
+dtrans/util/mcnttype \
 dbaccess/util/dba \
 embeddedobj/util/embobj \
 eventattacher/source/evtatt \
 filter/source/config/cache/filterconfig1 \
+filter/source/odfflatxml/odfflatxml \
 filter/source/storagefilterdetect/storagefd \
+filter/source/xmlfilteradaptor/xmlfa \
+filter/source/xmlfilterdetect/xmlfd \
 forms/util/frm \
 framework/util/fwk \
 i18npool/util/i18npool \
@@ -93,6 +101,9 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\
 sw/util/sw \
 sw/util/swd \
 sw/util/msword \
+sd/util/sd \
+sd/util/sdfilt \
+sd/util/sdd \
 $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
 scaddins/source/analysis/analysis \
@@ -115,6 +126,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\
 unoxml/source/service/unoxml \
 writerfilter/util/writerfilter \
 xmloff/util/xo \
+xmlscript/util/xmlscript \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,chart2_export))
diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 4443b06..297950b 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -50,6 +50,7 @@ public:
 void testShapeFollowedByChart();
 void testPieChartDataLabels();
 void testSeriesIdxOrder();
+void testScatterPlotLabels();
 void testErrorBarDataRangeODS();
 void testChartCrash();
 void testPieChartRotation();
@@ -82,6 +83,7 @@ public:
 CPPUNIT_TEST(testShapeFollowedByChart);
 CPPUNIT_TEST(testPieChartDataLabels);
 CPPUNIT_TEST(testSeriesIdxOrder);
+//  CPPUNIT_TEST(testScatterPlotLabels); TODO : This test crashes for some 
unknown reason.
 CPPUNIT_TEST(testErrorBarDataRangeODS);
 CPPUNIT_TEST(testChartCrash);
 CPPUNIT_TEST(testPieChartRotation);
@@ -712,6 +714,50 @@ void Chart2ExportTest::testSeriesIdxOrder()
 assertXPath(pXmlDoc, 
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1], 
val, 1);
 }
 
+void Chart2ExportTest::testScatterPlotLabels()
+{
+load(/chart2/qa/extras/data/odg/, scatter-plot-labels.odg);
+Referencechart2::XChartDocument xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Referencechart2::XChartType xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
+CPPUNIT_ASSERT(xCT.is());
+
+OUString aLabelRole = xCT-getRoleOfSequenceForSeriesLabel();
+
+fprintf(stdout, Chart2ExportTest::testScatterPlotLabels:   label role = 
'%s\n,
+rtl::OUStringToOString(aLabelRole, 
RTL_TEXTENCODING_UTF8).getStr());
+
+Referencechart2::XDataSeriesContainer xDSCont(xCT, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xDSCont.is());
+Sequenceuno::Referencechart2::XDataSeries  aDataSeriesSeq =

Crash on chart test in draw document

Hi there,

With this commit

http://cgit.freedesktop.org/libreoffice/core/commit/?id=81d2c208a4e6f9df87e2ee70c6e6da146742178a

on the master branch, I tried to add a test case involving a drawing
document with chart, but I've met with weird  random crashes and I was
wondering if I could get some help with this.

It's currently disabled, but you can re-enable it by uncommenting the
CPPUNIT_TEST line.

TIA,

Kohei



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

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

 chart2/qa/extras/chart2export.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 7d10da2174eac4afd189ee2e9bfb031d315763c1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Jun 10 21:16:44 2014 -0400

Remove this.

Change-Id: Ie2c64d3254dba35ba3fcb1af2566de84b8b300e2

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 297950b..8ad51b6 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -725,9 +725,6 @@ void Chart2ExportTest::testScatterPlotLabels()
 
 OUString aLabelRole = xCT-getRoleOfSequenceForSeriesLabel();
 
-fprintf(stdout, Chart2ExportTest::testScatterPlotLabels:   label role = 
'%s\n,
-rtl::OUStringToOString(aLabelRole, 
RTL_TEXTENCODING_UTF8).getStr());
-
 Referencechart2::XDataSeriesContainer xDSCont(xCT, uno::UNO_QUERY);
 CPPUNIT_ASSERT(xDSCont.is());
 Sequenceuno::Referencechart2::XDataSeries  aDataSeriesSeq = 
xDSCont-getDataSeries();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 filter/CppunitTest_filter_pict_test.mk  |6 +-
 filter/source/graphicfilter/ipict/ipict.cxx |   23 +++
 filter/source/graphicfilter/ipict/ipict.hxx |8 +---
 3 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 7b72e5051437d7ecfdb3658375b3cb09b1b4abf8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jun 11 07:46:03 2014 +0200

Access code under test via gb_Library_use_library_objects

Change-Id: Ib92dc55827b69cf33a04fe4084cf296049efc9c6

diff --git a/filter/CppunitTest_filter_pict_test.mk 
b/filter/CppunitTest_filter_pict_test.mk
index 1e4e0be..6722712 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -18,7 +18,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,filter_pict_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \
-ipt \
+   basegfx \
sal \
test \
tl \
@@ -27,6 +27,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, 
\
$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_CppunitTest_use_library_objects,filter_pict_test, \
+ipt \
+))
+
 $(eval $(call gb_CppunitTest_use_api,filter_pict_test,\
 udkapi \
 offapi \
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx 
b/filter/source/graphicfilter/ipict/ipict.cxx
index c0f1955..4566288 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1913,6 +1913,16 @@ void PictReader::ReadPict( SvStream  rStreamPict, 
GDIMetaFile  rGDIMetaFile )
 if (pPict-GetError()) pPict-Seek(nOrigPos);
 }
 
+namespace pict {
+
+void ReadPictFile(SvStream rStreamPict, GDIMetaFile rGDIMetaFile)
+{
+PictReader aPictReader;
+aPictReader.ReadPict(rStreamPict, rGDIMetaFile);
+}
+
+}
+
 //== GraphicImport - the exported function 
 
 // this needs to be kept in sync with
@@ -1926,10 +1936,9 @@ extern C SAL_DLLPUBLIC_EXPORT bool SAL_CALL
 GraphicImport( SvStream rIStm, Graphic  rGraphic, FilterConfigItem* )
 {
 GDIMetaFile aMTF;
-PictReader  aPictReader;
 boolbRet = false;
 
-aPictReader.ReadPict( rIStm, aMTF );
+pict::ReadPictFile( rIStm, aMTF );
 
 if ( !rIStm.GetError() )
 {
@@ -1940,14 +1949,4 @@ GraphicImport( SvStream rIStm, Graphic  rGraphic, 
FilterConfigItem* )
 return bRet;
 }
 
-namespace pict {
-
-void ReadPictFile(SvStream rStreamPict, GDIMetaFile rGDIMetaFile)
-{
-PictReader aPictReader;
-aPictReader.ReadPict(rStreamPict, rGDIMetaFile);
-}
-
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/ipict/ipict.hxx 
b/filter/source/graphicfilter/ipict/ipict.hxx
index a7ca2bf..5b2de27 100644
--- a/filter/source/graphicfilter/ipict/ipict.hxx
+++ b/filter/source/graphicfilter/ipict/ipict.hxx
@@ -13,19 +13,13 @@
 #include sal/config.h
 #include sal/types.h
 
-#if defined PCT_DLLIMPLEMENTATION
-#define PCT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define PCT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
 class GDIMetaFile;
 class SvStream;
 
 namespace pict {
 
 /// Function to access PictReader::ReadPict for unit testing.
-PCT_DLLPUBLIC void ReadPictFile(SvStream rStreamPict, GDIMetaFile 
rGDIMetaFile);
+void ReadPictFile(SvStream rStreamPict, GDIMetaFile rGDIMetaFile);
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/qa/extras/chart2export.cxx |   82 +++---
 1 file changed, 41 insertions(+), 41 deletions(-)

New commits:
commit 967157a4bab4e73036bd1354315e8f3a3e084145
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jun 11 07:58:24 2014 +0200

loplugin:unreffun

Change-Id: I3d5ddbca7760a32231ef7fee19b45bca83667ca7

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 8ad51b6..6d83a8a 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -50,7 +50,7 @@ public:
 void testShapeFollowedByChart();
 void testPieChartDataLabels();
 void testSeriesIdxOrder();
-void testScatterPlotLabels();
+// void testScatterPlotLabels();
 void testErrorBarDataRangeODS();
 void testChartCrash();
 void testPieChartRotation();
@@ -714,46 +714,46 @@ void Chart2ExportTest::testSeriesIdxOrder()
 assertXPath(pXmlDoc, 
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1], 
val, 1);
 }
 
-void Chart2ExportTest::testScatterPlotLabels()
-{
-load(/chart2/qa/extras/data/odg/, scatter-plot-labels.odg);
-Referencechart2::XChartDocument xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
-CPPUNIT_ASSERT(xChartDoc.is());
-
-Referencechart2::XChartType xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
-CPPUNIT_ASSERT(xCT.is());
-
-OUString aLabelRole = xCT-getRoleOfSequenceForSeriesLabel();
-
-Referencechart2::XDataSeriesContainer xDSCont(xCT, uno::UNO_QUERY);
-CPPUNIT_ASSERT(xDSCont.is());
-Sequenceuno::Referencechart2::XDataSeries  aDataSeriesSeq = 
xDSCont-getDataSeries();
-CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aDataSeriesSeq.getLength());
-
-for (sal_Int32 i = 0; i  aDataSeriesSeq.getLength(); ++i)
-{
-uno::Referencechart2::data::XDataSource xDSrc(aDataSeriesSeq[i], 
uno::UNO_QUERY);
-CPPUNIT_ASSERT(xDSrc.is());
-uno::SequenceReferencechart2::data::XLabeledDataSequence  
aDataSeqs = xDSrc-getDataSequences();
-for (sal_Int32 j = 0; j  aDataSeqs.getLength(); ++j)
-{
-Referencechart2::data::XDataSequence xValues = 
aDataSeqs[j]-getValues();
-CPPUNIT_ASSERT(xValues.is());
-Referencebeans::XPropertySet xPropSet(xValues, uno::UNO_QUERY);
-if (!xPropSet.is())
-continue;
-
-OUString aRoleName;
-xPropSet-getPropertyValue(Role) = aRoleName;
-if (aRoleName == aLabelRole)
-{
-// TODO : Check the data series labels.
-}
-}
-}
-
-CPPUNIT_ASSERT(false);
-}
+// void Chart2ExportTest::testScatterPlotLabels()
+// {
+// load(/chart2/qa/extras/data/odg/, scatter-plot-labels.odg);
+// Referencechart2::XChartDocument 
xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
+// CPPUNIT_ASSERT(xChartDoc.is());
+//
+// Referencechart2::XChartType xCT = getChartTypeFromDoc(xChartDoc, 0, 
0);
+// CPPUNIT_ASSERT(xCT.is());
+//
+// OUString aLabelRole = xCT-getRoleOfSequenceForSeriesLabel();
+//
+// Referencechart2::XDataSeriesContainer xDSCont(xCT, uno::UNO_QUERY);
+// CPPUNIT_ASSERT(xDSCont.is());
+// Sequenceuno::Referencechart2::XDataSeries  aDataSeriesSeq = 
xDSCont-getDataSeries();
+// CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aDataSeriesSeq.getLength());
+//
+// for (sal_Int32 i = 0; i  aDataSeriesSeq.getLength(); ++i)
+// {
+// uno::Referencechart2::data::XDataSource xDSrc(aDataSeriesSeq[i], 
uno::UNO_QUERY);
+// CPPUNIT_ASSERT(xDSrc.is());
+// uno::SequenceReferencechart2::data::XLabeledDataSequence  
aDataSeqs = xDSrc-getDataSequences();
+// for (sal_Int32 j = 0; j  aDataSeqs.getLength(); ++j)
+// {
+// Referencechart2::data::XDataSequence xValues = 
aDataSeqs[j]-getValues();
+// CPPUNIT_ASSERT(xValues.is());
+// Referencebeans::XPropertySet xPropSet(xValues, 
uno::UNO_QUERY);
+// if (!xPropSet.is())
+// continue;
+//
+// OUString aRoleName;
+// xPropSet-getPropertyValue(Role) = aRoleName;
+// if (aRoleName == aLabelRole)
+// {
+// // TODO : Check the data series labels.
+// }
+// }
+// }
+//
+// CPPUNIT_ASSERT(false);
+// }
 
 void Chart2ExportTest::testErrorBarDataRangeODS()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-qa] Bug 79686 needs confirmation on Mac OS

2014-06-10 Thread Cor Nouws

Hi,

I see this one
  https://bugs.freedesktop.org/show_bug.cgi?id=79686

but cannot test this on Ubuntu. Anyone with Mac OS pls?
Cheers,


-- 
Cor Nouws
GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28  A038 E49D 7365 B134 80A6
- vrijwilliger http://nl.libreoffice.org
- volunteer http://www.libreoffice.org
- The Document Foundation Membership Committee Member



signature.asc
Description: OpenPGP digital signature
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Anybody with KDE

2014-06-10 Thread Robert Großkopf

Hi Jay,
 
 Have a bug report that i cant confirm on Linux Mint and the user says
 they are running Fedora 20 KDE, so i'm assuming it maybe KDE related, so
 if you anyone has KDE, can you check it out.
 
 https://bugs.freedesktop.org/show_bug.cgi?id=76347
 
Have tried it with OpenSUSE 12.3 64bit rpm and KDE 4.10. Couldn't
confirm the buggy behavior.

Regards

Robert

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 79863] FILEOPEN: HTML file opened as text

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

--- Comment #2 from Jay Philips philip...@hotmail.com ---
Yes with the selection of html that is when it will import correctly, but not
without it.

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

[Libreoffice-bugs] [Bug 61805] EDITING: Copy chart from Calc to any other component (Writer, Impress, Draw) lost axis formating