date:20131115

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7c1d47f460888bd742c4ebcae64407b9af1f5fff
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 15 10:19:43 2013 +0200

Correction and clarification to help message

Change-Id: I93b4ccdf40ffa2f013764b6270bab9aa1dced7c7

diff --git a/configure.ac b/configure.ac
index 7218fb8..875c434 100644
--- a/configure.ac
+++ b/configure.ac
@@ -786,8 +786,8 @@ AC_ARG_ENABLE([hardlink-deliver],
 AC_ARG_ENABLE(mergelibs,
 AS_HELP_STRING([--enable-mergelibs=all/yes],
 [Enables linking of big, merged, library. Experimental feature tested
-only on Linux and Android. All will link a lot more libraries into 
libmerged
-while yes or no argument will simply enable a core set of libraries.])
+only for Linux. 'all' will link a lot of libraries into libmerged
+while 'yes' will do it for just a core set of libraries.])
 )
 
 AC_ARG_ENABLE(graphite,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svl/source/notify/broadcast.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 78751ef3be02d6dcddf56830ec60f792096697c2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 15 09:46:16 2013 +0100

Band-aid fix for SvtBroadcaster::Broadcast

...after 18d07b2affbbbfb2ff9152d3ad8d1744fe75ab47 Rework SvtListener and
SvtBroadcaster internals broke the case where SvtBroadcaster::Add/Remove is
called from within SvtBroadcaster::Broadcast, and at least 
CppunitTest_sc_ucalc
started to fail.

It should be evaluated whether the original SvtBroadcaster logic to handle 
this
was better than taking a copy here.

Change-Id: Ie47bccb8c5789e405349a9c8b89f30b1dba3cfba

diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index 96d34a7..24b5790 100644
--- a/svl/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.cxx
@@ -114,7 +114,8 @@ SvtBroadcaster::~SvtBroadcaster()
 void SvtBroadcaster::Broadcast( const SfxHint rHint )
 {
 Normalize();
-std::for_each(maListeners.begin(), maListeners.end(), NotifyHandler(*this, 
rHint));
+ListenersType listeners(maListeners);
+std::for_each(listeners.begin(), listeners.end(), NotifyHandler(*this, 
rHint));
 }
 
 void SvtBroadcaster::ListenersGone() {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

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

New commits:
commit 91fd405c4dee468e4e00a6bd87eb76dd8f57aff3
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Nov 15 10:14:05 2013 +0100

Updated core
Project: translations  1bb07277935bce4a9dcf1e0eeaf2ebdfcf4b2b11

diff --git a/translations b/translations
index 70db96b..1bb0727 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 70db96bbb2c8cbd22c1ce9c421cc1988658af09e
+Subproject commit 1bb07277935bce4a9dcf1e0eeaf2ebdfcf4b2b11
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit af6c43c023e9401fd2df9c637bf76096a3e05b9d
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 15 11:05:41 2013 +0200

No fpicker lib any more, no mork lib on Windows

Change-Id: I07cdd13eef09a84abca0d5204c6f55ca25b9d9c0

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 15d9cfc..4ff78bb 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -39,7 +39,6 @@ gb_EXTRAMERGEDLIBS := \
flash \
for \
forui \
-   fpicker \
fps_office \
$(call gb_Helper_optional,DBCONNECTIVITY,frm) \
fwl \
@@ -67,7 +66,7 @@ gb_EXTRAMERGEDLIBS := \
$(if $(ENABLE_LWP),lwpft) \
$(call gb_Helper_optional,DESKTOP,migrationoo2) \
$(call gb_Helper_optional,DESKTOP,migrationoo3) \
-   $(call gb_Helper_optional,DBCONNECTIVITY,mork) \
+   $(if $(filter-out WNT,$(OS)),$(call 
gb_Helper_optional,DBCONNECTIVITY,mork)) \
$(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
$(if $(filter-out ANDROID IOS,$(OS)),odbc) \
$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source include/toolkit toolkit/source

 accessibility/inc/accessibility/helper/accresmgr.hxx |5 +
 accessibility/source/helper/accresmgr.cxx|2 
 include/toolkit/helper/tkresmgr.hxx  |   39 +--
 toolkit/source/awt/vclxtabpagecontainer.cxx  |1 
 toolkit/source/helper/tkresmgr.cxx   |   48 ---
 5 files changed, 10 insertions(+), 85 deletions(-)

New commits:
commit cef6dad4f6539c2fab0e02b24b71a15537f69034
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 15 10:30:56 2013 +0100

Remove unused parts of TkResMgr

Change-Id: I33f6bb8756a3bab054068a73c8e3d71b414ddfe0

diff --git a/include/toolkit/helper/tkresmgr.hxx 
b/include/toolkit/helper/tkresmgr.hxx
index 6e8a170..668a1bd 100644
--- a/include/toolkit/helper/tkresmgr.hxx
+++ b/include/toolkit/helper/tkresmgr.hxx
@@ -21,45 +21,12 @@
 #define INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
 
 #include rtl/ustring.hxx
-#include vcl/image.hxx
 
-class SimpleResMgr;
-class ResMgr;
+class Image;
 
-#define TK_RES_STRING(id)   TkResMgr::loadString(id)
-
-// 
-
-// TkResMgr
-// 
-
-
-class TkResMgr
+namespace TkResMgr
 {
-static SimpleResMgr* m_pSimpleResMgr;
-static ResMgr* m_pResMgr;
-
-private:
-// no instantiation allowed
-TkResMgr() { }
-~TkResMgr() { }
-
-// we'll instantiate one static member of the following class,
-// which in it's dtor ensures that m_pSimpleResMgr will be deleted
-class EnsureDelete
-{
-public:
-EnsureDelete() { }
-~EnsureDelete();
-};
-friend class EnsureDelete;
-
-protected:
-static void ensureImplExists();
-
-public:
-// loads the string with the specified resource id
-static OUString loadString( sal_uInt16 nResId );
-
-static Image getImageFromURL( const OUString i_rImageURL );
+Image getImageFromURL( const OUString i_rImageURL );
 };
 
 
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 928b4bd..47447d4 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -20,6 +20,7 @@
 #include toolkit/awt/vclxtabpagecontainer.hxx
 #include com/sun/star/awt/tab/XTabPageModel.hpp
 #include com/sun/star/awt/XControl.hpp
+#include vcl/image.hxx
 #include vcl/tabpage.hxx
 #include vcl/tabctrl.hxx
 #include vcl/svapp.hxx
diff --git a/toolkit/source/helper/tkresmgr.cxx 
b/toolkit/source/helper/tkresmgr.cxx
index 5b9fbce..06d14c8 100644
--- a/toolkit/source/helper/tkresmgr.cxx
+++ b/toolkit/source/helper/tkresmgr.cxx
@@ -18,65 +18,19 @@
  */
 
 #include toolkit/helper/tkresmgr.hxx
-#include tools/simplerm.hxx
 #include comphelper/processfactory.hxx
 #include comphelper/namedvaluecollection.hxx
 #include com/sun/star/graphic/GraphicProvider.hpp
 #include com/sun/star/graphic/XGraphicProvider.hpp
-#include tools/resmgr.hxx
 #include tools/diagnose_ex.h
 
-#include vcl/svapp.hxx
+#include vcl/image.hxx
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::graphic::XGraphic;
 using ::com::sun::star::graphic::XGraphicProvider;
 using namespace ::com::sun::star;
-// 
-
-// TkResMgr
-// 
-
 
-SimpleResMgr*   TkResMgr::m_pSimpleResMgr = NULL;
-ResMgr* TkResMgr::m_pResMgr = NULL;
-
-// 
-
-
-TkResMgr::EnsureDelete::~EnsureDelete()
-{
-delete TkResMgr::m_pSimpleResMgr;
-//delete TkResMgr::m_pResMgr;
-}
-
-// 
-
-
-void TkResMgr::ensureImplExists()
-{
-if (m_pSimpleResMgr)
-return;
-
-m_pSimpleResMgr = SimpleResMgr::Create( tk, 
Application::GetSettings().GetUILanguageTag() );
-m_pResMgr = ResMgr::CreateResMgr( tk );
-
-if (m_pSimpleResMgr)
-{
-// now that we have a impl class, make sure it's deleted on unloading 
the library
-static TkResMgr::EnsureDelete s_aDeleteTheImplClass;
-}
-}
-
-// 
-
-OUString TkResMgr::loadString( sal_uInt16 nResId )
-{
-OUString sReturn;
-
-ensureImplExists();
-if ( m_pSimpleResMgr )
-sReturn = m_pSimpleResMgr-ReadString( nResId );
-
-return sReturn;
-}
-
-// 
-
 Image TkResMgr::getImageFromURL( const OUString i_rImageURL )
 {
 if ( i_rImageURL.isEmpty() )
commit 2549be5a75ef2a17e56d5392f6c1592275abf65e
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Nov 14 16:33:23 2013 +

Add namespace to accessbility's TkResMgr.

Previously this conflicted with

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

Bug 65675 depends on bug 71321, which changed state.

Bug 71321 Summary: Can't scroll down in Calc and Writer on Mac osx
https://bugs.freedesktop.org/show_bug.cgi?id=71321

   What|Removed |Added

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

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

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

2013-11-15 Thread Muthu Subramanian

 oox/source/export/preset-definitions-to-shape-types.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 889b01696b7a3f55b5008a3cc58e3903d3d2779b
Author: Muthu Subramanian sumu...@collabora.com
Date:   Fri Nov 15 15:17:38 2013 +0530

fdo#71581: Use pictureFrame for images.

Which would be a simple rect instead of the
complicated shape.

diff --git a/oox/source/export/preset-definitions-to-shape-types.pl 
b/oox/source/export/preset-definitions-to-shape-types.pl
index 80536607..fc0b781 100644
--- a/oox/source/export/preset-definitions-to-shape-types.pl
+++ b/oox/source/export/preset-definitions-to-shape-types.pl
@@ -151,7 +151,7 @@ my %shapes_ids = (
 72 = 'irregularSeal2',
 73 = 'lightningBolt',
 74 = 'heart',
-75 = 'frame', # pictureFrame
+75 = 'pictureFrame',
 76 = 'quadArrow',
 77 = 'leftArrowCallout',
 78 = 'rightArrowCallout',
___
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

 helpers/help_hid.lst |1 -
 1 file changed, 1 deletion(-)

New commits:
commit fedee798f49ae39358c0b0c618aee3ab7c0d1687
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 09:52:44 2013 +

drop unused help id

Change-Id: I3a0440ee6c1abb6a4137aa372d32b58973573b36

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index cf88c5f..cd1815b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6365,7 +6365,6 @@ sd_ModalDialog_DLG_INSERT_PASTE,1084850176,
 sd_ModalDialog_DLG_PRINTDIALOG,1104003072,
 sd_ModalDialog_DLG_PRINT_WARNINGS,1087307776,
 sd_ModalDialog_DLG_PUBLISHING,1085849600,
-sd_ModalDialog_DLG_TABLEDESIGNPANE,1417379840,
 sd_MultiLineEdit_DLG_ASS_EDT_PAGE4_ASKINFORMATION,1088490011,
 sd_MultiLineEdit_DLG_PUBLISHING_PAGE4_MISC,1085852234,
 sd_NumericField_DLG_VECTORIZE_NM_LAYERS,1084463105,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 20075205724ede61c35bcbf4781e3f7bf5811a78
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 09:52:44 2013 +

Updated core
Project: help  fedee798f49ae39358c0b0c618aee3ab7c0d1687

diff --git a/helpcontent2 b/helpcontent2
index 33bc686..fedee79 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 33bc6868c0b6ffaf2e9ee31b8e5448b11930634f
+Subproject commit fedee798f49ae39358c0b0c618aee3ab7c0d1687
___
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' - 44/de3926bd631b005ec20b57a576bbee43d7d62a

 44/de3926bd631b005ec20b57a576bbee43d7d62a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9236e2ef863c85ce911cb6e6bb4ca170224fc225
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 09:54:07 2013 +

Notes added by 'git notes add'

diff --git a/44/de3926bd631b005ec20b57a576bbee43d7d62a 
b/44/de3926bd631b005ec20b57a576bbee43d7d62a
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/44/de3926bd631b005ec20b57a576bbee43d7d62a
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-15 Thread Tushar Bende

 sw/qa/extras/ooxmlexport/data/cell-grid-span.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   10 ++
 sw/source/filter/writer/wrtswtbl.cxx  |6 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 8f7c127c4be32a91052ea962aafd0af8a1645714
Author: Tushar Bende tushar.be...@synerzip.com
Date:   Thu Nov 14 20:04:23 2013 +0530

Fix for LibreOffice crash during Document RoundTrip

Description: Some Documents were crashing LO During Roundtrip.
This was because of setting wrong gridSpan value during export.

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

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

diff --git a/sw/qa/extras/ooxmlexport/data/cell-grid-span.docx 
b/sw/qa/extras/ooxmlexport/data/cell-grid-span.docx
new file mode 100644
index 000..de71d48
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/cell-grid-span.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ce9a0a9..30f7115 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1811,6 +1811,16 @@ DECLARE_OOXML_TEST(testTextBoxGradientAngle, 
fdo65295.docx)
 CPPUNIT_ASSERT_EQUAL(sal_Int16( 45 * 10), aGradient8.Angle);
 }
 
+DECLARE_OOXML_TEST(testCellGridSpan, cell-grid-span.docx)
+{
+// The problem was during export gridSpan value for 1st  2nd cells for 
test document
+// used to get set wrongly to 5 and 65532 respectively which was the 
reason for crash during save operation
+// Varifying gridSpan element is not present in RoundTriped Document (As 
it's Default value is 1).
+xmlDocPtr pXmlDoc = parseExport();
+assertXPath(pXmlDoc, 
/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:tcPr/w:gridSpan,0);
+assertXPath(pXmlDoc, 
/w:document/w:body/w:tbl/w:tr/w:tc[2]/w:tcPr/w:gridSpan,0);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/writer/wrtswtbl.cxx 
b/sw/source/filter/writer/wrtswtbl.cxx
index c75de62..18d4896 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -651,7 +651,11 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, 
sal_uInt16 nStartRow,
 SwWriteTableCol aSrchCol( nCPos );
 SwWriteTableCols::const_iterator it = aCols.find( aSrchCol );
 OSL_ENSURE( it != aCols.end(), missing column );
-nCol = it - aCols.begin();
+if(it != aCols.end())
+{
+// if find fails for some nCPos value then it used to set nCol 
value with size of aCols.
+nCol = it - aCols.begin();
+}
 
 if( !ShouldExpandSub( pBox, bSubExpanded, nDepth ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-15 Thread Samuel Mehrbrodt

 sw/source/ui/app/app.src  |4 ++--
 sw/source/ui/uiview/view2.cxx |   15 ++-
 2 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit 01af3e2efd4f7e0994340cb5b09c252323de63d9
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Tue Oct 29 20:36:22 2013 +0100

fdo#70978 Improve Word Count display

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

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index e5c6ac6..bc8cd0e 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -506,12 +506,12 @@ String STR_OUTLINE_NUMBERING
 
 String STR_STATUSBAR_WORDCOUNT_NO_SELECTION
 {
-Text [ en-US ] = Words (characters): $1 ($2);
+Text [ en-US ] = %1 words, %2 characters;
 };
 
 String STR_STATUSBAR_WORDCOUNT
 {
-Text [ en-US ] = Words (characters): $1 ($2) Selected: $3 ($4);
+Text [ en-US ] = %1 words, %2 characters selected;
 };
 
 String STR_CONVERT_TEXT_TABLE
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index eae1397..388cf6a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1266,15 +1266,12 @@ void SwView::StateStatusLine(SfxItemSet rSet)
 documentStats = rShell.GetDoc()-GetUpdatedDocStat( true 
/* complete-async */, false /* don't update fields */ );
 }
 
-const sal_uInt32 stringId = selectionStats.nWord? 
STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION;
-OUString wordCount(SW_RES(stringId));
-wordCount = wordCount.replaceAll($1, 
OUString::number(documentStats.nWord));
-wordCount = wordCount.replaceAll($2, 
OUString::number(documentStats.nChar));
-if (selectionStats.nWord)
-{
-wordCount = wordCount.replaceAll($3, 
OUString::number(selectionStats.nWord));
-wordCount = wordCount.replaceAll($4, 
OUString::number(selectionStats.nChar));
-}
+OUString wordCount(SW_RES(selectionStats.nWord ?
+  STR_STATUSBAR_WORDCOUNT : 
STR_STATUSBAR_WORDCOUNT_NO_SELECTION));
+wordCount = wordCount.replaceFirst(%1,
+OUString::number(selectionStats.nWord ? 
selectionStats.nWord : documentStats.nWord));
+wordCount = wordCount.replaceFirst(%2,
+OUString::number(selectionStats.nChar ? 
selectionStats.nChar : documentStats.nChar));
 rSet.Put(SfxStringItem(FN_STAT_WORDCOUNT, wordCount));
 
 SwWordCountWrapper *pWrdCnt = 
(SwWordCountWrapper*)GetViewFrame()-GetChildWindow(SwWordCountWrapper::GetChildWindowId());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-15 Thread Jürgen Schmidt

 configure.in |   16 ++--
 vcl/source/app/svapp.cxx |4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 74e54220a6341ef9f100128556106b698388295a
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Nov 15 08:31:04 2013 +

adapt Python section for MacOS

diff --git a/configure.in b/configure.in
index b1bc76a..2fca76f 100644
--- a/configure.in
+++ b/configure.in
@@ -4048,15 +4048,27 @@ if test $_os = Darwin  test $with_system_python 
!= no; then
with_system_python=yes
 
_python=/Library/Frameworks/Python.framework/Versions/Current/bin/python 
+   if test ! -f $_python; then
+ _python=/usr/bin/python
+   fi
+   AC_MSG_RESULT([compiling against system python ($_python)])
+
_python_hexversion=`$_python -c import sys; print(sys.hexversion);`
-   
+ 
dnl hex version of Python 2.7.1 = 34013680
if test $_python_hexversion -ge 34013680 ; then
+ _python_version=`$_python -c import sys; print sys.version; | head 
-n 1`
   AC_MSG_RESULT([compiling against system python (version 
$_python_version)])
 
  _python_ver=`$_python -c import distutils.sysconfig; 
print(distutils.sysconfig.get_config_var('VERSION'));`
  
- 
PYTHON_CFLAGS=-I/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver
+ if test -d 
/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver;
 then
+
PYTHON_CFLAGS=-I/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver
+ elif test -d 
/Developer/SDKs/MacOSX10.4u.sdk/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver;
 then
+
PYTHON_CFLAGS=-I/Developer/SDKs/MacOSX10.4u.sdk/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver
  
+ else
+
PYTHON_CFLAGS=-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver
+ fi
else
AC_MSG_ERROR([Python 2.7.1 or higher is required])
fi
commit 9cf2b1706af6ad55ec80ba3148e5a3738c4d33c6
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Nov 15 08:06:44 2013 +

fix build breaker on non-Windows platforms

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 32992af..f538ebd 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -2140,8 +2140,8 @@ bool Application::EnableAccessInterface(bool bEnable)
 #ifdef WNT
 return WNTEnableAccessInterface(bEnable);
 #else
-bEnable = TRUE; // avoid compiler warning
-return TRUE;
+bEnable = true; // avoid compiler warning
+return true;
 #endif
 }
 bool Application::IsEnableAccessInterface()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-15 Thread Jan Holesovsky

 framework/source/layoutmanager/toolbarlayoutmanager.cxx |   26 ++--
 1 file changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 986644335c3f9e99ec3c6bebc0b75cca0acdf79b
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Nov 15 10:59:36 2013 +0100

fdo#66864: Return from full-screen should restore toolbars.

The fix for fdo#37758 was not correct, we shouldn't fiddle with the 
m_bVisible
itself, but instead react on the m_bMasterHide flag; or at least that is my
understanding of the related framework code (why is it so confusing?!)

Change-Id: I791fcea9e5e5313b6a5b776cb3187cbd1a028386

diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx 
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index bd2f04e..97cfa76 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -294,7 +294,7 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea()
 SolarMutexGuard aGuard;
 
 Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-if ( pWindow  !xDockWindow-isFloating()  
pConstIter-m_bVisible )
+if ( pWindow  !xDockWindow-isFloating()  
pConstIter-m_bVisible  !pConstIter-m_bMasterHide )
 {
 awt::Rectangle aPosSize = xWindow-getPosSize();
 if ( pConstIter-m_aDockedData.m_nDockedArea != 
nCurrDockingArea )
@@ -442,7 +442,7 @@ bool ToolbarLayoutManager::requestToolbar( const OUString 
rResourceURL )
 if ( !xUIElement.is() )
 bMustCallCreate = true;
 
-bool bCreateOrShowToolbar( aRequestedToolbar.m_bVisible  
!aRequestedToolbar.m_bMasterHide );
+bool bCreateOrShowToolbar( aRequestedToolbar.m_bVisible  
!aRequestedToolbar.m_bMasterHide );
 
 uno::Reference awt::XWindow2  xContainerWindow( m_xContainerWindow, 
uno::UNO_QUERY );
 if ( xContainerWindow.is()  aRequestedToolbar.m_bFloating )
@@ -681,28 +681,24 @@ void ToolbarLayoutManager::setVisible( bool bVisible )
 UIElementVector::iterator pIter;
 for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); 
++pIter )
 {
-pIter-m_bMasterHide = !bVisible;
+if (!pIter-m_bFloating)
+{
+UIElement aUIElement(*pIter);
+aUIElement.m_bMasterHide = !bVisible;
+implts_setToolbar(aUIElement);
+implts_setLayoutDirty();
+}
+
 Window* pWindow = getWindowFromXUIElement( pIter-m_xUIElement );
 if ( pWindow )
 {
-bool bSetVisible( pIter-m_bVisible  bVisible );
+bool bSetVisible( pIter-m_bVisible  bVisible );
 if ( !bSetVisible )
-{
 pWindow-Hide();
-
-UIElement aUIElement( *pIter );
-if ( !aUIElement.m_bFloating )
-implts_setLayoutDirty();
-
-aUIElement.m_bVisible = false;
-implts_setToolbar( aUIElement );
-}
 else
 {
 if ( pIter-m_bFloating )
 pWindow-Show(true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-else
-implts_setLayoutDirty();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

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

Bug 60270 depends on bug 66864, which changed state.

Bug 66864 Summary: By using full screen applications and then restore them, the 
toolbar disappears in normal view.
https://bugs.freedesktop.org/show_bug.cgi?id=66864

   What|Removed |Added

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

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

Re: You're now in the committer group on gerrit.libreoffice.org

2013-11-15 Thread Jacobo Aragunde Pérez

Hi,

El 14/11/13 16:27, Miklos Vajna escribió:
 Hi Jacobo,
 
 I'm happy to notify you about that you've been added to the Committers
 group on gerrit. This means that when you're sure about your changes,
 please just go ahead and push them directly to master. :-)
 

I feel really honored by the trust the community is putting on me. I
promise not to break the code base too often :D

 
 Happy hacking,
 

Happy hacking to you all! Keep rocking!

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

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

 sc/source/ui/view/printfun.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 2e63bf23c29abd7a3b32902ee3acb889d8c04f35
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 15 11:26:57 2013 +0100

Referer check for Calc background image

Change-Id: I69f69e4fa790969ac4e338dd6294ff9ef951d5b6

diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 6ab7d1e..87c508b 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1085,10 +1085,11 @@ static void lcl_DrawGraphic( const Graphic rGraphic, 
OutputDevice *pOut,
 }
 
 static void lcl_DrawGraphic( const SvxBrushItem rBrush, OutputDevice *pOut, 
OutputDevice* pRefDev,
-const Rectangle rOrg, const Rectangle rOut )
+const Rectangle rOrg, const Rectangle rOut,
+OUString const  referer )
 {
 Size aGrfSize(0,0);
-const Graphic *pGraphic = rBrush.GetGraphic();
+const Graphic *pGraphic = rBrush.GetGraphic(referer);
 SvxGraphicPosition ePos;
 if ( pGraphic  pGraphic-IsSupportedGraphic() )
 {
@@ -1260,8 +1261,11 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, 
long nScrW, long nScrH,
 pRefDev = pDev; // don't use printer for PDF
 else
 pRefDev = pDoc-GetPrinter();   // use printer also for preview
-
-lcl_DrawGraphic( *pBackground, pDev, pRefDev, aFrameRect, 
aFrameRect );
+OUString referer;
+if (pDocShell-HasName()) {
+referer = pDocShell-GetMedium()-GetName();
+}
+lcl_DrawGraphic( *pBackground, pDev, pRefDev, aFrameRect, 
aFrameRect, referer );
 }
 else
 {
___
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/poolfmt.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 66bd352d3a5516404cfc16f9a760655744a39949
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Nov 15 11:42:24 2013 +0100

SwDoc::GetTxtCollFromPool: fix Footnote paragraph style

Commit 5cf62a6ab450c25eb07a1ec08c857f17f674ef67 (First modification on
the default template for the Writer, 2013-11-04) probably wanted to
ensure that the footnote field (which is usually just a number) is
superscript, but instead it modified the footnote itself. Having the
footnote text itself as superscript doesn't make sense by default.

Change-Id: Ic990d0afca356c2723eee0764b86b9c8c57c14b7

diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 925aa21..4c9f982 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -555,7 +555,6 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, 
bool bRegardLanguage )
 break;
 
 case RES_POOLCOLL_FOOTNOTE: // paragraph style Footnote
-aSet.Put( SvxEscapementItem( DFLT_ESC_AUTO_SUPER, 58, 
RES_CHRATR_ESCAPEMENT ) );
 case RES_POOLCOLL_ENDNOTE:  // paragraph style Endnote
 {
 SvxLRSpaceItem aLR( RES_LR_SPACE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Vendors Name via UNO API / Basic Macros

Hey all,

I am looking for an easy way to find out, which product (LibO or AOO) is
installed and currently activ via Basic Macros.

Because in LO 4.1 we have some API-changes, macros should now have a
version-switch.
There are different methods to get the internal version-number - that is
not a problem.

But: The version number itself is not suffcient because AOO 4.1.0 will
start soon and this version-number is identical to LO 4.1.0.

So macros must have additional a vendor-switch.

Do somebody have an easy access hint to vendor-name?

There should be a possibility in configuration-data, but I do not know
where?

Thanks for your answers

Thomas



-- 
## Unterstützung der freien Office Suite
## http://de.libreOffice.org  - www.LibreOffice.org
## Vorstand Freies Office Deutschland e.V.
## Mitglieder willkommen: www.FroDeV.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

junit autogen error?

2013-11-15 Thread Joseph Pellegrino

I am not sure if this is the right list to post this question if not please 
accept my apologies and let me know which is the appropriate list. I’ve also 
tried to find similar posts along this line but I didn’t find one. Anyhow, I 
recently checked out the current version of LO (git clone 
git://gerrit.libreoffice.org/core) and tried to run the build configuration 
(autogen.sh) and ultimately got the following error:

checking for JUnit 4... no
configure: error: cannot find JUnit 4 jar; please install one in the default
location (/usr/share/java), specify its pathname via
--with-junit=..., or disable it via --without-junit
Error running configure at ./autogen.sh line 209.

When I specify the junit path:

./autogen.sh --with-junit=/opt/local/share/java/

I get the same error. I’ve tried several versions of junit with different 
versions of hamcrest but can’t seem to get a successful configuration without 
excluding junit. I am wondering if anyone could give me a hint as to the issue.

Some additional information:

OS X v10.9
junit-4.11, hamcrest-core-1.3

$ automake --version
automake (GNU automake) 1.14

$ gcc -v

Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr 
--with-gxx-include-dir=/usr/include/c++/4.2.1
Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
Target: x86_64-apple-darwin13.0.0
Thread model: posix


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

Digital Signing a document with an Elliptic Curve certificate on Ubuntu 12.04

2013-11-15 Thread linux problems

Hi,

 

On Ubuntu 12.04 with LibreOffice 3.5.7.2 I fail to digitally sign a document 
using an ECC certificate.

I tried loading such a pfx to firefox' software token and it appears on the 
list of available certificates for signing - however, I cannot sign any 
document with it. 

RSA based certificates work fine.

 

Is it a known issue?

 

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

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

 sw/source/filter/inc/wrtswtbl.hxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a3886c529cefdc0cb3db8ca27b3ea02f456c0470
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 15 12:06:34 2013 +0100

o3tl::sorted_vector Compare needs to be a strict weak ordering

No idea what the odd COLFUZZY SwWriteTableCol::operator == and  are 
supposed to
be good for, so leave them alone for now.

Change-Id: I52528a097f18ff12fac9725d802a3988c9dfa7e2

diff --git a/sw/source/filter/inc/wrtswtbl.hxx 
b/sw/source/filter/inc/wrtswtbl.hxx
index f4b7d50..6c25b8a 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -219,8 +219,13 @@ inline int SwWriteTableCol::operator( const 
SwWriteTableCol rCol ) const
 return nPos  rCol.nPos - COLFUZZY;
 }
 
+struct SwWriteTableColLess {
+bool operator()(SwWriteTableCol const * lhs, SwWriteTableCol const * rhs) {
+return lhs-GetPos()  rhs-GetPos();
+}
+};
 
-class SwWriteTableCols : public o3tl::sorted_vectorSwWriteTableCol*, 
o3tl::less_ptr_toSwWriteTableCol  {
+class SwWriteTableCols : public o3tl::sorted_vectorSwWriteTableCol*, 
SwWriteTableColLess {
 public:
 ~SwWriteTableCols() { DeleteAndDestroyAll(); }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-15 Thread Muthu Subramanian

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

New commits:
commit 98e7faeeb59e2fc13681bfc3896016b64a81d665
Author: Muthu Subramanian sumu...@collabora.com
Date:   Fri Nov 15 16:47:09 2013 +0530

fdo#71581: Fix unit test cases.

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 30f7115..13c0bf1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1648,7 +1648,7 @@ DECLARE_OOXML_TEST(testVMLData, TestVMLData.docx)
 // The problem was exporter was exporting vml data for shape in w:rPr 
element.
 // vml data shoud not come under w:rPr element.
 xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
-CPPUNIT_ASSERT(getXPath(pXmlDoc, /w:hdr/w:p/w:r/w:pict/v:shape, 
stroked).match(f));
+CPPUNIT_ASSERT(getXPath(pXmlDoc, /w:hdr/w:p/w:r/w:pict/v:rect, 
stroked).match(f));
 }
 
 DECLARE_OOXML_TEST(testImageData, image_data.docx)
@@ -1656,7 +1656,7 @@ DECLARE_OOXML_TEST(testImageData, image_data.docx)
 // The problem was exporter was exporting v:imagedata data for shape in 
w:pict as v:fill w element.
 
 xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
-CPPUNIT_ASSERT(getXPath(pXmlDoc, 
/w:hdr/w:p/w:r/w:pict/v:shape/v:imagedata, detectmouseclick).match(t));
+CPPUNIT_ASSERT(getXPath(pXmlDoc, 
/w:hdr/w:p/w:r/w:pict/v:rect/v:imagedata, detectmouseclick).match(t));
 }
 
 DECLARE_OOXML_TEST(testImageCrop, ImageCrop.docx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Failures in sw/source/core/doc/doccomp.cxx(2122)

On Thu, 2013-11-14 at 10:03 +0100, Matteo Casalin wrote:
 This is my fault,
unluckily I won't be able to work on that until this late evening.
 
 If someone can work on that, the (untested) fix for line 2122 should be 
 something like:
 
 nBorderLen = std::minsal_Int32( 3, std::min( nPar1Len, nPar2Len ) );

I sorted that out yesterday.

C.

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

Re: Handling of worksheet functions from Excel 2010 and newer

2013-11-15 Thread Eike Rathke

Hi Winfried,

On Friday, 2013-11-15 08:42:29 +0100, Winfried Donkers wrote:

 No problem, only AFAICS, the current test is more of a 'do _xlfn.-functions 
 import correctly' kind. 

That specific test case yes. We can add other tests to check correctness
of results (within bounds of rounding errors) or whatever we want.

 Should we add all new/renamed Excel2010 functions to that xlsx-document? 
 It isn't too much trouble for me, but I wouldn't like to give 'one of you 
 with Excel' work that is not necessary. :) 

I'd appreciate if you could add all the functions, send the document to
me, I'd check it in Excel if all works and then save it again to commit.

 BTW, I would put all functions in the xlsx-document at once, and only add the 
 test when adding a set of functions.

Please do so.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


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

Re: Vendors Name via UNO API / Basic Macros

On 14/11/13 09:21, Thomas Krumbein wrote:
 Hey all,
 
 I am looking for an easy way to find out, which product (LibO or AOO) is
 installed and currently activ via Basic Macros.
 
 Because in LO 4.1 we have some API-changes, macros should now have a
 version-switch.

i hope the API changes are small enough in scope so that you don't have
to re-write everything?  we try to do API changes only after a careful
discussion of the alternatives; please give us feedback in case you
think that you spend too much time and effort on this kind of thing :)

 There are different methods to get the internal version-number - that is
 not a problem.
 
 But: The version number itself is not suffcient because AOO 4.1.0 will
 start soon and this version-number is identical to LO 4.1.0.
 
 So macros must have additional a vendor-switch.
 
 Do somebody have an easy access hint to vendor-name?
 
 There should be a possibility in configuration-data, but I do not know
 where?

searching for PRODUCTNAME finds this:

http://opengrok.libreoffice.org/xref/core/officecfg/registry/data/org/openoffice/Setup.xcu#22

org.openoffice.Setup.Product.ooName

value should be LibreOffice at runtime (or LibreOfficeDev for a
non-release build).

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

Re: Failures in sw/source/core/doc/doccomp.cxx(2122)

2013-11-15 Thread Matteo Casalin

On Fri, 15 Nov 2013 11:11:22 +
Caolán McNamara caol...@redhat.com wrote:

 On Thu, 2013-11-14 at 10:03 +0100, Matteo Casalin wrote:
  This is my fault,
 unluckily I won't be able to work on that until this late evening.
  
  If someone can work on that, the (untested) fix for line 2122 should be 
  something like:
  
  nBorderLen = std::minsal_Int32( 3, std::min( nPar1Len, nPar2Len ) );
 
 I sorted that out yesterday.
 

Thank you very much!
I noticed that by having a look to the tinderbox status during the day.
Cheers
Matteo

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

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

2013-11-15 Thread Oliver-Rainer Wittmann

 accessibility/source/standard/vclxaccessiblelist.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ddf54d685f05d6be26f609df42461d14da857442
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Nov 15 11:58:27 2013 +

revert unnecessary change to curl patch file for Windows made by the 
introduction of ia2 as it breaks the on Windows when using a git-clone

part 1 of the revert: removing svn:eol-style property
commit e2f90c93c97f3cf137c348ed302c6470f398aa70
Author: Herbert DÃ¼rr h...@apache.org
Date:   Fri Nov 15 11:03:37 2013 +

#i107914# fix build breaker on 64bit platforms introduced by ia2

diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx 
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 1cff9aa..6453c72 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -369,7 +369,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const 
VclWindowEvent rVclWindowEve
 break;
 case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
 if ( !m_bDisableProcessEvent )
-
UpdateFocus_Impl_Acc((sal_uInt16)reinterpret_castsal_uInt32(rVclWindowEvent.GetData()),b_IsDropDownList);
+
UpdateFocus_Impl_Acc((sal_uInt16)reinterpret_castsal_uIntPtr(rVclWindowEvent.GetData()),b_IsDropDownList);
 break;
 case VCLEVENT_WINDOW_GETFOCUS:
 break;
___
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' - 74/e54220a6341ef9f100128556106b698388295a

 74/e54220a6341ef9f100128556106b698388295a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 49bfce5606d1fb3d8c59e4c2437fab9ea7e9f8fd
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 12:12:29 2013 +

Notes added by 'git notes add'

diff --git a/74/e54220a6341ef9f100128556106b698388295a 
b/74/e54220a6341ef9f100128556106b698388295a
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/74/e54220a6341ef9f100128556106b698388295a
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - extras/source sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk vcl/inc vcl/source

 extras/source/glade/libreoffice-catalog.xml.in |4 +
 sd/AllLangResTarget_sd.mk  |2 
 sd/UIConfig_sdraw.mk   |1 
 sd/UIConfig_simpress.mk|1 
 sd/inc/glob.hrc|1 
 sd/source/core/glob.src|5 +
 sd/source/ui/dlg/RemoteDialog.cxx  |   30 +++--
 sd/source/ui/dlg/RemoteDialog.hxx  |8 --
 sd/source/ui/dlg/RemoteDialog.src  |   56 -
 sd/source/ui/dlg/RemoteDialogClientBox.cxx |   73 +--
 sd/source/ui/dlg/RemoteDialogClientBox.hxx |6 -
 sd/source/ui/dlg/dlgolbul.cxx  |   58 --
 sd/source/ui/dlg/dlgolbul.src  |   63 
 sd/source/ui/inc/OutlineBulletDlg.hxx  |   10 +--
 sd/source/ui/inc/RemoteDialog.hrc  |   18 -
 sd/source/ui/inc/dlgolbul.hrc  |   21 --
 sd/source/ui/table/TableDesignPane.cxx |   16 +
 sd/uiconfig/simpress/ui/remotedialog.ui|   78 +
 vcl/inc/svids.hrc  |1 
 vcl/source/src/btntext.src |5 +
 vcl/source/window/builder.cxx  |2 
 21 files changed, 194 insertions(+), 265 deletions(-)

New commits:
commit 2d1782250088280425833c060513245bf3defed7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 11:21:30 2013 +

convert bullets and numbering dialog to .ui

Change-Id: I303684cd0d4e2f3092cc776cd0b77725d6741bc6

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 895bdbb..45d874e 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/animobjs.src \
 sd/source/ui/dlg/dlgass.src \
 sd/source/ui/dlg/dlgfield.src \
-sd/source/ui/dlg/dlgolbul.src \
 sd/source/ui/dlg/LayerDialog.src \
 sd/source/ui/dlg/navigatr.src \
 sd/source/ui/dlg/PaneDockingWindow.src \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 90c2448..228a4d7 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/breakdialog \
+   sd/uiconfig/sdraw/ui/bulletsandnumbering \
sd/uiconfig/sdraw/ui/crossfadedialog \
sd/uiconfig/sdraw/ui/dlgsnap \
sd/uiconfig/sdraw/ui/copydlg \
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index a09b92e..a03ae76 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -38,7 +38,6 @@
 #include sdresid.hxx
 
 #include glob.hrc
-#include dlgolbul.hrc
 #include bulmaper.hxx
 #include DrawDocShell.hxx
 #include svl/aeitem.hxx
@@ -52,13 +51,12 @@ OutlineBulletDlg::OutlineBulletDlg(
 ::Window* pParent,
 const SfxItemSet* pAttr,
 ::sd::View* pView )
-: SfxTabDialog  ( pParent, SdResId(TAB_OUTLINEBULLET) ),
-  aInputSet ( *pAttr ),
-  bTitle( sal_False ),
-  pSdView   ( pView )
+: SfxTabDialog( pParent, BulletsAndNumberingDialog,
+modules/sdraw/ui/bulletsandnumbering.ui)
+, aInputSet( *pAttr )
+, bTitle(false)
+, pSdView(pView)
 {
-FreeResource();
-
 aInputSet.MergeRange( SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL );
 aInputSet.Put( *pAttr );
 
@@ -128,15 +126,14 @@ OutlineBulletDlg::OutlineBulletDlg(
 SetInputSet( aInputSet );
 
 if(!bTitle)
-AddTabPage(RID_SVXPAGE_PICK_SINGLE_NUM);
+AddTabPage(singlenum, RID_SVXPAGE_PICK_SINGLE_NUM);
 else
-RemoveTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
-
-AddTabPage( RID_SVXPAGE_PICK_BULLET  );
-AddTabPage( RID_SVXPAGE_PICK_BMP   );
-AddTabPage(RID_SVXPAGE_NUM_OPTIONS  );
-AddTabPage(RID_SVXPAGE_NUM_POSITION );
+RemoveTabPage(singlenum);
 
+AddTabPage(bullets, RID_SVXPAGE_PICK_BULLET);
+AddTabPage(graphics, RID_SVXPAGE_PICK_BMP);
+m_nOptionsId = AddTabPage(customize, RID_SVXPAGE_NUM_OPTIONS);
+m_nPositionId = AddTabPage(position, RID_SVXPAGE_NUM_POSITION);
 }
 
 OutlineBulletDlg::~OutlineBulletDlg()
@@ -146,30 +143,25 @@ OutlineBulletDlg::~OutlineBulletDlg()
 
 void OutlineBulletDlg::PageCreated( sal_uInt16 nId, SfxTabPage rPage )
 {
-switch ( nId )
+if (nId == m_nOptionsId)
 {
-case RID_SVXPAGE_NUM_OPTIONS:
+if( pSdView )
 {
-if( pSdView )
-{
-FieldUnit eMetric = pSdView-GetDoc().GetUIUnit();
-SfxAllItemSet aSet(*(GetInputSetImpl()-GetPool()));
-aSet.Put ( 
SfxAllEnumItem(SID_METRIC_ITEM,(sal_uInt16)eMetric));
-rPage.PageCreated(aSet);
-}
+FieldUnit eMetric = pSdView-GetDoc().GetUIUnit();
+

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - dd/f54d685f05d6be26f609df42461d14da857442

 dd/f54d685f05d6be26f609df42461d14da857442 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d38a4fe41539784e19e9933c66d5f130dcae1b63
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 12:12:53 2013 +

Notes added by 'git notes add'

diff --git a/dd/f54d685f05d6be26f609df42461d14da857442 
b/dd/f54d685f05d6be26f609df42461d14da857442
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/dd/f54d685f05d6be26f609df42461d14da857442
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/count-todo-dialogs

 bin/count-todo-dialogs |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7d923ad8195211e618b0a65caad4456da20fcec
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 12:17:03 2013 +

update count-todo-dialogs to exclude comments mentioning Dialogs

Change-Id: I997356cc76c8ef9737309b3347f7a1969d306682

diff --git a/bin/count-todo-dialogs b/bin/count-todo-dialogs
index fef854d..fdb6fbb 100755
--- a/bin/count-todo-dialogs
+++ b/bin/count-todo-dialogs
@@ -13,9 +13,9 @@
 converted=`ls */uiconfig/ui/*.ui */uiconfig/*/ui/*.ui|wc -l`
 echo $converted .ui files currently exist
 
-dialogs=`git grep -h Dialog -- *.src|grep -v DialogControl|grep -v HelpID|grep 
-v define|grep -v String|grep -v QuickHelpText|grep -v Text \[ en-US \]|grep 
-v HelpId|grep -v Cancel-Button|grep -v \Dialog\|grep -v Dialog Controls 
|grep -v .uno:|grep -v //|grep -v include|grep -v paste region|grep -v 
Tabpage-Dialog|sed -e 's/^ *//g' -e 's/ *$//g'|cut -d' ' -f2- |sort|uniq|wc 
-l`
+dialogs=`git grep -h Dialog -- *.src|grep -v DialogControl|grep -v HelpID|grep 
-v define|grep -v String|grep -v QuickHelpText|grep -v Text \[ en-US \]|grep 
-v HelpId|grep -v Cancel-Button|grep -v \Dialog\|grep -v Dialog Controls 
|grep -v .uno:|grep -v //|grep -v */|grep -v include|grep -v paste 
region|grep -v Tabpage-Dialog|sed -e 's/^ *//g' -e 's/ *$//g'|cut -d' ' -f2- 
|sort|uniq|wc -l`
 
-tabpages=`git grep -h TabPage -- *.src|grep -v DialogControl|grep -v 
HelpID|grep -v define|grep -v String|grep -v QuickHelpText|grep -v Text \[ 
en-US \]|grep -v HelpId|grep -v Cancel-Button|grep -v \Dialog\|grep -v 
Dialog Controls |grep -v .uno:|grep -v //|grep -v include|grep -v paste 
region|grep -v Tabpage-Dialog|sed -e 's/^ *//g' -e 's/ *$//g'|cut -d' ' -f2- 
|sort|uniq|wc -l`
+tabpages=`git grep -h TabPage -- *.src|grep -v DialogControl|grep -v 
HelpID|grep -v define|grep -v String|grep -v QuickHelpText|grep -v Text \[ 
en-US \]|grep -v HelpId|grep -v Cancel-Button|grep -v \Dialog\|grep -v 
Dialog Controls |grep -v .uno:|grep -v //|grep -v */|grep -v include|grep 
-v paste region|grep -v Tabpage-Dialog|sed -e 's/^ *//g' -e 's/ *$//g'|cut 
-d' ' -f2- |sort|uniq|wc -l`
 
 echo There are $dialogs unconverted dialogs
 echo There are $tabpages unconverted tabpages
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sd/uiconfig/sdraw/ui/bulletsandnumbering.ui |  175 
 1 file changed, 175 insertions(+)

New commits:
commit 2531d750ed8089e9342c8cb21c0fb48a1b14b4f2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 12:20:49 2013 +

missing .ui

Change-Id: Ifac13b48a951e002e2fa3eed19c2bd00ff4cca67

diff --git a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui 
b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
new file mode 100644
index 000..4c3ca19
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
@@ -0,0 +1,175 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=BulletsAndNumberingDialog
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesBullets and Numbering/property
+property name=window_positionmouse/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing12/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=layout_styleend/property
+child
+  object class=GtkButton id=ok
+property name=labelgtk-ok/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position3/property
+  /packing
+/child
+child
+  object class=GtkButton id=reset
+property name=label translatable=yesReset/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position4/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkNotebook id=tabcontrol
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
+child
+  placeholder/
+/child
+child type=tab
+  object class=GtkLabel id=bullets
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesBullets/property
+  /object
+  packing
+property name=tab_fillFalse/property
+  /packing
+/child
+child
+  placeholder/
+/child
+child type=tab
+  object class=GtkLabel id=singlenum
+property name=visibleTrue/property
+property

[Libreoffice-commits] core.git: 3 commits - android/sdremote l10ntools/source

 android/sdremote/Makefile|   12 +
 l10ntools/source/stringmerge.cxx |   49 +++
 2 files changed, 46 insertions(+), 15 deletions(-)

New commits:
commit 96e23cb9305da8b00db2587104932ee9d5d3122c
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Nov 15 13:20:07 2013 +0100

fix Makefile of Android Impress Remote

it is not part of gbuild system
qtz does not build

Change-Id: I46fb43d21255df76775a2d7e30950bf519c58526

diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 740c6f6..c480bcc 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -10,6 +10,10 @@ ifeq ($(BUILDDIR),)
 include ../../config_host.mk
 endif
 
+STRINGEX_EXECUTABLE := $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/stringex
+STRINGEX_LDPATH := 
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)
+STRINGEX_COMMAND := $(STRINGEX_LDPATH) $(STRINGEX_EXECUTABLE)
+
 all: properties translations.done
mkdir -p ../abs-lib/libs
cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar 
../abs-lib/libs
@@ -36,10 +40,8 @@ endef
 define android_translation_rules
 $(call android_get_po,$(1)):
mkdir -p res/values-$(1)
-   $(if $(filter-out qtz,$(1)), \
-   echo 
$(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po  
translations-$(1).db \
-   $(gb_Executable_BINDIR_FOR_BUILD)/stringex -i 
res/values/strings.xml -o res/values-$(1)/strings.xml -m translations-$(1).db 
-l $(1), \
-   $(gb_Executable_BINDIR_FOR_BUILD)/stringex -i 
res/values/strings.xml -o res/values-$(1)/strings.xml -m -l $(1))
+   echo $(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po 
 translations-$(1).db \
+   $(STRINGEX_COMMAND) -i res/values/strings.xml -o 
res/values-$(1)/strings.xml -m translations-$(1).db -l $(1)
 
 endef
 
@@ -48,7 +50,7 @@ $(foreach lang,$(1),$(call android_translation_rules,$(lang)))
 endef
 
 define android_get_langlist
-$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo nso 
kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
+$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo nso kok 
qtz,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
 endef
 
 $(eval $(call android_translations_rules,$(call android_get_langlist)))
commit 1cd032658648b597d7f89b3098a40606f674ce41
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Nov 15 13:10:41 2013 +0100

do not merge translatable=false strings to Android resource

Change-Id: Ie5653d0b03fb5090deaad6c70a9e3e638f6e24e0

diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index d6ffbc6..7cc5d01 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -159,6 +159,30 @@ void StringParser::Merge(
 }
 }
 
+for( xmlNodePtr pCurrent = pRootNode-children; pCurrent; )
+{
+if (!xmlStrcmp(pCurrent-name, (const xmlChar*)(string)))
+{
+xmlChar* pTranslatable = xmlGetProp(pCurrent, (const 
xmlChar*)(translatable));
+if (!xmlStrcmp(pTranslatable, (const xmlChar*)(false)))
+{
+xmlNodePtr pNonTranslatable = pCurrent;
+pCurrent = pCurrent-next;
+xmlUnlinkNode( pNonTranslatable );
+xmlFreeNode( pNonTranslatable );
+}
+else
+{
+pCurrent = pCurrent-next;
+}
+xmlFree( pTranslatable );
+}
+else
+{
+pCurrent = pCurrent-next;
+}
+}
+
 delete pMergeDataFile;
 xmlSaveFile( rDestinationFile.getStr(), m_pSource );
 xmlFreeDoc( m_pSource );
commit ba433c69e658e2edf2832878acae544bcf54133d
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Nov 15 11:14:12 2013 +0100

do not extract translatable=false strings from Android resource

Change-Id: Id00ce654b99426c771b647e0ae6be02bfdc24359

diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 9e3fa7a..d6ffbc6 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -68,17 +68,22 @@ void StringParser::Extract( const OString rPOFile )
 {
 if (!xmlStrcmp(pCurrent-name, (const xmlChar*)(string)))
 {
-xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)(name));
-xmlChar* pText = xmlNodeGetContent(pCurrent);
-const OString sTemp =
-helper::unEscapeAll(helper::xmlStrToOString( pText 
),\\n\\t\\',\n\t\\');
-common::writePoEntry(
-Stringex, aPOStream, m_pSource-name, string,
-helper::xmlStrToOString( pID ), OString(), OString(),
-sTemp);
+xmlChar* pTranslatable = xmlGetProp(pCurrent, (const

Re: [Libreoffice-commits] core.git: COLFUZZY SwWriteTableCol

CppunitTest_sw_ooxmlexport started to fail after 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=8f7c127c4be32a91052ea962aafd0af8a1645714 
Fix for LibreOffice crash during Document RoundTrip though it is 
unclear to me whether it is due to that commit's change to 
sw/source/filter/writer/wrtswtbl.cxx or whether it is a problem that has 
been in the code before and only now happens to be triggered by that 
commit's newly added test in sw/qa/extras/ooxmlexport/ooxmlexport.cxx.


My --enable-dbgutil build started to abort in 
CppunitTest_sw_ooxmlexport, complaining about unsorted input to 
std::lower/upper_bound in o3tl/sorted_vector.hxx, which I band-aided 
with the below commit.  (Though that left CppunitTest_sw_ooxmlexport 
still failing with number of nodes is incorrect test failures.)


However, the code in sw/source/filter/inc/wrtswtbl.hxx leaves me 
completely puzzled.


* For one,


inline int SwWriteTableCol::operator( const SwWriteTableCol rCol ) const
{
// Da wir hier nur die Wahrheits-Grade 0 und 1 kennen, lassen wir lieber
// auch nicht zu, dass x==y und xy gleichzeitig gilt ;-)
return nPos  rCol.nPos - COLFUZZY;
}


is clearly broken and even does not fulfill the fuzzy compare of 
treating Cols with |a.nPos - b.nPos| = COLFUZZY as equivalent, as 
codified in the accompanying



inline int SwWriteTableCol::operator==( const SwWriteTableCol rCol ) const
{
// etwas Unschaerfe zulassen
return (nPos = rCol.nPos ? nPos - rCol.nPos
 : rCol.nPos - nPos ) = COLFUZZY;
}


(Note esp. that nPos is sal_uInt32, so e.g. 1000  10 - COLFUZZY is true.)

* For another, I /guess/ that what is intended here is that 
SwWriteTable.aCols normalizes the given input and does not insert a 
new Col whose nPos is = COLFUZZY apart from any existing Col.  But the 
code clearly fails to deliver that...


* Also, SwXMLTableColumn_Impl inherits the broken 
SwWriteTableCol::operator and is used in a similarly dubious way in 
sw/source/filter/xml/xmltble.cxx.


Does anybody have insight into this part of the code and can properly 
fix the mess?


Stephan


On 11/15/2013 12:08 PM, Stephan Bergmann wrote:

commit a3886c529cefdc0cb3db8ca27b3ea02f456c0470
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 15 12:06:34 2013 +0100

 o3tl::sorted_vector Compare needs to be a strict weak ordering

 No idea what the odd COLFUZZY SwWriteTableCol::operator == and  are 
supposed to
 be good for, so leave them alone for now.

 Change-Id: I52528a097f18ff12fac9725d802a3988c9dfa7e2

diff --git a/sw/source/filter/inc/wrtswtbl.hxx 
b/sw/source/filter/inc/wrtswtbl.hxx
index f4b7d50..6c25b8a 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -219,8 +219,13 @@ inline int SwWriteTableCol::operator( const 
SwWriteTableCol rCol ) const
  return nPos  rCol.nPos - COLFUZZY;
  }

+struct SwWriteTableColLess {
+bool operator()(SwWriteTableCol const * lhs, SwWriteTableCol const * rhs) {
+return lhs-GetPos()  rhs-GetPos();
+}
+};

-class SwWriteTableCols : public o3tl::sorted_vectorSwWriteTableCol*, 
o3tl::less_ptr_toSwWriteTableCol  {
+class SwWriteTableCols : public o3tl::sorted_vectorSwWriteTableCol*, 
SwWriteTableColLess {
  public:
  ~SwWriteTableCols() { DeleteAndDestroyAll(); }
  };

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

[Libreoffice-commits] core.git: desktop/inc desktop/Library_libreoffice.mk desktop/source smoketest/libtest.cxx

2013-11-15 Thread Michael Meeks

 desktop/Library_libreoffice.mk |2 
 desktop/inc/liblibreoffice.h   |   46 +
 desktop/inc/liblibreoffice.hxx |   46 ++---
 desktop/source/lib/init.cxx|  106 +++--
 desktop/source/lib/shim.c  |   66 +
 desktop/source/lib/shim.cxx|   64 
 smoketest/libtest.cxx  |2 
 7 files changed, 223 insertions(+), 109 deletions(-)

New commits:
commit 9013a3a76dd773cf3f292267c9aac8046f19f0aa
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Nov 15 12:09:10 2013 +

liblibo: expose a C API for ABI reasons, and wrap with C++.

Change-Id: I7b3bcead05788e663d94724522bfa3f227b15499

diff --git a/desktop/Library_libreoffice.mk b/desktop/Library_libreoffice.mk
index b35c75d..dbdf6ac 100644
--- a/desktop/Library_libreoffice.mk
+++ b/desktop/Library_libreoffice.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_StaticLibrary_use_libraries,libreoffice,\
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_StaticLibrary_add_exception_objects,libreoffice,\
+$(eval $(call gb_StaticLibrary_add_cobjects,libreoffice,\
 desktop/source/lib/shim \
 ))
 
diff --git a/desktop/inc/liblibreoffice.h b/desktop/inc/liblibreoffice.h
new file mode 100644
index 000..db3b835
--- /dev/null
+++ b/desktop/inc/liblibreoffice.h
@@ -0,0 +1,46 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_H
+#define INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_H
+
+#ifdef __cplusplus
+  extern C {
+#endif
+
+typedef struct _LibreOffice LibreOffice;
+typedef struct _LibreOfficeDocument LibreOfficeDocument;
+
+struct _LibreOffice {
+  int  nSize;
+
+  void (*destroy)   (LibreOffice *pThis);
+  int  (*initialize)(LibreOffice *pThis,
+ const char *pInstallPath);
+  LibreOfficeDocument *(*documentLoad)  (LibreOffice *pThis,
+ const char *pURL);
+  char *   (*getError)  (LibreOffice *pThis);
+};
+
+struct _LibreOfficeDocument {
+  int  nSize;
+
+  void (*destroy)   (LibreOfficeDocument *pThis);
+  int (*saveAs) (LibreOfficeDocument *pThis,
+ const char *pUrl, const char *pFormat);
+};
+
+LibreOffice *lo_init (const char *install_path);
+
+#ifdef __cplusplus
+  }
+#endif
+
+#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/liblibreoffice.hxx b/desktop/inc/liblibreoffice.hxx
index 28c2347..81207ac 100644
--- a/desktop/inc/liblibreoffice.hxx
+++ b/desktop/inc/liblibreoffice.hxx
@@ -10,30 +10,60 @@
 #ifndef INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_HXX
 #define INCLUDED_DESKTOP_INC_LIBLIBREOFFICE_HXX
 
+#include liblibreoffice.h
+
+/*
+ * The reasons this C++ code is not as pretty as it could be are:
+ *  a) provide a pure C API - that's useful for some people
+ *  b) allow ABI stability - C++ vtables are not good for that.
+ *  c) avoid C++ types as part of the API.
+ */
+
 class LODocument
 {
+LibreOfficeDocument *mpDoc;
 public:
-virtual ~LODocument() {}
+inline LODocument( LibreOfficeDocument *pDoc ) : mpDoc( pDoc ) {}
+inline ~LODocument() { mpDoc-destroy( mpDoc ); }
 
 // Save as the given format, if format is NULL sniff from ext'n
-virtual bool saveAs (const char *url, const char *format = NULL) = 0;
+inline bool saveAs( const char *url, const char *format = NULL )
+{
+return mpDoc-saveAs( mpDoc, url, format );
+}
 };
 
 class LibLibreOffice
 {
+LibreOffice *mpThis;
 public:
-virtual ~LibLibreOffice () {};
+inline LibLibreOffice( LibreOffice *pThis ) : mpThis( pThis ) {}
+inline ~LibLibreOffice() { mpThis-destroy( mpThis ); };
 
-virtual boolinitialize (const char *installPath) = 0;
+inline bool initialize( const char *installPath )
+{
+return mpThis-initialize( mpThis, installPath );
+}
 
-virtual LODocument *documentLoad (const char *url) = 0;
+inline LODocument *documentLoad( const char *url )
+{
+LibreOfficeDocument *pDoc = mpThis-documentLoad( mpThis, url );
+if( !pDoc )
+return NULL;
+return new LODocument( pDoc );
+}
 
 // return the last error as a string, free me.
-virtual char   *getError() = 0;
-
+inline char *getError() { return mpThis-getError( mpThis ); }
 };
 
-LibLibreOffice *lo_init (const char *install_path);
+inline LibLibreOffice *lo_cpp_init( const char *install_path )
+{
+LibreOffice *pThis = lo_init( install_path );
+if( !pThis || !pThis-nSize  0 )
+return NULL;
+return new LibLibreOffice( pThis );
+}

Re: Vendors Name via UNO API / Basic Macros

Hey Michael,

Am 15.11.2013 12:53, schrieb Michael Stahl:
On 14/11/13 09:21, Thomas Krumbein wrote:
Hey all,

I am looking for an easy way to find out, which product (LibO or AOO) is
installed and currently activ via Basic Macros.

Because in LO 4.1 we have some API-changes, macros should now have a
version-switch.

i hope the API changes are small enough in scope so that you don't have
to re-write everything? we try to do API changes only after a careful
discussion of the alternatives; please give us feedback in case you
think that you spend too much time and effort on this kind of thing :)

Well, this change was a small technical thing - but with a very big
influence on typical market applications. Every custom macro application
with dialogs or forms for user interfaces is influenced if dialogs/forms
using Date/time fields. And typicly most of them (in my applications
about 70%) used those fields.
So all applications will crash using LO 4.1.1.2 or upper. So in my
opinion nobody who make this decision has a closer market view.

Do somebody have an easy access hint to vendor-name?

There should be a possibility in configuration-data, but I do not know
where?

searching for PRODUCTNAME finds this:

http://opengrok.libreoffice.org/xref/core/officecfg/registry/data/org/openoffice/Setup.xcu#22

org.openoffice.Setup.Product.ooName

Thanks for this - I know the xcu files. But this is not an easy access
for (Basic-) macros. The way to do is: Search for this file, parse this
file and extract the vendor name... for basic marcos a very long way.
I can find a solution - but I think about all those macro-programmers
out in the market: Do you really think, this is a real solution?

Thank you an d best regards

Thomas

--
## Unterstützung der freien Office Suite
## http://de.libreOffice.org - www.LibreOffice.org
## Vorstand Freies Office Deutschland e.V.
## Mitglieder willkommen: www.FroDeV.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: junit autogen error?

2013-11-15 Thread Noel Grandin


On 2013-11-13 04:14, Joseph Pellegrino wrote:

When I specify the junit path:

./autogen.sh --with-junit=/opt/local/share/java/




You need to do:

./autogen.sh --with-junit=/opt/local/share/java/junit-4.jar

or whatever your jar file name is.

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


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

[Libreoffice-commits] core.git: extras/source include/svx sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_sdraw.mk svx/source

 extras/source/glade/libreoffice-catalog.xml.in |3 
 include/svx/graphctl.hxx   |1 
 sd/AllLangResTarget_sd.mk  |1 
 sd/UIConfig_sdraw.mk   |1 
 sd/inc/helpids.h   |2 
 sd/source/ui/dlg/vectdlg.cxx   |  114 +++
 sd/source/ui/dlg/vectdlg.src   |  206 -
 sd/source/ui/inc/vectdlg.hrc   |   47 ---
 sd/source/ui/inc/vectdlg.hxx   |   36 --
 sd/uiconfig/sdraw/ui/vectorize.ui  |  383 +
 svx/source/dialog/graphctl.cxx |   29 +
 11 files changed, 486 insertions(+), 337 deletions(-)

New commits:
commit 2dec3d1d4f3e91ce005bb3b5362b826e7c7590c8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 12:49:18 2013 +

convert 500th dialog (vectorize) to .ui

Change-Id: Ib1a8716091a16eb970c9f218f4a8e496de72ff51

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 83946db..a9c74e6 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -353,6 +353,9 @@
 glade-widget-class title=Rectangle Control name=svxlo-SvxRectCtl
 generic-name=Rectangle Control 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Graph Control name=svxlo-GraphCtrl
+generic-name=Graph Control parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
 glade-widget-class title=Frame Direction ListBox 
name=svxlo-FrameDirectionListBox
 generic-name=FrameDirectionListBox 
parent=GtkComboBox
 icon-name=widget-gtk-combobox/
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 26fca7e..ee183bb 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -81,6 +81,7 @@ protected:
 public:
 
 GraphCtrl( Window* pParent, const ResId rResId );
+GraphCtrl( Window* pParent, WinBits nStyle );
 ~GraphCtrl();
 
 voidSetWinStyle( WinBits nWinBits );
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 45d874e..8385a49 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/PaneDockingWindow.src \
 sd/source/ui/dlg/sdpreslt.src \
 sd/source/ui/dlg/tpaction.src \
-sd/source/ui/dlg/vectdlg.src \
 sd/source/ui/slideshow/slideshow.src \
 sd/source/ui/view/DocumentRenderer.src \
 ))
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 228a4d7..5f8ce22 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/printeroptions \
sd/uiconfig/sdraw/ui/tabledesigndialog \
+   sd/uiconfig/sdraw/ui/vectorize \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 1bab9f8..ff67035 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -155,8 +155,6 @@
 #define HID_SD_TABLE_DESIGN 
SD_HID_SD_TABLE_DESIGN
 #define HID_SD_ANNOTATIONS  
SD_HID_SD_ANNOTATIONS
 
-#define HID_VECTORIZE_DLG   
SD_HID_VECTORIZE_DLG
-
 #define HID_MN_SUB_GRAPHIC  
SD_HID_MN_SUB_GRAPHIC
 #define HID_MN_SUB_FIELD
SD_HID_MN_SUB_FIELD
 #define HID_MN_SUB_TEMPLATES
SD_HID_MN_SUB_TEMPLATES
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index de8ce7c..5abbec9 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -26,49 +26,45 @@
 #include sdmod.hxx
 #include sdiocmpt.hxx
 #include vectdlg.hxx
-#include vectdlg.hrc
 #include vcl/bmpacc.hxx
 #include vcl/msgbox.hxx
 #include vcl/metaact.hxx
 
 #define VECTORIZE_MAX_EXTENT 512
 
-SdVectorizeDlg::SdVectorizeDlg(
-Window* pParent, const Bitmap rBmp, ::sd::DrawDocShell* pDocShell ) :
-ModalDialog ( pParent, SdResId( DLG_VECTORIZE ) ),
-mpDocSh  ( pDocShell ),
-aGrpSettings( this, SdResId( GRP_SETTINGS ) ),
-aFtLayers   ( this, SdResId( FT_LAYERS ) ),
-aNmLayers   ( this, SdResId( NM_LAYERS ) ),
-aFtReduce   ( this, SdResId( FT_REDUCE ) ),
-aMtReduce   ( this, SdResId( MT_REDUCE ) ),
-aFtFillHoles( this, SdResId( FT_FILLHOLES ) ),
-aMtFillHoles( this, SdResId( MT_FILLHOLES ) ),
-aCbFillHoles( this, SdResId( CB_FILLHOLES ) ),
-aFtOriginal (

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit a7fb491ff7a01829fea3f3299e7181e6ea537304
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 12:55:09 2013 +

Updated core
Project: help  f3a5452927181f245084721c7ed0fc6047bf70e7

diff --git a/helpcontent2 b/helpcontent2
index fedee79..f3a5452 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fedee798f49ae39358c0b0c618aee3ab7c0d1687
+Subproject commit f3a5452927181f245084721c7ed0fc6047bf70e7
___
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 |5 -
 source/text/simpress/01/13050200.xhp |   24 
 2 files changed, 12 insertions(+), 17 deletions(-)

New commits:
commit f3a5452927181f245084721c7ed0fc6047bf70e7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 12:55:09 2013 +

update help ids for vectorize dialog .ui conversion

Change-Id: I926c5ad78000c44bc80142ab662ecd2173ea5b3b

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index cd1815b..27e7096 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6320,7 +6320,6 @@ sd_CheckBox_DLG_PUBLISHING_PAGE3_SLD_SOUND,1085850685,
 sd_CheckBox_DLG_PUBLISHING_PAGE4_CREATED,1085850700,
 sd_CheckBox_DLG_PUBLISHING_PAGE4_DOWNLOAD,1085850699,
 sd_CheckBox_DLG_PUBLISHING_PAGE5_TEXTONLY,1085850706,
-sd_CheckBox_DLG_VECTORIZE_CB_FILLHOLES,1084457985,
 sd_Checkbox_DLG_CUSTOMANIMATION_SCHEMES_PANE_4,1415742468,
 sd_ComboBox_DLG_PUBLISHING_PAGE3_QUALITY,1085853751,
 sd_DockingWindow_FLT_LEFT_PANE_DRAW_DOCKING_WINDOW,3234217984,
@@ -6358,8 +6357,6 @@ sd_ListBox_FLT_WIN_ANIMATION_LB_ADJUSTMENT,3231370754,
 sd_ListBox_FLT_WIN_ANIMATION_LB_LOOP_COUNT,3231370755,
 sd_ListBox_TP_ANIMATION_LB_ACTION,549768707,
 sd_ListBox_TP_ANIMATION_LB_OLE_ACTION,549768708,
-sd_MetricField_DLG_VECTORIZE_MT_FILLHOLES,1084463620,
-sd_MetricField_DLG_VECTORIZE_MT_REDUCE,1084463619,
 sd_ModalDialog_DLG_CUSTOMANIMATION_SCHEMES_PANE,1415741440,
 sd_ModalDialog_DLG_INSERT_PASTE,1084850176,
 sd_ModalDialog_DLG_PRINTDIALOG,1104003072,
@@ -6367,7 +6364,6 @@ sd_ModalDialog_DLG_PRINT_WARNINGS,1087307776,
 sd_ModalDialog_DLG_PUBLISHING,1085849600,
 sd_MultiLineEdit_DLG_ASS_EDT_PAGE4_ASKINFORMATION,1088490011,
 sd_MultiLineEdit_DLG_PUBLISHING_PAGE4_MISC,1085852234,
-sd_NumericField_DLG_VECTORIZE_NM_LAYERS,1084463105,
 sd_NumericField_FLT_WIN_ANIMATION_NUM_FLD_BITMAP,3231373313,
 sd_PushButton_DLG_ASS_BUT_LAST,1088492035,
 sd_PushButton_DLG_ASS_BUT_NEXT,1088492036,
@@ -6384,7 +6380,6 @@ sd_PushButton_DLG_PUBLISHING_PAGE6_BACK,1085854312,
 sd_PushButton_DLG_PUBLISHING_PAGE6_LINK,1085854314,
 sd_PushButton_DLG_PUBLISHING_PAGE6_TEXT,1085854313,
 sd_PushButton_DLG_PUBLISHING_PAGE6_VLINK,1085854315,
-sd_PushButton_DLG_VECTORIZE_BTN_PREVIEW,1084461569,
 sd_PushButton_FLT_WIN_ANIMATION_BTN_CREATE_GROUP,3231371786,
 sd_PushButton_TP_ANIMATION_BTN_SEARCH,549769729,
 sd_PushButton_TP_ANIMATION_BTN_SEEK,549769730,
diff --git a/source/text/simpress/01/13050200.xhp 
b/source/text/simpress/01/13050200.xhp
index af3c797..12f7dfd 100644
--- a/source/text/simpress/01/13050200.xhp
+++ b/source/text/simpress/01/13050200.xhp
@@ -32,8 +32,8 @@
 /meta
 body
 section id=inpolygon
-bookmark xml-lang=en-US branch=hid/.uno:ChangePolygon id=bm_id5748041 
localize=false/!-- HID added by script --
-bookmark xml-lang=en-US branch=hid/.uno:ChangePolygon id=bm_id3147435 
localize=false/
+bookmark xml-lang=en-US branch=hid/.uno:ChangePolygon id=bm_id5748041 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/sdraw/ui/vectorize/VectorizeDialog id=bm_id3147435 
localize=false/
 paragraph role=heading id=hd_id3152578 xml-lang=en-US level=1 
l10n=CHG oldref=1link href=text/simpress/01/13050200.xhp name=To 
PolygonTo Polygon/link/paragraph
 paragraph role=paragraph id=par_id3145252 xml-lang=en-US l10n=U 
oldref=2ahelp hid=.uno:ChangePolygonConverts the selected object to a 
polygon (a closed object bounded by straight lines)./ahelp The appearance of 
the object does not change. If you want, you can right-click and choose link 
href=text/shared/main0227.xhp name=Edit PointsemphEdit 
Points/emph/link to view the changes./paragraph
 /section
@@ -45,26 +45,26 @@
 paragraph role=paragraph id=par_id3153713 xml-lang=en-US l10n=U 
oldref=5The following options are required to convert a bitmap image to a 
polygon. The converted image is actually a collection of smaller polygons 
filled with color./paragraph
 paragraph role=heading id=hd_id3154254 xml-lang=en-US level=2 
l10n=U oldref=6Settings/paragraph
 paragraph role=paragraph id=par_id3149126 xml-lang=en-US l10n=U 
oldref=7Set the conversion options for the image./paragraph
-bookmark xml-lang=en-US 
branch=hid/sd:NumericField:DLG_VECTORIZE:NM_LAYERS id=bm_id3150202 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/sdraw/ui/vectorize/colors 
id=bm_id3150202 localize=false/
 paragraph role=heading id=hd_id3146314 xml-lang=en-US level=3 
l10n=U oldref=8Number of colors:/paragraph
-paragraph role=paragraph id=par_id3145790 xml-lang=en-US l10n=U 
oldref=9ahelp hid=SD:NUMERICFIELD:DLG_VECTORIZE:NM_LAYERSEnter the 
number of colors to be displayed in the converted image. $[officename] 
generates a polygon for each occurrence of a color in the 
image./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sd:MetricField:DLG_VECTORIZE:MT_REDUCE 
id=bm_id3154658 localize=false/
+paragraph role=paragraph id=par_id3145790 xml-lang=en-US l10n=U 
oldref=9ahelp hid=modules/sdraw/ui/vectorize/colorsEnter the number of 
colors

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

 desktop/source/lib/init.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 13d36ad94937fa278690a5cc5287e8997aecb10f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 15 14:05:16 2013 +0100

-Werror,-Wmismatched-tags

Change-Id: I5388bcf7228b181e429a0d82e9b0968a2ed5a06c

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 817d846..6fa9211 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -40,8 +40,8 @@
 
 using namespace ::com::sun::star;
 
-class LibLODocument_Impl;
-class LibLibreOffice_Impl;
+struct LibLODocument_Impl;
+struct LibLibreOffice_Impl;
 
 static LibLibreOffice_Impl *gImpl = NULL;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Vendors Name via UNO API / Basic Macros

Hi,

On Fri, Nov 15, 2013 at 01:43:38PM +0100, Thomas Krumbein 
thomas.krumb...@documentfoundation.org wrote:
 Thanks for this - I know the xcu files. But this is not an easy access
 for (Basic-) macros. The way to do is: Search for this file, parse this
 file and extract the vendor name... for basic marcos a very long way.

Why not use the css::configuration::ConfigurationProvider API instead?

I mean something like:

 oProvider = 
 createUnoService(com.sun.star.configuration.ConfigurationProvider)
 Dim aParams(0) As new com.sun.star.beans.PropertyValue
 aParams(0).Name = nodepath
 aParams(0).Value = /org.openoffice.Setup/Product
 oSettings = 
 oProvider.createInstanceWithArguments(com.sun.star.configuration.ConfigurationAccess,
  aParams)
 xray oSettings.getByName(ooName)

HTH,

Miklos


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

Re: Vendors Name via UNO API / Basic Macros

2013-11-15 Thread Andrew Douglas Pitonyak



On 11/15/2013 07:43 AM, Thomas Krumbein wrote:
Every custom macro application with dialogs or forms for user 
interfaces is influenced if dialogs/forms using Date/time fields. And 
typicly most of them (in my applications about 70%) used those fields. 
So all applications will crash using LO 4.1.1.2 or upper.


Are you saying that if you use a Date / Time field in a form or dialog 
in LO, it fails? If there is more to it, can you be more specific, sorry 
if I am uninformed on this.


--
Andrew Pitonyak
My Macro Document: http://www.pitonyak.org/AndrewMacro.odt
Info:  http://www.pitonyak.org/oo.php

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

[Libreoffice-commits] core.git: Library_urelibs.mk

 Library_urelibs.mk |9 +
 1 file changed, 9 insertions(+)

New commits:
commit b7f38c8f6d63798714b9881ac8ff2da11c72799b
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 15 16:05:21 2013 +0200

Add Win32 system libs

Change-Id: I9d232d1e4104319083bc74c491b9c37231e259cc

diff --git a/Library_urelibs.mk b/Library_urelibs.mk
index 014116b..dfcdd53 100644
--- a/Library_urelibs.mk
+++ b/Library_urelibs.mk
@@ -35,4 +35,13 @@ $(eval $(call gb_Library_add_libs,urelibs,\
) \
 ))
 
+$(if $(filter $(OS),WNT), \
+   $(eval $(call gb_Library_use_system_win32_libs,urelibs,\
+   mpr \
+   ole32 \
+   shell32 \
+   ws2_32 \
+   )) \
+)
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - accessibility/source curl/curl-7.19.7_win.patch editeng/source sw/source winaccessibility/source

2013-11-15 Thread Oliver-Rainer Wittmann

 accessibility/source/standard/vclxaccessiblelist.cxx|2 
 curl/curl-7.19.7_win.patch  |   38 ++--
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |4 -
 sw/source/core/access/accfield.hxx  |2 
 sw/source/core/access/accpara.cxx   |6 -
 winaccessibility/source/UAccCOM/makefile.mk |9 --
 6 files changed, 27 insertions(+), 34 deletions(-)

New commits:
commit 11dde52476f5723d874699e0f0fc58092e7e96ad
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Nov 15 13:40:56 2013 +

fix build breaker in new module winaccessibility introduced with ia2

build breaks under Windows on non-pro build when building without stlport

Patch by: hdu

diff --git a/winaccessibility/source/UAccCOM/makefile.mk 
b/winaccessibility/source/UAccCOM/makefile.mk
index e190f25..9222140 100644
--- a/winaccessibility/source/UAccCOM/makefile.mk
+++ b/winaccessibility/source/UAccCOM/makefile.mk
@@ -46,9 +46,6 @@ CFLAGS+=-D_UNICODE -DUNICODE
 .IF $(PRODUCT)!=
 RC+=-DPRODUCT
 .ENDIF
-.IF $(USE_STLP_DEBUG)!=
-CDEFS+=-D_DEBUG
-.ENDIF # $(USE_STLP_DEBUG)!=
 
 RCFILES=\
 $(TARGET).rc
@@ -113,12 +110,8 @@ SHL1STDLIBS=\
 
 .IF $(COM)!=GCC
 .IF $(CCNUMVER)  0013
-.IF $(USE_STLP_DEBUG) != 
-SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
 SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
 .ENDIF
-.ENDIF
 .ENDIF 
 
 SHL1OBJS=$(SLOFILES)
@@ -139,4 +132,4 @@ ALLTAR : \
 $(MISC)/$(TARGET).manifest: $(BIN)$/$(TARGET)$(DLLPOST)
 cat *.rgs  $(MISC)$/$(TARGET).rgs
 mt.exe -rgs:$(MISC)$/$(TARGET).rgs -tlb:$(MISC)$/$(TARGET).tlb 
-dll:$(TARGET).dll -out:$(MISC)$/$(TARGET).manifest
-mt.exe -manifest $(MISC)$/$(TARGET).manifest 
-outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97
\ No newline at end of file
+mt.exe -manifest $(MISC)$/$(TARGET).manifest 
-outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97
commit e9ca732f8aeba1a9bb2e1d9f4e95047675490d79
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Nov 15 12:51:21 2013 +

part 2 of revert unnecessary change to curl patch file

diff --git a/curl/curl-7.19.7_win.patch b/curl/curl-7.19.7_win.patch
index bc59433..3f08fd2 100644
--- a/curl/curl-7.19.7_win.patch
+++ b/curl/curl-7.19.7_win.patch
@@ -1,19 +1,19 @@
 misc/curl-7.19.7/lib/Makefile.vc9  2009-11-04 13:35:39.0 +0100
-+++ misc/build/curl-7.19.7/lib/Makefile.vc92009-11-18 12:32:57.234375000 
+0100
-@@ -46,13 +46,13 @@
- # Stem for static libs and DLLs
- #
- LIB_NAME   = libcurl
--LIB_NAME_DEBUG = libcurld
-+LIB_NAME_DEBUG = libcurl
- 
- #
- # Stem for DLL import libs
- #
--IMPLIB_NAME   = libcurl_imp
--IMPLIB_NAME_DEBUG = libcurld_imp
-+IMPLIB_NAME   = libcurl
-+IMPLIB_NAME_DEBUG = libcurl
- 
- !IFNDEF OPENSSL_PATH
- OPENSSL_PATH   = ../../openssl-0.9.8g
+--- misc/curl-7.19.7/lib/Makefile.vc9  2009-11-04 13:35:39.0 +0100
 misc/build/curl-7.19.7/lib/Makefile.vc92009-11-18 12:32:57.234375000 
+0100
+@@ -46,13 +46,13 @@
+ # Stem for static libs and DLLs
+ #
+ LIB_NAME   = libcurl
+-LIB_NAME_DEBUG = libcurld
++LIB_NAME_DEBUG = libcurl
+ 
+ #
+ # Stem for DLL import libs
+ #
+-IMPLIB_NAME   = libcurl_imp
+-IMPLIB_NAME_DEBUG = libcurld_imp
++IMPLIB_NAME   = libcurl
++IMPLIB_NAME_DEBUG = libcurl
+ 
+ !IFNDEF OPENSSL_PATH
+ OPENSSL_PATH   = ../../openssl-0.9.8g
commit 807186202af80d8320e5c7459e94c0bdd02f765b
Author: Herbert DÃ¼rr h...@apache.org
Date:   Fri Nov 15 12:37:08 2013 +

#i107914# IA2 build fixes in SW-module for 64bit platforms

diff --git a/sw/source/core/access/accfield.hxx 
b/sw/source/core/access/accfield.hxx
index 18db16c..e99a3c3 100644
--- a/sw/source/core/access/accfield.hxx
+++ b/sw/source/core/access/accfield.hxx
@@ -125,7 +125,7 @@ public:
 //=  XAccessibleContext  ==
 
 /// Return the number of currently visible children.
-virtual long SAL_CALL getAccessibleChildCount (void)
+virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
 throw (::com::sun::star::uno::RuntimeException);
 
 /// Return the specified child or NULL if index is invalid.
diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 31e41f7..84e4a6e 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2533,7 +2533,7 @@ void SwAccessibleParagraph::_correctValues( const 
sal_Int32 nIndex,
 if (rValue.Name.compareTo(::rtl::OUString::createFromAscii( 
GetPropName( UNO_NAME_CHAR_BACK_COLOR ).pName ) )==0)
 {
 uno::Any anyChar = rValue.Value;
-sal_uInt32 crBack = (sal_uInt32)(anyChar.pReserved);
+sal_uInt32 crBack = static_castsal_uInt32( 
reinterpret_castsal_uIntPtr(anyChar.pReserved));
 if (COL_AUTO == crBack)
 {
 uno::ReferenceXAccessibleComponent xComponent(this);
@@

Re: You're now in the committer group on gerrit.libreoffice.org

2013-11-15 Thread bjoern

Hi,

On Fri, Nov 15, 2013 at 11:13:53AM +0100, Jacobo Aragunde Pérez wrote:
 El 14/11/13 16:27, Miklos Vajna escribió:
  Hi Jacobo,
  
  I'm happy to notify you about that you've been added to the Committers
  group on gerrit. This means that when you're sure about your changes,
  please just go ahead and push them directly to master. :-)
  
 
 I feel really honored by the trust the community is putting on me. I
 promise not to break the code base too often :D

Oh, and just to repeat the obvious:

When you have direct commit access, this also means you can push in _other_
peoples changes from gerrit to master, so you are a 'full reviewer' as much as
a 'unrestricted committer'. So I kindly ask to help us in patch review, as:

 with great power comes great responsibility ;)

Best,

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

Re: Vendors Name via UNO API / Basic Macros

2013-11-15 Thread Jan Holesovsky

Hi Thomas,

Thomas Krumbein píše v Pá 15. 11. 2013 v 13:43 +0100:

 Well, this change was a small technical thing - but with a very big
 influence on typical market applications. Every custom macro application
 with dialogs or forms for user interfaces is influenced if dialogs/forms
 using Date/time fields.

Have you filed a bugreport, please?  A minimal example of the macro that
fails would be most appreciated.

Thank you,
Kendy

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

Re: Vendors Name via UNO API / Basic Macros

Hey Kendy,

Am 15.11.2013 15:35, schrieb Jan Holesovsky:
 Hi Thomas,
 
 Thomas Krumbein píše v Pá 15. 11. 2013 v 13:43 +0100:
 
 Well, this change was a small technical thing - but with a very big
 influence on typical market applications. Every custom macro application
 with dialogs or forms for user interfaces is influenced if dialogs/forms
 using Date/time fields.
 
 Have you filed a bugreport, please?  A minimal example of the macro that
 fails would be most appreciated.

Well - it´s not a bug, because you mentioned the change in release-notes
of version 4.1.

What´s happend, you can read my article on my homepage. It is in german
language but I am sure, you get the context ;)

http://www.mic-consulting.de/index.php/opersource/api-makros-libo-aoo/10-datumsfelder-geaendert-in-lo-4-1-1

Best regards
Thomas


-- 
## Unterstützung der freien Office Suite
## http://de.libreOffice.org  - www.LibreOffice.org
## Vorstand Freies Office Deutschland e.V.
## Mitglieder willkommen: www.FroDeV.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sw/qa/extras/rtfexport/rtfexport.cxx   |2 -
 sw/qa/extras/rtfimport/data/copypaste-footnote.rtf |2 -
 sw/qa/extras/rtfimport/data/cp118.rtf  |   27 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |   14 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |1 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   12 +
 6 files changed, 44 insertions(+), 14 deletions(-)

New commits:
commit 9389cf78e304a5a99bcf1745b9388e14ac36281a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Nov 15 15:05:02 2013 +0100

cp#118 RTF import: empty para at the end of footnote text got lost

Updated 3 testcases, in all cases first checked that the new behavior
matches what Word does.

Also added a new test, to check that empty para at footnote end is now
kept.

Change-Id: I96b8788feb4d730b5a64ba3a743311a0180ab41f

diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 72beefc..58df4b5 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -344,7 +344,7 @@ DECLARE_RTFEXPORT_TEST(testFdo55939, fdo55939.odt)
 uno::Referencetext::XTextRange xParagraph(getParagraph(1));
 getRun(xParagraph, 1, Main text before footnote.);
 // Why the tab has to be removed here?
-CPPUNIT_ASSERT_EQUAL(OUString(Footnote text.),
+CPPUNIT_ASSERT_EQUAL(OUString(Footnote text.\n),
 getProperty uno::Referencetext::XTextRange (getRun(xParagraph, 
2), Footnote)-getText()-getString().replaceAll(\t, ));
 getRun(xParagraph, 3,  Text after the footnote.); // However, this 
leading space is intentional and OK.
 }
diff --git a/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf 
b/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf
index 93e4613..1420878 100644
--- a/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf
+++ b/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf
@@ -1,6 +1,6 @@
 {\rtf1
 aaa
 {\super \chftn
-{\*\footnote \chftn\pard\plain \li339\fi-339 \par}
+{\*\footnote \chftn\pard\plain \li339\fi-339}
 }
 \par }
diff --git a/sw/qa/extras/rtfimport/data/cp118.rtf 
b/sw/qa/extras/rtfimport/data/cp118.rtf
new file mode 100644
index 000..725d21e
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/cp118.rtf
@@ -0,0 +1,27 @@
+{\rtf1\ansi\deff3\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New 
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 
Arial;}{\f3\froman\fprq2\fcharset0 Times New Roman;}{\f4\fswiss\fprq2\fcharset0 
Arial;}{\f5\fnil\fprq2\fcharset0 DejaVu Sans;}}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\cf0\kerning1\dbch\af5\langfe2052\dbch\af5\afs24\alang1081\loch\f3\fs24\lang1038
 Normal;}
+{\*\cs15\snext15 Footnote Characters;}
+{\*\cs16\snext16\super Footnote Anchor;}
+{\*\cs17\snext17\super Endnote Anchor;}
+{\*\cs18\snext18 Endnote Characters;}
+{\s19\sbasedon0\snext20\sb240\sa120\keepn\dbch\af5\dbch\af5\afs28\loch\f4\fs28 
Heading;}
+{\s20\sbasedon0\snext20\sb0\sa120 Text Body;}
+{\s21\sbasedon20\snext21\sb0\sa120 List;}
+{\s22\sbasedon0\snext22\sb120\sa120\noline\i\afs24\ai\fs24 Caption;}
+{\s23\sbasedon0\snext23\noline Index;}
+{\s24\sbasedon0\snext24\li339\ri0\lin339\rin0\fi-339\noline\afs20\fs20 
Footnote;}
+}{\info{\creatim\yr2010\mo6\dy1\hr16\min51}{\revtim\yr2013\mo11\dy15\hr14\min22}{\printim\yr0\mo0\dy0\hr0\min0}{\comment
 LibreOfficeDev}{\vern67239936}}\deftab709
+\viewscale100
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse451\pgwsxn11906\pghsxn5499\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
 Default Style;}}
+\formshade\paperh5499\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn5499\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\pgndec\pard\plain 
\s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\cf0\kerning1\dbch\af5\langfe2052\dbch\af5\afs24\alang1081\loch\f3\fs24\lang1038{\rtlch
 \ltrch\loch
+Hello world!}{{\super \chftn{\*\footnote \chftn\pard\plain 
\s24\li339\ri0\lin339\rin0\fi-339\noline\afs20\fs20{\rtlch \ltrch\loch\rtlch 
\ltrch\loch
+\tab Footnote }{\rtlch \ltrch\loch
+first line}{\rtlch \ltrch\loch
+.}
+\par }}
+}
+\par }
\ No newline at end of file
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 24708c4..f1db5f6 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -357,7 +357,7 @@ DECLARE_RTFIMPORT_TEST(testFdo45182, fdo45182.rtf)
 uno::Referencecontainer::XIndexAccess 
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
 uno::Referencetext::XTextRange xTextRange(xFootnotes-getByIndex(0), 
uno::UNO_QUERY);
 // Encoding in the footnote was wrong.
-

Re: Vendors Name via UNO API / Basic Macros

Hi Miklos,

yes, thanks, that might be a practible way at this time.

Nevertheless - it is not a solution for the future.

I guess, there should be an implementation of the original product name,
version-number (major and minor) and actuall product name.

This should be easy accessible even for unexpierienced macro developers.

I will do a feature request or this :)


best regards
Thomas



Am 15.11.2013 14:11, schrieb Miklos Vajna:
 Hi,
 
 On Fri, Nov 15, 2013 at 01:43:38PM +0100, Thomas Krumbein 
 thomas.krumb...@documentfoundation.org wrote:
 Thanks for this - I know the xcu files. But this is not an easy access
 for (Basic-) macros. The way to do is: Search for this file, parse this
 file and extract the vendor name... for basic marcos a very long way.
 
 Why not use the css::configuration::ConfigurationProvider API instead?
 
 I mean something like:
 
 oProvider = 
 createUnoService(com.sun.star.configuration.ConfigurationProvider)
 Dim aParams(0) As new com.sun.star.beans.PropertyValue
 aParams(0).Name = nodepath
 aParams(0).Value = /org.openoffice.Setup/Product
 oSettings = 
 oProvider.createInstanceWithArguments(com.sun.star.configuration.ConfigurationAccess,
  aParams)
 xray oSettings.getByName(ooName)
 
 HTH,
 
 Miklos


-- 
## Unterstützung der freien Office Suite
## http://de.libreOffice.org  - www.LibreOffice.org
## Vorstand Freies Office Deutschland e.V.
## Mitglieder willkommen: www.FroDeV.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-11-15 Thread Faisal M . Al-Otaibi

 sw/qa/extras/ooxmlexport/data/fdo71646.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   12 
 sw/source/filter/ww8/docxattributeoutput.cxx |2 ++
 3 files changed, 14 insertions(+)

New commits:
commit 84b3d6dc3a7d5ba52b00285e59e7aa6b5ca15837
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Fri Nov 15 18:09:21 2013 +0300

DOCX:fdo#71646 fix wrong direction when save the file.

Change-Id: I6f3dcf1007e91551e1f3335f4c40424add1c45c3

diff --git a/sw/qa/extras/ooxmlexport/data/fdo71646.docx 
b/sw/qa/extras/ooxmlexport/data/fdo71646.docx
new file mode 100644
index 000..d49d88b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo71646.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 13c0bf1..1bf422f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1820,6 +1820,18 @@ DECLARE_OOXML_TEST(testCellGridSpan, 
cell-grid-span.docx)
 assertXPath(pXmlDoc, 
/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:tcPr/w:gridSpan,0);
 assertXPath(pXmlDoc, 
/w:document/w:body/w:tbl/w:tr/w:tc[2]/w:tcPr/w:gridSpan,0);
 }
+DECLARE_OOXML_TEST(testFdo71646, fdo71646.docx)
+{
+// The problem was after save file created by MS the direction changed to 
RTL.
+uno::Referenceuno::XInterface xParaLTRLeft(getParagraph( 1, LTR LEFT));
+sal_Int32 nLTRLeft = getProperty sal_Int32 ( xParaLTRLeft, ParaAdjust 
);
+// test the text Direction value for the pragraph
+sal_Int16 nLRDir  = getProperty sal_Int32 ( xParaLTRLeft, WritingMode 
);
+
+// this will test the both the text direction and alignment for paragraph
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT), nLTRLeft);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, nLRDir);
+}
 
 #endif
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 54e0a5f..9e41119 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6157,6 +6157,8 @@ void DocxAttributeOutput::FormatFrameDirection( const 
SvxFrameDirectionItem rDi
 {
 if ( bBiDi )
 m_pSerializer-singleElementNS( XML_w, XML_bidi, FSNS( XML_w, 
XML_val ), 1, FSEND );
+else
+m_pSerializer-singleElementNS( XML_w, XML_bidi, FSNS( XML_w, 
XML_val ), 0, FSEND );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/inc sc/qa sc/source

 sc/inc/tokenstringcontext.hxx  |   11 ++-
 sc/qa/unit/ucalc_formula.cxx   |   30 ++--
 sc/source/core/tool/token.cxx  |   43 ++---
 sc/source/core/tool/tokenstringcontext.cxx |   18 +++-
 sc/source/filter/oox/formulabuffer.cxx |   12 
 5 files changed, 86 insertions(+), 28 deletions(-)

New commits:
commit cf3977c605cca29e35a9079a3c5c118f4d22fc39
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 15 10:37:26 2013 -0500

Handle global range names and use CreateString() during xlsx import.

This makes the load speed slightly faster.

Change-Id: I64e4d4b8c42a68577350539f3812cafdc0433f96

diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index e5bb01c..5bcc3b3 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -12,6 +12,10 @@
 
 #include compiler.hxx
 
+#include boost/unordered_map.hpp
+
+class ScDocument;
+
 namespace sc {
 
 /**
@@ -20,16 +24,19 @@ namespace sc {
  * between multiple CreateString() calls as long as the document content is
  * unmodified.
  */
-struct TokenStringContext
+struct SC_DLLPUBLIC TokenStringContext
 {
+typedef boost::unordered_mapsal_uInt16, OUString IndexNameMapType;
+
 formula::FormulaGrammar::Grammar meGram;
 formula::FormulaCompiler::OpCodeMapPtr mxOpCodeMap;
 const ScCompiler::Convention* mpRefConv;
 OUString maErrRef;
 
 std::vectorOUString maTabNames;
+IndexNameMapType maGlobalRangeNames;
 
-TokenStringContext( formula::FormulaGrammar::Grammar eGram );
+TokenStringContext( const ScDocument* pDoc, 
formula::FormulaGrammar::Grammar eGram );
 };
 
 }
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 1f867f1..43e0d1d 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -32,6 +32,7 @@ using namespace formula;
 
 void Test::testFormulaCreateStringFromTokens()
 {
+// Insert sheets.
 OUString aTabName1(Test);
 OUString aTabName2(Kevin's Data);
 OUString aTabName3(Past Data);
@@ -41,19 +42,42 @@ void Test::testFormulaCreateStringFromTokens()
 m_pDoc-InsertTab(2, aTabName3);
 m_pDoc-InsertTab(3, aTabName4);
 
+// Insert named ranges.
+struct {
+const char* pName;
+const char* pExpr;
+} aNames[] = {
+{ x, Test.H1 },
+{ y, Test.H2 },
+{ z, Test.H3 }
+};
+
+ScRangeName* pGlobalNames = m_pDoc-GetRangeName();
+CPPUNIT_ASSERT_MESSAGE(Failed to obtain global named expression object., 
pGlobalNames);
+
+for (size_t i = 0, n = SAL_N_ELEMENTS(aNames); i  n; ++i)
+{
+ScRangeData* pName = new ScRangeData(
+m_pDoc, OUString::createFromAscii(aNames[i].pName), 
OUString::createFromAscii(aNames[i].pExpr),
+ScAddress(0,0,0), RT_NAME, formula::FormulaGrammar::GRAM_NATIVE);
+
+bool bInserted = pGlobalNames-insert(pName);
+CPPUNIT_ASSERT_MESSAGE(Failed to insert a new name., bInserted);
+}
+
 const char* aTests[] = {
 1+2,
 SUM(A1:A10;B1:B10;C5;D6),
 IF(Test.B1010;\Good\;\Bad\),
 AVERAGE('2013'.B10:C20),
 'Kevin''s Data'.B10,
-'Past Data'.B1+'2013'.B2*(1+'Kevin''s Data'.C10)
+'Past Data'.B1+'2013'.B2*(1+'Kevin''s Data'.C10),
+x+y*z
 };
 
 boost::scoped_ptrScTokenArray pArray;
 
-sc::TokenStringContext aCxt(formula::FormulaGrammar::GRAM_ENGLISH);
-aCxt.maTabNames = m_pDoc-GetAllTableNames();
+sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
 ScAddress aPos(0,0,0);
 
 for (size_t i = 0, n = SAL_N_ELEMENTS(aTests); i  n; ++i)
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index a226549..8984632 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3222,7 +3222,22 @@ void appendTokenByType( sc::TokenStringContext rCxt, 
OUStringBuffer rBuf, cons
 // TODO : Implement this.
 break;
 case svIndex:
-// TODO : Implement this.
+{
+sal_uInt16 nIndex = rToken.GetIndex();
+switch (eOp)
+{
+case ocName:
+{
+sc::TokenStringContext::IndexNameMapType::const_iterator 
it = rCxt.maGlobalRangeNames.find(nIndex);
+if (it != rCxt.maGlobalRangeNames.end())
+rBuf.append(it-second);
+}
+break;
+// TODO : Handle other name types.
+default:
+;
+}
+}
 break;
 case svExternal:
 // TODO : Implement this.
@@ -3284,23 +3299,19 @@ OUString ScTokenArray::CreateString( 
sc::TokenStringContext rCxt, const ScAddre
 {
 const FormulaToken* pToken = *p;
 OpCode eOp = pToken-GetOpCode();
-switch (eOp)
+

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - include/formula

 include/formula/FormulaCompiler.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fd0f4bdd1969b945e44f260c90c28e70de3d077c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 15 10:52:59 2013 -0500

Make FormulaCompiler explicitly non-copyable.

Change-Id: Ie0618c7e6e3854d54f117c3fe957925f3f81ac46

diff --git a/include/formula/FormulaCompiler.hxx 
b/include/formula/FormulaCompiler.hxx
index b450ed6..a90bc82 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -27,6 +27,7 @@
 
 #include boost/shared_ptr.hpp
 #include boost/unordered_map.hpp
+#include boost/noncopyable.hpp
 
 #include com/sun/star/uno/Sequence.hxx
 
@@ -62,7 +63,7 @@ struct FormulaArrayStack
 typedef ::boost::unordered_map OUString, OpCode, OUStringHash, 
::std::equal_to OUString   OpCodeHashMap;
 typedef ::boost::unordered_map OUString, OUString, OUStringHash, 
::std::equal_to OUString   ExternalHashMap;
 
-class FORMULA_DLLPUBLIC FormulaCompiler
+class FORMULA_DLLPUBLIC FormulaCompiler : boost::noncopyable
 {
 public:
 FormulaCompiler();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/extras/ooxmlexport/data/para-auto-spacing.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   56 ---
 sw/source/filter/ww8/docxattributeoutput.hxx |4 +
 sw/source/filter/ww8/docxtablestyleexport.cxx|   10 ++-
 writerfilter/source/dmapper/DomainMapper.cxx |   33 ---
 writerfilter/source/dmapper/PropertyIds.cxx  |2 
 writerfilter/source/dmapper/PropertyIds.hxx  |2 
 writerfilter/source/dmapper/PropertyMap.hxx  |1 
 9 files changed, 94 insertions(+), 20 deletions(-)

New commits:
commit 9db943c50519b2a36f3eb144fda7f08abe13bdb2
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Nov 15 16:55:31 2013 +0100

DOCX export: fixes for para auto spacing roundtrip

- m_bParaBeforeAutoSpacing / m_bParaBeforeAutoSpacing was never set to false
- m_iParaBeforeSpacing / m_iParaAfterSpacing was uninitialized

Change-Id: I5c8ebd8e4f4c151059916397bc45e0c0ebcf5040

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6bfc91d..70361fa 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5656,6 +5656,7 @@ void DocxAttributeOutput::FormatULSpace( const 
SvxULSpaceItem rULSpace )
 m_pParagraphSpacingAttrList-add( FSNS( XML_w, XML_before ),
 OString::number( rULSpace.GetUpper() ) );
 }
+m_bParaBeforeAutoSpacing = false;
 // check if after auto spacing was set during import and spacing we 
get from actual object is same
 // that we set in import. If yes just write afterAutoSpacing tag.
 if (m_bParaAfterAutoSpacing  m_iParaAfterSpacing == 
rULSpace.GetLower())
@@ -5668,6 +5669,7 @@ void DocxAttributeOutput::FormatULSpace( const 
SvxULSpaceItem rULSpace )
 m_pParagraphSpacingAttrList-add( FSNS( XML_w, XML_after ),
 OString::number( rULSpace.GetLower()) );
 }
+m_bParaAfterAutoSpacing = false;
 
 if (rULSpace.GetContext())
 m_pSerializer-singleElementNS( XML_w, XML_contextualSpacing, 
FSEND );
@@ -6262,7 +6264,9 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
rExport, FSHelperPtr pSeri
   m_bFrameBtLr(false),
   m_pTableStyleExport(new DocxTableStyleExport(rExport.pDoc, pSerializer)),
   m_bParaBeforeAutoSpacing(false),
-  m_bParaAfterAutoSpacing(false)
+  m_bParaAfterAutoSpacing(false),
+  m_iParaBeforeSpacing(0),
+  m_iParaAfterSpacing(0)
 {
 }
 
commit 68e538ea6d6b2308de7c9390116fa06cd8c02d18
Author: Nikhil Walvekar nikhil.walve...@synerzip.com
Date:   Fri Nov 1 23:25:41 2013 +0530

Resolved: Preservation of para before and after auto spacing.

During import a flag and fixed value is stored in InteropGrabBag and
during export we check for fixed value and value available in para spacing
object. Write autospacing only if para spacing values are not modified 
during
edit.

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

Change-Id: If34c5b61c3180b01e68dfe83862784c3d6f33981

diff --git a/sw/qa/extras/ooxmlexport/data/para-auto-spacing.docx 
b/sw/qa/extras/ooxmlexport/data/para-auto-spacing.docx
new file mode 100644
index 000..c7604bf
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/para-auto-spacing.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1bf422f..23fe7cd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1833,6 +1833,12 @@ DECLARE_OOXML_TEST(testFdo71646, fdo71646.docx)
 CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, nLRDir);
 }
 
+DECLARE_OOXML_TEST(testParaAutoSpacing, para-auto-spacing.docx)
+{
+xmlDocPtr pXmlDoc = parseExport();
+CPPUNIT_ASSERT(getXPath(pXmlDoc, /w:document/w:body/w:p/w:pPr/w:spacing, 
beforeAutospacing).match(1));
+CPPUNIT_ASSERT(getXPath(pXmlDoc, /w:document/w:body/w:p/w:pPr/w:spacing, 
afterAutospacing).match(1));
+}
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9e41119..6bfc91d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5643,10 +5643,32 @@ void DocxAttributeOutput::FormatULSpace( const 
SvxULSpaceItem rULSpace )
 {
 if ( !m_pParagraphSpacingAttrList )
 m_pParagraphSpacingAttrList = m_pSerializer-createAttrList();
-m_pParagraphSpacingAttrList-add( FSNS( XML_w, XML_before ),
-OString::number( rULSpace.GetUpper() ) );
-m_pParagraphSpacingAttrList-add( FSNS( XML_w, XML_after ),
-OString::number( rULSpace.GetLower() ) );
+SAL_INFO(sw.ww8,

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

 xmloff/source/draw/shapeexport.cxx |   51 -
 xmloff/source/text/txtparae.cxx|   44 +--
 2 files changed, 52 insertions(+), 43 deletions(-)

New commits:
commit 306a39ec0d2cde09d7e75e726ce47622939733d7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 15 15:29:02 2013 +

Resolves: fdo#62461 put preferred image first

with fallback after.

Each child element of a frame is a different representation of the same
content. The order of content elements reflects the document author's
preference for rendering, with the first child element being preferred. That
means that consumers should render the first child element that they 
support. A
frame may contain multiple content elements, but shall contain at least one
content element.

Change-Id: If50062cad58f5b8561ad6bd8dc1a06956d2f444b

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 82adf52..421b11f 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2256,29 +2256,6 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
 {
 if( !bIsEmptyPresObj )
 {
-OUString aReplacementUrl;
-xPropSet-getPropertyValue(ReplacementGraphicURL) = 
aReplacementUrl;
-
-// If there is no url, then then graphic is empty
-if(!aReplacementUrl.isEmpty())
-{
-const OUString aStr = 
mrExport.AddEmbeddedGraphicObject(aReplacementUrl);
-
-if(aStr.getLength())
-{
-mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, 
aStr);
-mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, 
XML_SIMPLE );
-mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, 
XML_EMBED );
-mrExport.AddAttribute(XML_NAMESPACE_XLINK, 
XML_ACTUATE, XML_ONLOAD );
-
-// xlink:href for replacement, only written for Svg 
content
-SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, 
XML_IMAGE, sal_True, sal_True);
-
-// optional office:binary-data
-
mrExport.AddEmbeddedGraphicObjectAsBase64(aReplacementUrl);
-}
-}
-
 OUString aStreamURL;
 OUString aStr;
 
@@ -2346,6 +2323,34 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
 if( !bIsEmptyPresObj )
 ImpExportText( xShape );
 }
+
+//Resolves: fdo#62461 put preferred image first above, followed by
+//fallback here
+if( !bIsEmptyPresObj )
+{
+OUString aReplacementUrl;
+xPropSet-getPropertyValue(ReplacementGraphicURL) = 
aReplacementUrl;
+
+// If there is no url, then then graphic is empty
+if(!aReplacementUrl.isEmpty())
+{
+const OUString aStr = 
mrExport.AddEmbeddedGraphicObject(aReplacementUrl);
+
+if(aStr.getLength())
+{
+mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, 
aStr);
+mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, 
XML_SIMPLE );
+mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, 
XML_EMBED );
+mrExport.AddAttribute(XML_NAMESPACE_XLINK, 
XML_ACTUATE, XML_ONLOAD );
+
+// xlink:href for replacement, only written for Svg 
content
+SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, 
XML_IMAGE, sal_True, sal_True);
+
+// optional office:binary-data
+
mrExport.AddEmbeddedGraphicObjectAsBase64(aReplacementUrl);
+}
+}
+}
 }
 
 ImpExportEvents( xShape );
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index f43673c..755db35 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3097,26 +3097,6 @@ void XMLTextParagraphExport::_exportTextGraphic(
 OUString sReplacementOrigURL;
 rPropSet-getPropertyValue( sReplacementGraphicURL ) = 
sReplacementOrigURL;
 
-if(sReplacementOrigURL.getLength())
-{
-const OUString sReplacementURL(GetExport().AddEmbeddedGraphicObject( 
sReplacementOrigURL ));
-
-// If there is no url, then then graphic is empty
-if(sReplacementURL.getLength())
-{
-GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, 
sReplacementURL);
-GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, 
XML_SIMPLE);
-GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED);
-

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

2013-11-15 Thread Pallavi Jadhav

 sw/qa/extras/ooxmlexport/data/test_GIF_ImageCrop.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   18 ++
 sw/source/filter/ww8/docxattributeoutput.cxx  |   10 --
 3 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 09d381adbfba893331a07918c9ec9b3c58939dfb
Author: Pallavi Jadhav pallavi.jad...@synerzip.com
Date:   Fri Nov 15 13:10:30 2013 +0530

Save Image-Crop information for GIF in docx

Issue:-
1] When MS Office docx file containing cropped image is
   round tripped with LibreOffice 4.2, image looses
   its cropping effect.
Implementation:-
1] Converted MAP unit, MAP_PIXEL to MAP_100TH_MM using
   PixelToLogic function.
   As for calculating EMU values for XML, we need
   Original Height and Width of an image in
   100thMM(HMM) format.
2] Written Export Unit Test (GIF) to verify cropping parameters.

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

Change-Id: I54d7b08c96608a0cfca3c2f8833684c09848351c

diff --git a/sw/qa/extras/ooxmlexport/data/test_GIF_ImageCrop.docx 
b/sw/qa/extras/ooxmlexport/data/test_GIF_ImageCrop.docx
new file mode 100644
index 000..8fe7ff2
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/test_GIF_ImageCrop.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 23fe7cd..b7bdaef 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -94,6 +94,7 @@ protected:
 math-escape.docx,
 math-mso2k7.docx,
 ImageCrop.docx,
+test_GIF_ImageCrop.docx
 };
 std::vectorconst char* vBlacklist(aBlacklist, aBlacklist + 
SAL_N_ELEMENTS(aBlacklist));
 
@@ -1839,6 +1840,23 @@ DECLARE_OOXML_TEST(testParaAutoSpacing, 
para-auto-spacing.docx)
 CPPUNIT_ASSERT(getXPath(pXmlDoc, /w:document/w:body/w:p/w:pPr/w:spacing, 
beforeAutospacing).match(1));
 CPPUNIT_ASSERT(getXPath(pXmlDoc, /w:document/w:body/w:p/w:pPr/w:spacing, 
afterAutospacing).match(1));
 }
+
+DECLARE_OOXML_TEST(testGIFImageCrop, test_GIF_ImageCrop.docx)
+{
+uno::Referencedrawing::XShape image = getShape(1);
+uno::Referencebeans::XPropertySet imageProperties(image, uno::UNO_QUERY);
+::com::sun::star::text::GraphicCrop aGraphicCropStruct;
+
+imageProperties-getPropertyValue( GraphicCrop ) = aGraphicCropStruct;
+
+// FIXME import test is disabled (we only check after import-export-import)
+// The reason is that after import this is 1171 -- why?
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 1265 ), aGraphicCropStruct.Left );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 4256 ), aGraphicCropStruct.Right );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 1109 ), aGraphicCropStruct.Top );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 1448 ), aGraphicCropStruct.Bottom );
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 70361fa..80c17e3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2689,8 +2689,7 @@ OString lcl_ConvertTransparency(const Color rColor)
 }
 
 /* Writes a:srcRect tag back to document.xml if a file conatins a cropped 
image.
-   NOTE : It works only for images of type JPEG,EMF/WMF and BMP.
-  It does not work for images of type PNG and GIF.
+*  NOTE : Tested on images of type JPEG,EMF/WMF,BMP, PNG and GIF.
 */
 void DocxAttributeOutput::WriteSrcRect(const SdrObject* pSdrObj )
 {
@@ -2704,6 +2703,13 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* 
pSdrObj )
 ::com::sun::star::text::GraphicCrop aGraphicCropStruct;
 xPropSet-getPropertyValue( GraphicCrop ) = aGraphicCropStruct;
 
+const MapMode aMap100mm( MAP_100TH_MM );
+const MapMode mapMode = GraphicObject::CreateGraphicObjectFromURL( sUrl 
).GetPrefMapMode();
+if( mapMode.GetMapUnit() == MAP_PIXEL )
+{
+aOriginalSize = 
Application::GetDefaultDevice()-PixelToLogic(aOriginalSize, aMap100mm );
+}
+
 if ( (0 != aGraphicCropStruct.Left) || (0 != aGraphicCropStruct.Top) || (0 
!= aGraphicCropStruct.Right) || (0 != aGraphicCropStruct.Bottom) )
 {
 double  widthMultiplier  = 10.0/aOriginalSize.Width();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Vendors Name via UNO API / Basic Macros

2013-11-15 Thread Niklas Johansson

Just to point you to some other options. The basic library Tools that 
comes with LibreOffice contains a few interesting macros related to 
this. You need to load the library first then you can use GetProductName.


BasicLibraries.LoadLibrary(Tools)
msgbox GetProductName

If you need more detailed information you can look in the registry 
(xcu-files) using the helper-function GetRegistryKeyContent.

BasicLibraries.LoadLibrary(Tools)
oKey = GetRegistryKeyContent(/org.openoffice.Setup/Product)
msgbox oKey.ooName
msgbox oKey.ooSetupVersionAboutBox

The GetRegistryKeyContent basically does what Milkos did for you. Use 
xray to inspect oKey for more possibilities.

These functions is available in AOO as well.

Regards,
Niklas Johansson

Thomas Krumbein skrev 2013-11-15 15:49:

Hi Miklos,

yes, thanks, that might be a practible way at this time.

Nevertheless - it is not a solution for the future.

I guess, there should be an implementation of the original product name,
version-number (major and minor) and actuall product name.

This should be easy accessible even for unexpierienced macro developers.

I will do a feature request or this :)


best regards
Thomas



Am 15.11.2013 14:11, schrieb Miklos Vajna:

Hi,

On Fri, Nov 15, 2013 at 01:43:38PM +0100, Thomas Krumbein 
thomas.krumb...@documentfoundation.org wrote:

Thanks for this - I know the xcu files. But this is not an easy access
for (Basic-) macros. The way to do is: Search for this file, parse this
file and extract the vendor name... for basic marcos a very long way.

Why not use the css::configuration::ConfigurationProvider API instead?

I mean something like:


oProvider = createUnoService(com.sun.star.configuration.ConfigurationProvider)
Dim aParams(0) As new com.sun.star.beans.PropertyValue
aParams(0).Name = nodepath
aParams(0).Value = /org.openoffice.Setup/Product
oSettings = 
oProvider.createInstanceWithArguments(com.sun.star.configuration.ConfigurationAccess,
 aParams)
xray oSettings.getByName(ooName)

HTH,

Miklos




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

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

 sw/inc/anchoredobject.hxx|7 ++-
 sw/source/core/inc/layfrm.hxx|   14 ++
 sw/source/core/layout/anchoredobject.cxx |   12 
 sw/source/core/layout/ssfrm.cxx  |8 
 4 files changed, 36 insertions(+), 5 deletions(-)

New commits:
commit 7eae50f9ff5877ef880be9a85d3f7e52b1fec49f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Nov 8 14:53:42 2013 +

Access by AnchoredObject of a deleted SwLayoutFrm

as demonstrated by abi10075-1.doc

just register the AnchoredObjects in the SwLayoutFrm and
inform them when the SwLayoutFrm goes away.

This crash was triggered by 1e113cb7604e1509e7d598a9be329f1f7b6e9322 
import
different first page header/footer from doc. But that commit is blameless.

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

diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index cc5edbf..ff4b88ad 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -269,15 +269,12 @@ class SW_DLLPUBLIC SwAnchoredObject
 
 // accessors to data of position calculation:
 // frame vertical position is orient at
-inline const SwLayoutFrm* GetVertPosOrientFrm() const
+const SwLayoutFrm* GetVertPosOrientFrm() const
 {
 return mpVertPosOrientFrm;
 }
 // method to clear member mpVertPosOrientFrm
-inline void ClearVertPosOrientFrm()
-{
-mpVertPosOrientFrm = 0L;
-}
+void ClearVertPosOrientFrm();
 
 /** check anchor character rectangle and top of line
 
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index fdd6b7c..d17b6e5 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -21,6 +21,7 @@
 
 #include frame.hxx
 
+class SwAnchoredObject;
 class SwCntntFrm;
 class SwFlowFrm;
 class SwFmtCol;
@@ -53,6 +54,7 @@ protected:
 virtual void MakeAll();
 
 SwFrm   *pLower;
+std::vectorSwAnchoredObject* aVertPosOrientFrmsFor;
 
 virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool 
bInfo = sal_False );
 virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool 
bInfo = sal_False );
@@ -164,6 +166,18 @@ public:
 inline SwFrm* GetLastLower();
 
 virtual void PaintBreak() const;
+
+void SetVertPosOrientFrmFor(SwAnchoredObject *pObj)
+{
+aVertPosOrientFrmsFor.push_back(pObj);
+}
+
+void ClearVertPosOrientFrmFor(SwAnchoredObject *pObj)
+{
+aVertPosOrientFrmsFor.erase(
+std::remove(aVertPosOrientFrmsFor.begin(),
+aVertPosOrientFrmsFor.end(), pObj), 
aVertPosOrientFrmsFor.end());
+}
 };
 
 //Um doppelte Implementierung zu sparen wird hier ein bischen gecasted
diff --git a/sw/source/core/layout/anchoredobject.cxx 
b/sw/source/core/layout/anchoredobject.cxx
index ab4a193..77cf548 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -107,8 +107,18 @@ SwAnchoredObject::SwAnchoredObject() :
 {
 }
 
+void SwAnchoredObject::ClearVertPosOrientFrm()
+{
+if (mpVertPosOrientFrm)
+{
+
const_castSwLayoutFrm*(mpVertPosOrientFrm)-ClearVertPosOrientFrmFor(this);
+mpVertPosOrientFrm = NULL;
+}
+}
+
 SwAnchoredObject::~SwAnchoredObject()
 {
+ClearVertPosOrientFrm();
 }
 
 // 
=
@@ -238,6 +248,8 @@ void SwAnchoredObject::SetVertPosOrientFrm( const 
SwLayoutFrm _rVertPosOrientFr
 {
 mpVertPosOrientFrm = _rVertPosOrientFrm;
 
+const_castSwLayoutFrm*(mpVertPosOrientFrm)-SetVertPosOrientFrmFor(this);
+
 // #i28701# - take over functionality of deleted method
 // SwFlyAtCntFrm::AssertPage(): assure for at-paragraph and at-character
 // an anchored object, that it is registered at the correct page frame
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 4ae962e..1fc5ff0 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -557,6 +557,14 @@ void SwCntntFrm::DelFrms( const SwCntntNode rNode )
 
 void SwLayoutFrm::Destroy()
 {
+while (!aVertPosOrientFrmsFor.empty())
+{
+SwAnchoredObject *pObj = *aVertPosOrientFrmsFor.begin();
+pObj-ClearVertPosOrientFrm();
+}
+
+assert(aVertPosOrientFrmsFor.empty());
+
 SwFrm *pFrm = pLower;
 
 if( GetFmt()  !GetFmt()-GetDoc()-IsInDtor() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 idl/source/objects/types.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93a23d1148381871c4ed15117c9e24cb3780b9f5
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 15 18:08:51 2013 +0200

No __weak__ in Win32

Change-Id: I3bd5e3787d0f47cfef667734211cdf8c0fd606a7

diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 642d303..5bdd292 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1416,7 +1416,7 @@ void SvMetaType::WriteSfxItem(
 
 // write the implementation part
 rOutStm  #ifdef SFX_TYPEMAP  endl
- #if defined(DISABLE_DYNLOADING)  (defined(ANDROID) || 
defined(IOS)) || defined(LIBO_MERGELIBS)  endl
+ #if !defined(_WIN32)  ((defined(DISABLE_DYNLOADING)  
(defined(ANDROID) || defined(IOS))) || defined(LIBO_MERGELIBS))  endl
  __attribute__((__weak__))  endl
  #endif  endl
  aTypeName.getStr()  aVarName.getStr()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-15 Thread Pallavi Jadhav

 sw/qa/extras/ooxmlexport/data/test_PNG_ImageCrop.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   23 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 85ff539bb1b6fa90c16f80e44df5df0962521f72
Author: Pallavi Jadhav pallavi.jad...@synerzip.com
Date:   Fri Nov 15 16:49:31 2013 +0530

Added Unit test for PNG Crop image in Export.

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

Change-Id: I766460915775791388850691b3b940fe32190052

diff --git a/sw/qa/extras/ooxmlexport/data/test_PNG_ImageCrop.docx 
b/sw/qa/extras/ooxmlexport/data/test_PNG_ImageCrop.docx
new file mode 100644
index 000..7fda321
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/test_PNG_ImageCrop.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b7bdaef..d182180 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -94,7 +94,8 @@ protected:
 math-escape.docx,
 math-mso2k7.docx,
 ImageCrop.docx,
-test_GIF_ImageCrop.docx
+test_GIF_ImageCrop.docx,
+test_PNG_ImageCrop.docx
 };
 std::vectorconst char* vBlacklist(aBlacklist, aBlacklist + 
SAL_N_ELEMENTS(aBlacklist));
 
@@ -1857,6 +1858,26 @@ DECLARE_OOXML_TEST(testGIFImageCrop, 
test_GIF_ImageCrop.docx)
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 1448 ), aGraphicCropStruct.Bottom );
 }
 
+DECLARE_OOXML_TEST(testPNGImageCrop, test_PNG_ImageCrop.docx)
+{
+/* The problem was image cropping information was not getting saved
+ * after roundtrip.
+ * Check for presenece of cropping parameters in exported file.
+ */
+uno::Referencedrawing::XShape image = getShape(1);
+uno::Referencebeans::XPropertySet imageProperties(image, uno::UNO_QUERY);
+::com::sun::star::text::GraphicCrop aGraphicCropStruct;
+
+imageProperties-getPropertyValue( GraphicCrop ) = aGraphicCropStruct;
+
+// FIXME import test is disabled (we only check after import-export-import)
+// The reason is that after import this is 1141 -- why?
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 1231 ), aGraphicCropStruct.Left );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 1295 ), aGraphicCropStruct.Right );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 1358 ), aGraphicCropStruct.Top );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 737 ), aGraphicCropStruct.Bottom );
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/inc sc/source

 sc/inc/compiler.hxx  |   12 -
 sc/source/core/tool/compiler.cxx |   88 +++
 sc/source/core/tool/token.cxx|4 -
 3 files changed, 57 insertions(+), 47 deletions(-)

New commits:
commit dbe2563b41ef70b7a56aa0490c6b8110c3783932
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 15 11:28:48 2013 -0500

Have makeRefStr() accept a context object rather than individual params.

Change-Id: Id52e02aa29d85d207420c80a95ada2f8487f165f

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 6844b28..ee3c689 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -78,6 +78,12 @@ class ScRangeData;
 class ScExternalRefManager;
 class ScTokenArray;
 
+namespace sc {
+
+struct TokenStringContext;
+
+}
+
 // constants and data types internal to compiler
 
 /*
@@ -235,8 +241,7 @@ public:
 virtual ~Convention();
 
 virtual void makeRefStr(
-OUStringBuffer rBuffer, const ScAddress rPos, 
formula::FormulaGrammar::Grammar eGram,
-const OUString rErrRef, const std::vectorOUString rTabNames,
+OUStringBuffer rBuffer, const ScAddress rPos, const 
sc::TokenStringContext rCxt,
 const ScComplexRefData rRef, bool bSingleRef ) const = 0;
 
 virtual ::com::sun::star::i18n::ParseResult
@@ -333,6 +338,7 @@ private:
 boolmbCloseBrackets;// whether to close open brackets 
automatically, default TRUE
 boolmbRewind;   // whether symbol is to be rewound 
to some step during lexical analysis
 std::vectorsal_uInt16 maExternalFiles;
+mutable sc::TokenStringContext* mpTokenStringCxt;
 
 bool   NextNewToken(bool bInArray = false);
 
@@ -370,6 +376,8 @@ public:
 
 ScCompiler( ScDocument* pDocument, const ScAddress,ScTokenArray rArr);
 
+virtual ~ScCompiler();
+
 public:
 static void DeInit();   /// all
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 1ef766c..b5fdedc 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -67,6 +67,7 @@
 #include formulaparserpool.hxx
 #include tokenarray.hxx
 #include scmatrix.hxx
+#include tokenstringcontext.hxx
 
 using namespace formula;
 using namespace ::com::sun::star;
@@ -727,14 +728,14 @@ struct ConventionOOO_A1 : public Convention_A1
 ConventionOOO_A1() : Convention_A1 (FormulaGrammar::CONV_OOO) { }
 ConventionOOO_A1( FormulaGrammar::AddressConvention eConv ) : 
Convention_A1 (eConv) { }
 
-static OUString MakeTabStr( const std::vectorOUString rTabNames, SCTAB 
nTab, OUString aDoc )
+static OUString MakeTabStr( const sc::TokenStringContext rCxt, SCTAB 
nTab, OUString aDoc )
 {
 OUString aString;
-if (static_castsize_t(nTab) = rTabNames.size())
+if (static_castsize_t(nTab) = rCxt.maTabNames.size())
 aString = ScGlobal::GetRscString(STR_NO_REF_TABLE);
 else
 {
-aString = rTabNames[nTab];
+aString = rCxt.maTabNames[nTab];
 // 'Doc'#Tab
 sal_Int32 nPos = ScCompiler::GetDocTabPos( aString );
 if ( nPos != -1 )
@@ -753,7 +754,7 @@ struct ConventionOOO_A1 : public Convention_A1
 }
 
 void MakeOneRefStrImpl(
-OUStringBuffer rBuffer, const OUString rErrRef, const 
std::vectorOUString rTabNames,
+OUStringBuffer rBuffer, const sc::TokenStringContext rCxt,
 const ScSingleRefData rRef, const ScAddress rAbsRef,
 bool bForceTab, bool bODF ) const
 {
@@ -763,13 +764,13 @@ struct ConventionOOO_A1 : public Convention_A1
 {
 if (!rRef.IsTabRel())
 rBuffer.append('$');
-rBuffer.append(rErrRef);
+rBuffer.append(rCxt.maErrRef);
 rBuffer.append('.');
 }
 else
 {
 OUString aDoc;
-OUString aRefStr(MakeTabStr(rTabNames, rAbsRef.Tab(), aDoc));
+OUString aRefStr(MakeTabStr(rCxt, rAbsRef.Tab(), aDoc));
 rBuffer.append(aDoc);
 if (!rRef.IsTabRel())
 rBuffer.append('$');
@@ -781,22 +782,20 @@ struct ConventionOOO_A1 : public Convention_A1
 if (!rRef.IsColRel())
 rBuffer.append('$');
 if (!ValidCol(rAbsRef.Col()))
-rBuffer.append(rErrRef);
+rBuffer.append(rCxt.maErrRef);
 else
 MakeColStr(rBuffer, rAbsRef.Col());
 if (!rRef.IsRowRel())
 rBuffer.append('$');
 if (!ValidRow(rAbsRef.Row()))
-rBuffer.append(rErrRef);
+rBuffer.append(rCxt.maErrRef);
 else
 MakeRowStr(rBuffer, rAbsRef.Row());
 }
 
 void makeRefStr( OUStringBuffer   rBuffer,
  const ScAddress rPos,
- FormulaGrammar::Grammar /*eGram*/,
- const

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

Bug 65675 depends on bug 62461, which changed state.

Bug 62461 Summary: LO-4.x.x creates new ODT, ODP and ODG file with fallback PNG 
graphic first, if an SVG picture inserted into the file
https://bugs.freedesktop.org/show_bug.cgi?id=62461

   What|Removed |Added

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

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

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

Bug 60270 depends on bug 62461, which changed state.

Bug 62461 Summary: LO-4.x.x creates new ODT, ODP and ODG file with fallback PNG 
graphic first, if an SVG picture inserted into the file
https://bugs.freedesktop.org/show_bug.cgi?id=62461

   What|Removed |Added

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

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

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

2013-11-15 Thread Pallavi Jadhav

 sw/qa/extras/ooxmlexport/data/testFootnote.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   10 ++
 sw/source/filter/ww8/docxattributeoutput.cxx|6 --
 sw/source/filter/ww8/docxattributeoutput.hxx|2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 5cdd6d28d10d815c046b65db48847558259a1d1a
Author: Pallavi Jadhav pallavi.jad...@synerzip.com
Date:   Fri Nov 8 18:48:58 2013 +0530

LibreOffice Corrupts DOCX files containing Footnotes after Roundtrip

Issue :
1] Extra data was getting written into document.xml after
   /w:document
   This includes :
1) sectPr tag
2) Paragraph tag of w:footnote w:id=2 from
   footnotes.xml
2] This is leading to document corruption

Implementation :
1] Enabled a flag inside DocxAttributeOutput::FootnotesEndnotes
2] Check value of flag to decide whehter to write section
   properties or not

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
sw/source/filter/ww8/docxattributeoutput.cxx
Reviewed on:
https://gerrit.libreoffice.org/6644

Change-Id: Iae53fd6bf12bcbac84846bd36823bc08f21f9edf

diff --git a/sw/qa/extras/ooxmlexport/data/testFootnote.docx 
b/sw/qa/extras/ooxmlexport/data/testFootnote.docx
new file mode 100644
index 000..5bba6d8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/testFootnote.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d182180..7c5738f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1878,6 +1878,16 @@ DECLARE_OOXML_TEST(testPNGImageCrop, 
test_PNG_ImageCrop.docx)
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 737 ), aGraphicCropStruct.Bottom );
 }
 
+DECLARE_OOXML_TEST(testFootnoteParagraphTag, testFootnote.docx)
+{
+/* In footnotes.xml, the paragraph tag inside w:footnote w:id=2 was 
getting written into document.xml.
+ * Check for, paragraph tag is correctly written into footnotes.xml.
+ */
+xmlDocPtr pXmlFootnotes = parseExport(word/footnotes.xml);
+assertXPath(pXmlFootnotes, /w:footnotes/w:footnote[3],id,2);
+assertXPath(pXmlFootnotes, 
/w:footnotes/w:footnote[3]/w:p/w:r/w:rPr/w:rStyle,val,Footnotereference);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 80c17e3..054e946 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -501,7 +501,7 @@ void DocxAttributeOutput::StartParagraphProperties()
 m_pSerializer-startElementNS( XML_w, XML_pPr, FSEND );
 
 // and output the section break now (if it appeared)
-if ( m_pSectionInfo )
+if ( m_pSectionInfo  (!m_setFootnote))
 {
 m_rExport.SectionProperties( *m_pSectionInfo );
 m_pSectionInfo.reset();
@@ -5120,6 +5120,7 @@ void DocxAttributeOutput::FootnoteEndnoteReference()
 
 void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
 {
+m_setFootnote = true;
 const FootnotesVector rVector = bFootnotes? 
m_pFootnotesList-getVector(): m_pEndnotesList-getVector();
 
 sal_Int32 nBody = bFootnotes? XML_footnotes: XML_endnotes;
@@ -6272,7 +6273,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
rExport, FSHelperPtr pSeri
   m_bParaBeforeAutoSpacing(false),
   m_bParaAfterAutoSpacing(false),
   m_iParaBeforeSpacing(0),
-  m_iParaAfterSpacing(0)
+  m_iParaAfterSpacing(0),
+  m_setFootnote(false)
 {
 }
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 14b22b2..2099116 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -784,6 +784,8 @@ private:
 // store hardcoded value which was set during import.
 sal_Int32 m_iParaBeforeSpacing,m_iParaAfterSpacing;
 
+bool m_setFootnote;
+
 public:
 DocxAttributeOutput( DocxExport rExport, ::sax_fastparser::FSHelperPtr 
pSerializer, oox::drawingml::DrawingML* pDrawingML );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-15 Thread PriyankaGaikwad

 sw/qa/extras/ooxmlexport/data/table_lineRule.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |6 ++
 sw/source/filter/ww8/ww8atr.cxx   |3 +++
 3 files changed, 9 insertions(+)

New commits:
commit b00c73f9338a1bc0d4698f14383c4a5f9dbd78b6
Author: PriyankaGaikwad priyanka.gaik...@synerzip.com
Date:   Fri Nov 15 15:27:54 2013 +0530

Fixed for spacing between lines having lineRule auto is getting preserved

Problem Desciption:
In w:spacing value of w:lineRule attribute value is not getting is 
preserved.

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

Change-Id: Ie9c99864bd5a198af94c1d251666bcb3427d955a

diff --git a/sw/qa/extras/ooxmlexport/data/table_lineRule.docx 
b/sw/qa/extras/ooxmlexport/data/table_lineRule.docx
new file mode 100644
index 000..d1d47ff
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/table_lineRule.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 7c5738f..459d615 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1888,6 +1888,12 @@ DECLARE_OOXML_TEST(testFootnoteParagraphTag, 
testFootnote.docx)
 assertXPath(pXmlFootnotes, 
/w:footnotes/w:footnote[3]/w:p/w:r/w:rPr/w:rStyle,val,Footnotereference);
 }
 
+DECLARE_OOXML_TEST(testSpacingLineRule,table_lineRule.docx)
+{
+ xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+ assertXPath(pXmlDoc, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing, lineRule, 
auto);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b0630a8..69f5900 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4529,6 +4529,9 @@ void AttributeOutputBase::ParaLineSpacing( const 
SvxLineSpacingItem rSpacing )
 default:
 break;
 case SVX_LINE_SPACE_AUTO:
+nSpace = (short)( ( nSpace * rSpacing.GetPropLineSpace() ) / 100L 
);
+nMulti = 1;
+break;
 case SVX_LINE_SPACE_FIX:
 case SVX_LINE_SPACE_MIN:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-15 Thread PriyankaGaikwad

 sw/qa/extras/ooxmlexport/data/table_atleast.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |3 +++
 3 files changed, 9 insertions(+)

New commits:
commit 9fbdb2b8a71e195ac2aa68740e66e84316b08ed7
Author: PriyankaGaikwad priyanka.gaik...@synerzip.com
Date:   Fri Nov 15 18:29:22 2013 +0530

Fixed for spacing between lines in table is getting preserve.

Problem Description:
In w:spacing value of w:line attribute value in table is not getting is 
preserved.

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

Change-Id: I2b0284a22da3a828c81876960f488049be4f8681

diff --git a/sw/qa/extras/ooxmlexport/data/table_atleast.docx 
b/sw/qa/extras/ooxmlexport/data/table_atleast.docx
new file mode 100644
index 000..ec751aa
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/table_atleast.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 459d615..66a24c5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1894,6 +1894,12 @@ 
DECLARE_OOXML_TEST(testSpacingLineRule,table_lineRule.docx)
  assertXPath(pXmlDoc, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing, lineRule, 
auto);
 }
 
+DECLARE_OOXML_TEST(testTableLineSpacing, table_atleast.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+assertXPath(pXmlDoc, 
/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:pPr/w:spacing, line, 320);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index f18c329..a8e51b0 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -656,6 +656,9 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 const PropertyMap::iterator aDefaultRepeatIt = 
pAllCellProps-find(PROP_HEADER_ROW_COUNT);
 if ( aDefaultRepeatIt != pAllCellProps-end( ) )
 pAllCellProps-erase( aDefaultRepeatIt );
+const PropertyMap::iterator aDefaultRepeatIt2 = 
pAllCellProps-find(PROP_PARA_LINE_SPACING);
+if ( aDefaultRepeatIt2 != pAllCellProps-end( ) )
+pAllCellProps-erase( aDefaultRepeatIt2 );
 
 // Then add the cell properties
 pAllCellProps-InsertProps(*aCellIterator);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: WRITER : Extend support for RDF Metadata

hi Arnaud,

sorry for late reply, somehow i missed your mail initially :(

On 06/11/13 10:00, Miklos Vajna wrote:
 Hi,
 
 On Thu, Oct 31, 2013 at 02:37:21PM +0100, arkarell 
 arnaud.mal...@arkarell.com wrote:
 I would like to extend support for RDF metadata in LibreOffice
 Writer in order to be able to set metadata
 on a lot of elements unsupported today like tables.
 Is there anybody that could help me to find what source code are involved ?

unfortunately i don't have time to work on the implementation myself but
can point you to the relevant places in the code, answer questions and
review patches.

the main parts for adding an xml:id are:

1. derive the core object from sfx2::Metadatable
   and implement the pure virtual methods
   (see include/sfx2/Metadatable.hxx)

2. derive the UNO wrapper object from sfx2::MetadatableMixin
   and implement the pure virtual methods

3. adapt all places that copy the core object to call
   Metadatable::RegisterAsCopyOf

4. for Undo, insert calls to Metadatable::CreateUndo
   and Metadatable::RestoreMetadata

5. in case the core object can be merged like paragraphs:
   add call to Metadatable::JoinMetadatable

of course you can git grep for these functions and classes to see
usage examples.

well one thing that is still a sort of unresolved conceptual issue is
how to copy/paste the RDF metadata in case some content entity with an
xml:id is copied.  especially _which_ RDF statements should be copied in
that case.

 For information, I use the API of LibreOffice/OpenOffice for many
 years now but it would be my first contribution at the LO code.
 
 There are two SfxPoolItems you can use to set metadata on items like
 paragraphs or tables:
 
 - SvXMLAttrContainerItem is used to store unknown XML attributes from
   ODF (so they survive a roundtrip)
 - SfxGrabBagItem is a string-any map, so can store nested structures,
   etc. -- but explicitly runtime-only, so ODF filter intentionally
   ignores it.

that's totally not the way to go... the xml:id must be unique in the
document and these classes don't ensure that; they also don't make the
content entity available in the UNO RDF API.

On 13/11/13 12:14, Jan Holesovsky wrote:


https://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/RDF_metadata

 what you are searching for?  This applies to LibreOffice too if I am not
 mistaken.

yes that is still up to date since nothing has changed...

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

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

 sw/qa/extras/htmlexport/htmlexport.cxx  |4 -
 sw/qa/extras/ooxmlexport/data/activexbin.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   28 ++
 sw/source/filter/ww8/docxexport.cxx |   54 +++
 writerfilter/inc/ooxml/OOXMLDocument.hxx|3 -
 writerfilter/source/filter/ImportFilter.cxx |6 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   66 
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |3 +
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx   |6 +-
 9 files changed, 142 insertions(+), 28 deletions(-)

New commits:
commit 758dc9e3051514ff5d5441ac2ebe782a57533a7c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Nov 15 18:37:00 2013 +0100

CppunitTest_sw_htmlexport: check for nullptr

I couldn't reproduce this one, but JBFaure says on IRC it helps in his
case.

Change-Id: Ib0a22996bdfc758326c4910b5b652f0772c08912

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index c86b2f4..ed264e2 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -38,7 +38,7 @@ private:
 
 void preTest(const char* filename) SAL_OVERRIDE
 {
-if (OString(filename) == charborder.odt)
+if (OString(filename) == charborder.odt  SW_MOD())
 {
 // FIXME if padding-top gets exported as inches, not cms, we get 
rounding errors.
 SwMasterUsrPref* pPref = 
const_castSwMasterUsrPref*(SW_MOD()-GetUsrPref(false));
@@ -49,7 +49,7 @@ private:
 
 void postTest(const char* filename) SAL_OVERRIDE
 {
-if (OString(filename) == charborder.odt)
+if (OString(filename) == charborder.odt  SW_MOD())
 {
 SwMasterUsrPref* pPref = 
const_castSwMasterUsrPref*(SW_MOD()-GetUsrPref(false));
 pPref-SetMetric(m_eUnit);
commit b8a4abdda4e6a95535992c26a906226ede7f050a
Author: sushil_shinde sushil.shi...@synerzip.com
Date:   Fri Nov 15 12:20:36 2013 +0530

[docx] activeX reference files (.bin) saved in InteropGrabBag and exported.

  The XInputStream for activeX.bin files is stored as the PropertyValue
  OOXActiveXBin into the InteropGraBag

  Added mxActiveXBinList object which holds XInputStreams for each
  activeX.bin from activeX folder.

  Added .bin files entry to respective acivex.xml's .rels file.

  Added Unit Test to test all .bin files are stores properly.

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

Change-Id: I3a0e9462a6cc53d8cbb9c7d59ed24631d77d4d30

diff --git a/sw/qa/extras/ooxmlexport/data/activexbin.docx 
b/sw/qa/extras/ooxmlexport/data/activexbin.docx
new file mode 100644
index 000..e7c15e8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/activexbin.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 66a24c5..18a0031 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1617,6 +1617,34 @@ DECLARE_OOXML_TEST(testActiveXGrabBag, activex.docx)
CPPUNIT_ASSERT(bActiveX); // Grab Bag has all the expected elements
 }
 
+DECLARE_OOXML_TEST(testActiveXBinGrabBag, activexbin.docx)
+{
+   // The problem was that activeX.bin files were missing from docx file after 
saving file.
+   // This test case tests whether activex bin files grabbagged properly in 
correct object.
+
+   uno::Referencetext::XTextDocument xTextDocument(mxComponent, 
uno::UNO_QUERY);
+   uno::Referencebeans::XPropertySet xTextDocumentPropertySet(xTextDocument, 
uno::UNO_QUERY);
+   uno::Sequencebeans::PropertyValue aGrabBag(0);
+   xTextDocumentPropertySet-getPropertyValue(OUString(InteropGrabBag)) = 
aGrabBag;
+   CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty
+   bool bActiveX = sal_False;
+   for(int i = 0; i  aGrabBag.getLength(); ++i)
+   {
+   if (aGrabBag[i].Name == OOXActiveXBin)
+   {
+   bActiveX = sal_True;
+   uno::Referenceio::XInputStream aActiveXBin;
+   uno::Sequenceuno::Referenceio::XInputStream  aActiveXBinList;
+   CPPUNIT_ASSERT(aGrabBag[i].Value = aActiveXBinList); // 
PropertyValue of proper type
+   sal_Int32 length = aActiveXBinList.getLength();
+   CPPUNIT_ASSERT_EQUAL(sal_Int32(5), length);
+   aActiveXBin = aActiveXBinList[0];
+   CPPUNIT_ASSERT(aActiveXBin.get()); // Reference not empty
+   }
+   }
+   CPPUNIT_ASSERT(bActiveX); // Grab Bag has all the expected elements
+}
+
 DECLARE_OOXML_TEST(testFdo69644, fdo69644.docx)
 {
 // The problem was that the exporter exported the table definition
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 9053d6b..e29cd64f 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -867,6 +867,7 @@ void

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - 2 commits - sc/source

 sc/source/core/tool/compiler.cxx   |   74 -
 sc/source/core/tool/tokenstringcontext.cxx |6 ++
 2 files changed, 17 insertions(+), 63 deletions(-)

New commits:
commit 9ba5a227b0e71f73356d2783720d2cdeff37ba01
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 15 12:49:53 2013 -0500

Pre-quote sheet names to avoid doing it every single time.

Change-Id: Ib103ca22bf59c334945c0462588610899a0acfaa

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 395bf11..a9d17d6 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -734,10 +734,7 @@ struct ConventionOOO_A1 : public Convention_A1
 if (static_castsize_t(nTab) = rCxt.maTabNames.size())
 aString = ScGlobal::GetRscString(STR_NO_REF_TABLE);
 else
-{
 aString = rCxt.maTabNames[nTab];
-ScCompiler::CheckTabQuotes( aString, FormulaGrammar::CONV_OOO );
-}
 aString += .;
 return aString;
 }
@@ -1040,10 +1037,6 @@ struct ConventionXL
 return;
 }
 rTabName = rCxt.maTabNames[aAbs.Tab()];
-
-// XL uses the same sheet name quoting conventions in both modes
-// it is safe to use A1 here
-ScCompiler::CheckTabQuotes( rTabName, FormulaGrammar::CONV_XL_A1 );
 }
 
 static void MakeTabStr( OUStringBuffer rBuf,
diff --git a/sc/source/core/tool/tokenstringcontext.cxx 
b/sc/source/core/tool/tokenstringcontext.cxx
index b26d338..075bd96 100644
--- a/sc/source/core/tool/tokenstringcontext.cxx
+++ b/sc/source/core/tool/tokenstringcontext.cxx
@@ -27,6 +27,12 @@ TokenStringContext::TokenStringContext( const ScDocument* 
pDoc, formula::Formula
 if (pDoc)
 {
 maTabNames = pDoc-GetAllTableNames();
+{
+std::vectorOUString::iterator it = maTabNames.begin(), itEnd = 
maTabNames.end();
+for (; it != itEnd; ++it)
+ScCompiler::CheckTabQuotes(*it, 
formula::FormulaGrammar::extractRefConvention(eGram));
+}
+
 const ScRangeName* pNames = pDoc-GetRangeName();
 if (pNames)
 {
commit e69986d7a4c4e793a2cabdbbd50cbf3149c332f1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 15 12:33:41 2013 -0500

We don't need this any more.

This was used when external references used hidden sheets as a cheesy
workaround.

Change-Id: I7e4bf3a2235a0c2e80d0aa71a81f22a10b8d0fd5

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b5fdedc..395bf11 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -728,7 +728,7 @@ struct ConventionOOO_A1 : public Convention_A1
 ConventionOOO_A1() : Convention_A1 (FormulaGrammar::CONV_OOO) { }
 ConventionOOO_A1( FormulaGrammar::AddressConvention eConv ) : 
Convention_A1 (eConv) { }
 
-static OUString MakeTabStr( const sc::TokenStringContext rCxt, SCTAB 
nTab, OUString aDoc )
+static OUString MakeTabStr( const sc::TokenStringContext rCxt, SCTAB nTab 
)
 {
 OUString aString;
 if (static_castsize_t(nTab) = rCxt.maTabNames.size())
@@ -736,17 +736,6 @@ struct ConventionOOO_A1 : public Convention_A1
 else
 {
 aString = rCxt.maTabNames[nTab];
-// 'Doc'#Tab
-sal_Int32 nPos = ScCompiler::GetDocTabPos( aString );
-if ( nPos != -1 )
-{
-aDoc = aString.copy( 0, nPos + 1 );
-aString = aString.copy( nPos + 1 );
-aDoc = INetURLObject::decode( aDoc, INET_HEX_ESCAPE,
-  
INetURLObject::DECODE_UNAMBIGUOUS );
-}
-else
-aDoc = ;
 ScCompiler::CheckTabQuotes( aString, FormulaGrammar::CONV_OOO );
 }
 aString += .;
@@ -769,9 +758,7 @@ struct ConventionOOO_A1 : public Convention_A1
 }
 else
 {
-OUString aDoc;
-OUString aRefStr(MakeTabStr(rCxt, rAbsRef.Tab(), aDoc));
-rBuffer.append(aDoc);
+OUString aRefStr(MakeTabStr(rCxt, rAbsRef.Tab()));
 if (!rRef.IsTabRel())
 rBuffer.append('$');
 rBuffer.append(aRefStr);
@@ -1042,40 +1029,24 @@ const ScCompiler::Convention * const 
ScCompiler::pConvOOO_A1_ODF = ConvOOO_A1_O
 
 struct ConventionXL
 {
-static bool GetDocAndTab(
+static void GetTab(
 const ScAddress rPos, const sc::TokenStringContext rCxt,
-const ScSingleRefData rRef, OUString rDocName, OUString rTabName )
+const ScSingleRefData rRef, OUString rTabName )
 {
-bool bHasDoc = false;
-
-rDocName = ;
 ScAddress aAbs = rRef.toAbs(rPos);
 if (rRef.IsTabDeleted() || static_castsize_t(aAbs.Tab()) = 
rCxt.maTabNames.size())
 {
 rTabName

Re: footnotes (Replacing one DLL from official build)

2013-11-15 Thread Pavel Laštovička


Hi Kendy,  :)

Dne 13.11.2013 14:11, Jan Holesovsky napsal(a):
I wouldn't use it - as you can see, anything can go wrong there... But I am more 
curious why do you need to do an own swlo.dll in the first place? Cannot you just 
up-stream the functionality you need there? All the best, Kendy 


sorry I did not get to respond sooner. I am attaching my trivial change. However it 
took me long to discover what exactly to change.


It fixes compatibility problem with footnotes in Microsoft Word (.doc) documents. 
Fix removes indentation between footnote number and footnote text. But, it means 
footnotes in all other documents will be displayed incorrectly. I tried to think 
about some universal solution but I have not come up with any. Imported Word 
documents may become .odt documents upon saving. The change is also necessary to be 
able to have a footnote number e.g. 1) where the number is in superscript and ) 
symbol manually added in normal script.


At least what could be done is to add a new compatibility option to source code and 
to the UI.


Regards
Pavel

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 37c3ce0..850794b 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -584,9 +584,9 @@ sal_Bool SwNumberPortion::Format( SwTxtFormatInfo rInf )

 if ( !mbLabelAlignmentPosAndSpaceModeActive )
 {
-if ( 
!rInf.GetTxtFrm()-GetTxtNode()-getIDocumentSettingAccess()-get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING) 

+if ( 
!rInf.GetTxtFrm()-GetTxtNode()-getIDocumentSettingAccess()-get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING)

  // #i32902#
- !IsFtnNumPortion() )
+ || IsFtnNumPortion())
 {
 nDiff = rInf.Left()
 + rInf.GetTxtFrm()-GetTxtNode()-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - editeng/inc offapi/com svtools/inc svtools/source svx/source sw/source

2013-11-15 Thread Herbert Dürr

 editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx  |   48 
-
 offapi/com/sun/star/accessibility/MSAAService.idl   |   49 
-
 offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl |   47 
+++--
 offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl   |   47 
+++--
 offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl  |   47 
+++--
 offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl |   47 
+++--
 offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl  |   47 
+++--
 offapi/com/sun/star/accessibility/XMSAAService.idl  |   47 
+++--
 svtools/inc/svtools/accessibleruler.hxx |   39 
+++
 svtools/inc/svtools/vclxaccessibleheaderbar.hxx |   40 
+++
 svtools/inc/svtools/vclxaccessibleheaderbaritem.hxx |   39 
+++
 svtools/source/control/accessibleruler.cxx  |   39 
+++
 svtools/source/control/ruler.src|   52 
--
 svtools/source/control/vclxaccessibleheaderbar.cxx  |   39 
+++
 svtools/source/control/vclxaccessibleheaderbaritem.cxx  |   39 
+++
 svx/source/inc/svxpixelctlaccessiblecontext.hxx |   39 
+++
 sw/source/core/access/accfield.cxx  |   39 
+++
 sw/source/core/access/accfield.hxx  |   39 
+++
 sw/source/core/access/accnotexthyperlink.cxx|   40 
+++
 sw/source/core/access/accnotexthyperlink.hxx|   39 
+++
 20 files changed, 362 insertions(+), 500 deletions(-)

New commits:
commit ec5f72659e478cf6eed9155a344a3777886000fd
Author: Herbert DÃ¼rr h...@apache.org
Date:   Fri Nov 15 16:35:11 2013 +

#i107914# adjust license headers to the ALv2

as intended by IBM's symphony contribution
and the individual ICLAs of the developers

Found by: V Stuart Foote vstuart.fo...@utsa.edu

diff --git a/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx 
b/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx
index ba6b6f6..5d4031a 100644
--- a/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx
+++ b/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx
@@ -1,30 +1,24 @@
-/*
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-*  Copyright IBM Corporation 2010.
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* http://www.openoffice.org/license.html
-* for a copy of the LGPLv3 License.
-*
-/
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 #ifndef _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
 #define _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
 #ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
diff --git a/offapi/com/sun/star/accessibility/MSAAService.idl 
b/offapi/com/sun/star/accessibility/MSAAService.idl
index b7c4efe..da07150 100644
--- a/offapi/com/sun/star/accessibility/MSAAService.idl
+++ b/offapi/com/sun/star/accessibility/MSAAService.idl
@@ -1,30 +1,24 @@

Dev-Environment with Vagrant/VirtualBox?

2013-11-15 Thread Andreas Mantke

Hello,

I don't know if it would be useful to create a development environment
based on vagrant and VirtualBox. I saw such a project in another open
source project that should lower the barriers to get involved with the
project and the code/environment.

The environment should contain a Linux environment with the necessary
tools installed, everything created from an vagrant script.

I ask here before I start to work on the vagrant script if I should
invest my time for that.

What do you think?

Regards,
Andreas

-- 
## Developer LibreOffice
## Freie Office-Suite für Linux, Mac, Windows
## http://LibreOffice.org
## Support the Document Foundation (http://documentfoundation.org)
## Meine Seite: http://www.amantke.de 

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

Re: Dev-Environment with Vagrant/VirtualBox?

2013-11-15 Thread bjoern

Hi Andreas,

On Fri, Nov 15, 2013 at 07:19:02PM +0100, Andreas Mantke wrote:
 The environment should contain a Linux environment with the necessary
 tools installed, everything created from an vagrant script.
 
 I ask here before I start to work on the vagrant script if I should
 invest my time for that.
 
 What do you think?

Such a get started right away environment would be quite valueable IMHO. If
we have a full Linux environment in it, it might make sense to have a
moderately recent checkout of master fully build in it, as it likely is not
that much extra space and really lets a developer start right away.

Best,

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

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

Bug 60270 depends on bug 62461, which changed state.

Bug 62461 Summary: LO-4.x.x creates new ODT, ODP and ODG file with fallback PNG 
graphic first, if an SVG picture inserted into the file
https://bugs.freedesktop.org/show_bug.cgi?id=62461

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 Resolution|FIXED   |---

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

Bug 65675 depends on bug 62461, which changed state.

Bug 62461 Summary: LO-4.x.x creates new ODT, ODP and ODG file with fallback PNG 
graphic first, if an SVG picture inserted into the file
https://bugs.freedesktop.org/show_bug.cgi?id=62461

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 Resolution|FIXED   |---

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

Re: Dev-Environment with Vagrant/VirtualBox?

2013-11-15 Thread Marc Weber

nixos.org can be used, too.

Like gentoo it knows about all build dependencies.

A build environment for a packgae nixos already knowns to build can be
created. by nix-shell -A libreoffice.

Nixos already provides VirtualBox images.

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

Re: Dev-Environment with Vagrant/VirtualBox?

On 15/11/13 19:56, bjoern wrote:
 Hi Andreas,
 
 On Fri, Nov 15, 2013 at 07:19:02PM +0100, Andreas Mantke wrote:
 The environment should contain a Linux environment with the necessary
 tools installed, everything created from an vagrant script.

 I ask here before I start to work on the vagrant script if I should
 invest my time for that.

 What do you think?
 
 Such a get started right away environment would be quite valueable IMHO. If
 we have a full Linux environment in it, it might make sense to have a
 moderately recent checkout of master fully build in it, as it likely is not
 that much extra space and really lets a developer start right away.

given that a full debug build (which is what would make sense for a
newbie) is 30 GB, let me take this opportunity to question Bjoern's
sanity and/or request a don't-drink-and-post policy.

also, a build will get outdated pretty soon anyway... what would be the
benefit of a 2 month old build today with 4000 extra commits on master?


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

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

2013-11-15 Thread Ray

 sc/source/core/opencl/op_math.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ec6d0deca7e2fcde1f461e093b51bd101fe1eba9
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date:   Fri Nov 15 13:37:22 2013 -0600

GPU Calc: fix compilation error in using sprintf

Change-Id: Iea316f3355a9105702391aa7b76268cdfc8831ef

diff --git a/sc/source/core/opencl/op_math.cxx 
b/sc/source/core/opencl/op_math.cxx
index dc5d7d4..5e5c749 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -1927,10 +1927,11 @@ void 
OpProduct::GenSlidingWindowFunction(std::stringstream ss,
 ss  int gid0 = get_global_id(0);\n;
 ss  int i = 0;\n;
 ss  double product=0.0;\n\n;
-char sArgNoI[5];
 for (unsigned i = 0; i  vSubArguments.size(); i++)
 {
-sprintf(sArgNoI,%d,i);
+std::stringstream ssArgNoI;
+ssArgNoI  i;
+std::string sArgNoI = ssArgNoI.str();
 ss  std::string(double arg)+sArgNoI+;\n;
 FormulaToken *pCur = vSubArguments[i]-GetFormulaToken();
 assert(pCur);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 l10ntools/source/lngmerge.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f64ef0b43a5cd97657cffa2cfb415d523d55095c
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Nov 15 21:07:57 2013 +0100

qtz handling in ulfex

If we don't want to use qtz codes in .ulf files, then why
do we write out qtz language with en-US content?
In fact this patch would not be necessary, if I didn't find
a build breaker bug, somehow sNewText was empty for certain
strings, and the sNewText.copy(sNewText.indexOf('|') + 2)
failed.

Change-Id: Idf377e61391eb08ecb692a7c404d190659b97575

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 4913bc4..fc8aa7b 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -244,7 +244,7 @@ sal_Bool LngParser::Merge(
 OString sNewText;
 pEntrys-GetText( sNewText, STRING_TYP_TEXT, 
sLang, sal_True );
 if( sLang == qtz )
-sNewText = sNewText.copy(sNewText.indexOf('|') 
+ 2);
+continue;
 
 if ( !sNewText.isEmpty()) {
 OString *pLine = (*pLines)[ nPos ];
@@ -282,7 +282,7 @@ sal_Bool LngParser::Merge(
 OString sNewText;
 pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur, 
sal_True );
 if( sCur == qtz )
-sNewText = sNewText.copy(sNewText.indexOf('|') + 2);
+continue;
 if ( !sNewText.isEmpty()  sCur != x-comment)
 {
 OString sLine;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 solenv/gdb/six.py |  577 ++
 1 file changed, 577 insertions(+)

New commits:
commit 118d63cd5214c47540e9b78b8f15dabacdf7114f
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Fri Nov 15 17:52:07 2013 +0100

Import Python six v1.4.1.

Python six just consists of a single Python file, so this includes
the file as a convenience.

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

diff --git a/solenv/gdb/six.py b/solenv/gdb/six.py
new file mode 100644
index 000..85898ec
--- /dev/null
+++ b/solenv/gdb/six.py
@@ -0,0 +1,577 @@
+Utilities for writing code that runs on Python 2 and 3
+
+# Copyright (c) 2010-2013 Benjamin Peterson
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the Software), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in 
all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import operator
+import sys
+import types
+
+__author__ = Benjamin Peterson benja...@python.org
+__version__ = 1.4.1
+
+
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+string_types = str,
+integer_types = int,
+class_types = type,
+text_type = str
+binary_type = bytes
+
+MAXSIZE = sys.maxsize
+else:
+string_types = basestring,
+integer_types = (int, long)
+class_types = (type, types.ClassType)
+text_type = unicode
+binary_type = str
+
+if sys.platform.startswith(java):
+# Jython always uses 32 bits.
+MAXSIZE = int((1  31) - 1)
+else:
+# It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+class X(object):
+def __len__(self):
+return 1  31
+try:
+len(X())
+except OverflowError:
+# 32-bit
+MAXSIZE = int((1  31) - 1)
+else:
+# 64-bit
+MAXSIZE = int((1  63) - 1)
+del X
+
+
+def _add_doc(func, doc):
+Add documentation to a function.
+func.__doc__ = doc
+
+
+def _import_module(name):
+Import module, returning the module after the last dot.
+__import__(name)
+return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+def __init__(self, name):
+self.name = name
+
+def __get__(self, obj, tp):
+result = self._resolve()
+setattr(obj, self.name, result)
+# This is a bit ugly, but it avoids running this again.
+delattr(tp, self.name)
+return result
+
+
+class MovedModule(_LazyDescr):
+
+def __init__(self, name, old, new=None):
+super(MovedModule, self).__init__(name)
+if PY3:
+if new is None:
+new = name
+self.mod = new
+else:
+self.mod = old
+
+def _resolve(self):
+return _import_module(self.mod)
+
+
+class MovedAttribute(_LazyDescr):
+
+def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+super(MovedAttribute, self).__init__(name)
+if PY3:
+if new_mod is None:
+new_mod = name
+self.mod = new_mod
+if new_attr is None:
+if old_attr is None:
+new_attr = name
+else:
+new_attr = old_attr
+self.attr = new_attr
+else:
+self.mod = old_mod
+if old_attr is None:
+old_attr = name
+self.attr = old_attr
+
+def _resolve(self):
+module = _import_module(self.mod)
+return getattr(module, self.attr)
+
+
+
+class _MovedItems(types.ModuleType):
+Lazy loading of moved objects
+
+
+_moved_attributes = [
+MovedAttribute(cStringIO, cStringIO, io, StringIO),
+MovedAttribute(filter, itertools, builtins, ifilter, filter),
+MovedAttribute(filterfalse, itertools, itertools, ifilterfalse, 
filterfalse),
+

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

Bug 65675 depends on bug 62461, which changed state.

Bug 62461 Summary: LO-4.x.x creates new ODT, ODP and ODG file with fallback PNG 
graphic first, if an SVG picture inserted into the file
https://bugs.freedesktop.org/show_bug.cgi?id=62461

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |FIXED

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

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

2013-11-15 Thread Ray

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

New commits:
commit 46dbc13169a9b97d3f8ac310ac35d5f51eea7de6
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date:   Fri Nov 15 14:16:40 2013 -0600

GPU Calc: revert back to OpenCL fmin and fmax

When generating code for MIN and MAX an integer version (min/max) isn't
correct.

Change-Id: I4bf1e774e37e0ce30924178f022156e0e43f4c06

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 6c27cd1..3548480 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -775,7 +775,7 @@ public:
 virtual std::string GetBottom(void) { return MAXFLOAT; }
 virtual std::string Gen2(const std::string lhs, const std::string rhs) 
const
 {
-return min(+lhs + , + rhs +);
+return fmin(+lhs + , + rhs +);
 }
 virtual std::string BinFuncName(void) const { return min; }
 };
@@ -785,7 +785,7 @@ public:
 virtual std::string GetBottom(void) { return -MAXFLOAT; }
 virtual std::string Gen2(const std::string lhs, const std::string rhs) 
const
 {
-return max(+lhs + , + rhs +);
+return fmax(+lhs + , + rhs +);
 }
 virtual std::string BinFuncName(void) const { return max; }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

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

Bug 60270 depends on bug 62461, which changed state.

Bug 62461 Summary: LO-4.x.x creates new ODT, ODP and ODG file with fallback PNG 
graphic first, if an SVG picture inserted into the file
https://bugs.freedesktop.org/show_bug.cgi?id=62461

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |FIXED

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

Re: WRITER : Extend support for RDF Metadata

On 15/11/13 19:03, arkarell wrote:

 I managed few days ago to implement the points 1 and 2 for text:table.
 I worked in analogy with what was done for sections.
 I used the SwTableFmt core object and the SwXTextTable UNO wrapper 
 object. But I also modified the SwXMLExport::ExportTable method in
 sw/source/filter/xml/xmltble.cxx in order to export xml:id. And it's 
 working, I can set and retrieve rdf metadata on tables !!!

wow, sounds great!

 I didn't treat any undo/copy/paste/merge, because first, as you said, 
 specifications are missing and needs could be very different,  and second
 because it doesn't seem to be already treated for yet supported 
 elements. For instance, if i set metadata on a paragraph and copy/paste 
 this paragraph,
 the rdf data are not copied.

yes... what is currently copied is just the xml:id, not the metadata.
that may still be useful, for example if you Cut and Paste in the same
document.

 My problem in my modifications is that I put some code at some place but 
 without knowledge of the purpose and links of impacted classes.
 And I'm not sure to use the good class : for instance for table support 
 in core object, why SwTableFmt and not SwTable ? Because SwSectionFmt ?

generally the UNO wrapper object is obvious, and the core object is the
one to which the UNO wrapper object has a pointer.

as you can see from code in untbl.cxx such as ...

  SwXTextTable::SwXTextTable(SwFrmFmt rFrmFmt)
  : SwClient( rFrmFmt )


... and SwXTextTable::attachToRange ...

SwFrmFmt* pTblFmt = pTable-GetFrmFmt();
lcl_FormatTable( pTblFmt );

pTblFmt-Add(this);

... it is obvious (well it's obvious if you understand first that
SwClient/SwModify is the horribly deficient notification / observer
mechanism on which all of Writer is built) that you picked the right
class with SwTableFmt (which is a subclass of SwFrmFmt).

 Do you have some documentation to understand these objects (core, uno 
 wrapper, std or *Fmt, ...) and their relations ?

... not really ... you can look at the doxygen documentation[1] to get a
quick overview (especially useful to quickly see inheritance trees)...
and [2] is a useful article in general...  but usually for this purpose
it's a SwXFoo UNO wrapper class that is a SwClient of some core class,
which is sometimes a SwFrmFmt or subclass.  often there are several core
classes for different aspects of the entity.

things get especially tricky here if the core object is a SfxPoolItem,
like it is with SwXMeta and ::sw::Meta ... but i hope there aren't more
of these left that need an xml:id.

[1] http://docs.libreoffice.org/sw.html
[2] https://wiki.openoffice.org/wiki/Writer/Core_And_Layout

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

Merge enabled change tracking

2013-11-15 Thread Peter Rakyta


Dear Mail list subscribers!

Recently the merge-enabled change tracking proposal (MCT) has been 
chosen as a prime orientation of change tracking developments in ODF 
documents by the OASIS ODF TC. MultiRacio Ltd. is developing an 
extension as a first implementation of the MCT proposal.
Our company would like to share the results of the development with the 
developers of the office suite. We will be grateful for every idea, 
reported bug or other comment related to the extension.
Notice, however, that the extension is still in experimental phase, 
containing many bugs and being unstable under numerous circumstances.


The binaries of the extension and its documentation can be downloaded 
from the site below:
http://itl88.elte.hu/~rakytap/EuroOffice_MCT.oxt 
http://itl88.elte.hu/%7Erakytap/EuroOffice_MCT.oxt
http://itl88.elte.hu/~rakytap/MCT_extension.pdf 
http://itl88.elte.hu/%7Erakytap/MCT_extension.pdf


Best regards,
Peter Rakyta
MultiRacio Ltd.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Vendors Name via UNO API / Basic Macros

2013-11-15 Thread Fernand Vanrie


 Andrew ,
the problem is :

 stardiv.Toolkit.UnoDateFieldControls who has until 4.0 a date 
property who is a ISO representation of the datevalue.
Since 4.1 this date property is a structure (day, month, year) who is 
more handy but painfull for us with hundreds of code lines using the 
isovalue.


i signaled this already to Lionel, but he he is working hard to solving 
other base problems, i supose  e we should fil a Regresion issue for this ?


On 11/15/2013 07:43 AM, Thomas Krumbein wrote:
Every custom macro application with dialogs or forms for user 
interfaces is influenced if dialogs/forms using Date/time fields. And 
typicly most of them (in my applications about 70%) used those 
fields. So all applications will crash using LO 4.1.1.2 or upper.


Are you saying that if you use a Date / Time field in a form or dialog 
in LO, it fails? If there is more to it, can you be more specific, 
sorry if I am uninformed on this.




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

License statement

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

All of my past  future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual or EUPL license.

Jan-Marek Glogowski
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlKGh2sACgkQj6MK58wZA3cpJACggjshyMaA0wuR7XN6QDuDtaIe
0c4AoIn3HXs3ObBGNERodP50cIP/TM61
=KO+L
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 solenv/gdb/boost/lib/unordered.py   |5 +++--
 solenv/gdb/boost/ptr_container.py   |   17 +
 solenv/gdb/boost/unordered.py   |9 +
 solenv/gdb/boost/util/printing.py   |3 ++-
 solenv/gdb/libreoffice/basegfx.py   |9 +
 solenv/gdb/libreoffice/cppu.py  |6 --
 solenv/gdb/libreoffice/sal.py   |3 ++-
 solenv/gdb/libreoffice/svl.py   |5 +++--
 solenv/gdb/libreoffice/sw.py|5 +++--
 solenv/gdb/libreoffice/tl.py|5 +++--
 solenv/gdb/libreoffice/util/printing.py |3 ++-
 solenv/gdb/libreoffice/util/uno.py  |   17 +
 12 files changed, 50 insertions(+), 37 deletions(-)

New commits:
commit c5b7cc9598f4a9a5c7c42c1ccd06765dc17b4c24
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Thu Nov 14 12:14:29 2013 +0100

Add Python 3 compatibility to GDB pretty printers.

GDB on *buntu is linked against Python 3.3, which has many
incompatibilities to Python 2, resulting in broken code.

This patch uses the Python six library as a compatibility layer.

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

diff --git a/solenv/gdb/boost/lib/unordered.py 
b/solenv/gdb/boost/lib/unordered.py
index eecfa79..ee58d04 100644
--- a/solenv/gdb/boost/lib/unordered.py
+++ b/solenv/gdb/boost/lib/unordered.py
@@ -19,6 +19,7 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
 import gdb
+import six
 
 class Unordered(object):
 '''Common representation of Boost.Unordered types'''
@@ -57,7 +58,7 @@ class Unordered(object):
 assert node_type != None
 return node_type
 
-class _iterator(object):
+class _iterator(six.Iterator):
 '''Iterator for Boost.Unordered types'''
 
 def __init__(self, first_bucket, last_bucket, node_type, extractor):
@@ -71,7 +72,7 @@ class Unordered(object):
 def __iter__(self):
 return self
 
-def next(self):
+def __next__(self):
 if self.node:
 self.node = self.node.dereference()['next_']
 
diff --git a/solenv/gdb/boost/ptr_container.py 
b/solenv/gdb/boost/ptr_container.py
index 9e9a66f..38f3b2f 100644
--- a/solenv/gdb/boost/ptr_container.py
+++ b/solenv/gdb/boost/ptr_container.py
@@ -20,6 +20,7 @@
 
 
 import gdb
+import six
 
 from boost.lib.unordered import Map, Set
 
@@ -59,7 +60,7 @@ class PtrStdPrinterBase(object):
 def children(self):
 return self._iterator(self.sequence, 
self.value.type.template_argument(0))
 
-class _iterator(object):
+class _iterator(six.Iterator):
 
 def __init__(self, sequence, type):
 self.impl = iter(sequence)
@@ -68,7 +69,7 @@ class PtrStdPrinterBase(object):
 def __iter__(self):
 return self
 
-def next(self):
+def __next__(self):
 (index, value) = self.impl.next()
 return (index, value.cast(self.type).dereference())
 
@@ -124,7 +125,7 @@ class PtrMapPrinter(PtrStdPrinterBase):
 type = self.value.type
 return self._iterator(self.sequence, type.template_argument(0), 
type.template_argument(1))
 
-class _iterator(object):
+class _iterator(six.Iterator):
 
 def __init__(self, sequence, key_type, value_type):
 self.impl = iter(sequence)
@@ -135,7 +136,7 @@ class PtrMapPrinter(PtrStdPrinterBase):
 def __iter__(self):
 return self
 
-def next(self):
+def __next__(self):
 (index, value) = self.impl.next()
 if self.key:
 value = value.cast(self.key_type)
@@ -176,7 +177,7 @@ class PtrUnorderedMapPrinter(PtrBoostPrinterBase):
 def display_hint(self):
 return 'map'
 
-class _iterator(object):
+class _iterator(six.Iterator):
 
 def __init__(self, impl, value_type):
 self.impl = impl
@@ -187,7 +188,7 @@ class PtrUnorderedMapPrinter(PtrBoostPrinterBase):
 def __iter__(self):
 return self
 
-def next(self):
+def __next__(self):
 if self.step:
 self.value = self.impl.next()
 value = self.value[0]
@@ -205,7 +206,7 @@ class PtrUnorderedSetPrinter(PtrBoostPrinterBase):
 def display_hint(self):
 return 'array'
 
-class _iterator(object):
+class _iterator(six.Iterator):
 
 def __init__(self, impl, value_type):
 self.impl = impl
@@ -214,7 +215,7 @@ class PtrUnorderedSetPrinter(PtrBoostPrinterBase):
 def __iter__(self):
 return self
 
-def next(self):
+def __next__(self):
 return (, 
self.impl.next()[1].cast(self.value_type).dereference())
 
 printer = None
diff --git a/solenv/gdb/boost/unordered.py

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

 sw/qa/extras/odfexport/odfexport.cxx |   18 +-
 sw/qa/extras/odfimport/odfimport.cxx |   32 ++--
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |  210 +++
 3 files changed, 131 insertions(+), 129 deletions(-)

New commits:
commit 6f7df889f4f280d482a9c94a9f398d8531372ee5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Nov 15 22:03:33 2013 +0100

CppunitTest_sw_{odfexport,odfimport,ooxmlexport}: consistent macro naming

Change-Id: I4dfcdc851fce49de25b3bd21f733f819a3d02eb3

diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index c1391ae..1441027 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -28,9 +28,9 @@ public:
 }
 };
 
-#define DECLARE_ODT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
+#define DECLARE_ODFEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
 
-DECLARE_ODT_TEST(testFdo38244, fdo38244.odt)
+DECLARE_ODFEXPORT_TEST(testFdo38244, fdo38244.odt)
 {
 // See ooxmlexport's testFdo38244().
 
@@ -56,7 +56,7 @@ DECLARE_ODT_TEST(testFdo38244, fdo38244.odt)
 CPPUNIT_ASSERT_EQUAL(OUString(M), getPropertyOUString(xPropertySet, 
Initials));
 }
 
-DECLARE_ODT_TEST(testFirstHeaderFooter, first-header-footer.odt)
+DECLARE_ODFEXPORT_TEST(testFirstHeaderFooter, first-header-footer.odt)
 {
 // Test import and export of the header-first token.
 
@@ -75,7 +75,7 @@ DECLARE_ODT_TEST(testFirstHeaderFooter, 
first-header-footer.odt)
 CPPUNIT_ASSERT_EQUAL(OUString(Left footer2),  
parseDump(/root/page[6]/footer/txt/text()));
 }
 
-DECLARE_ODT_TEST(testTextframeGradient, textframe-gradient.odt)
+DECLARE_ODFEXPORT_TEST(testTextframeGradient, textframe-gradient.odt)
 {
 uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
@@ -96,7 +96,7 @@ DECLARE_ODT_TEST(testTextframeGradient, 
textframe-gradient.odt)
 CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style);
 }
 
-DECLARE_ODT_TEST(testFdo60769, fdo60769.odt)
+DECLARE_ODFEXPORT_TEST(testFdo60769, fdo60769.odt)
 {
 // Test multi-paragraph comment range feature.
 uno::Referencetext::XTextDocument xTextDocument(mxComponent, 
uno::UNO_QUERY);
@@ -122,7 +122,7 @@ DECLARE_ODT_TEST(testFdo60769, fdo60769.odt)
 }
 }
 
-DECLARE_ODT_TEST(testFdo58949, fdo58949.docx)
+DECLARE_ODFEXPORT_TEST(testFdo58949, fdo58949.docx)
 {
 /*
  * The problem was that the exporter didn't insert Obj102 to the
@@ -139,7 +139,7 @@ DECLARE_ODT_TEST(testFdo58949, fdo58949.docx)
 CPPUNIT_ASSERT_EQUAL(true, bool(xNameAccess-hasByName(Obj102)));
 }
 
-DECLARE_ODT_TEST(testCharacterBorder, charborder.odt)
+DECLARE_ODFEXPORT_TEST(testCharacterBorder, charborder.odt)
 {
 // Make sure paragraph and character attributes don't interfere
 // First paragraph has a paragraph border and a character border included 
by the paragraph style
@@ -294,7 +294,7 @@ DECLARE_ODT_TEST(testCharacterBorder, charborder.odt)
 }
 }
 
-DECLARE_ODT_TEST(testFdo43807, fdo43807.odt)
+DECLARE_ODFEXPORT_TEST(testFdo43807, fdo43807.odt)
 {
 uno::Referencebeans::XPropertySet xSet(getParagraph(1), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(OUString(Drop 
Caps),getPropertyOUString(xSet,DropCapCharStyleName));
@@ -303,7 +303,7 @@ DECLARE_ODT_TEST(testFdo43807, fdo43807.odt)
 CPPUNIT_ASSERT_EQUAL(OUString(User Defined Drop 
Caps),getPropertyOUString(xSet,DropCapCharStyleName));
 }
 
-DECLARE_ODT_TEST(testTextframeTransparentShadow, 
textframe-transparent-shadow.odt)
+DECLARE_ODFEXPORT_TEST(testTextframeTransparentShadow, 
textframe-transparent-shadow.odt)
 {
 uno::Referencedrawing::XShape xPicture = getShape(1);
 // ODF stores opacity of 75%, that means 25% transparency.
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 118dda7..87e7402 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -32,12 +32,14 @@ class Test : public SwModelTestBase
 Test() : SwModelTestBase(/sw/qa/extras/odfimport/data/, writer8) {}
 };
 
-DECLARE_SW_IMPORT_TEST(testEmptySvgFamilyName, empty-svg-family-name.odt, 
Test)
+#define DECLARE_ODFIMPORT_TEST(TestName, filename) 
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
+
+DECLARE_ODFIMPORT_TEST(testEmptySvgFamilyName, empty-svg-family-name.odt)
 {
 // .odt import did crash on the empty font list (which I think is valid 
according SVG spec)
 }
 
-DECLARE_SW_IMPORT_TEST(testHideAllSections, fdo53210.odt, Test)
+DECLARE_ODFIMPORT_TEST(testHideAllSections, fdo53210.odt)
 {
 // This document has a section that is conditionally hidden, but has no 
empty paragraph after it.
 uno::Referencetext::XTextFieldsSupplier xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
@@ -49,7 +51,7 @@

Re: minutes of ESC call ...

Hi,

On Thu, Nov 14, 2013 at 5:27 PM, Michael Meeks
michael.me...@collabora.com wrote:

 * Pending Action Items:
 + poke at Android / iOS remote-control translation issues (Andras)
 [ found the issue, know how to fix it - fix pending ]

First I thought that I needed to fix a Makefile, but now it seems that
this task is more complex.

If I understood correctly, we want to release Android and iOS Impress
Remote from master.

Android version takes the strings from translations/, but
unfortunately it is not translated at all in master. libreoffice-4-1
branch -- which is translated -- contains a completely different app,
at least the strings do not match.

iOS version takes localization from its own folder, it does not use
translations/ and currently it has French and Chinese translations
only (presumably from Siqi).

For me it seems that mobile app release schedule is different from
LibreOffice's release schedule. I think it makes little sense to
handle LibreOffice and mobile app localization together. I think we
need to handle mobile apps separately, create new projects in Pootle,
and ask translators to translate them quickly. Also, I found tools
that convert Android strings.xml and iOS .strings to .po and vice
versa, we don't have to depend on our own l10ntools. Practically,
localized mobile apps could be built without LibreOffice build
environment.

Please let me know, what you think. I'd like to setup Android and iOS
translation projects in Pootle ASAP.

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

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

 vcl/unx/kde4/KDE4FilePicker.hxx |   11 ---
 vcl/unx/kde4/KDEXLib.cxx|6 +++---
 vcl/unx/kde4/KDEXLib.hxx|4 ++--
 3 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit 2e6a17ac88e89d4db8491605ac4dd6ea249b5d01
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Thu Nov 14 11:24:59 2013 +0100

Use Q_* macros.

This way we won't conflict with boosts signals and slots.

Change-Id: Ia92b283a5b47b7bc8c2bec2c6be664c9b7f1bed8
Reviewed-on: https://gerrit.libreoffice.org/6682
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com

diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 5ac37d0..41d3cd2 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -87,17 +87,14 @@ public:
 virtual ~KDE4FilePicker();
 
 // XFilePickerNotifier
-
 virtual void SAL_CALL addFilePickerListener( const 
::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XFilePickerListener  xListener ) throw( 
::com::sun::star::uno::RuntimeException );
 virtual void SAL_CALL removeFilePickerListener( const 
::com::sun::star::uno::Reference 
::com::sun::star::ui::dialogs::XFilePickerListener  xListener ) throw( 
::com::sun::star::uno::RuntimeException );
 
 // XExecutableDialog functions
-
 virtual void SAL_CALL setTitle( const OUString rTitle ) throw( 
::com::sun::star::uno::RuntimeException );
 virtual sal_Int16 SAL_CALL execute() throw( 
::com::sun::star::uno::RuntimeException );
 
 // XFilePicker functions
-
 virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( 
::com::sun::star::uno::RuntimeException );
 virtual void SAL_CALL setDefaultName( const OUString rName ) throw( 
::com::sun::star::uno::RuntimeException );
 virtual void SAL_CALL setDisplayDirectory( const OUString rDirectory ) 
throw( ::com::sun::star::uno::RuntimeException );
@@ -105,17 +102,14 @@ public:
 virtual ::com::sun::star::uno::Sequence OUString  SAL_CALL getFiles() 
throw( ::com::sun::star::uno::RuntimeException );
 
 // XFilterManager functions
-
 virtual void SAL_CALL appendFilter( const OUString rTitle, const OUString 
rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException );
 virtual void SAL_CALL setCurrentFilter( const OUString rTitle ) throw( 
::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException );
 virtual OUString SAL_CALL getCurrentFilter() throw( 
::com::sun::star::uno::RuntimeException );
 
 // XFilterGroupManager functions
-
 virtual void SAL_CALL appendFilterGroup( const OUString rGroupTitle, 
const ::com::sun::star::uno::Sequence ::com::sun::star::beans::StringPair  
rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
 
 // XFilePickerControlAccess functions
-
 virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 
nControlAction, const ::com::sun::star::uno::Any rValue ) throw 
(::com::sun::star::uno::RuntimeException);
 virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 
nControlId, sal_Int16 nControlAction ) throw 
(::com::sun::star::uno::RuntimeException);
 virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool 
bEnable ) throw( ::com::sun::star::uno::RuntimeException );
@@ -134,25 +128,20 @@ public:
 */
 
 // XFilePicker2 functions
-
 virtual ::com::sun::star::uno::Sequence OUString  SAL_CALL 
getSelectedFiles()
 throw (::com::sun::star::uno::RuntimeException);
 
 // XInitialization
-
 virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Any  rArguments ) throw( 
::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
 
 // XCancellable
-
 virtual void SAL_CALL cancel( ) throw( 
::com::sun::star::uno::RuntimeException );
 
 // XEventListener
-
 virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject 
rEvent ) throw( ::com::sun::star::uno::RuntimeException );
 using cppu::WeakComponentImplHelperBase::disposing;
 
 // XServiceInfo
-
 virtual OUString SAL_CALL getImplementationName() throw( 
::com::sun::star::uno::RuntimeException );
 virtual sal_Bool SAL_CALL supportsService( const OUString rServiceName ) 
throw( ::com::sun::star::uno::RuntimeException );
 virtual ::com::sun::star::uno::Sequence OUString  SAL_CALL 
getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 0e5a88b..21b7939 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -304,7 +304,7 @@ void KDEXLib::Yield( bool bWait, bool 
bHandleAllCurrentEvents )
 else
 { // if this deadlocks, event processing needs to go into a separate thread
   // or some

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

Mihkel Tõnnov mihh...@gmail.com changed:

   What|Removed |Added

 Depends on|62461   |

-- 
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 'distro/suse/suse-3.6' - 5 commits - instsetoo_native/util shell/inc shell/source solenv/inc

 instsetoo_native/util/openoffice.lst  |8 
 shell/inc/internal/stream_helper.hxx  |4 
 shell/inc/internal/types.hxx  |2 
 shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |7 
 shell/source/win32/zipfile/zipfile.cxx|  115 +-
 solenv/inc/minor.mk   |4 
 6 files changed, 91 insertions(+), 49 deletions(-)

New commits:
commit 7d8745e4f852f867ac7bc02997b1be353633449f
Author: Andras Timar ati...@suse.com
Date:   Wed Oct 16 15:05:28 2013 +0200

Bump for 3.6-32

Change-Id: I3dccc20c6b6a237954c136a14af215c6c385a877

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 21ee86d..1393da5 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 31
+WINDOWSPATCHLEVEL 32
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-531
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-532
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-531
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-532
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-531
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-532
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 59249f5..7fd1240 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:531)
-BUILD=531
+RSCREVISION=360m1(Build:532)
+BUILD=532
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
commit 86b94ce821f12a4bdd15b9e3f5333f5dbe563fd8
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Oct 4 19:36:57 2013 +0200

fdo#67534: try to avoid file locking in Explorer shell extensions

Change-Id: I287395f6c25b1bfb9b9482166ae6f34d9af8f455

diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx 
b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 5ab0c20..f41aa09 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -115,7 +115,8 @@ long BufferStream::sseek (long offset, int origin)
 FileStream::FileStream(const char *filename) :
 file(0)
 {
-file = fopen(filename, rb);
+// fdo#67534: avoid locking to not interfere with soffice opening the file
+file = _fsopen(filename, rb, _SH_DENYNO);
 }
 
 FileStream::~FileStream()
commit e5a1c6461d4ca4d82925dccabd91e1c08bb560b6
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jul 16 17:13:14 2013 +0200

bnc#829017 fix issue with negative seeks in win32 shell extension

Change-Id: Ia8072f78ad43281e406377922f50f8de53194f1b

diff --git a/shell/inc/internal/stream_helper.hxx 
b/shell/inc/internal/stream_helper.hxx
index f0d41bb..23745d7 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
@@ -40,7 +40,7 @@ public:
 ~BufferStream();
 unsigned long sread (unsigned char *vuf, unsigned long size);
 long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
 private:
 IStream *stream;
 };
@@ -52,7 +52,7 @@ public:
 ~FileStream();
 unsigned long sread (unsigned char *buf, unsigned long size);
 long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
 private:
 FILE *file;
 };
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index c6fbfac..628c9f6 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -87,7 +87,7 @@ public:
 virtual ~StreamInterface() {}
 virtual unsigned long sread (unsigned char* vuf, unsigned long size) = 0;
 virtual long stell () = 0;
-virtual long sseek (unsigned long offset, int origin) = 0;
+

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

2013-11-15 Thread Petr Mladek

Tag 'suse-3.6-32' created by Andras Timar ati...@suse.com at 2013-11-15 21:36 
-0800

suse-3.6-32

Changes since suse-3.6-12:
Andras Timar (3):
  updated pt-PT spelling dictionary
  fdo#56130 update Galician dictionary pack
  Update pt-PT dictionary

Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Lior Kaplan (1):
  Update Hebrew dictionary to one created with Hspell 1.2 (taken from 
Fedora 17 64bit)

Olivier Hallot (1):
  Fix for fdo#53520, Portuguese spelling files

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 dictionaries/pt_PT/description.xml |2 
 dictionaries/pt_PT/pt_PT.dic   |  257 -
 2 files changed, 144 insertions(+), 115 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

Tag 'suse-3.6-32' created by Andras Timar ati...@suse.com at 2013-11-15 21:36 
-0800

suse-3.6-32

Changes since suse-3.6-31-4:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-15 Thread Petr Mladek

Tag 'suse-3.6-32' created by Andras Timar ati...@suse.com at 2013-11-15 21:36 
-0800

suse-3.6-32

Changes since suse-3.6-12:
Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

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

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