[Libreoffice-commits] .: librelogo/Configuration_librelogo.mk

2012-11-07 Thread Libreoffice Gerrit user 
 librelogo/Configuration_librelogo.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ff923d03a095893952d3c205959118ddb3f09df8
Author: David Tardon 
Date:   Thu Nov 8 08:21:56 2012 +0100

librelogo configuration needs registry schemas

Change-Id: I4f3cd813a15c2e5666824859a5fd904acef0ca70

diff --git a/librelogo/Configuration_librelogo.mk 
b/librelogo/Configuration_librelogo.mk
index 0098388..cf2e6f4 100644
--- a/librelogo/Configuration_librelogo.mk
+++ b/librelogo/Configuration_librelogo.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Configuration_Configuration,librelogo,nodeliver))
 
+$(eval $(call gb_Configuration_use_configuration,librelogo,registry))
+
 $(eval $(call 
gb_Configuration_add_localized_datas,librelogo,librelogo/source/registry/data,\
org/openoffice/Office/Addons.xcu \
org/openoffice/Office/UI/StartModuleWindowState.xcu \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: liblangtag/makefile.mk

2012-11-07 Thread Libreoffice Gerrit user 
 liblangtag/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e6bfea03efffeba0f4eb92f7359c3b3924c9a9ec
Author: Tor Lillqvist 
Date:   Thu Nov 8 09:16:25 2012 +0200

Ask MSVC to be less verbose: -nologo

Change-Id: I332b322343ccbabe55c247f9bd934a0394ebd429

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index 2ac05e6..6c4db05 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -75,7 +75,7 @@ CONFIGURE_FLAGS+= --disable-introspection
 CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)/external'
 .IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
 CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)/libxml2.lib'
-CC!:=$(CC) -MD
+CC!:=$(CC) -MD -nologo
 .IF "$(debug)"=="TRUE"
 CC!:=$(CC) -Zi
 .ENDIF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

2012-11-07 Thread Libreoffice Gerrit user 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b261177e5d81a662c76d523e447d80c108ebdf5b
Author: Tor Lillqvist 
Date:   Thu Nov 8 08:52:18 2012 +0200

round() is not portable

Change-Id: I0f19fe7866e2ae85608e8a6380d52b66a47a98ec

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 0038da2..0853700 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -478,7 +478,7 @@ void DomainMapperTableManager::endOfRowAction()
 }while( --nGridCount );
 
 sal_Int16 nRelPos =
-sal::static_int_cast< sal_Int16 >( round( fGridWidth * 
nFullWidthRelative / nFullWidth ) );
+sal::static_int_cast< sal_Int16 >( floor( fGridWidth * 
nFullWidthRelative / nFullWidth  + 0.5 ) );
 
 pSeparators[nBorder].Position =  nRelPos + nLastRelPos;
 pSeparators[nBorder].IsVisible = sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] enable ado driver unit test again

2012-11-07 Thread David Ostrovsky (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1004

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/1004/1

enable ado driver unit test again

The problem is that ado driver creates a link file in the tree
leaving it dirty: tinderbox doesn't like it. Instead of reading
the mdb file direct from srcdir we copy it first to workdir and
read it from there with the new function: getPathFromWorkdir.
Thank you Norbert!

Change-Id: I504bc26b80686db55a505bac19a95cc9c6022fcc
---
M connectivity/CppunitTest_connectivity_ado.mk
M connectivity/Module_connectivity.mk
M connectivity/qa/connectivity/ado/DriverTest.cxx
3 files changed, 10 insertions(+), 9 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I504bc26b80686db55a505bac19a95cc9c6022fcc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 

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

[PATCH] cppCheck: Unused variable and Redundant assignment

2012-11-07 Thread Christophe JAILLET (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1005

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/1005/1

cppCheck: Unused variable and Redundant assignment

Change-Id: I67084c1cb9dc23eb77787d2a6d57a5b70126873c
Signed-off-by: jailletc36 
---
M sfx2/source/bastyp/fltfnc.cxx
M sfx2/source/control/dispatch.cxx
M sfx2/source/dialog/dinfdlg.cxx
M sfx2/source/dialog/securitypage.cxx
4 files changed, 0 insertions(+), 13 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67084c1cb9dc23eb77787d2a6d57a5b70126873c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christophe JAILLET 

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

Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options

2012-11-07 Thread Norbert Thiebaud 
On Wed, Nov 7, 2012 at 3:02 PM, David Ostrovsky  wrote:
> Given that we don't want to rename two last options, we are trying to find a
> new (less confusing and not so long) name
> for the first one:
> --enable-symbols-and-preserve-optimization

nah, --enable-symbol is just fine

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

Re: CPPUNIT road map, recent changes etc.

2012-11-07 Thread Markus Mohrhard 
Hey,

>
>>2012/10/30 John McCabe :
>>> Just found this fork but a bit disappointed with the lack of
>>information on
>>> the wiki. Is there a road map? What are the changes between 1.12.1
>>and the
>>> latest release? Has documentation been updated?
>>>
>>
>>You can find the updates for 1.13.0 in
>>http://cgit.freedesktop.org/libreoffice/cppunit/tree/NEWS?h=cppunit-1-13
>>and about the two fixes that went in for 1.13.1 at
>>http://mmohrhard.wordpress.com/2012/09/25/cppunit-1-13-1-libreoffice-version-released/
>>
>>Basically we have mostly upstreamed our patches and fixed some bugs.
>>I'm currently planning some more changes but this is only on paper and
>>nothing written as code yet.
>>
>>You can find a documentation generated from my latest master build at
>>http://people.freedesktop.org/~mmohrhard/cppunit/
>
> Thank you for those links, they're very useful. Can they be added to the wiki 
> page easily?
>

Well, I'd not like to use the people.freedesktop address as default
address for the cppunit documentation. It is mainly a version from my
master tree that already contains some parts that will maybe make it
into 1.14.0 and I don't think the webspace there should be used for
such tasks. However I have not yet a better idea where to place the
documentation. Except for that I think if you're interested you can
also edit the freedesktop wiki page about cppunit.

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

[Libreoffice-commits] .: 6 commits - connectivity/CppunitTest_connectivity_ado.mk connectivity/Module_connectivity.mk connectivity/qa lpsolve/ExternalProject_lpsolve.mk lpsolve/UnpackedTarball_lpsolve

2012-11-07 Thread Libreoffice Gerrit user 
 RepositoryExternal.mk   |2 +-
 connectivity/CppunitTest_connectivity_ado.mk|4 
 connectivity/Module_connectivity.mk |   11 +--
 connectivity/qa/connectivity/ado/DriverTest.cxx |4 +---
 lpsolve/ExternalProject_lpsolve.mk  |2 --
 lpsolve/UnpackedTarball_lpsolve.mk  |3 +--
 sd/source/ui/view/ViewShellBase.cxx |4 +---
 sw/inc/doc.hxx  |2 +-
 sw/inc/fmtcol.hxx   |   10 +-
 sw/inc/format.hxx   |6 +++---
 sw/inc/htmltbl.hxx  |6 +++---
 sw/inc/lineinfo.hxx |2 +-
 sw/inc/ndgrf.hxx|   12 ++--
 sw/source/core/attr/format.cxx  |   20 ++--
 sw/source/core/doc/fmtcol.cxx   |   24 
 sw/source/core/doc/gctable.cxx  |8 
 sw/source/core/doc/htmltbl.cxx  |4 ++--
 sw/source/core/doc/lineinfo.cxx |2 +-
 sw/source/core/doc/notxtfrm.cxx |   20 ++--
 sw/source/core/doc/visiturl.cxx |8 
 sw/source/core/graphic/ndgrf.cxx|6 +++---
 sw/source/core/inc/notxtfrm.hxx |2 +-
 sw/source/core/inc/tblrwcl.hxx  |   12 ++--
 sw/source/core/layout/fly.cxx   |2 +-
 24 files changed, 86 insertions(+), 90 deletions(-)

New commits:
commit 88e457dc60b7a7e5f4048e00c0418bc57537c029
Author: Takeshi Abe 
Date:   Thu Nov 8 12:16:44 2012 +0900

sal_Bool to bool

Change-Id: Idfbc33106b20b06c5247c50d099972305f016a51

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 0183d1f..ca5efc9 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1803,7 +1803,7 @@ public:
 // Query if ::com::sun::star::util::URL was visited.
 // Query via Doc, if only a ::com::sun::star::text::Bookmark has been 
given.
 // In this case the document name has to be set in front.
-sal_Bool IsVisitedURL( const String& rURL ) const;
+bool IsVisitedURL( const String& rURL ) const;
 
 /// Save current values for automatic registration of exceptions in 
Autocorrection.
 void SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew );
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 941e20c..5cb721b 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -103,7 +103,7 @@ public:
 inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
 SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
 
-sal_Bool IsAtDocNodeSet() const;
+bool IsAtDocNodeSet() const;
 
 void SetAttrOutlineLevel( int );
 int  GetAttrOutlineLevel() const;
@@ -117,9 +117,9 @@ public:
 
 /** Override to recognize changes on the  and 
register/unregister
  the paragragh style at the corresponding  instance. */
-virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr );
-virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet );
-virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 
);
+virtual bool SetFmtAttr( const SfxPoolItem& rAttr );
+virtual bool SetFmtAttr( const SfxItemSet& rSet );
+virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
 
 /// Override  to stay assigned to list level of outline 
style.
 virtual sal_uInt16 ResetAllFmtAttr();
@@ -256,7 +256,7 @@ public:
 const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
 const SwFmtCollConditions& GetCondColls() const { return aCondColls; }
 void InsertCondition( const SwCollCondition& rCond );
-sal_Bool RemoveCondition( const SwCollCondition& rCond );
+bool RemoveCondition( const SwCollCondition& rCond );
 
 void SetConditions( const SwFmtCollConditions& );
 };
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 8b8b61b..51cea19 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -98,9 +98,9 @@ public:
   sal_Bool bInParents = sal_True ) 
const;
 inline SfxItemState GetItemState( sal_uInt16 nWhich, sal_Bool 
bSrchInParent = sal_True,
 const SfxPoolItem **ppItem = 0 ) const;
-virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr );
-virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet );
-virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 
);
+virtual bool SetFmtAttr( const SfxPoolItem& rAttr );
+virtual bool SetFmtAttr( const SfxItemSet& rSet );
+virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
 
 /** Takes all hints from Delta-Array,
 @return count of deleted hints. */
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index a3c06d2..2f027e9 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -64,1

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 4 commits - sc/source

2012-11-07 Thread Libreoffice Gerrit user 
 sc/source/ui/inc/xmlsourcedlg.hrc   |4 ++--
 sc/source/ui/inc/xmlsourcedlg.hxx   |8 ++--
 sc/source/ui/src/xmlsourcedlg.src   |   28 +---
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |   23 +--
 4 files changed, 46 insertions(+), 17 deletions(-)

New commits:
commit dcfae841de4676aff3e0d732f93451ee4185343f
Author: Kohei Yoshida 
Date:   Wed Nov 7 22:27:35 2012 -0500

Handler methods for OK and Cancel.

Change-Id: I8637543dc10ade3e75205031581eeaadd1b7ca4d

diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
index b75f323..058058a 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -92,6 +92,9 @@ private:
 
 bool IsChildrenDirty(SvTreeListEntry* pEntry) const;
 
+void OkPressed();
+void CancelPressed();
+
 DECL_LINK(GetFocusHdl, Control*);
 DECL_LINK(LoseFocusHdl, Control*);
 DECL_LINK(BtnPressedHdl, Button*);
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 69fb08d..2fd452d 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -37,9 +37,9 @@ ScXMLSourceDlg::ScXMLSourceDlg(
 maFtSourceFile(this, ScResId(FT_SOURCE_FILE)),
 maFtMapXmlDoc(this, ScResId(FL_MAP_XML_TO_DOCUMENT)),
 maFtMappedCellTitle(this, ScResId(FT_MAPPED_CELL_TITLE)),
+maLbTree(this, ScResId(LB_SOURCE_TREE)),
 maRefEdit(this, this, ScResId(ED_MAPPED_CELL)),
 maRefBtn(this, ScResId(BTN_MAPPED_CELL), &maRefEdit, this),
-maLbTree(this, ScResId(LB_SOURCE_TREE)),
 maBtnOk(this, ScResId(BTN_OK)),
 maBtnCancel(this, ScResId(BTN_CANCEL)),
 maImgFileOpen(ScResId(IMG_FILE_OPEN)),
@@ -54,7 +54,10 @@ ScXMLSourceDlg::ScXMLSourceDlg(
 maBtnSelectSource.SetModeImage(maImgFileOpen);
 FreeResource();
 
-maBtnSelectSource.SetClickHdl(LINK(this, ScXMLSourceDlg, BtnPressedHdl));
+Link aBtnHdl = LINK(this, ScXMLSourceDlg, BtnPressedHdl);
+maBtnSelectSource.SetClickHdl(aBtnHdl);
+maBtnOk.SetClickHdl(aBtnHdl);
+maBtnCancel.SetClickHdl(aBtnHdl);
 
 Link aLink = LINK(this, ScXMLSourceDlg, GetFocusHdl);
 maRefEdit.SetGetFocusHdl(aLink);
@@ -388,6 +391,17 @@ bool ScXMLSourceDlg::IsChildrenDirty(SvTreeListEntry* 
pEntry) const
 return false;
 }
 
+void ScXMLSourceDlg::OkPressed()
+{
+// Store the xml link data to document.
+Close();
+}
+
+void ScXMLSourceDlg::CancelPressed()
+{
+Close();
+}
+
 IMPL_LINK(ScXMLSourceDlg, GetFocusHdl, Control*, pCtrl)
 {
 HandleGetFocus(pCtrl);
@@ -404,6 +418,10 @@ IMPL_LINK(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn)
 {
 if (pBtn == &maBtnSelectSource)
 SelectSourceFile();
+else if (pBtn == &maBtnOk)
+OkPressed();
+else if (pBtn == &maBtnCancel)
+CancelPressed();
 return 0;
 }
 
commit e01ca0f69bc7cc1e7ddbf176c5c8769036eeca0c
Author: Kohei Yoshida 
Date:   Wed Nov 7 22:12:40 2012 -0500

Added OK button next to the Cancel button.

Change-Id: I05782d9be74b3fddd34b79f3e15b43800b654d87

diff --git a/sc/source/ui/inc/xmlsourcedlg.hrc 
b/sc/source/ui/inc/xmlsourcedlg.hrc
index a5df403..748bed5 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hrc
+++ b/sc/source/ui/inc/xmlsourcedlg.hrc
@@ -9,8 +9,8 @@
 
 #include "sc.hrc"
 
-#define BTN_OK 0
-#define BTN_CANCEL 1
+#define BTN_OK 1
+#define BTN_CANCEL 2
 
 #define FL_SOURCE_FILE 10
 #define BTN_SELECT_SOURCE_FILE 11
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
index 052f96e..b75f323 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -43,6 +43,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg
 formula::RefEdit   maRefEdit;
 formula::RefButton maRefBtn;
 
+OKButton maBtnOk;
 CancelButton maBtnCancel;
 
 Image maImgFileOpen;
diff --git a/sc/source/ui/src/xmlsourcedlg.src 
b/sc/source/ui/src/xmlsourcedlg.src
index ef6a8f4..99d6f56 100644
--- a/sc/source/ui/src/xmlsourcedlg.src
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -104,6 +104,12 @@ ModelessDialog RID_SCDLG_XML_SOURCE
 MaskColor = STD_MASKCOLOR ;
 };
 
+OKButton BTN_OK
+{
+Pos = MAP_APPFONT ( 139 , 181 ) ;
+Size = MAP_APPFONT ( 50 , 14 ) ;
+};
+
 CancelButton BTN_CANCEL
 {
 Pos = MAP_APPFONT ( 194 , 181 ) ;
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index eae0f99..69fb08d 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -40,6 +40,7 @@ ScXMLSourceDlg::ScXMLSourceDlg(
 maRefEdit(this, this, ScResId(ED_MAPPED_CELL)),
 maRefBtn(this, ScResId(BTN_MAPPED_CELL), &maRefEdit, this),
 maLbTree(this, ScResId(LB_SOURCE_TREE)),
+maBtnOk(this, ScResId(BTN_OK)),
 maBtnCancel(this, ScResId(BTN_CANCEL)),
 maImgFileOpen(ScResId(IMG_FILE_OPEN)),
 mpDoc(pDoc),
commit b648726a4df0

[PUSHED] enable ado driver unit test again

2012-11-07 Thread Norbert Thiebaud (via Code Review) 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/1004

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I504bc26b80686db55a505bac19a95cc9c6022fcc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 
Gerrit-Reviewer: Norbert Thiebaud 

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

Re: building failure in binfilter

2012-11-07 Thread Norbert Thiebaud 
On Tue, Nov 6, 2012 at 4:33 AM, Jean-Baptiste Faure
 wrote:
>>
>> For me, what works well is "git pull [-r] && git submodule update".
>
> Indeed it works better with the right command. :-)
>

FYI

./g pull -r

nowadays does just that.. git pul + git submodule update)

but yes, I think it is better to do it explicitly, I weaked ./g for
the benefit of the tinderbox mostly
I think with recent git version it is possible to make that a config
of git, so that the submodule update occurs automatically after git
pull...

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

[PUSHED] convert lpsolve to gbuild

2012-11-07 Thread Michael Stahl (via Code Review) 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/1002

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley 
Gerrit-Reviewer: Michael Stahl 

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

[Libreoffice-commits] .: config_host.mk.in configure.ac lpsolve/ccc.static lpsolve/ExternalPackage_lpsolve.mk lpsolve/ExternalProject_lpsolve.mk lpsolve/lp_solve_5.5.patch lpsolve/lp_solve_5.5-windows

2012-11-07 Thread Libreoffice Gerrit user 
 Makefile.top   |2 
 Module_tail_build.mk   |1 
 RepositoryExternal.mk  |   12 +++
 RepositoryModule_ooo.mk|1 
 config_host.mk.in  |1 
 configure.ac   |2 
 lpsolve/ExternalPackage_lpsolve.mk |   35 +++
 lpsolve/ExternalProject_lpsolve.mk |   44 +
 lpsolve/Makefile   |7 ++
 lpsolve/Module_lpsolve.mk  |   22 ++
 lpsolve/UnpackedTarball_lpsolve.mk |   36 +++
 lpsolve/ccc.static |   11 +++
 lpsolve/lp_solve_5.5-windows.patch |5 -
 lpsolve/lp_solve_5.5.patch |   50 ---
 lpsolve/makefile.mk|  117 -
 lpsolve/prj/d.lst  |   11 ---
 ooo.lst.in |2 
 sccomp/Library_solver.mk   |2 
 sccomp/source/solver/solver.cxx|4 +
 tail_build/prj/build.lst   |2 
 20 files changed, 181 insertions(+), 186 deletions(-)

New commits:
commit 085346f80da394ad5008f40679a0d3519f7a82a3
Author: Peter Foley 
Date:   Sat Nov 3 19:19:30 2012 -0400

convert lpsolve to gbuild

Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
Reviewed-on: https://gerrit.libreoffice.org/1002
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/Makefile.top b/Makefile.top
index 1a7a9e2..a31df13 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -118,6 +118,7 @@ libwps\
 lingucomponent\
 linguistic\
 lotuswordpro\
+lpsolve\
 mdds\
 more_fonts\
 mythes\
@@ -228,7 +229,6 @@ libxml2\
 libxmlsec\
 libxslt\
 lcms2\
-lpsolve\
 migrationanalysis\
 moz\
 mysqlc\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ddff7ab..06abdb9 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
lingucomponent \
linguistic \
lotuswordpro \
+   $(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
MathMLDTD \
mdds \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9159962..120dd65 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1232,8 +1232,11 @@ endif # SYSTEM_LCMS2
 
 ifeq ($(SYSTEM_LPSOLVE),YES)
 
-define gb_LinkTarget__use_lpsolve55
+define gb_LinkTarget__use_lpsolve
 $(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
+$(call gb_LinkTarget_add_defs,$(1),\
+   -DSYSTEM_LPSOLVE \
+))
 
 endef
 
@@ -1243,10 +1246,15 @@ $(eval $(call 
gb_Helper_register_libraries,PLAINLIBS_OOO, \
lpsolve55 \
 ))
 
-define gb_LinkTarget__use_lpsolve55
+define gb_LinkTarget__use_lpsolve
+$(call gb_LinkTarget_use_unpacked,$(1),lpsolve)
 $(call gb_LinkTarget_use_libraries,$(1),\
lpsolve55 \
 )
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,lpsolve) \
+   $$(INCLUDE) \
+)
 
 endef
 
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index b0112df..3b8cf28 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
lingucomponent \
linguistic \
lotuswordpro \
+   $(call gb_Helper_optional,LPSOLVE,lpsolve) \
MathMLDTD \
mdds \
Mesa \
diff --git a/config_host.mk.in b/config_host.mk.in
index d4e83f2..9f44d80 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -336,6 +336,7 @@ export LIBXML_LIBS=@LIBXML_LIBS@
 export LIBXSLT_CFLAGS=@LIBXSLT_CFLAGS@
 export LIBXSLT_LIBS=@LIBXSLT_LIBS@
 export LINK_X64_BINARY=@LINK_X64_BINARY@
+export LPSOLVE_TARBALL=@LPSOLVE_TARBALL@
 @x_Cygwin@ export LS=@WIN_LS@
 export MANDIR=@MANDIR@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
diff --git a/configure.ac b/configure.ac
index fcfd197..e2e9d67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8941,9 +8941,11 @@ if test "$with_system_lpsolve" = "yes"; then
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LPSOLVE=NO
+LPSOLVE_TARBALL="26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
 BUILD_TYPE="$BUILD_TYPE LPSOLVE"
 fi
 AC_SUBST(SYSTEM_LPSOLVE)
+AC_SUBST(LPSOLVE_TARBALL)
 AC_SUBST([MINGW_LPSOLVE_DLL])
 
 dnl ===
diff --git a/lpsolve/ExternalPackage_lpsolve.mk 
b/lpsolve/ExternalPackage_lpsolve.mk
new file mode 100644
index 000..ed777ab
--- /dev/null
+++ b/lpsolve/ExternalPackage_lpsolve.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
+$(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lps

[Libreoffice-commits] .: translations

2012-11-07 Thread Libreoffice Gerrit user 
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0facaa9fe659efa0e0a3ddbeea81e83e1fede191
Author: Andras Timar 
Date:   Wed Nov 7 23:27:43 2012 +0100

Updated core
Project: translations  e56b8e6646a90ecd054fae9d09ea4b0cbc6c66eb
add librelogo files

diff --git a/translations b/translations
index 6d66e32..e56b8e6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 6d66e3242a10fbf54ae7d843fc823cf348fcec26
+Subproject commit e56b8e6646a90ecd054fae9d09ea4b0cbc6c66eb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/scripts nlpsolver/help sdext/source swext/mediawiki

2012-11-07 Thread Libreoffice Gerrit user 
 l10ntools/scripts/update_tree.pl   |  
394 --
 nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/tree_strings.xhp|   
29 
 sdext/source/presenter/help/en-US/com.sun.PresenterScreen/tree_strings.xhp |   
29 
 swext/mediawiki/help/tree_strings.xhp  |   
29 
 4 files changed, 481 deletions(-)

New commits:
commit 428d9e15f98630df9a652be2b2f5064ac1bc7a89
Author: Zolnai Tamás 
Date:   Wed Nov 7 22:50:56 2012 +0100

Delete unused files

Belong to extensions which become
unneeded because of treex

Change-Id: I86ca7494a9022c1e72d64b2ec5cbd41d6e292a00

diff --git a/l10ntools/scripts/update_tree.pl b/l10ntools/scripts/update_tree.pl
deleted file mode 100644
index 02faf6a..000
--- a/l10ntools/scripts/update_tree.pl
+++ /dev/null
@@ -1,394 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-if 0;
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# 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
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-use Cwd 'abs_path';
-use File::Find;
-use File::Copy qw/cp mv/;
-use File::Basename;
-
-# update the tree files in /misc/*
-
-$| = 1;
-
-my $prj = $ENV{PWD};
-
-my $inpath = $ENV{WORKDIR};
-terminate() if ( ! defined $inpath );
-
-my $destpath = $inpath;
-my $with_lang = $ARGV[1];
-my $xmllint = $ENV{XMLLINT} || "$ENV{OUTDIR_FOR_BUILD}/bin/xmllint";
-
-$tree_target_prefix = $ARGV[4];
-
-# Always use / directory separators
-$prj =~ s/\\/\//g if defined($prj);
-$inpath =~ s/\\/\//g;
-$destpath =~ s/\\/\//g;
-
-if ( ! defined $prj ) {
-# do someting that works for manual call
-($scriptname = `pwd`) =~ s/\n/\/$0/;
-($tree_src = $scriptname) =~ s/\/update_tree.pl/\/..\/source\/auxiliary/;
-($tree_dest = $scriptname) =~ s/\/update_tree.pl/\/..\/$destpath\/misc/;
-($source_dir = $scriptname) =~ s/\/update_tree.pl/\/..\/source/;
-($source_dir_xhp = $scriptname) =~ s/\/update_tree.pl/\/..\/source/;
-
-if ( defined $ENV{TRYSDF} || defined $ENV{LOCALIZESDF} )
-{
-if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq 
"YES" )
-{
-$source_dir = $ENV{TRYSDF};
-}
-elsif( defined $ENV{LOCALIZESDF} && $ENV{LOCALIZESDF} ne "" )
-{
-$source_dir = $ENV{LOCALIZESDF};
-}
-$source_dir =~ s/\/auxiliary\/localize.sdf$// ;
-}
-$treestrings = "$ARGV[0]";
-$treestrings=~ s/\/*.tree//g;
-} else {
-$source_dir_xhp = "$prj/source/presenter/help";
-$tree_src = "$ARGV[0]";
-$tree_src =~ s/\/help.tree//g;
-$tree_dest = "$ARGV[3]";
-$tree_dest =~ s/\/help.tree//g;
-$source_dir = "$ARGV[2]";
-$source_dir =~ s/\/localize.sdf//g;
-$treestrings = "$ARGV[0]";
-$treestrings=~ s/\/help.tree/\/tree_strings.xhp/g;
-
-if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
-{
-$source_dir = $ENV{TRYSDF};
-}
-elsif ( defined $ENV{LOCALIZESDF} && $ENV{LOCALIZESDF} ne "" )
-{
-$source_dir = $ENV{LOCALIZESDF};
-}
-$source_dir =~ s/\/auxiliary\/localize.sdf$// ;
-}
-
-# Get the English tree files as master
-#---
-# Update English from xhp
-#---
-&do_english;
-#---
-# Update localizations from sdf
-#---
-
-if( defined $with_lang && $with_lang ne "" )
-{
-@langs = split /\s+/, $with_lang;
-&read_loc;
-for $l(@langs)
-{
-#if ($l ne "en-US") {
-&do_lang($l);
-#}
-}
-}
-else
-{
-print "\nNo WITH_LANG set, skipping l10n\n";
-}
-#---
-#
-
-
-# SUBS
-
-sub terminate {
-$err = shift;
-print "$err\n\n";
-$msg = <<"MSG";
-
-update_tree.pl
-   all languages in WITH_LANG are processed. WITH_LANG=ALL is
-   not supported in manual calls.
-
-   Updates th

[PUSHED] check for builtins pollutes CFLAGS and in turn breaks pthrea...

2012-11-07 Thread Michael Stahl (via Code Review) 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/999

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65716bc9d7ff19976e5e82ae869c7594978e93e3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 
Gerrit-Reviewer: Michael Stahl 

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

[PATCH] fdo#44664: printer truncates Landscape orientation pages to ...

2012-11-07 Thread Lior Kaplan (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1003

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/1003/1

fdo#44664: printer truncates Landscape orientation pages to Portrait dimensions

Change-Id: I0554d38367a0b00fdc1e3b7fb72d4ad5d537a254
---
M vcl/unx/generic/printer/cupsmgr.cxx
1 file changed, 2 insertions(+), 2 deletions(-)


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

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

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

[Libreoffice-commits] .: liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch liblangtag/liblangtag-0.4.0-windows.patch liblangtag/makefile.mk

2012-11-07 Thread Libreoffice Gerrit user 
 liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch |   62 
++
 liblangtag/liblangtag-0.4.0-windows.patch  |   62 
--
 liblangtag/makefile.mk |2 
 3 files changed, 64 insertions(+), 62 deletions(-)

New commits:
commit 7c0606c94246909807433d91fc79b0c2ac6f95bb
Author: Christian Lohmaier 
Date:   Wed Nov 7 15:52:47 2012 +0100

check for builtins pollutes CFLAGS and in turn breaks pthread check

since the -march=i486 is not supported on PPC, all further compile
checks done in liblangtag's configure break.
So moving the corresponding patch out of the windows patch in a generic
one and also apply that for Mac.

Change-Id: I65716bc9d7ff19976e5e82ae869c7594978e93e3
Reviewed-on: https://gerrit.libreoffice.org/999
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch 
b/liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch
new file mode 100644
index 000..92efbfd
--- /dev/null
+++ b/liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch
@@ -0,0 +1,62 @@
+--- misc/liblangtag-0.4.0/configure.ac
 misc/build/liblangtag-0.4.0/configure.ac
+@@ -173,8 +173,9 @@
+ __sync_synchronize();
+ j = __sync_fetch_and_sub(&i, 1);
+ return j;
+-   ]])], [AC_MSG_ERROR([liblangtag has to be built with -march=i486 or 
later.])]
+-   [lt_cv_has_atomic=no])])
++   ]])], [AC_MSG_ERROR([liblangtag has to be built with -march=i486 or 
later.])],
++   [lt_cv_has_atomic=no
++CFLAGS="$_save_cflags"])])
+ ])
+ if test "x$lt_cv_has_atomic" = "xyes"; then
+   AC_DEFINE(LT_HAVE_ATOMIC_BUILTINS, 1, [Have buit-in atomic functions])
+@@ -291,8 +291,14 @@
+ dnl ==
+ dnl check another libraries
+ dnl ==
++case $host_os in
++  cygwin* | mingw*)
++;;
+-AX_PTHREAD([],
++  *)
++AX_PTHREAD([],
+   [AC_MSG_ERROR([*** pthread library are required])])
++;;
++esac
+ 
+ GOBJECT_INTROSPECTION_CHECK([1.30.0])
+ if test "x$enable_introspection" != "xyes"; then
+--- misc/liblangtag-0.4.0/configure
 misc/build/liblangtag-0.4.0/configure
+@@ -12604,7 +12604,9 @@
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   as_fn_error $? "liblangtag has to be built with -march=i486 or later." 
"$LINENO" 5
++else
+lt_cv_has_atomic=no
++   CFLAGS="$_save_cflags"
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+@@ -13201,6 +13201,10 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
++case $host_os in
++  cygwin* | mingw*)
++;;
++  *)
+ ax_pthread_ok=no
+ 
+ # We used to check for pthread.h first, but this fails if pthread.h
+@@ -13582,6 +13582,8 @@
+ ax_pthread_ok=no
+ as_fn_error $? "*** pthread library are required" "$LINENO" 5
+ fi
++;;
++esac
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/liblangtag/liblangtag-0.4.0-windows.patch 
b/liblangtag/liblangtag-0.4.0-windows.patch
index fef4a48..1f07bd0 100644
--- a/liblangtag/liblangtag-0.4.0-windows.patch
+++ b/liblangtag/liblangtag-0.4.0-windows.patch
@@ -1,65 +1,3 @@
 misc/liblangtag-0.4.0/configure.ac
-+++ misc/build/liblangtag-0.4.0/configure.ac
-@@ -173,8 +173,9 @@
- __sync_synchronize();
- j = __sync_fetch_and_sub(&i, 1);
- return j;
--   ]])], [AC_MSG_ERROR([liblangtag has to be built with -march=i486 or 
later.])]
--   [lt_cv_has_atomic=no])])
-+   ]])], [AC_MSG_ERROR([liblangtag has to be built with -march=i486 or 
later.])],
-+   [lt_cv_has_atomic=no
-+CFLAGS="$_save_cflags"])])
- ])
- if test "x$lt_cv_has_atomic" = "xyes"; then
-   AC_DEFINE(LT_HAVE_ATOMIC_BUILTINS, 1, [Have buit-in atomic functions])
-@@ -291,8 +291,14 @@
- dnl ==
- dnl check another libraries
- dnl ==
-+case $host_os in
-+  cygwin* | mingw*)
-+;;
--AX_PTHREAD([],
-+  *)
-+AX_PTHREAD([],
-   [AC_MSG_ERROR([*** pthread library are required])])
-+;;
-+esac
- 
- GOBJECT_INTROSPECTION_CHECK([1.30.0])
- if test "x$enable_introspection" != "xyes"; then
 misc/liblangtag-0.4.0/configure
-+++ misc/build/liblangtag-0.4.0/configure
-@@ -12607,7 +12607,9 @@
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-   as_fn_error $? "liblangtag has to be built with -march=i486 or later." 
"$LINENO" 5
-+else
-lt_cv_has_atomic=no
-+   CFLAGS="$_save_cflags"
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-@@ -13203,6 +13203,10 @@
- ac_link='$CC -o conftest$ac_exeext $CF

[PUSHED] Change in core[libreoffice-3-5]: fdo51023: Revert e4450c54aee85b295b933e91d207fd8220c01107 fo...

2012-11-07 Thread Michael Stahl (via Code Review) 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/1000

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfb62fb24a5c72fda39c8bcea125267c99ecf624
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: LibreOffice gerrit bot 
Gerrit-Reviewer: Michael Stahl 

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

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source

2012-11-07 Thread Libreoffice Gerrit user 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |   42 +++
 1 file changed, 42 insertions(+)

New commits:
commit 6d425d93fd842f74d84bdcd65bce6a77c1c8821d
Author: Tor Lillqvist 
Date:   Wed Nov 7 15:50:21 2012 +0200

fdo51023: Revert e4450c54aee85b295b933e91d207fd8220c01107 for Mac OS X

See bug for discussion. Basically, the root cause to the problem is
that on the Mac, all the drag-and-drop action happens during the call
to pSlideSorterViewShell->StartDrag() in the Initialize method. Thus
no wonder that mpDragAndDropContext is null in the ProcessDragEvent()
as it has not been initialized yet, and is in fact initialised
pointlessly only after the drag-and-drop already has finished.

Reverted just for Mac OS X and ifdefified in a straightforward even if
ugly fashion.

Change-Id: Icfb62fb24a5c72fda39c8bcea125267c99ecf624
Reviewed-on: https://gerrit.libreoffice.org/1000
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 605749c..11a892b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -261,10 +261,17 @@ public:
 MultiSelectionModeHandler (
 SlideSorter& rSlideSorter,
 SelectionFunction& rSelectionFunction,
+#ifndef MACOSX
 const Point& rMouseModelPosition);
+#else
+const Point& rMouseModelPosition,
+const sal_uInt32 nEventCode);
+#endif
 virtual ~MultiSelectionModeHandler (void);
 
+#ifndef MACOSX
 void Initialize(const sal_uInt32 nEventCode);
+#endif
 
 virtual SelectionFunction::Mode GetMode (void) const;
 virtual void Abort (void);
@@ -311,10 +318,19 @@ class DragAndDropModeHandler : public 
SelectionFunction::ModeHandler
 public:
 DragAndDropModeHandler (
 SlideSorter& rSlideSorter,
+#ifndef MACOSX
 SelectionFunction& rSelectionFunction);
+#else
+SelectionFunction& rSelectionFunction,
+const Point& rMousePosition,
+::Window* pWindow);
+#endif
 virtual ~DragAndDropModeHandler (void);
 
+#ifndef MACOSX
 void Initialize(const Point& rMousePosition, ::Window* pWindow);
+#endif
+
 virtual SelectionFunction::Mode GetMode (void) const;
 virtual void Abort (void);
 
@@ -827,6 +843,7 @@ void SelectionFunction::SwitchToDragAndDropMode (const 
Point aMousePosition)
 {
 if (mpModeHandler->GetMode() != DragAndDropMode)
 {
+#ifndef MACOSX
 ::boost::shared_ptr handler(
 new DragAndDropModeHandler(mrSlideSorter, *this));
 SwitchMode(handler);
@@ -834,6 +851,10 @@ void SelectionFunction::SwitchToDragAndDropMode (const 
Point aMousePosition)
 // could already trigger DND events, which would recursively trigger 
this code again,
 // and without mpModeHandler set it would again try to set a new 
handler.
 handler->Initialize(aMousePosition, mpWindow);
+#else
+SwitchMode(::boost::shared_ptr(
+new DragAndDropModeHandler(mrSlideSorter, *this, aMousePosition, 
mpWindow)));
+#endif
 }
 }
 
@@ -845,6 +866,7 @@ void SelectionFunction::SwitchToMultiSelectionMode (
 const sal_uInt32 nEventCode)
 {
 if (mpModeHandler->GetMode() != MultiSelectionMode)
+#ifndef MACOSX
 {
 ::boost::shared_ptr handler(
 new MultiSelectionModeHandler(mrSlideSorter, *this, 
aMousePosition));
@@ -853,6 +875,10 @@ void SelectionFunction::SwitchToMultiSelectionMode (
 // is non-trivial, so it could possibly recurse just like the DND 
handler above.
 handler->Initialize(nEventCode);
 }
+#else
+SwitchMode(::boost::shared_ptr(
+new MultiSelectionModeHandler(mrSlideSorter, *this, 
aMousePosition, nEventCode)));
+#endif
 }
 
 
@@ -1569,7 +1595,12 @@ void NormalModeHandler::ResetButtonDownLocation (void)
 MultiSelectionModeHandler::MultiSelectionModeHandler (
 SlideSorter& rSlideSorter,
 SelectionFunction& rSelectionFunction,
+#ifndef MACOSX
 const Point& rMouseModelPosition)
+#else
+const Point& rMouseModelPosition,
+const sal_uInt32 nEventCode)
+#endif
 : ModeHandler(rSlideSorter, rSelectionFunction, false),
   meSelectionMode(SM_Normal),
   maSecondCorner(rMouseModelPosition),
@@ -1578,11 +1609,13 @@ MultiSelectionModeHandler::MultiSelectionModeHandler (
   mnSecondIndex(-1),
   maButtonBarLock(rSlideSorter)
 {
+#ifndef MACOSX
 }
 
 
 void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode)
 {
+#endif
 const Pointer aSelectionPointer (POINTER_TEXT);
 mrSlideSorter.GetContentWindow()->SetPointer(aSelectionPointer);
 SetSelectionModeFromModifier(nEventCode);
@@ -1822,13 +1855,22 @@ void MultiSelectionModeHandler::UpdateSelection (void)
 
 DragAndDropModeHandler::DragAndDropModeHandler (
 SlideSorter&

[PATCH] convert lpsolve to gbuild

2012-11-07 Thread Peter Foley (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1002

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/1002/1

convert lpsolve to gbuild

Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
---
M Makefile.top
M Module_tail_build.mk
M RepositoryExternal.mk
M RepositoryModule_ooo.mk
M config_host.mk.in
M configure.ac
A lpsolve/ExternalPackage_lpsolve.mk
A lpsolve/ExternalProject_lpsolve.mk
A lpsolve/Makefile
A lpsolve/Module_lpsolve.mk
A lpsolve/UnpackedTarball_lpsolve.mk
A lpsolve/ccc.static
M lpsolve/lp_solve_5.5-windows.patch
M lpsolve/lp_solve_5.5.patch
D lpsolve/makefile.mk
M lpsolve/prj/d.lst
D lpsolve/prj/dmake
M ooo.lst.in
M sccomp/Library_solver.mk
M sccomp/source/solver/solver.cxx
M tail_build/prj/build.lst
21 files changed, 181 insertions(+), 186 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley 

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

Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options

2012-11-07 Thread David Ostrovsky 

On 07.11.2012 17:16, Tor Lillqvist wrote:



If no one has any opinion on it, I'm going to name it
--enable-symbols-only.


I don't like that, as it strongly suggests that this option would 
cause some kind of lighter, symbol/address mapping only kind of data 
to be emitted, as opposed to full debug information. Which is doesn't, 
at least not for all platforms. Or am I missing something?
no, you are right, it's the same symbol information as with full debug 
information (on all platforms). The difference between the two is only 
optimization:


   O | S | D | T
--
production-code| x | -  | -  | -
--
enable-symbols  | x | x | -  | -
--
enable-debug | -  | x | -  | -
--
enable-dbgutil| -  | x | x  | x

where
O: optimization
S:  symbols
D: debug STL
T: trace facility

So to reflect what these options mean exactly one should name it as follows:
enable-symbols: --enable-symbols-and-preserve-optimization
enable-debug: --enable-symbols-and-disable-optimization
enable-dbgutil: 
--enable-symbols-and-disable-optimization-and-enable-debugstl-and-enable-trace-facility


Given that we don't want to rename two last options, we are trying to 
find a new (less confusing and not so long) name

for the first one:
--enable-symbols-and-preserve-optimization

Ideas?

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

[Libreoffice-commits] .: libvisio/libvisio-0.0.20-zlib.patch libvisio/UnpackedTarball_visio.mk

2012-11-07 Thread Libreoffice Gerrit user 
 libvisio/UnpackedTarball_visio.mk   |6 ++
 libvisio/libvisio-0.0.20-zlib.patch |   26 ++
 2 files changed, 32 insertions(+)

New commits:
commit 1a142e8b5c5a45032a4c940afe90320d5023c324
Author: Fridrich Å trba 
Date:   Wed Nov 7 21:53:24 2012 +0100

Make libvisio build pick the right zlib headers

Change-Id: I159cd926e5b373ca7bbecea87a4798b08b89b7ef

diff --git a/libvisio/UnpackedTarball_visio.mk 
b/libvisio/UnpackedTarball_visio.mk
index aa9113b..59d4adb 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,visio,\
+   libvisio/libvisio-0.0.20-zlib.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.20-zlib.patch 
b/libvisio/libvisio-0.0.20-zlib.patch
new file mode 100644
index 000..28cf881
--- /dev/null
+++ b/libvisio/libvisio-0.0.20-zlib.patch
@@ -0,0 +1,26 @@
+--- libvisio-0.0.20/configure
 libvisio-0.0.20/configure
+@@ -17165,8 +17165,8 @@
+ fi
+ 
+ fi
+-LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS}"
+-LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS}"
++LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} 
${ZLIB_CFLAGS}"
++LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS}"
+ 
+ 
+ 
+--- libvisio-0.0.20/Makefile.in
 libvisio-0.0.20/Makefile.in
+@@ -55,8 +55,8 @@
+   $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+   $(srcdir)/libvisio-0.0.pc.in $(srcdir)/libvisio-zip.in \
+   $(srcdir)/libvisio.spec.in $(top_srcdir)/configure AUTHORS \
+-  NEWS ar-lib config.guess config.sub install-sh ltmain.sh \
+-  missing
++  NEWS ar-lib config.guess config.sub depcomp install-sh \
++  ltmain.sh missing
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/smaller-base-cell' - sc/inc sc/Library_sc.mk sc/source

2012-11-07 Thread Libreoffice Gerrit user 
 sc/Library_sc.mk   |1 
 sc/inc/cell.hxx|1 
 sc/inc/celltextwidths.hxx  |   37 +
 sc/source/core/data/cell.cxx   |1 
 sc/source/core/data/celltextwidths.cxx |   35 +++
 sc/source/core/data/column.cxx |   18 ++--
 sc/source/core/data/documen8.cxx   |1 
 sc/source/core/data/table1.cxx |1 
 sc/source/core/data/table5.cxx |2 +
 9 files changed, 81 insertions(+), 16 deletions(-)

New commits:
commit c3ff0f589a5cd22bda09a8e90e97f3da8810ad3a
Author: Kohei Yoshida 
Date:   Wed Nov 7 09:30:48 2012 -0500

Let's use a separate class to manage storage of cell text widths.

Change-Id: I5c823dea4d2e1fd17fae466be26ebff2aa24ecb6

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 4ac291e..bef4866 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/data/bcaslot \
sc/source/core/data/cell \
sc/source/core/data/cell2 \
+   sc/source/core/data/celltextwidths \
sc/source/core/data/clipparam \
sc/source/core/data/column \
sc/source/core/data/column2 \
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 79e99db..3ec6084 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -47,7 +47,6 @@
 #include "scdllapi.h"
 
 #define USE_MEMPOOL
-#define TEXTWIDTH_DIRTY 0x
 
 // in addition to SCRIPTTYPE_... flags from scripttypeitem.hxx:
 // set (in nScriptType) if type has not been determined yet
diff --git a/sc/inc/celltextwidths.hxx b/sc/inc/celltextwidths.hxx
new file mode 100644
index 000..ef4499b
--- /dev/null
+++ b/sc/inc/celltextwidths.hxx
@@ -0,0 +1,37 @@
+/* -*- 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 __SC_CELLTEXTWIDTHS_HXX__
+#define __SC_CELLTEXTWIDTHS_HXX__
+
+#include "address.hxx"
+#include "sal/types.h"
+
+#include 
+#include 
+
+class ScCellTextWidths
+{
+typedef mdds::multi_type_vector StoreType;
+StoreType maStore;
+
+public:
+static sal_uInt16 Dirty;
+
+ScCellTextWidths();
+
+sal_uInt16 get(SCROW nRow) const;
+void set(SCROW nRow, sal_uInt16 nWidth);
+};
+
+#define TEXTWIDTH_DIRTY ScCellTextWidths::Dirty
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index e27339e..c4325a5 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -49,6 +49,7 @@
 #include "externalrefmgr.hxx"
 #include "macromgr.hxx"
 #include "dbdata.hxx"
+#include "celltextwidths.hxx"
 
 #include 
 #include 
diff --git a/sc/source/core/data/celltextwidths.cxx 
b/sc/source/core/data/celltextwidths.cxx
new file mode 100644
index 000..39240d3
--- /dev/null
+++ b/sc/source/core/data/celltextwidths.cxx
@@ -0,0 +1,35 @@
+/* -*- 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/.
+ */
+
+#include "celltextwidths.hxx"
+
+sal_uInt16 ScCellTextWidths::Dirty = 0x;
+
+ScCellTextWidths::ScCellTextWidths() :
+maStore(MAXROWCOUNT) {}
+
+sal_uInt16 ScCellTextWidths::get(SCROW nRow) const
+{
+switch (maStore.get_type(nRow))
+{
+case mdds::mtv::element_type_ushort:
+return maStore.get(nRow);
+default:
+;
+}
+return Dirty;
+}
+
+void ScCellTextWidths::set(SCROW nRow, sal_uInt16 nWidth)
+{
+// We only use unsigned short type in this container.
+maStore.set(nRow, static_cast(nWidth));
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 8c9c1c2..0323eaf 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -38,6 +38,7 @@
 #include "markdata.hxx"
 #include "detfunc.hxx"  // for Notes in Sort/Swap
 #include "postit.hxx"
+#include "celltextwidths.hxx"
 
 #include 
 #include 
@@ -45,8 +46,6 @@
 
 #include 
 #include 
-#include 
-#include 
 
 using ::editeng::SvxBorderLine;
 using namespace formula;
@@ -66,11 +65,7 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
 
 struct ScColumnImpl
 {
-typedef mdds::multi_type_vector 
TextWidthType;
-
-TextWidthType maTextWidths;
-
-ScColumnImpl() : maTextWidths(MAXROWCOUNT) {}
+ScCellTextWidths maTextWidths;
 };
 
 ScNeededSizeOptions::ScNeededSiz

Re: [fdo#40325] PRINTING: order of page not respected with Handout

2012-11-07 Thread Regina Henschel 

Hi,

Regina Henschel schrieb:



I have not tried it actually, but in "default" mode, setting the order
should work.


Other way round: The presets follow the page order setting, and 
"default" follows the manual setting from the handout page layout. That 
seems right to me. Enhancement can be to put "default" not at first 
place but last, find a better word ("follow page layout" might be to 
long), and disable page order setting in case of "default".


Kind regards
Regina

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

Re: [fdo#40325] PRINTING: order of page not respected with Handout

2012-11-07 Thread Regina Henschel 

Hi Rob,

Rob Snelders schrieb:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi All,

This bug describes that the printing of handouts doesn't respect the
"order of page"-option.

It seems some parts of the working of this already functions but the
default-option still is weird. It defaults to 6 slides and doesn't
respect the "order of page"-option it always prints vertically first.

I think it would be better to remove te default-option for the slides
and default to 6 slides with the "left to right then down" selected
for "order of page".

Anybody any thoughts on that?


It is a long history. It starts around this
"Enhance handout printing in impress"
https://issues.apache.org/ooo/show_bug.cgi?id=85355

Then I noticed this bug
"Can no longer print handouts with customized size and arrangement of 
the preview objects"

https://issues.apache.org/ooo/show_bug.cgi?id=94055

which leads to the "default" option in the print dialog. So no, do not 
remove the "default" option.


That the order cannot be set is an issue for its own, already know on 
OpenOffice.org:
"Print order (horizontal/vertical) cannot be selected freely when 
printing multiple slides with Impress"

https://issues.apache.org/ooo/show_bug.cgi?id=98598
"New print dialog ignores Order setting when printing handouts in Impress"
https://issues.apache.org/ooo/show_bug.cgi?id=114442

As far as I understand the presets, it was intended, that the user 
cannot alter these. That does not mean, that a change of this behavior 
is not possible.


I have not tried it actually, but in "default" mode, setting the order 
should work.


Kind regards
Regina





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

[Libreoffice-commits] .: tools/Library_tl.mk

2012-11-07 Thread Libreoffice Gerrit user 
 tools/Library_tl.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit 2f0b0e54f45cd9694d07d9e0399cd39bc465c09e
Author: Fridrich Å trba 
Date:   Wed Nov 7 18:44:48 2012 +0100

Don't export zlib symbols

Change-Id: Idd90a8ee15e275036f38d0b149ec4a599948e9ba

diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index cd8afec..98ee848 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -106,6 +106,14 @@ $(eval $(call gb_Library_use_external,tl,zlib))
 
 ifeq ($(OS),WNT)
 
+ifeq ($(COM),GCC)
+
+$(eval $(call gb_Library_add_libs,tl,\
+-Wl$(COMMA)--exclude-libs=libzlib.a \
+))
+
+endif
+
 $(eval $(call gb_Library_set_include,tl,\
 -I$(SRCDIR)/tools/win/inc \
 $$(INCLUDE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/inc sc/source

2012-11-07 Thread Libreoffice Gerrit user 
 sc/inc/orcusxml.hxx |4 ++--
 sc/source/core/tool/orcusxml.cxx|2 +-
 sc/source/filter/orcus/orcusfiltersimpl.cxx |8 
 sc/source/ui/inc/xmlsourcedlg.hxx   |   10 +-
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |   22 +++---
 5 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 4f2856c017310f8775b8617797f21bf2fbf208fb
Author: Kohei Yoshida 
Date:   Wed Nov 7 13:06:35 2012 -0500

Get it to build again after the rebase.

The breakage is mostly due to my tree control rework on master.

Change-Id: I1db09fa18b4d997cf77fea2968e787cbce3b0a72

diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index 2c4b07b..a133b78 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -16,7 +16,7 @@
 
 #include 
 
-class SvLBoxEntry;
+class SvTreeListEntry;
 
 /**
  * Parameter used during call to ScOrcusFilters::loadXMLStructure().
@@ -47,7 +47,7 @@ struct ScOrcusXMLTreeParam
  */
 UserDataStoreType maUserDataStore;
 
-static SC_DLLPUBLIC EntryData* getUserData(SvLBoxEntry& rEntry);
+static SC_DLLPUBLIC EntryData* getUserData(SvTreeListEntry& rEntry);
 };
 
 #endif
diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx
index 068fddf..8d5d91b 100644
--- a/sc/source/core/tool/orcusxml.cxx
+++ b/sc/source/core/tool/orcusxml.cxx
@@ -14,7 +14,7 @@
 ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType) :
 meType(eType), maLinkedPos(ScAddress::INITIALIZE_INVALID), 
mbRangeParent(false) {}
 
-ScOrcusXMLTreeParam::EntryData* ScOrcusXMLTreeParam::getUserData(SvLBoxEntry& 
rEntry)
+ScOrcusXMLTreeParam::EntryData* 
ScOrcusXMLTreeParam::getUserData(SvTreeListEntry& rEntry)
 {
 return static_cast(rEntry.GetUserData());
 }
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx 
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index b4a1408..0549156 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -177,7 +177,7 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, const 
OUString& rPath) cons
 namespace {
 
 void setUserDataToEntry(
-SvLBoxEntry& rEntry, ScOrcusXMLTreeParam::UserDataStoreType& rStore, 
ScOrcusXMLTreeParam::EntryType eType)
+SvTreeListEntry& rEntry, ScOrcusXMLTreeParam::UserDataStoreType& rStore, 
ScOrcusXMLTreeParam::EntryType eType)
 {
 rStore.push_back(new ScOrcusXMLTreeParam::EntryData(eType));
 rEntry.SetUserData(&rStore.back());
@@ -186,10 +186,10 @@ void setUserDataToEntry(
 void populateTree(
SvTreeListBox& rTreeCtrl, orcus::xml_structure_tree::walker& rWalker,
const orcus::xml_structure_tree::entity_name& rElemName, bool bRepeat,
-   SvLBoxEntry* pParent, ScOrcusXMLTreeParam& rParam)
+   SvTreeListEntry* pParent, ScOrcusXMLTreeParam& rParam)
 {
 OUString aName(rElemName.name.get(), rElemName.name.size(), 
RTL_TEXTENCODING_UTF8);
-SvLBoxEntry* pEntry = rTreeCtrl.InsertEntry(aName, pParent);
+SvTreeListEntry* pEntry = rTreeCtrl.InsertEntry(aName, pParent);
 if (!pEntry)
 // Can this ever happen!?
 return;
@@ -217,7 +217,7 @@ void populateTree(
 for (; it != itEnd; ++it)
 {
 orcus::xml_structure_tree::entity_name aAttrName = *it;
-SvLBoxEntry* pAttr = rTreeCtrl.InsertEntry(
+SvTreeListEntry* pAttr = rTreeCtrl.InsertEntry(
 OUString(aAttrName.name.get(), aAttrName.name.size(), 
RTL_TEXTENCODING_UTF8), pEntry);
 
 if (!pAttr)
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
index 0f8f0cb..c283ec4 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -74,9 +74,9 @@ private:
 void HandleGetFocus(Control* pCtrl);
 void HandleLoseFocus(Control* pCtrl);
 void TreeItemSelected();
-void DefaultElementSelected(SvLBoxEntry& rEntry);
-void RepeatElementSelected(SvLBoxEntry& rEntry);
-void AttributeSelected(SvLBoxEntry& rEntry);
+void DefaultElementSelected(SvTreeListEntry& rEntry);
+void RepeatElementSelected(SvTreeListEntry& rEntry);
+void AttributeSelected(SvTreeListEntry& rEntry);
 
 void SetNonLinkable();
 void SetSingleLinkable();
@@ -87,9 +87,9 @@ private:
  * not checked; its parent is the first one to be checked, then all its
  * parents get checked all the way to the root.
  */
-bool IsParentDirty(SvLBoxEntry* pEntry) const;
+bool IsParentDirty(SvTreeListEntry* pEntry) const;
 
-bool IsChildrenDirty(SvLBoxEntry* pEntry) const;
+bool IsChildrenDirty(SvTreeListEntry* pEntry) const;
 
 DECL_LINK(GetFocusHdl, Control*);
 DECL_LINK(LoseFocusHdl, Control*);
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index b9d518b..eae0f99 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -90,7 +90,7 @@ void ScXMLSourceDlg::SetReference(const

[PUSHED] Change in core[libreoffice-3-6]: fdo51023: Revert e4450c54aee85b295b933e91d207fd8220c01107 fo...

2012-11-07 Thread Michael Meeks (via Code Review) 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/1001


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfb62fb24a5c72fda39c8bcea125267c99ecf624
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: LibreOffice gerrit bot 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Tor Lillqvist 

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

Change in core[libreoffice-3-6]: fdo51023: Revert e4450c54aee85b295b933e91d207fd8220c01107 fo...

2012-11-07 Thread Michael Meeks (via Code Review) 
Michael Meeks has uploaded a new patch set (#2).

Change subject: fdo51023: Revert e4450c54aee85b295b933e91d207fd8220c01107 for 
Mac OS X
..

fdo51023: Revert e4450c54aee85b295b933e91d207fd8220c01107 for Mac OS X

See bug for discussion. Basically, the root cause to the problem is
that on the Mac, all the drag-and-drop action happens during the call
to pSlideSorterViewShell->StartDrag() in the Initialize method. Thus
no wonder that mpDragAndDropContext is null in the ProcessDragEvent()
as it has not been initialized yet, and is in fact initialised
pointlessly only after the drag-and-drop already has finished.

Reverted just for Mac OS X and ifdefified in a straightforward even if
ugly fashion.

Change-Id: Icfb62fb24a5c72fda39c8bcea125267c99ecf624
Signed-off-by: Michael Meeks 
---
M sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
1 file changed, 42 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/1001/2
--
To view, visit https://gerrit.libreoffice.org/1001
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Icfb62fb24a5c72fda39c8bcea125267c99ecf624
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: LibreOffice gerrit bot 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Tor Lillqvist 

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-11-07 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 51023, which changed state.

Bug 51023 Summary: EDITING: Drag-and-drop slide always moves slide to first 
position, leading to data corruption and sometimes CRASH
https://bugs.freedesktop.org/show_bug.cgi?id=51023

   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] .: Branch 'libreoffice-3-6' - sd/source

2012-11-07 Thread Libreoffice Gerrit user 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |   42 +++
 1 file changed, 42 insertions(+)

New commits:
commit 7ec1ae356a6b06a31fca68eb30c706b906d75fdd
Author: Tor Lillqvist 
Date:   Wed Nov 7 15:50:21 2012 +0200

fdo51023: Revert e4450c54aee85b295b933e91d207fd8220c01107 for Mac OS X

See bug for discussion. Basically, the root cause to the problem is
that on the Mac, all the drag-and-drop action happens during the call
to pSlideSorterViewShell->StartDrag() in the Initialize method. Thus
no wonder that mpDragAndDropContext is null in the ProcessDragEvent()
as it has not been initialized yet, and is in fact initialised
pointlessly only after the drag-and-drop already has finished.

Reverted just for Mac OS X and ifdefified in a straightforward even if
ugly fashion.

Change-Id: Icfb62fb24a5c72fda39c8bcea125267c99ecf624
Signed-off-by: Michael Meeks 

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 0d3fc63..4220a0e 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -251,10 +251,17 @@ public:
 MultiSelectionModeHandler (
 SlideSorter& rSlideSorter,
 SelectionFunction& rSelectionFunction,
+#ifndef MACOSX
 const Point& rMouseModelPosition);
+#else
+const Point& rMouseModelPosition,
+const sal_uInt32 nEventCode);
+#endif
 virtual ~MultiSelectionModeHandler (void);
 
+#ifndef MACOSX
 void Initialize(const sal_uInt32 nEventCode);
+#endif
 
 virtual SelectionFunction::Mode GetMode (void) const;
 virtual void Abort (void);
@@ -301,10 +308,19 @@ class DragAndDropModeHandler : public 
SelectionFunction::ModeHandler
 public:
 DragAndDropModeHandler (
 SlideSorter& rSlideSorter,
+#ifndef MACOSX
 SelectionFunction& rSelectionFunction);
+#else
+SelectionFunction& rSelectionFunction,
+const Point& rMousePosition,
+::Window* pWindow);
+#endif
 virtual ~DragAndDropModeHandler (void);
 
+#ifndef MACOSX
 void Initialize(const Point& rMousePosition, ::Window* pWindow);
+#endif
+
 virtual SelectionFunction::Mode GetMode (void) const;
 virtual void Abort (void);
 
@@ -817,6 +833,7 @@ void SelectionFunction::SwitchToDragAndDropMode (const 
Point aMousePosition)
 {
 if (mpModeHandler->GetMode() != DragAndDropMode)
 {
+#ifndef MACOSX
 ::boost::shared_ptr handler(
 new DragAndDropModeHandler(mrSlideSorter, *this));
 SwitchMode(handler);
@@ -824,6 +841,10 @@ void SelectionFunction::SwitchToDragAndDropMode (const 
Point aMousePosition)
 // could already trigger DND events, which would recursively trigger 
this code again,
 // and without mpModeHandler set it would again try to set a new 
handler.
 handler->Initialize(aMousePosition, mpWindow);
+#else
+SwitchMode(::boost::shared_ptr(
+new DragAndDropModeHandler(mrSlideSorter, *this, aMousePosition, 
mpWindow)));
+#endif
 }
 }
 
@@ -835,6 +856,7 @@ void SelectionFunction::SwitchToMultiSelectionMode (
 const sal_uInt32 nEventCode)
 {
 if (mpModeHandler->GetMode() != MultiSelectionMode)
+#ifndef MACOSX
 {
 ::boost::shared_ptr handler(
 new MultiSelectionModeHandler(mrSlideSorter, *this, 
aMousePosition));
@@ -843,6 +865,10 @@ void SelectionFunction::SwitchToMultiSelectionMode (
 // is non-trivial, so it could possibly recurse just like the DND 
handler above.
 handler->Initialize(nEventCode);
 }
+#else
+SwitchMode(::boost::shared_ptr(
+new MultiSelectionModeHandler(mrSlideSorter, *this, 
aMousePosition, nEventCode)));
+#endif
 }
 
 
@@ -1513,7 +1539,12 @@ void NormalModeHandler::ResetButtonDownLocation (void)
 MultiSelectionModeHandler::MultiSelectionModeHandler (
 SlideSorter& rSlideSorter,
 SelectionFunction& rSelectionFunction,
+#ifndef MACOSX
 const Point& rMouseModelPosition)
+#else
+const Point& rMouseModelPosition,
+const sal_uInt32 nEventCode)
+#endif
 : ModeHandler(rSlideSorter, rSelectionFunction, false),
   meSelectionMode(SM_Normal),
   maSecondCorner(rMouseModelPosition),
@@ -1522,11 +1553,13 @@ MultiSelectionModeHandler::MultiSelectionModeHandler (
   mnSecondIndex(-1),
   maButtonBarLock(rSlideSorter)
 {
+#ifndef MACOSX
 }
 
 
 void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode)
 {
+#endif
 const Pointer aSelectionPointer (POINTER_TEXT);
 mrSlideSorter.GetContentWindow()->SetPointer(aSelectionPointer);
 SetSelectionModeFromModifier(nEventCode);
@@ -1766,13 +1799,22 @@ void MultiSelectionModeHandler::UpdateSelection (void)
 
 DragAndDropModeHandler::DragAndDropModeHandler (
 SlideSorter& rSlideSorter,
+#ifndef MACOSX
 SelectionFunction& rSelectionFunction)
+#else

[Libreoffice-commits] .: 4 commits - solenv/bin

2012-11-07 Thread Libreoffice Gerrit user 
 solenv/bin/concat-deps.c |   55 ---
 1 file changed, 33 insertions(+), 22 deletions(-)

New commits:
commit eed17d1f23bbefd5aae24cb7e75ecb37c8f28b4a
Author: Michael Stahl 
Date:   Wed Nov 7 18:11:37 2012 +0100

concat-deps: tweak boost handling to depend on unpacked target

Change-Id: Iae93f7a81959a5d9c23e9bddb65e6154655374e6

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index c6177ce..813c39d 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -113,7 +113,7 @@
 
 int internal_boost = 0;
 static char* base_dir;
-static char* out_dir;
+static char* work_dir;
 
 #ifdef __GNUC__
 #define clz __builtin_clz
@@ -785,13 +785,13 @@ elide_dependency(const char* key, int key_len,
 }
 
 /*
- * We collapse tens of internal boost headers to a single one, such
+ * We collapse tens of internal boost headers to the unpacked target, such
  * that you can re-compile / install boost and all is well.
  */
 static void emit_single_boost_header(void)
 {
-#define BOOST_HEADER "/inc/external/boost/bind.hpp"
-fprintf(stdout, "%s" BOOST_HEADER " ", out_dir);
+#define BOOST_TARGET "/UnpackedTarball/boost.done"
+fprintf(stdout, "%s" BOOST_TARGET " ", work_dir);
 }
 
 static void emit_unpacked_target(char const*const token, char const*const end)
@@ -1038,7 +1038,7 @@ const char *env_str;
 _usage();
 return 1;
 }
-if(get_var(&base_dir, "SRCDIR") || get_var(&out_dir, "OUTDIR"))
+if(get_var(&base_dir, "SRCDIR") || get_var(&work_dir, "WORKDIR"))
 return 1;
 
 env_str = getenv("SYSTEM_BOOST");
commit a8f357cffdf7242b86e3b0e276034069e1be13c2
Author: Michael Stahl 
Date:   Wed Nov 7 17:55:54 2012 +0100

concat-deps: on Windows, compare paths case-insensitively

Change-Id: I5e5d9b39cb0440644bf3ffb8dca4913dc123f672

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 44d83f1..c6177ce 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -97,9 +97,11 @@
 #ifdef __windows
 #define FILE_O_RDONLY _O_RDONLY
 #define FILE_O_BINARY _O_BINARY
+#define PATHNCMP strncasecmp /* MSVC converts paths to lower-case sometimes? */
 #else /* not windaube */
 #define FILE_O_RDONLY O_RDONLY
 #define FILE_O_BINARY 0
+#define PATHNCMP strncmp
 #endif /* not windaube */
 
 #ifndef TRUE
@@ -730,7 +732,7 @@ elide_dependency(const char* key, int key_len,
 #endif
 
 /* .hdl files are always matched by .hpp */
-if (key_len > 4 && !strncmp(key + key_len - 4, ".hdl", 4))
+if (key_len > 4 && !PATHNCMP(key + key_len - 4, ".hdl", 4))
 return 1;
 
 /* boost brings a plague of header files */
@@ -746,13 +748,13 @@ elide_dependency(const char* key, int key_len,
 {
 if (0 == boost)
 {
-if (!strncmp(key + i + 1, "solver/", 7))
+if (!PATHNCMP(key + i + 1, "solver/", 7))
 {
 boost++;
 continue;
 }
 }
-else if (!strncmp(key + i + 1, "inc/external/boost/", 19))
+else if (!PATHNCMP(key + i + 1, "inc/external/boost/", 19))
 {
 if (boost_count)
 (*boost_count)++;
@@ -761,7 +763,7 @@ elide_dependency(const char* key, int key_len,
 }
 if (0 == unpacked)
 {
-if (!strncmp(key + i + 1, "workdir/", 8))
+if (!PATHNCMP(key + i + 1, "workdir/", 8))
 {
 unpacked = 1;
 continue;
@@ -769,7 +771,7 @@ elide_dependency(const char* key, int key_len,
 }
 else
 {
-if (!strncmp(key + i + 1, "UnpackedTarball/", 16))
+if (!PATHNCMP(key + i + 1, "UnpackedTarball/", 16))
 {
 if (unpacked_end)
 *unpacked_end = strchr(key + i + 17, '/');
commit eb94d42df886db5c1ff56e57ac5da5e012bdead3
Author: Michael Stahl 
Date:   Wed Nov 7 17:43:03 2012 +0100

concat-deps: bin pointless duplication

Change-Id: I8aedf930bc007bf83f8111db9a5565668142321e

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index ddbaf24..44d83f1 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -846,16 +846,9 @@ static inline void print_fullpaths(char* line)
 end = token + 2;
 }
 }
-else if(*token == ':' || *token == '\\' || *token == '/' ||
-*token == '$' || ':' == token[1])
-{
-if(fwrite(token, token_len, 1, stdout) != 1)
-abort();
-fputc(' ', stdout);
-}
 else
 {
-if(fwrite(token, end - token, 1, stdout) != 1)
+if (fwrite(token, token_len, 1, stdout) != 1)
 abort();

[Libreoffice-commits] .: basic/source

2012-11-07 Thread Libreoffice Gerrit user 
 basic/source/classes/eventatt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6a21d8761b2b8533e259bc0bf220bf27a58d4f0
Author: Miklos Vajna 
Date:   Wed Nov 7 18:37:10 2012 +0100

BasicScriptListener_Impl::firing_impl: actually this is the default

Change-Id: I0fdb522a1119da4a75094db86217449e9d940d19

diff --git a/basic/source/classes/eventatt.cxx 
b/basic/source/classes/eventatt.cxx
index 24c84e6..173a3ce 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -216,7 +216,7 @@ void BasicScriptListener_Impl::firing_impl( const 
ScriptEvent& aScriptEvent, Any
 }
 
 OUString aModul = aMacro.getToken( (sal_Int32)0, (sal_Unicode)'.', 
nLast );
-aMacro = aMacro.copy( nLast , aMacro.getLength() - nLast);
+aMacro = aMacro.copy( nLast );
 }
 
 SbxObject* p = maBasicRef;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[fdo#40325] PRINTING: order of page not respected with Handout

2012-11-07 Thread Rob Snelders 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi All,

This bug describes that the printing of handouts doesn't respect the
"order of page"-option.

It seems some parts of the working of this already functions but the
default-option still is weird. It defaults to 6 slides and doesn't
respect the "order of page"-option it always prints vertically first.

I think it would be better to remove te default-option for the slides
and default to 6 slides with the "left to right then down" selected
for "order of page".

Anybody any thoughts on that?

- --
Greetings,
Rob Snelders
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQEcBAEBAgAGBQJQmpqAAAoJEGs78UIq7mKy/1oIAKe52qhtRa9VBKvB+UZcIbyk
rRT8uRhCqUvH8rdHw17hGl91a5jPVS1G6sIDSsiP0Ptiv0wOeye7SG+tXLsSKeK+
4jwapIuYxefiItmicX+b8dxF89bWyTzGXNnYzILDhxskODq8i/jZ5p4sqZnxTJXB
y2WVvm0OXifWJNiFcOP0L8saZ6zW7/fI/fvbDmGMNkGhu8gSOXCdPWPanP9qd6zz
2OoITSxwGJOIPNdeoKNLvEoAZ43UwtWp7fti3+rnVeFPTMIo0p1TbSSz/MDPsp3C
rveYsh1JUPmi7bRxjBP75gz3di6zqvpB7QYs5UTuzLFbpH04BbrtColPPlYNbaM=
=BKNx
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: basic/source

2012-11-07 Thread Libreoffice Gerrit user 
 basic/source/classes/eventatt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a166418b48ddcc24139a54f9a9b8a902fbb1e641
Author: Miklos Vajna 
Date:   Wed Nov 7 18:22:59 2012 +0100

basic: fix String -> OUString conversion in BasicScriptListener_Impl

Regression from commit ac476e78848ad02fd399633acbe9cb72e40d1235, the
second parameter of OUString::copy() is not the end position, but the
length. In practice this makes xray usable again.

Change-Id: I9f345648c851b61e2e3c581bc605af7df4c12c87

diff --git a/basic/source/classes/eventatt.cxx 
b/basic/source/classes/eventatt.cxx
index 15b1836..24c84e6 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -216,7 +216,7 @@ void BasicScriptListener_Impl::firing_impl( const 
ScriptEvent& aScriptEvent, Any
 }
 
 OUString aModul = aMacro.getToken( (sal_Int32)0, (sal_Unicode)'.', 
nLast );
-aMacro = aMacro.copy( nLast , aMacro.getLength());
+aMacro = aMacro.copy( nLast , aMacro.getLength() - nLast);
 }
 
 SbxObject* p = maBasicRef;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bug 34465 - get rid of all calls to virtual const SfxPoolItem* Put( const SfxPoolItem&, USHORT nWhich)

2012-11-07 Thread Bjoern Michaelsen 
Hi Maciej,

On Wed, Nov 07, 2012 at 04:41:04PM +0100, Maciej Rumianowski wrote:
> I've started to work on the *Bug
> 34465*i

awesome!

> and I have some questions:
> 
> 1) What do you suggest to find all places where Put( const SfxPoolItem&,
> USHORT nWhich) is used?
> I came up with idea to make function private and fix all places where
> g++ gives error. Do you have better idea?

Thats how I would go about it, yes.

> 2) Is it a good idea to make a special clone method in SfxPoolItem, such as
> 
> virtual SfxPoolItem* CloneAtWhich( sal_uInt16 nNewWhich, SfxItemPool
> > *pPool = 0 ) const
> >  { SfxPoolItem *pItem = Clone( pPool );
> > pItem->SetWhich( nNewWhich );
> >  return pItem; }

Great idea! Sounds good to me, go ahead, IIRC there are quite a lot of those in
editeng for example.

Best,

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

Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options

2012-11-07 Thread Tor Lillqvist 
>
>
>  If no one has any opinion on it, I'm going to name it
> --enable-symbols-only.


I don't like that, as it strongly suggests that this option would cause
some kind of lighter, symbol/address mapping only kind of data to be
emitted, as opposed to full debug information. Which is doesn't, at least
not for all platforms. Or am I missing something?

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

[PUSHED] cppCheck: Various clean-up

2012-11-07 Thread via Code Review 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/996

Approvals:
  Radek Doulík: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5016c12527a8811676ff10f07f7be9e855c66814
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christophe JAILLET 
Gerrit-Reviewer: Radek Doulík 

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

[Libreoffice-commits] .: solenv/bin

2012-11-07 Thread Libreoffice Gerrit user 
 solenv/bin/concat-deps.c |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f9c89b0662a3ffbf8af082451beda45f1087738d
Author: Jan Holesovsky 
Date:   Wed Nov 7 16:57:05 2012 +0100

Eat unneeded spaces at the beginning of .d files, they confuse concat-deps.

Change-Id: I541fb875d4d0bc46eb1bbb21793343c0283fd412

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 6db6e71..843cad1 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -892,6 +892,12 @@ off_t size;
 {
 base = cursor_out = cursor = end = buffer;
 end += size;
+
+/* first eat unneeded space at the beginning of file
+ */
+while(cursor < end && (*cursor == ' ' || *cursor == '\\'))
+++cursor;
+
 while(cursor < end)
 {
 if(*cursor == '\\')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/README sw/source tools/README

2012-11-07 Thread Libreoffice Gerrit user 
 sw/README   |4 
 sw/source/ui/config/mailconfigpage.cxx  |2 +-
 sw/source/ui/docvw/HeaderFooterWin.cxx  |2 --
 sw/source/ui/fldui/fldref.cxx   |6 +-
 sw/source/ui/shells/drwtxtsh.cxx|1 -
 sw/source/ui/uiview/formatclipboard.cxx |1 -
 sw/source/ui/web/wview.cxx  |1 -
 tools/README|8 +++-
 8 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit c8eb6910cd41901daf2f4192c0b3e583a20adc90
Author: jailletc36 
Date:   Tue Nov 6 22:49:28 2012 +0100

cppCheck: Various clean-up

mailconfigpapge: shouldn't it be a logical AND instead of a bit-wise 
operation ?
HeaderFooterWin, drwtxtsh, formatclipboard, wview:  redundant assignment
fldref: unused variable

Change-Id: I5016c12527a8811676ff10f07f7be9e855c66814
Signed-off-by: jailletc36 
Reviewed-on: https://gerrit.libreoffice.org/996
Reviewed-by: Radek Doulík 
Tested-by: Radek Doulík 

diff --git a/sw/source/ui/config/mailconfigpage.cxx 
b/sw/source/ui/config/mailconfigpage.cxx
index 430312c..197259a 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -548,7 +548,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, 
RadioButtonHdl_Impl)
 {
 sal_Bool bSeparate = m_aSeparateAuthenticationRB.IsChecked();
 sal_Bool bIsEnabled = m_aSeparateAuthenticationRB.IsEnabled();
-sal_Bool bNotSeparate = !bSeparate & bIsEnabled;
+sal_Bool bNotSeparate = !bSeparate && bIsEnabled;
 bSeparate &= bIsEnabled;
 
 m_aOutgoingServerFT.Enable(bSeparate);
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx 
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 82c6638..25e2913 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -276,8 +276,6 @@ void SwHeaderFooterWin::Paint( const Rectangle& )
 const StyleSettings& rSettings = 
Application::GetSettings().GetStyleSettings();
 if ( rSettings.GetHighContrastMode() )
 {
-aLineColor = rSettings.GetDialogTextColor().getBColor();
-
 aFillColor = rSettings.GetDialogColor( ).getBColor();
 aLineColor = rSettings.GetDialogTextColor( ).getBColor();
 
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 837c7d4..e00fb78 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -116,11 +116,7 @@ void SwFldRefPage::SaveSelectedTxtNode()
 if ( pEntry )
 {
 const sal_uInt16 nTypeId = 
(sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel());
-SwWrtShell *pSh = GetWrtShell();
-if ( !pSh )
-{
-pSh = ::GetActiveWrtShell();
-}
+
 if ( nTypeId == REFFLDFLAG_HEADING )
 {
 mnSavedSelectedPos = 
static_cast(reinterpret_cast(pEntry->GetUserData()));
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 82c6bee..fd5eb1a 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -837,7 +837,6 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
 SwWrtShell &rSh = GetShell();
 pSdrView = rSh.GetDrawView();
 SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
-pOutliner = pSdrView->GetTextEditOutliner();
 return &pOutliner->GetUndoManager();
 }
 
diff --git a/sw/source/ui/uiview/formatclipboard.cxx 
b/sw/source/ui/uiview/formatclipboard.cxx
index dd6e653..f907754 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -160,7 +160,6 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, 
SwWrtShell &rSh )
 const SfxPoolItem* pItem = 0;
 sal_Bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) ||
 SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) );
-pItem = 0;
 sal_Bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, 
sal_False, &pItem );
 const SfxPoolItem* pRowItem = 0, *pTableItem = 0;
 bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, 
sal_False, &pRowItem );
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx
index d6541a2..f9af40c 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/ui/web/wview.cxx
@@ -197,7 +197,6 @@ void SwWebView::SelectShell()
 SetShell( new svx::ExtrusionBar( this ) );
 rDispatcher.Push( *GetCurShell() );
 
-eShellMode = SHELL_MODE_DRAW;
 SetShell( new svx::FontworkBar( this ) );
 rDispatcher.Push( *GetCurShell() );
 
commit f3acd7232371fd67a80062a045a1a09e3c8d5ab9
Author: Thorsten Behrens 
Date:   Wed Nov 7 16:55:51 2012 +0100

Documenting results from src code archeology.

Kudos to mst for remembering the Writer core comments from Juergen
Pingel.

diff --git a/sw/README b/sw/README
index dc844a6..6bfac02 100644

[Libreoffice-commits] .: sal/inc xmlsecurity/source

2012-11-07 Thread Libreoffice Gerrit user 
 sal/inc/sal/log-areas.dox |2 
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx  |   23 --
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |7 ++-
 3 files changed, 25 insertions(+), 7 deletions(-)

New commits:
commit 14800ce5f2a23ab45b01a631b9253f7f6f3a7ce5
Author: Stephan Bergmann 
Date:   Wed Nov 7 16:55:20 2012 +0100

Improve logging

Change-Id: I5ff457c76970356a5748f6f319f32a1f49b86ca1

diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 4a603e9..0eadebb 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -200,6 +200,7 @@ certain functionality.
 @section xmlsecurity
 
 @li @c xmlsecurity.dialogs - xml security dialogs
+@li @c xmlsecurity.xmlsec - xmlsec wrapper
 
 @section other
 
@@ -227,7 +228,6 @@ certain functionality.
 @li @c xmlhelp
 @li @c xmloff
 @li @c xmlreader
-@li @c xmlsecurity
 
 */
 /* vim:set ft=cpp shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx 
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index a694c3f..a1c01d3 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -53,7 +53,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include "seinitializer_nssimpl.hxx"
 #include "../diagnose.hxx"
@@ -172,7 +172,12 @@ void deleteRootsModule()
 // first, try to get the profile from "MOZILLA_CERTIFICATE_FOLDER"
 const char* pEnv = getenv("MOZILLA_CERTIFICATE_FOLDER");
 if (pEnv)
+{
+SAL_INFO(
+"xmlsecurity.xmlsec",
+"Using Mozilla profile from MOZILLA_CERTIFICATE_FOLDER=" << pEnv);
 return rtl::OString(pEnv);
+}
 
 // second, try to get saved user-preference
 try
@@ -181,11 +186,19 @@ void deleteRootsModule()
 
officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(rtl::OUString());
 
 if (!sUserSetCertPath.isEmpty())
+{
+SAL_INFO(
+"xmlsecurity.xmlsec",
+"Using Mozilla profile from /org.openoffice.Office.Common/"
+"Security/Scripting/CertDir: " << sUserSetCertPath);
 return rtl::OUStringToOString(sUserSetCertPath, 
osl_getThreadTextEncoding());
+}
 }
 catch (const uno::Exception &e)
 {
-SAL_WARN("xmlsecurity", "getMozillaCurrentProfile: caught exception" 
<< e.Message);
+SAL_WARN(
+"xmlsecurity.xmlsec",
+"getMozillaCurrentProfile: caught exception " << e.Message);
 }
 
 // third, dig around to see if there's one available
@@ -211,13 +224,15 @@ void deleteRootsModule()
 if (!profile.isEmpty())
 {
 rtl::OUString sProfilePath = 
xMozillaBootstrap->getProfilePath( productTypes[i], profile );
+SAL_INFO(
+"xmlsecurity.xmlsec",
+"Using Mozilla profile " << sProfilePath);
 return rtl::OUStringToOString(sProfilePath, 
osl_getThreadTextEncoding());
 }
 }
 }
 
-RTL_LOGFILE_PRODUCT_TRACE( "XMLSEC: No Mozilla Profile found!" );
-
+SAL_INFO("xmlsecurity.xmlsec", "No Mozilla profile found");
 return rtl::OString();
 }
 
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 581663b..33a1ea3 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -45,7 +45,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include "boost/scoped_array.hpp"
@@ -444,7 +444,10 @@ void SecurityEnvironment_NssImpl::updateSlots()
 
 if(pSlot != NULL)
 {
-RTL_LOGFILE_TRACE2( "XMLSEC: Found a slot: SlotName=%s, 
TokenName=%s", PK11_GetSlotName(pSlot), PK11_GetTokenName(pSlot) );
+SAL_INFO(
+"xmlsecurity.xmlsec",
+"Found a slot: SlotName=" << PK11_GetSlotName(pSlot)
+<< ", TokenName=" << PK11_GetTokenName(pSlot));
 
 //The following code which is commented out checks if a slot, that is a smart 
card for example, is
 //  able to generate a symmetric key of type CKM_DES3_CBC. If this 
fails then this token
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options

2012-11-07 Thread David Ostrovsky 

Am 07.11.2012 16:20, schrieb Lubos Lunak:

> >It also might be a good idea to reconsider the "symbols" name,
> >unless you want to repeatedly explain it to people who for some
> >reason keep getting confused by all this stuff over and over again
> >(it's a lot of fun I can assure you, and "debug" vs "debug symbols"
> >is just asking for it).

>
>will do. Do you have any preferences?
>--with-profile-info
>--with-backtrace-info

  I don't. I have no intentions to be the one explaining what it does.

If no one has any opinion on it, I'm going to name it --enable-symbols-only.


> >File solenv/gbuild/gbuild.mk
> >Line 134: gb_SYMBOL := $(true)
> >This makes --enable-debug/dbgutil and --enable-symbols dependant,
> >even though your configure checks say that should not be used together.

>
>yes, these options are mutually exclusive.
>

> >Or, put differently, this breaks the selective debuginfo functionality.

>
>Why? gb_SYMBOL is used only in --enable-symbols case.
>My intention was not to touch --enable-debug/dbgutil case at all.

ifneq ($(strip $(DEBUG)),)
gb_DEBUGLEVEL := 1
...
+ifneq ($(gb_DEBUGLEVEL),0)
+gb_SYMBOL := $(true)
...
+ifeq ($(gb_SYMBOL),$(true))
+gb_LinkTarget_CXXFLAGS += $(GGDB2)

  I.e. --enable-debug/dbgutil leads to gb_SYMBOL being true as well, which
globally sets the -g flag, overriding any selective use.

  I suggest you just drop the gb_DEBUGLEVEL -> gb_SYMBOL setting, that'll
keep --enable-symbols separate from --enable-debug, so it shouldn't break
anything else.

Thank you for the clarification, missed it.

  That'll of course still leave two different systems for
setting -g in there, but this whole debug stuff is such an entangled mess
that it won't make a big difference in the end.
May be after restoring that old --enable-symbols way, we could refactor 
it and merge
these two different systems for setting -g like you suggested? At 
upcoming LO Hackfest?


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

Bug 34465 - get rid of all calls to virtual const SfxPoolItem* Put( const SfxPoolItem&, USHORT nWhich)

2012-11-07 Thread Maciej Rumianowski 
Hi Björn,

I've started to work on the *Bug
34465*and I have
some questions:

1) What do you suggest to find all places where Put( const SfxPoolItem&,
USHORT nWhich) is used?
I came up with idea to make function private and fix all places where
g++ gives error. Do you have better idea?

2) Is it a good idea to make a special clone method in SfxPoolItem, such as

virtual SfxPoolItem* CloneAtWhich( sal_uInt16 nNewWhich, SfxItemPool
> *pPool = 0 ) const
>  { SfxPoolItem *pItem = Clone( pPool );
> pItem->SetWhich( nNewWhich );
>  return pItem; }
>
Which is used for example in:

diff --git a/sc/source/core/tool/autoform.cxx
> b/sc/source/core/tool/autoform.cxx
> index 14be99e..1dd481c 100644
> --- a/sc/source/core/tool/autoform.cxx
> +++ b/sc/source/core/tool/autoform.cxx
> @@ -672,9 +672,9 @@ void ScAutoFormatData::FillToItemSet( sal_uInt16
> nIndex, SfxItemSet& rItemSet, S
>  }
>  else
>  {
> -rItemSet.Put( rField.GetHeight(), ATTR_CJK_FONT_HEIGHT );
> -rItemSet.Put( rField.GetWeight(), ATTR_CJK_FONT_WEIGHT );
> -rItemSet.Put( rField.GetPosture(), ATTR_CJK_FONT_POSTURE );
> +rItemSet.Put( *(rField.GetHeight().CloneAtWhich(
> ATTR_CJK_FONT_HEIGHT )) );
> +rItemSet.Put( *(rField.GetWeight().CloneAtWhich(
> ATTR_CJK_FONT_WEIGHT )) );
> +rItemSet.Put( *(rField.GetPosture().CloneAtWhich(
> ATTR_CJK_FONT_POSTURE )) );
>  }
>  // do not insert empty CTL font
>  const SvxFontItem& rCTLFont = rField.GetCTLFont();
>

>

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

[Libreoffice-commits] .: i18npool/README

2012-11-07 Thread Libreoffice Gerrit user 
 i18npool/README |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 6188a8db559c2a54e545d5b7ec2750521f1bfade
Author: Eike Rathke 
Date:   Wed Nov 7 16:22:34 2012 +0100

document the documentation

and get rid of ugly DOS line ends.

Change-Id: Ib20e594a26eb27d0649f64548eb55bc975218274

diff --git a/i18npool/README b/i18npool/README
index 0fed327..86f72d1 100644
--- a/i18npool/README
+++ b/i18npool/README
@@ -1,3 +1,6 @@
 Internationalisation (i18npool) framework ensures that the suite is adaptable 
to the requirements of different
-native languages, their local settings and customs, etc without source code 
modification
-or recompilation. 
\ No newline at end of file
+native languages, their local settings and customs, etc without source code 
modification.
+
+Specifically for locale data documentation please see 
i18npool/source/localedata/data/locale.dtd
+
+See also [http://wiki.documentfoundation.org/Category:I18n]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options

2012-11-07 Thread Lubos Lunak 
On Wednesday 07 of November 2012, d.ostrov...@idaia.de wrote:
> [bringing the discussion to ML as it related to other thread on this topic]
>
> Quoting "Lubos Lunák (via Code Review)" :
> > Lubos Lunák has posted comments on this change.
> >
> > Change subject: restore --enable-symbols option again
...
> It seems to be not so easy to differentiate between two approaches:
> * --enable-debug => which can be enhanced with selective debuginfo
> * --enable-symbols (or whatever new name we want to give to that old
> option)
>
> one option modifies optimization, another not
> one option has impact on stl library, another not

 The only option that affects STL is --enable-dbgutil, --enable-debug has no 
effect there whatsoever (other than its overall effect).

> > It also might be a good idea to reconsider the "symbols" name,
> > unless you want to repeatedly explain it to people who for some
> > reason keep getting confused by all this stuff over and over again
> > (it's a lot of fun I can assure you, and "debug" vs "debug symbols"
> > is just asking for it).
>
> will do. Do you have any preferences?
> --with-profile-info
> --with-backtrace-info

 I don't. I have no intentions to be the one explaining what it does.

> > File solenv/gbuild/gbuild.mk
> > Line 134: gb_SYMBOL := $(true)
> > This makes --enable-debug/dbgutil and --enable-symbols dependant,
> > even though your configure checks say that should not be used together.
>
> yes, these options are mutually exclusive.
>
> > Or, put differently, this breaks the selective debuginfo functionality.
>
> Why? gb_SYMBOL is used only in --enable-symbols case.
> My intention was not to touch --enable-debug/dbgutil case at all.

ifneq ($(strip $(DEBUG)),)
gb_DEBUGLEVEL := 1
...
+ifneq ($(gb_DEBUGLEVEL),0)
+gb_SYMBOL := $(true)
...
+ifeq ($(gb_SYMBOL),$(true))
+gb_LinkTarget_CXXFLAGS += $(GGDB2)

 I.e. --enable-debug/dbgutil leads to gb_SYMBOL being true as well, which 
globally sets the -g flag, overriding any selective use.

 I suggest you just drop the gb_DEBUGLEVEL -> gb_SYMBOL setting, that'll 
keep --enable-symbols separate from --enable-debug, so it shouldn't break 
anything else. That'll of course still leave two different systems for 
setting -g in there, but this whole debug stuff is such an entangled mess 
that it won't make a big difference in the end.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: embeddedobj/Library_embobj.mk embeddedobj/prj embeddedobj/source

2012-11-07 Thread Libreoffice Gerrit user 
 embeddedobj/Library_embobj.mk   |1 +
 embeddedobj/prj/build.lst   |2 +-
 embeddedobj/source/commonembedding/embedobj.cxx |   11 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 74670bf04e0dc693de6ea060d0dd2c10ee3b184d
Author: Stephan Bergmann 
Date:   Wed Nov 7 16:14:33 2012 +0100

fdo#56818 Work around deadlock caused by differing lock orders

Change-Id: Iaabe36bf0c1f051f9cebc2b65e614063698959fa

diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
index 99456ed..1fa1c5a 100644
--- a/embeddedobj/Library_embobj.mk
+++ b/embeddedobj/Library_embobj.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\
cppu \
cppuhelper \
sal \
+   vcl \
$(gb_UWINAPI) \
 ))
 
diff --git a/embeddedobj/prj/build.lst b/embeddedobj/prj/build.lst
index eed683e..fea2c33 100644
--- a/embeddedobj/prj/build.lst
+++ b/embeddedobj/prj/build.lst
@@ -1,2 +1,2 @@
-eo embeddedobj :   offapi sal cppu cppuhelper comphelper tools 
unotools LIBXSLT:libxslt NULL
+eo embeddedobj :   offapi sal cppu cppuhelper comphelper tools 
unotools vcl LIBXSLT:libxslt NULL
 eo embeddedobj\prj nmake   -   all eo_prj NULL
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx 
b/embeddedobj/source/commonembedding/embedobj.cxx
index df75afe..941186d 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -40,6 +40,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
@@ -529,6 +530,16 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 
nVerbID )
 {
 RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) 
OCommonEmbeddedObject::doVerb" );
 
+SolarMutexGuard aSolarGuard;
+//TODO: a gross hack to avoid deadlocks when this is called from the
+// outside and OCommonEmbeddedObject::changeState, with m_aMutex 
locked,
+// calls into framework code that tries to lock the solar mutex, while
+// another thread (through Window::ImplCallPaint, say) calls
+// OCommonEmbeddedObject::getComponent with the solar mutex locked and
+// then tries to lock m_aMutex (see fdo#56818); the alternative would 
be
+// to get locking done right in this class, but that looks like a
+// daunting task
+
 ::osl::ResettableMutexGuard aGuard( m_aMutex );
 if ( m_bDisposed )
 throw lang::DisposedException(); // TODO
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] check for builtins pollutes CFLAGS and in turn breaks pthrea...

2012-11-07 Thread Christian Lohmaier (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/999

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/999/1

check for builtins pollutes CFLAGS and in turn breaks pthread check

since the -march=i486 is not supported on PPC, all further compile
checks done in liblangtag's configure break.
So moving the corresponding patch out of the windows patch in a generic
one and also apply that for Mac.

Change-Id: I65716bc9d7ff19976e5e82ae869c7594978e93e3
---
A liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch
M liblangtag/liblangtag-0.4.0-windows.patch
M liblangtag/makefile.mk
3 files changed, 64 insertions(+), 62 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65716bc9d7ff19976e5e82ae869c7594978e93e3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 

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

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-2'

2012-11-07 Thread Libreoffice Gerrit user 
Tag 'suse-3.6-2' created by Petr Mladek  at 2012-11-07 14:42 
-0800

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

iEYEABECAAYFAlCac2YACgkQKZC06p8y5oP6DQCgiUAnrKTlvJBP6w3mooWVGRvo
UB0AnR60jT5x8LpGifquexY8hCxnQTFz
=zZgG
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-2'

2012-11-07 Thread Libreoffice Gerrit user 
Tag 'suse-3.6-2' created by Petr Mladek  at 2012-11-07 14:42 
-0800

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

iEYEABECAAYFAlCac2YACgkQKZC06p8y5oPSdACbBWJu5mxn1hOa5JpYqwD+JwIn
6sYAn0nolFCcXOJYNnFtvo25Fzr6OVAf
=XTAK
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-2'

2012-11-07 Thread Libreoffice Gerrit user 
Tag 'suse-3.6-2' created by Petr Mladek  at 2012-11-07 14:42 
-0800

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

iEYEABECAAYFAlCac2YACgkQKZC06p8y5oOPiwCdHhqKYNiW4nUWWop7zW3Ky+NB
1wwAoIwsmIyAkasY7IDdJc3ey7KDW6Q9
=JWAI
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-2'

2012-11-07 Thread Libreoffice Gerrit user 
Tag 'suse-3.6-2' created by Petr Mladek  at 2012-11-07 14:42 
-0800

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

iEYEABECAAYFAlCac2YACgkQKZC06p8y5oOSkgCeNGrGEJEQcgnmomO+rntxMZD+
2fcAn1rrf2xDEhd7z9IxsWVgP+Vfy/WQ
=t3Yg
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-2'

2012-11-07 Thread Libreoffice Gerrit user 
Tag 'suse-3.6-2' created by Petr Mladek  at 2012-11-07 14:42 
-0800

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

iEYEABECAAYFAlCac2YACgkQKZC06p8y5oOutQCfU4/Hb3hrt3hUcCav2+jvUuwz
uAUAn1Fwgb5kJFb7Wt0hgMHaXQM5vsLO
=Pml1
-END PGP SIGNATURE-

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

[Libreoffice-commits] .: i18npool/source

2012-11-07 Thread Libreoffice Gerrit user 
 i18npool/source/localedata/data/locale.dtd |8 
 1 file changed, 8 insertions(+)

New commits:
commit 628ec2a1ce1370b04b832437fce9a661f3d8f754
Author: Eike Rathke 
Date:   Wed Nov 7 15:52:25 2012 +0100

enhance documentation of Currency legacyOnly attribute

Change-Id: I05f2f5e51490b6830a01fe72b11dd9da174719fd

diff --git a/i18npool/source/localedata/data/locale.dtd 
b/i18npool/source/localedata/data/locale.dtd
index 6575eb3..d044801 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -395,6 +395,14 @@
  documents and is not selectable in the UI otherwise. Defaults to "false"
  if not specified. If this attribute is "true", 'default' and
  'usedInCompatibleFormatCodes' must both be "false".
+
+ Currency elements must not be changed to contain only a different
+ CurrencySymbol element without changing the CurrencyID and BankSymbol
+ elements, instead the entire Currency element must be duplicated, the old
+ element needs this 'legacyOnly' attribute be added and 'default' and
+ 'usedInCompatibleFormatCodes' attributes must be set to "false", and only
+ in the new duplicated Currency element the CurrencySymbol element be
+ changed.
 -->
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: liblangtag/makefile.mk

2012-11-07 Thread Libreoffice Gerrit user 
 liblangtag/makefile.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 08bf96de152609ee7586cd762db0b42f458920d6
Author: Tor Lillqvist 
Date:   Wed Nov 7 16:51:21 2012 +0200

Avoid "Warning: -- Macro `CC' redefined after use"

Change-Id: I99352369cd29d695ef09b6bdc58ff4f10ac73880

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index bd813fa..c223582 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -73,9 +73,9 @@ CONFIGURE_FLAGS+= --disable-introspection
 CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)/external'
 .IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
 CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)/libxml2.lib'
-CC:=$(CC) -MD
+CC!:=$(CC) -MD
 .IF "$(debug)"=="TRUE"
-CC:=$(CC) -Zi
+CC!:=$(CC) -Zi
 .ENDIF
 .ELSE
 CONFIGURE_FLAGS+= LIBXML2_LIBS='-L$(SOLARLIBDIR) -lxml2'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - liblangtag/liblangtag-0.4.0-mac.patch liblangtag/liblangtag-0.4.0-windows.patch liblangtag/makefile.mk

2012-11-07 Thread Libreoffice Gerrit user 
 liblangtag/liblangtag-0.4.0-mac.patch |7 +--
 liblangtag/liblangtag-0.4.0-windows.patch |8 +++-
 liblangtag/makefile.mk|3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 52e51f0fe7e3badee58cc8c63f73bf63f9cc79ec
Author: Tor Lillqvist 
Date:   Wed Nov 7 16:43:26 2012 +0200

Should not call lt_mem_add_ref() with a NULL pointer here either

Change-Id: I34f7ccca0fdfa71a53c2a80ae51178c5461b5640

diff --git a/liblangtag/liblangtag-0.4.0-mac.patch 
b/liblangtag/liblangtag-0.4.0-mac.patch
index 6f9c93d..dc44758 100644
--- a/liblangtag/liblangtag-0.4.0-mac.patch
+++ b/liblangtag/liblangtag-0.4.0-mac.patch
@@ -45,7 +45,7 @@ diff -r -u liblangtag-0.4.0.org/liblangtag/lt-error.c 
liblangtag-0.4.0/liblangta
lt_bool_t allocated;
  
lt_return_val_if_fail (error != NULL, NULL);
-@@ -117,10 +114,7 @@
+@@ -117,13 +114,9 @@
d->message = lt_strdup_vprintf(message, ap);
va_end(ap);
  
@@ -56,7 +56,10 @@ diff -r -u liblangtag-0.4.0.org/liblangtag/lt-error.c 
liblangtag-0.4.0/liblangta
 +  d->stack_size = 0;
  
lt_mem_add_ref(&d->parent, d->message, free);
-   lt_mem_add_ref(&d->parent, d->traces, free);
+-  lt_mem_add_ref(&d->parent, d->traces, free);
+ 
+   allocated = (*error)->data == NULL;
+   (*error)->data = lt_list_append((*error)->data, d, 
(lt_destroy_func_t)lt_mem_unref);
 diff -r -u liblangtag-0.4.0.org/liblangtag/lt-ext-module.c 
liblangtag-0.4.0/liblangtag/lt-ext-module.c
 --- misc/liblangtag-0.4.0.org/liblangtag/lt-ext-module.c   2012-11-06 
09:15:59.0 -0600
 +++ misc/build/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2012-11-06 
09:30:31.0 -0600
commit 2e7675b21707fc4efd012bda336a88307ecfc6ec
Author: Tor Lillqvist 
Date:   Wed Nov 7 16:14:45 2012 +0200

Must not call lt_mem_add_ref() with a NULL pointer

Otherwise will get the
  lt-mem.c: line 216: assertion `p != ((void *)0)' failed
message.

Change-Id: Ic585ad638211fda66a54725c5a4bd041499349ef

diff --git a/liblangtag/liblangtag-0.4.0-windows.patch 
b/liblangtag/liblangtag-0.4.0-windows.patch
index f922cab..fef4a48 100644
--- a/liblangtag/liblangtag-0.4.0-windows.patch
+++ b/liblangtag/liblangtag-0.4.0-windows.patch
@@ -176,7 +176,7 @@
  #include 
  #include "lt-list.h"
  #include "lt-mem.h"
-@@ -120,9 +120,13 @@
+@@ -120,13 +120,18 @@
d->message = lt_strdup_vprintf(message, ap);
va_end(ap);
  
@@ -190,6 +190,12 @@
d->stack_size = size;
  
lt_mem_add_ref(&d->parent, d->message, free);
+-  lt_mem_add_ref(&d->parent, d->traces, free);
++  if (d->traces != NULL)
++  lt_mem_add_ref(&d->parent, d->traces, free);
+ 
+   allocated = (*error)->data == NULL;
+   (*error)->data = lt_list_append((*error)->data, d, 
(lt_destroy_func_t)lt_mem_unref);
 --- misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c
 +++ misc/build/liblangtag-0.4.0/liblangtag/lt-ext-module.c
 @@ -15,11 +15,15 @@
commit fd58e9d5a969efa9ef983998d4a40f301c7ff695
Author: Tor Lillqvist 
Date:   Wed Nov 7 16:11:01 2012 +0200

Use -Zi when debug info wanted with MSVC

It really sucks to have to propagate debugging options to the compiler
in an ad-hoc fashion like this. But then each dmake-based external
library module really is an individual, especially the ways they are
built with MSVC.

Liblangtag is especially exotic, as it uses autotools and libtool(!)
also for a MSVC build. Which works, but just barely, almost by
accident. For instance, it ends up using the Cygwin ar and ranlib on
MSVC-produced object files. Which luckily seems to work at least with
MSVC2008.

Change-Id: I1c5244b2a599775c04ae8a003e4a096a0a11648f

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index c9b72a2..bd813fa 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -74,6 +74,9 @@ CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)/external'
 .IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
 CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)/libxml2.lib'
 CC:=$(CC) -MD
+.IF "$(debug)"=="TRUE"
+CC:=$(CC) -Zi
+.ENDIF
 .ELSE
 CONFIGURE_FLAGS+= LIBXML2_LIBS='-L$(SOLARLIBDIR) -lxml2'
 .ENDIF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - postprocess/packconfig sfx2/uiconfig

2012-11-07 Thread Libreoffice Gerrit user 
 postprocess/packconfig/packconfig.pl |4 -
 sfx2/uiconfig/ui/checkin.ui  |   85 +++
 2 files changed, 49 insertions(+), 40 deletions(-)

New commits:
commit 5cc34dc91211b6173139d1a1a76c494c4a1f9a75
Author: Caolán McNamara 
Date:   Wed Nov 7 14:39:15 2012 +

using a grid instead of a box

because I haven't implemented widget prop expands yet in boxes, but I have 
in
grid, not too hard to do, just need to get around to it

Change-Id: I6120df6061f622e14f8160f0bb098fcaba15abab

diff --git a/sfx2/uiconfig/ui/checkin.ui b/sfx2/uiconfig/ui/checkin.ui
index c97657d..0585acb 100644
--- a/sfx2/uiconfig/ui/checkin.ui
+++ b/sfx2/uiconfig/ui/checkin.ui
@@ -39,6 +39,8 @@
 False
 True
 True
+True
+True
 True
 False
 True
@@ -58,61 +60,68 @@
   
 
 
-  
+  
 True
 False
-vertical
+True
+True
 
-  
+  
+New major 
version
+False
 True
-False
-start
-8
-Version 
comment
+True
+False
+False
+0
+True
   
   
-False
-False
-0
+0
+1
+1
+1
   
 
 
-  
+  
 True
 False
-6
-12
+0
+none
 
-  
-300
-150
+  
 True
-True
-word
+False
+6
+12
+
+  
+300
+150
+True
+True
+word
+  
+
+  
+
+
+  
+True
+False
+Version 
comment
+
+  
+
   
 
   
   
-True
-True
-1
-  
-
-
-  
-New major 
version
-False
-True
-True
-False
-False
-0
-True
-  
-  
-False
-True
-2
+0
+0
+1
+1
   
 
   
commit 2f534d934fb10707146af977f6d1db7a19277645
Author: Caolán McNamara 
Date:   Wed Nov 7 13:45:42 2012 +

fix packconfig help message

Change-Id: I71b55505047104c7e7d64ca93fc59429754892d1

diff --git a/postprocess/packconfig/packconfig.pl 
b/postprocess/packconfig/packconfig.pl
index 924dee9..cb8fb89 100644
--- a/postprocess/packconfig/packconfig.pl
+++ b/postprocess/packconfig/packconfig.pl
@@ -231,8 +231,8 @@ sub replace_file
 
 sub usage
 {
-print STDERR "Usage: packimages.pl [-h] -o out_file -i file_path\n";
-print STDERR "Creates archive of images\n";
+print STDERR "Usage: packconfig.pl [-h] -o out_file -i file_path\n";
+print STDERR "Creates archive of userinterface config files\n";
 print STDERR "Options:\n";
 print STDERR "-h print this help\n";
 print STDERR "-o out_filepath to output archive\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: doc-dump.py src/docdirstream.py src/docrecord.py src/docstream.py

2012-11-07 Thread Miklos Vajna 
 doc-dump.py |   34 +++
 src/docdirstream.py |   32 +++
 src/docrecord.py|  110 +++
 src/docstream.py|  502 
 4 files changed, 678 insertions(+)

New commits:
commit 52348b33de681263a51bd7bdc9b508d9ae88ee08
Author: Miklos Vajna 
Date:   Wed Nov 7 13:26:39 2012 +0100

initial doc (WW8) support

diff --git a/doc-dump.py b/doc-dump.py
new file mode 100755
index 000..ac1fba6
--- /dev/null
+++ b/doc-dump.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append(sys.path[0]+"/src")
+import globals
+import docstream
+
+class DOCDumper:
+def __init__(self, filepath, params):
+self.filepath = filepath
+self.params = params
+
+def dump(self):
+file = open(self.filepath, 'rb')
+strm = docstream.DOCFile(file.read(), self.params)
+file.close()
+dirnames = strm.getDirectoryNames()
+print '\n'
+for dirname in dirnames:
+if len(dirname) == 0 or dirname in ['Root Entry']:
+continue
+strm.getDirectoryStreamByName(dirname).dump()
+print ''
+
+def main(args):
+exname, args = args[0], args[1:]
+params = globals.Params()
+dumper = DOCDumper(args[0], params)
+dumper.dump()
+
+if __name__ == '__main__':
+main(sys.argv)
+
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
diff --git a/src/docdirstream.py b/src/docdirstream.py
new file mode 100755
index 000..9f1ccd5
--- /dev/null
+++ b/src/docdirstream.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+import globals
+
+class DOCDirStream:
+"""Represents one single word file subdirectory, like e.g. 
'WordDocument'."""
+
+def __init__(self, bytes, params = None, name = None, mainStream = None, 
doc = None):
+self.bytes = bytes
+self.size = len(self.bytes)
+self.pos = 0
+self.params = params
+self.name = name
+self.mainStream = mainStream
+self.doc = doc
+
+def printAndSet(self, key, value, hexdump = True, end = True):
+setattr(self, key, value)
+if hexdump:
+value = hex(value)
+if end:
+print '<%s value="%s"/>' % (key, value)
+else:
+print '<%s value="%s">' % (key, value)
+
+def getBit(self, byte, bitNumber):
+return (byte & (1 << bitNumber)) >> bitNumber
+
+def dump(self):
+print '' % 
(globals.encodeName(self.name), self.size)
+
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
diff --git a/src/docrecord.py b/src/docrecord.py
new file mode 100755
index 000..df79c24
--- /dev/null
+++ b/src/docrecord.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python
+
+import struct
+from docdirstream import DOCDirStream
+import globals
+
+class FcCompressed(DOCDirStream):
+"""The FcCompressed structure specifies the location of text in the 
WordDocument Stream."""
+def __init__(self, bytes, mainStream, offset, size):
+DOCDirStream.__init__(self, bytes, mainStream=mainStream)
+self.pos = offset
+self.size = size
+
+def dump(self):
+print '' 
% (self.pos, self.size)
+buf = struct.unpack("> 2)) # bits 0..29
+self.printAndSet("fCompressed", self.getBit(buf, 30))
+self.printAndSet("r1", self.getBit(buf, 31))
+print ''
+
+def getTransformedAddress(self):
+if self.fCompressed:
+return self.fc/2
+else:
+print "TODO FcCompressed: fCompressed = 0 not supported"
+
+class Pcd(DOCDirStream):
+"""The Pcd structure specifies the location of text in the WordDocument 
Stream and additional properties for this text."""
+def __init__(self, bytes, mainStream, offset, size):
+DOCDirStream.__init__(self, bytes, mainStream=mainStream)
+self.pos = offset
+self.size = size
+
+def dump(self):
+print '' % (self.pos, 
self.size)
+buf = struct.unpack("'
+
+class PlcPcd(DOCDirStream):
+"""The PlcPcd structure is a PLC whose data elements are Pcds (8 bytes 
each)."""
+def __init__(self, bytes, mainStream, offset, size):
+DOCDirStream.__init__(self, bytes, mainStream=mainStream)
+self.pos = offset
+self.size = size
+
+def dump(self):
+print '' % 
(self.pos, self.size)
+elements = (self.size - 4) / (4 + 8) # 8 is defined by 2.8.35, the 
rest is defined by 2.2.2
+pos = self.pos
+self.ranges = []
+self.aPcds = []
+for i in range(elements):
+start = struct.unpack("' % (i, start, end)
+self.ranges.append((start, end))
+pos += 4
+for i in range(elements):
+offset = self.pos + ( 4 * ( elements + 1 ) ) + ( 8 * i ) # 8 as 
defined by 2.8.35
+self.aPcds.append(Pcd(self.bytes, self.mainStream, offset, 8))
+self.aPcds[-1].dump()
+for i, item in enumerate(self.ranges):
+s

[PUSHED] Hide the rulers in Writer by default for a cleaner look

2012-11-07 Thread via Code Review 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/956

Approvals:
  Radek Doulík: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbe719207410d952c76d96c84450fd5a5831ea15
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt 
Gerrit-Reviewer: Radek Doulík 
Gerrit-Reviewer: Samuel Mehrbrodt 

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

[PUSHED] fdo#47157 Add more keywords to .desktop files

2012-11-07 Thread via Code Review 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/953

Approvals:
  Radek Doulík: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34d0bf75d7cf8c5ec764a1bfa0ad0e4c5ab8ae4e
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt 
Gerrit-Reviewer: Alberto Ferreira 
Gerrit-Reviewer: Radek Doulík 
Gerrit-Reviewer: Samuel Mehrbrodt 

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

[Libreoffice-commits] .: officecfg/registry

2012-11-07 Thread Libreoffice Gerrit user 
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae991a10701caac3db2483a8aef05e4e8385765c
Author: Samuel Mehrbrodt 
Date:   Thu Nov 1 09:56:34 2012 +0100

Hide the rulers in Writer by default for a cleaner look

This is consistent with Impress. Might need to be discussed with ux-advise

Change-Id: Icbe719207410d952c76d96c84450fd5a5831ea15
Reviewed-on: https://gerrit.libreoffice.org/956
Reviewed-by: Radek Doulík 
Tested-by: Radek Doulík 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index c91f75d..5b55ea4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1362,7 +1362,7 @@
Specifies whether rulers 
are displayed. Filters the values of HorizontalRuler and VerticalRuler.
Show rulers

-   true
+   false



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

[Libreoffice-commits] .: sysui/desktop

2012-11-07 Thread Libreoffice Gerrit user 
 sysui/desktop/menus/calc.desktop|2 +-
 sysui/desktop/menus/draw.desktop|4 ++--
 sysui/desktop/menus/impress.desktop |2 +-
 sysui/desktop/menus/math.desktop|2 +-
 sysui/desktop/menus/writer.desktop  |2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d8b07e5ba238d529a7610dd302269ee05c5e8fbc
Author: Samuel Mehrbrodt 
Date:   Wed Oct 31 21:49:30 2012 +0100

fdo#47157 Add more keywords to .desktop files

Change-Id: I34d0bf75d7cf8c5ec764a1bfa0ad0e4c5ab8ae4e
Reviewed-on: https://gerrit.libreoffice.org/953
Reviewed-by: Radek Doulík 
Tested-by: Radek Doulík 

diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 638b9e2..6a0225a 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -9,7 +9,7 @@ 
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.op
 Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
 Comment=Perform calculations, analyze information and manage lists in 
spreadsheets by using Calc.
-Keywords=Accounting;Stats;Chart;ods;xls;xlsx;
+Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft 
Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 6d92845..10dee6e 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -8,8 +8,8 @@ Exec=${UNIXBASISROOTNAME} --draw %U
 
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
-Comment=Create and edit drawings, flow charts, and logos by using Draw.
-Keywords=Vector;Schema;Diagram;odg;
+Comment=Create and edit drawings, flow charts and logos by using Draw.
+Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft 
Publisher;Corel Draw;cdr;odg;svg;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
diff --git a/sysui/desktop/menus/impress.desktop 
b/sysui/desktop/menus/impress.desktop
index d8ca703..dc821c1 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -9,7 +9,7 @@ 
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.o
 Name=%PRODUCTNAME Impress
 GenericName=Presentation
 Comment=Create and edit presentations for slideshows, meeting and Web pages by 
using Impress.
-Keywords=Slideshow;odp;ppt;pptx;
+Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft 
PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 4381a49..7768c2b 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -10,7 +10,7 @@ 
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math
 Name=%PRODUCTNAME Math
 GenericName=Formula Editor
 Comment=Create and edit scientific formulas and equations by using Math.
-Keywords=Equation;
+Keywords=Equation;OpenDocument Formula;Formula;odf;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
diff --git a/sysui/desktop/menus/writer.desktop 
b/sysui/desktop/menus/writer.desktop
index f76ac4e..605a897 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -9,7 +9,7 @@ 
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocum
 Name=%PRODUCTNAME Writer
 GenericName=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and 
Web pages by using Writer.
-Keywords=Text;Letter;CV;odt;doc;docx;
+Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft 
Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] LibreLogo Writer extension

2012-11-07 Thread Andras Timar (via Code Review) 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/998

Approvals:
  Andras Timar: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31a61f0773689a054b5d5008ca9d4eb0bd9d7a19
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Németh László 
Gerrit-Reviewer: Andras Timar 

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

[Libreoffice-commits] .: 2 commits - libcmis/libcmis-0.3.0.patch libcmis/UnpackedTarball_cmis.mk sfx2/inc sfx2/Library_sfx.mk sfx2/source sfx2/uiconfig sfx2/UI_sfx.mk

2012-11-07 Thread Libreoffice Gerrit user 
 libcmis/UnpackedTarball_cmis.mk |1 
 libcmis/libcmis-0.3.0.patch |   22 ++
 sfx2/Library_sfx.mk |1 
 sfx2/UI_sfx.mk  |1 
 sfx2/inc/sfx2/checkin.hxx   |   35 ++
 sfx2/source/dialog/checkin.cxx  |   39 +++
 sfx2/source/doc/objserv.cxx |   20 +++---
 sfx2/uiconfig/ui/checkin.ui |  132 
 8 files changed, 243 insertions(+), 8 deletions(-)

New commits:
commit 207ed1b1a17ca6d785cad936ecadcd160acc2b83
Author: Cédric Bosdonnat 
Date:   Wed Nov 7 15:18:59 2012 +0100

CMIS: added CheckIn dialog

Change-Id: Iba938986478b880b7026285f607972a2e4d72283

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index eae3511..8a12ad9 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -147,6 +147,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/control/unoctitm \
 sfx2/source/dialog/alienwarn \
 sfx2/source/dialog/basedlgs \
+   sfx2/source/dialog/checkin \
 sfx2/source/dialog/dinfdlg \
 sfx2/source/dialog/dinfedt \
 sfx2/source/dialog/dockwin \
diff --git a/sfx2/UI_sfx.mk b/sfx2/UI_sfx.mk
index a084da1..c164884 100644
--- a/sfx2/UI_sfx.mk
+++ b/sfx2/UI_sfx.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_UI_UI,sfx))
 
 $(eval $(call gb_UI_add_uifiles,sfx,\
+   sfx2/uiconfig/ui/checkin \
sfx2/uiconfig/ui/password \
 ))
 
diff --git a/sfx2/inc/sfx2/checkin.hxx b/sfx2/inc/sfx2/checkin.hxx
new file mode 100644
index 000..65aa2e7
--- /dev/null
+++ b/sfx2/inc/sfx2/checkin.hxx
@@ -0,0 +1,35 @@
+/* -*- 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 _SFX_CHECKIN_HXX
+#define _SFX_CHECKIN_HXX
+
+#include 
+#include 
+#include 
+
+class SfxCheckinDialog : public ModalDialog
+{
+private:
+Edit*   m_pCommentED;
+CheckBox*   m_pMajorCB;
+
+OKButton*   m_pOKBtn;
+
+DECL_DLLPRIVATE_LINK(OKHdl, void *);
+
+public:
+SfxCheckinDialog( Window* pParent );
+
+rtl::OUString GetComment( );
+bool IsMajor( );
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx
new file mode 100644
index 000..a2bac25
--- /dev/null
+++ b/sfx2/source/dialog/checkin.cxx
@@ -0,0 +1,39 @@
+/* -*- 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/.
+ */
+
+#include 
+#include 
+
+SfxCheckinDialog::SfxCheckinDialog( Window* pParent ) :
+ModalDialog( pParent, "CheckinDialog", "sfx/ui/checkin.ui" )
+{
+get( m_pCommentED, "VersionComment" );
+get( m_pMajorCB, "MajorVersion" );
+
+get( m_pOKBtn, "ok" );
+m_pOKBtn->SetClickHdl( LINK( this, SfxCheckinDialog, OKHdl ) );
+}
+
+rtl::OUString SfxCheckinDialog::GetComment( )
+{
+return m_pCommentED->GetText( );
+}
+
+bool SfxCheckinDialog::IsMajor( )
+{
+return m_pMajorCB->IsChecked( );
+}
+
+IMPL_LINK_NOARG( SfxCheckinDialog, OKHdl )
+{
+EndDialog( RET_OK );
+return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 490a72b..2412dcc 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -87,6 +87,7 @@
 #include "sfx2/sfxhelp.hxx"
 #include 
 #include 
+#include 
 
 #include "../appl/app.hrc"
 #include 
@@ -366,7 +367,6 @@ void SfxObjectShell::CancelCheckOut( )
 try
 {
 uno::Reference< document::XCmisDocument > xCmisDoc( GetModel(), 
uno::UNO_QUERY_THROW );
-// TODO Pop up dialog to ask whether to loose data or not
 xCmisDoc->cancelCheckOut( );
 }
 catch ( const uno::RuntimeException& e )
@@ -382,13 +382,17 @@ void SfxObjectShell::CheckIn( )
 try
 {
 uno::Reference< document::XCmisDocument > xCmisDoc( GetModel(), 
uno::UNO_QUERY_THROW );
-sal_Bool bIsMajor = sal_False;
-rtl::OUString sComment( "Some sample comment" );
-// TODO Pop up dialog to ask for comment and major
-xCmisDoc->checkIn( bIsMajor, sComment );
-uno::Reference< util::XModifiable > xModifiable( GetModel( ), 
uno::UNO_QUERY );
-if ( xModifiable.is( ) )
-xModifiable->setModified( sal_False );
+// Pop up dialog to ask for comment and major
+SfxCheckinDialog checkinDlg( &GetFrame( )->GetWindow( ) );
+if ( checkinDlg.Execute( ) == RET_OK )
+{
+

[PATCH] LibreLogo Writer extension

2012-11-07 Thread via Code Review 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/998

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/998/1

LibreLogo Writer extension

Change-Id: I31a61f0773689a054b5d5008ca9d4eb0bd9d7a19
---
A librelogo/Addons.xcu
A librelogo/ChangeLog
A librelogo/LibreLogo/LibreLogo.py
A librelogo/LibreLogoDummy.py
A librelogo/META-INF/manifest.xml
A librelogo/Office/UI/StartModuleWindowState.xcu
A librelogo/Office/UI/WriterWindowState.xcu
A librelogo/README
A librelogo/description-en.txt
A librelogo/description-hu.txt
A librelogo/description.xml
A librelogo/help/en-US/LibreLogo/LibreLogo.xhp
A librelogo/help/en-US/LibreLogo/doc.txt
A librelogo/help/en-US/LibreLogo/gendoc.sh
A librelogo/help/en-US/LibreLogo/head
A librelogo/help/en-US/help.tree
A librelogo/icons/lc_arrowshapes.circular-arrow.png
A librelogo/icons/lc_arrowshapes.circular-leftarrow.png
A librelogo/icons/lc_arrowshapes.down-arrow.png
A librelogo/icons/lc_arrowshapes.up-arrow.png
A librelogo/icons/lc_basicstop.png
A librelogo/icons/lc_editglossary.png
A librelogo/icons/lc_navigationbarleft.png
A librelogo/icons/lc_newdoc.png
A librelogo/icons/lc_runbasic.png
A librelogo/icons/sc_arrowshapes.circular-arrow.png
A librelogo/icons/sc_arrowshapes.circular-leftarrow.png
A librelogo/icons/sc_arrowshapes.down-arrow.png
A librelogo/icons/sc_arrowshapes.up-arrow.png
A librelogo/icons/sc_basicstop.png
A librelogo/icons/sc_editglossary.png
A librelogo/icons/sc_navigationbarleft.png
A librelogo/icons/sc_newdoc.png
A librelogo/icons/sc_runbasic.png
A librelogo/make.py
A librelogo/pythonpath/en.properties
A librelogo/pythonpath/hu.properties
A librelogo/pythonpath/librelogodummy_path.py
38 files changed, 3,706 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31a61f0773689a054b5d5008ca9d4eb0bd9d7a19
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Németh László 

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

[Libreoffice-commits] .: sd/source

2012-11-07 Thread Libreoffice Gerrit user 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |   42 +++
 1 file changed, 42 insertions(+)

New commits:
commit 192a0eb2beccee5349c3c7b60208aa95eb985f35
Author: Tor Lillqvist 
Date:   Wed Nov 7 15:50:21 2012 +0200

fdo51023: Revert e4450c54aee85b295b933e91d207fd8220c01107 for Mac OS X

See bug for discussion. Basically, the root cause to the problem is
that on the Mac, all the drag-and-drop action happens during the call
to pSlideSorterViewShell->StartDrag() in the Initialize method. Thus
no wonder that mpDragAndDropContext is null in the ProcessDragEvent()
as it has not been initialized yet, and is in fact initialised
pointlessly only after the drag-and-drop already has finished.

Reverted just for Mac OS X and ifdefified in a straightforward even if
ugly fashion.

Change-Id: Icfb62fb24a5c72fda39c8bcea125267c99ecf624

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index a451c12..516ba98 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -246,10 +246,17 @@ public:
 MultiSelectionModeHandler (
 SlideSorter& rSlideSorter,
 SelectionFunction& rSelectionFunction,
+#ifndef MACOSX
 const Point& rMouseModelPosition);
+#else
+const Point& rMouseModelPosition,
+const sal_uInt32 nEventCode);
+#endif
 virtual ~MultiSelectionModeHandler (void);
 
+#ifndef MACOSX
 void Initialize(const sal_uInt32 nEventCode);
+#endif
 
 virtual SelectionFunction::Mode GetMode (void) const;
 virtual void Abort (void);
@@ -296,10 +303,19 @@ class DragAndDropModeHandler : public 
SelectionFunction::ModeHandler
 public:
 DragAndDropModeHandler (
 SlideSorter& rSlideSorter,
+#ifndef MACOSX
 SelectionFunction& rSelectionFunction);
+#else
+SelectionFunction& rSelectionFunction,
+const Point& rMousePosition,
+::Window* pWindow);
+#endif
 virtual ~DragAndDropModeHandler (void);
 
+#ifndef MACOSX
 void Initialize(const Point& rMousePosition, ::Window* pWindow);
+#endif
+
 virtual SelectionFunction::Mode GetMode (void) const;
 virtual void Abort (void);
 
@@ -775,6 +791,7 @@ void SelectionFunction::SwitchToDragAndDropMode (const 
Point aMousePosition)
 {
 if (mpModeHandler->GetMode() != DragAndDropMode)
 {
+#ifndef MACOSX
 ::boost::shared_ptr handler(
 new DragAndDropModeHandler(mrSlideSorter, *this));
 SwitchMode(handler);
@@ -782,6 +799,10 @@ void SelectionFunction::SwitchToDragAndDropMode (const 
Point aMousePosition)
 // could already trigger DND events, which would recursively trigger 
this code again,
 // and without mpModeHandler set it would again try to set a new 
handler.
 handler->Initialize(aMousePosition, mpWindow);
+#else
+SwitchMode(::boost::shared_ptr(
+new DragAndDropModeHandler(mrSlideSorter, *this, aMousePosition, 
mpWindow)));
+#endif
 }
 }
 
@@ -793,6 +814,7 @@ void SelectionFunction::SwitchToMultiSelectionMode (
 const sal_uInt32 nEventCode)
 {
 if (mpModeHandler->GetMode() != MultiSelectionMode)
+#ifndef MACOSX
 {
 ::boost::shared_ptr handler(
 new MultiSelectionModeHandler(mrSlideSorter, *this, 
aMousePosition));
@@ -801,6 +823,10 @@ void SelectionFunction::SwitchToMultiSelectionMode (
 // is non-trivial, so it could possibly recurse just like the DND 
handler above.
 handler->Initialize(nEventCode);
 }
+#else
+SwitchMode(::boost::shared_ptr(
+new MultiSelectionModeHandler(mrSlideSorter, *this, 
aMousePosition, nEventCode)));
+#endif
 }
 
 
@@ -1414,7 +1440,12 @@ void NormalModeHandler::ResetButtonDownLocation (void)
 MultiSelectionModeHandler::MultiSelectionModeHandler (
 SlideSorter& rSlideSorter,
 SelectionFunction& rSelectionFunction,
+#ifndef MACOSX
 const Point& rMouseModelPosition)
+#else
+const Point& rMouseModelPosition,
+const sal_uInt32 nEventCode)
+#endif
 : ModeHandler(rSlideSorter, rSelectionFunction, false),
   meSelectionMode(SM_Normal),
   maSecondCorner(rMouseModelPosition),
@@ -1423,11 +1454,13 @@ MultiSelectionModeHandler::MultiSelectionModeHandler (
   mnAnchorIndex(-1),
   mnSecondIndex(-1)
 {
+#ifndef MACOSX
 }
 
 
 void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode)
 {
+#endif
 const Pointer aSelectionPointer (POINTER_TEXT);
 mrSlideSorter.GetContentWindow()->SetPointer(aSelectionPointer);
 SetSelectionModeFromModifier(nEventCode);
@@ -1683,13 +1716,22 @@ void MultiSelectionModeHandler::UpdateSelection (void)
 
 DragAndDropModeHandler::DragAndDropModeHandler (
 SlideSorter& rSlideSorter,
+#ifndef MACOSX
 SelectionFunction& rSelectionFunction)
+#else
+SelectionFunction& rSelectionFunction,
+

[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeMinGW.conf liblangtag/liblangtag-0.4.0-mingw.patch

2012-11-07 Thread Libreoffice Gerrit user 
 distro-configs/LibreOfficeMinGW.conf|1 -
 liblangtag/liblangtag-0.4.0-mingw.patch |   11 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 7551d099d853fe5fbafc4d6a3bf4d71ac0e66dd1
Author: Jan Holesovsky 
Date:   Wed Nov 7 14:30:57 2012 +0100

There is no --with-system-glib any more.

Change-Id: I43690a0196e54d45567f30151d95cf10f0ac3c38

diff --git a/distro-configs/LibreOfficeMinGW.conf 
b/distro-configs/LibreOfficeMinGW.conf
index 9bfafc1..642dcc9 100644
--- a/distro-configs/LibreOfficeMinGW.conf
+++ b/distro-configs/LibreOfficeMinGW.conf
@@ -8,7 +8,6 @@
 --with-system-db
 --with-system-expat
 --with-system-gettext
---with-system-glib
 --with-system-graphite
 --with-system-hunspell
 --with-system-icu
commit ac449bffdc4ed8ac8aaa9eddd98e975cc61b5635
Author: Jan Holesovsky 
Date:   Wed Nov 7 14:29:50 2012 +0100

Fix MinGW build.

Change-Id: I12fb6b8b8fdb7b9b00070c6d2a87da5d7d2fed13

diff --git a/liblangtag/liblangtag-0.4.0-mingw.patch 
b/liblangtag/liblangtag-0.4.0-mingw.patch
index b3ea943..82592aa 100644
--- a/liblangtag/liblangtag-0.4.0-mingw.patch
+++ b/liblangtag/liblangtag-0.4.0-mingw.patch
@@ -62,3 +62,14 @@
  
  ACLOCAL_AMFLAGS = \
-I m4macros \
+--- misc/liblangtag-0.4.0/extensions/lt-ext-ldml-u.c   2012-11-07 
14:26:53.0 +0100
 misc/build/liblangtag-0.4.0/extensions/lt-ext-ldml-u.c 2012-11-07 
14:27:39.0 +0100
+@@ -14,7 +14,7 @@
+ #include "config.h"
+ #endif
+ 
+-#ifndef _WIN32
++#if !defined( _WIN32 ) || defined( __MINGW32__ )
+ #include 
+ #else
+ typedef unsigned __int64 uint64_t;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Remove unnecessary #include

2012-11-07 Thread via Code Review 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/980

Approvals:
  Radek Doulík: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c33ce1eecad649c3d23719b51d51057d41d9a2e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matteo Casalin 
Gerrit-Reviewer: Radek Doulík 

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

[Libreoffice-commits] .: sw/source

2012-11-07 Thread Libreoffice Gerrit user 
 sw/source/ui/lingu/hhcwrp.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 05c9b36b53240ca085d3273531fe56fe4c236826
Author: Matteo Casalin 
Date:   Sun Nov 4 11:38:55 2012 +0100

Remove unnecessary #include

Change-Id: I3c33ce1eecad649c3d23719b51d51057d41d9a2e
Reviewed-on: https://gerrit.libreoffice.org/980
Reviewed-by: Radek Doulík 
Tested-by: Radek Doulík 

diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 5a34917..015de0c 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -43,7 +43,6 @@
 #include 
 #include 
 #include 
-#include 
 #include// Progress
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/Module_connectivity.mk postprocess/packcomponents scp2/source

2012-11-07 Thread Libreoffice Gerrit user 
 connectivity/Module_connectivity.mk|1 +
 postprocess/packcomponents/makefile.mk |4 +++-
 scp2/source/ooo/file_library_ooo.scp   |1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2ece91f79be01c1540328111ede71749388b
Author: Stephan Bergmann 
Date:   Wed Nov 7 13:37:57 2012 +0100

Always package at least mozbootstrap

...if not even mozab.  Otherwise, there is no implementation of
com.sun.star.mozilla.MozillaBootstrap and "File - Digital Signatures... - 
Sign
Document..." cannot show any certificates from Mozilla profiles.

Change-Id: Ie9b73fad798b2c2a3b52ba374ea967401694f685

diff --git a/connectivity/Module_connectivity.mk 
b/connectivity/Module_connectivity.mk
index fcf9c13..c01f007 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -136,6 +136,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_mork \
Executable_mork_helper \
Library_mork \
+   Library_mozbootstrap \
 ))
 
 $(eval $(call gb_Module_add_check_targets,connectivity,\
diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index a6f386a..d8e43bf 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -389,7 +389,9 @@ my_components += 
component/connectivity/source/drivers/mozab/mozab
 my_components += 
component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
 .END
 .ELIF "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
-my_components += component/connectivity/source/drivers/mork/mork
+my_components += \
+component/connectivity/source/drivers/mork/mork \
+component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
 .END
 
 .IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" && "$(OS)" != 
"headless"
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index ff1d509..d3c08f3 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -905,6 +905,7 @@ End
 #else
 
 STD_LIB_FILE(gid_File_Lib_Mork,mork)
+SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fail to build LO on Windows, missing separator not in sal this time but in accessibility

2012-11-07 Thread Michael Stahl 
On 06/11/12 23:53, julien2412 wrote:
> I updated today my sources and runned make clean && make.
> In addition, since I still got have a problem to build sources in Windows, I
> used the command provided by Norbert:
> make --debug=c,e tail_build
> 
> logs.zip   

oops, appears to be my fault...
i don't build with --enable-crashdump so i didn't have the problem here :)

> Any idea?

should be fixed with 949e06a801aa8b3939d621a450bf2b62c97fca16


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

[Libreoffice-commits] .: solenv/gbuild

2012-11-07 Thread Libreoffice Gerrit user 
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 949e06a801aa8b3939d621a450bf2b62c97fca16
Author: Michael Stahl 
Date:   Wed Nov 7 13:25:37 2012 +0100

gbuild: fix "missing separator" errors with --enable-crashdump

Add missing backslash in com_MSC_class.mk.
Thanks to Julien Nabet for finding this problem.
(regression from 85b6a93cf41fb05e726027e34fcd805330e20414)

Change-Id: Iaae670c58e42bc22691b141495598276fa23bf02

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index f94d159..d0b3cfc 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -239,7 +239,7 @@ $(if $(filter $(gb_MERGEDLIBS),$(1)),,\
 $(call gb_Library_add_auxtarget,$(1),$(OUTDIR)/bin/$(notdir $(3
 
 ifneq ($(ENABLE_CRASHDUMP),)
-$(call gb_Library_add_auxtargets,$(1),
+$(call gb_Library_add_auxtargets,$(1),\
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: inital build problem (master)

2012-11-07 Thread Michael Meeks 
Hi there,

On Wed, 2012-11-07 at 13:12 +0100, oger000 wrote:
> Trying a build on a new machine I end up with attatched build_error.log 
> (looks 
> like lpsolve is the problem).

It looks like downloading the source for those has silently failed -
[ not the only silent problem failure in download I think ? ].

Can you try running ./download after you've configured ? that -should-
grab those bits from the net for you automagically. Sorry for the
annoyance ...
 
HTH !

Michael.

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

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

[PUSHED] More ::rtl::OUString -> OUString in bridges

2012-11-07 Thread via Code Review 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/976

Approvals:
  Radek Doulík: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd29c68077dd8f27c95cd4cb62cd8dad0e18aacf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Radek Doulík 

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

[PUSHED] ::rtl::OUString -> OUString in bridges

2012-11-07 Thread via Code Review 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/974

Approvals:
  Radek Doulík: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a4fa7b108c58f100d2c8a586ec6c76af902e138
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Radek Doulík 

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

[Libreoffice-commits] .: bridges/source

2012-11-07 Thread Libreoffice Gerrit user 
 bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx |2 -
 bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx   |4 +--
 bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx   |4 ---
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx   |4 +--
 bridges/source/cpp_uno/shared/unointerfaceproxy.cxx   |4 +--
 bridges/source/cpp_uno/shared/vtablefactory.cxx   |   20 +-
 6 files changed, 16 insertions(+), 22 deletions(-)

New commits:
commit 595771d00dd7993ad34f38bcb6dfee880e75dffd
Author: Ricardo Montania 
Date:   Sat Nov 3 18:44:29 2012 -0200

More ::rtl::OUString -> OUString in bridges

Change-Id: Ibd29c68077dd8f27c95cd4cb62cd8dad0e18aacf
Reviewed-on: https://gerrit.libreoffice.org/976
Reviewed-by: Radek Doulík 
Tested-by: Radek Doulík 

diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx 
b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
index 6b80c02..ee7efc2 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
@@ -42,8 +42,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
-
 namespace
 {
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index 7957b91..be59df5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -255,7 +255,7 @@ static typelib_TypeClass cpp_mediate(
  "### illegal vtable index!" );
 if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
 {
-throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"illegal vtable index!" )), (XInterface *)pCppI );
+throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI );
 }
 
 // determine called method
@@ -350,7 +350,7 @@ static typelib_TypeClass cpp_mediate(
 }
 default:
 {
-throw RuntimeException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no 
member description found!" )), (XInterface *)pCppI );
+throw RuntimeException( "no member description found!", (XInterface 
*)pCppI );
 }
 }
 return eRet;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
index 149a2e3..eaf0045 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
@@ -39,10 +39,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
-
 namespace
 {
 
//==
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx 
b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index cc8c4d9..35b2f2c 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -106,7 +106,7 @@ void freeCppInterfaceProxy(uno_ExtEnvironment * pEnv, void 
* pInterface)
 
 com::sun::star::uno::XInterface * CppInterfaceProxy::create(
 bridges::cpp_uno::shared::Bridge * pBridge, uno_Interface * pUnoI,
-typelib_InterfaceTypeDescription * pTypeDescr, rtl::OUString const & rOId)
+typelib_InterfaceTypeDescription * pTypeDescr, OUString const & rOId)
 SAL_THROW(())
 {
 typelib_typedescription_complete(
@@ -153,7 +153,7 @@ void CppInterfaceProxy::releaseProxy() SAL_THROW(())
 
 CppInterfaceProxy::CppInterfaceProxy(
 bridges::cpp_uno::shared::Bridge * pBridge_, uno_Interface * pUnoI_,
-typelib_InterfaceTypeDescription * pTypeDescr_, rtl::OUString const & 
rOId_)
+typelib_InterfaceTypeDescription * pTypeDescr_, OUString const & rOId_)
 SAL_THROW(())
 : nRef( 1 )
 , pBridge( pBridge_ )
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx 
b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index 81353cf..b82ebfd 100644
--- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
@@ -91,7 +91,7 @@ UnoInterfaceProxy * UnoInterfaceProxy::create(
 bridges::cpp_uno::shared::Bridge * pBridge,
 com::sun::star::uno::XInterface * pCppI,
 typelib_InterfaceTypeDescription * pTypeDescr,
-rtl::OUString const & rOId) SAL_THROW(())
+OUString const & rOId) SAL_THROW(())
 {
 return new UnoInterfaceProxy(pBridge, pCppI, pTypeDescr, rOId);
 }
@@ -99,7 +99,7 @@ UnoInterfaceProxy * UnoInterfaceProxy::create(
 UnoInterfaceProxy::UnoInterfaceProxy(
 bridges::cpp_uno::shared::Bridge * pBridge_,
 com::sun::star::uno::XInterface * pCppI_,
-typelib_InterfaceTypeDescription * pTypeDescr_, rtl::OUString const & 
rOId_)
+typelib_InterfaceTypeDescription * pTypeDescr_, OUString const & rOId_)
 SAL_THROW(())
 : nRef( 1 )
 , pBridge( pBridge_ )
diff --git a/bridges/source/cpp_uno/shared/vtablefa

[Libreoffice-commits] .: bridges/inc bridges/source

2012-11-07 Thread Libreoffice Gerrit user 
 bridges/inc/bridges/cpp_uno/bridge.hxx   |   22 +++
 bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx |8 ++---
 bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx |6 ++--
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx |2 -
 bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx |8 ++---
 bridges/source/cpp_uno/shared/component.cxx  |   22 +++
 6 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit da67a17d2dc3000b1d72ef9a02a48f509a009b45
Author: Ricardo Montania 
Date:   Sat Nov 3 18:24:25 2012 -0200

::rtl::OUString -> OUString in bridges

Change-Id: I3a4fa7b108c58f100d2c8a586ec6c76af902e138
Reviewed-on: https://gerrit.libreoffice.org/974
Reviewed-by: Radek Doulík 
Tested-by: Radek Doulík 

diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx 
b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 96af924..7e6350c 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -126,7 +126,7 @@ inline void cppu_cppInterfaceProxy::releaseProxy() 
SAL_THROW(())
 
//__
 inline cppu_cppInterfaceProxy::cppu_cppInterfaceProxy(
 cppu_Bridge * pBridge_, uno_Interface * pUnoI_,
-typelib_InterfaceTypeDescription * pTypeDescr_, const ::rtl::OUString & 
rOId_ ) SAL_THROW(())
+typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ) 
SAL_THROW(())
 : nRef( 1 )
 , pBridge( pBridge_ )
 , pUnoI( pUnoI_ )
@@ -243,7 +243,7 @@ inline void SAL_CALL cppu_Mapping_cpp2uno(
 
//__
 inline cppu_unoInterfaceProxy::cppu_unoInterfaceProxy(
 cppu_Bridge * pBridge_, ::com::sun::star::uno::XInterface * pCppI_,
-typelib_InterfaceTypeDescription * pTypeDescr_, const ::rtl::OUString & 
rOId_ ) SAL_THROW(())
+typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ) 
SAL_THROW(())
 : nRef( 1 )
 , pBridge( pBridge_ )
 , pCppI( pCppI_ )
@@ -392,22 +392,22 @@ inline void SAL_CALL cppu_ext_getMapping(
 
//##
 
 #if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
-static ::rtl::OUString * s_pStaticOidPart = 0;
+static OUString * s_pStaticOidPart = 0;
 #endif
 
 // environment init stuff
 
//--
-inline const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() 
SAL_THROW(())
+inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
 {
 #if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
-static ::rtl::OUString * s_pStaticOidPart = 0;
+static OUString * s_pStaticOidPart = 0;
 #endif
 if (! s_pStaticOidPart)
 {
 ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
 if (! s_pStaticOidPart)
 {
-::rtl::OUStringBuffer aRet( 64 );
+OUStringBuffer aRet( 64 );
 aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") );
 // good guid
 sal_uInt8 ar[16];
@@ -417,9 +417,9 @@ inline const ::rtl::OUString & SAL_CALL 
cppu_cppenv_getStaticOIdPart() SAL_THROW
 aRet.append( (sal_Int32)ar[i], 16 );
 }
 #if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
-s_pStaticOidPart = new ::rtl::OUString( aRet.makeStringAndClear() 
);
+s_pStaticOidPart = new OUString( aRet.makeStringAndClear() );
 #else
-static ::rtl::OUString s_aStaticOidPart( aRet.makeStringAndClear() 
);
+static OUString s_aStaticOidPart( aRet.makeStringAndClear() );
 s_pStaticOidPart = &s_aStaticOidPart;
 #endif
 }
@@ -449,18 +449,18 @@ inline void SAL_CALL cppu_cppenv_computeObjectIdentifier(
 if (xHome.is())
 {
 // interface
-::rtl::OUStringBuffer oid( 64 );
+OUStringBuffer oid( 64 );
 oid.append( (sal_Int64)xHome.get(), 16 );
 oid.append( (sal_Unicode)';' );
 // ;environment[context]
 oid.append(
-*reinterpret_cast< ::rtl::OUString const * >(
+*reinterpret_cast< OUString const * >(
 &((uno_Environment *) pEnv)->pTypeName ) );
 oid.append( (sal_Unicode)'[' );
 oid.append( (sal_Int64)((uno_Environment *)pEnv)->pContext, 16 
);
 // ];good guid
 oid.append( cppu_cppenv_getStaticOIdPart() );
-::rtl::OUString aRet( oid.makeStringAndClear() );
+OUString aRet( oid.makeStringAndClear() );
 ::rtl_uString_acquire( *ppOId = aRet.pData );
 }
 }
diff

[PUSHED] Change in core[libreoffice-3-6]: Minor enhancements on the autofilter popup window.

2012-11-07 Thread via Code Review 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/997

Approvals:
  Radek Doulík: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a33a52afc6005b4a7428d5f7046eff986da80d2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Kohei Yoshida 
Gerrit-Reviewer: Radek Doulík 

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

2012-11-07 Thread Libreoffice Gerrit user 
 sc/source/ui/cctrl/checklistmenu.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 9d90fc7593445d0cd2333a827840e1c993e7a9b5
Author: Kohei Yoshida 
Date:   Fri Nov 2 14:51:35 2012 -0400

Minor enhancements on the autofilter popup window.

1) Launch pop-up right-aligned in case the cell is wider than the popup.
Launching it always left-aligned will look weird especially when the column
is very wide.

2) Allow type-ahead search when launching the autofilter via keyboard.  This
is achieved by making two small changes to the popup; first, the focus is 
set
on the check list box upon launching, and second, the type-ahead search is
enabled on the check list box control.

Change-Id: I8a33a52afc6005b4a7428d5f7046eff986da80d2
Reviewed-on: https://gerrit.libreoffice.org/997
Reviewed-by: Radek Doulík 
Tested-by: Radek Doulík 

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index ca85f70..f3b07b2 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -915,6 +915,9 @@ ScCheckListMenuWindow::ScCheckListMenuWindow(Window* 
pParent, ScDocument* pDoc)
 maTabStopCtrls.push_back(&maBtnUnselectSingle);
 maTabStopCtrls.push_back(&maBtnOk);
 maTabStopCtrls.push_back(&maBtnCancel);
+
+// Enable type-ahead search in the check list box.
+maChecks.SetStyle(maChecks.GetStyle() | WB_QUICK_SEARCH);
 }
 
 ScCheckListMenuWindow::~ScCheckListMenuWindow()
@@ -1355,7 +1358,18 @@ void ScCheckListMenuWindow::launch(const Rectangle& 
rRect)
 // We need to have at least one member selected.
 maBtnOk.Enable(maChecks.GetCheckedEntryCount() != 0);
 
-StartPopupMode(rRect, (FLOATWIN_POPUPMODE_DOWN | 
FLOATWIN_POPUPMODE_GRABFOCUS));
+Rectangle aRect(rRect);
+if (maWndSize.Width() < aRect.GetWidth())
+{
+// Target rectangle (i.e. cell width) is wider than the window.
+// Simulate right-aligned launch by modifying the target rectangle
+// size.
+long nDiff = aRect.GetWidth() - maWndSize.Width();
+aRect.Left() += nDiff;
+}
+
+StartPopupMode(aRect, (FLOATWIN_POPUPMODE_DOWN | 
FLOATWIN_POPUPMODE_GRABFOCUS));
+cycleFocus(); // Set initial focus to the check list box.
 }
 
 void ScCheckListMenuWindow::close(bool bOK)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: about parallelized building

2012-11-07 Thread Jean-Baptiste Faure 
Le 07/11/2012 11:31, Rene Engelhard a écrit :
> Hi.
>
> On Wed, Nov 07, 2012 at 11:18:06AM +0100, Jean-Baptiste Faure wrote:
>> I noticed that options --with-max-jobs= and --with-num-cpus= are not
>> recognized anymore. Instead of that we have only --with-parallelism or
>> without-parallelism.
>> My question is : does that mean that it is not possible to use
>> parallelism but with only a part of the available cpus?
> No?
>
> --with-parallelism=X
Oops, indeed it works. Sorry for the noise.

Thank you very much.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

[Libreoffice-commits] .: 2 commits - basic/source connectivity/source

2012-11-07 Thread Libreoffice Gerrit user 
 basic/source/runtime/dllmgr-x64.cxx  |6 +++---
 connectivity/source/drivers/mozab/MStatement.cxx |4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f0e797a351babf2282bac801c33a485671accf1b
Author: Michael Stahl 
Date:   Wed Nov 7 12:09:00 2012 +0100

basic: adapt dllmgr-x64.cxx to OUString changes

Change-Id: I9e5ff5be1f001a9f55953fd516fb5ef7fe94bf44

diff --git a/basic/source/runtime/dllmgr-x64.cxx 
b/basic/source/runtime/dllmgr-x64.cxx
index c7a7729..14d782a 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -185,7 +185,7 @@ SbError marshalString(
 {
 OSL_ASSERT(variable != 0 && buffer != 0);
 rtl::OString str;
-SbError e = convert(variable->GetString(), &str);
+SbError e = convert(variable->GetOUString(), &str);
 if (e != ERRCODE_NONE) {
 return e;
 }
@@ -448,7 +448,7 @@ SbError unmarshalString(StringData const & data, 
SbxVariable & result) {
 return e;
 }
 }
-data.variable->PutString(String(str));
+data.variable->PutString(str);
 return ERRCODE_NONE;
 }
 
@@ -575,7 +575,7 @@ SbError call(
 if (e != ERRCODE_NONE) {
 return e;
 }
-result.PutString(String(s2));
+result.PutString(s2);
 break;
 }
 case SbxOBJECT:
commit 8479ff19d9df5ad3f88bc370b49c4003e8bcd39c
Author: Michael Stahl 
Date:   Wed Nov 7 12:05:24 2012 +0100

mozab: adapt to XComponentContext changes

Change-Id: I6b8cdd69edb1e25cd7545cea5a3ffdfcff5000a0

diff --git a/connectivity/source/drivers/mozab/MStatement.cxx 
b/connectivity/source/drivers/mozab/MStatement.cxx
index c1041d9..9f6b2d5 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -73,7 +74,8 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
 ,m_xDBMetaData(_pConnection->getMetaData())
 ,m_pTable(NULL)
 ,m_pConnection(_pConnection)
-,m_aParser(_pConnection->getDriver()->getMSFactory())
+,m_aParser(::comphelper::getComponentContext(
+_pConnection->getDriver()->getMSFactory()))
 ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, 
_pConnection->createCatalog()->getTables(), m_aParser, NULL ) )
 ,m_pParseTree(NULL)
 ,rBHelper(OCommonStatement_IBASE::rBHelper)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/uiconfig vcl/aqua vcl/inc vcl/source vcl/unx

2012-11-07 Thread Libreoffice Gerrit user 
 sw/uiconfig/swriter/ui/wordcount.ui   |  383 --
 vcl/aqua/source/window/salframe.cxx   |6 
 vcl/inc/svdata.hxx|1 
 vcl/inc/vcl/settings.hxx  |   17 -
 vcl/source/app/settings.cxx   |   15 -
 vcl/source/control/scrbar.cxx |   24 +
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx  |   10 
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   10 
 8 files changed, 240 insertions(+), 226 deletions(-)

New commits:
commit 2efa35a812a6f1e35e4959a357f50feff7e598f5
Author: Caolán McNamara 
Date:   Tue Nov 6 23:21:06 2012 +

Resolves: fdo#56198 collect scrollbar click preference settings

for gtk and merge with aqua equivalent so as to alternate "jump to here"
behavior for primary button vs primary means scroll by single page. 
Secondary
button takes the alternative behaviour

Change-Id: I0a96f3131f41ec87052da39cbe96bfd895ca53f6

diff --git a/vcl/aqua/source/window/salframe.cxx 
b/vcl/aqua/source/window/salframe.cxx
index 924210d..cf7c048 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1146,7 +1146,7 @@ rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 
nKeyCode )
 
 // ---
 
-static void getAppleScrollBarVariant(void)
+static void getAppleScrollBarVariant(StyleSettings &rSettings)
 {
 bool bIsScrollbarDoubleMax = true; // default is DoubleMax
 
@@ -1183,7 +1183,7 @@ static void getAppleScrollBarVariant(void)
 if( jumpStr )
 {
 if( CFGetTypeID( jumpStr ) == CFBooleanGetTypeID() )
-ImplGetSVData()->maNWFData.mbScrollbarJumpPage = (jumpStr == 
kCFBooleanTrue);
+rSettings.SetPrimaryButtonWarpsSlider(jumpStr == 
kCFBooleanTrue);
 CFRelease( jumpStr );
 }
 CFRelease( jumpScroll );
@@ -1324,7 +1324,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings 
)
 // no mnemonics on aqua
 aStyleSettings.SetOptions( aStyleSettings.GetOptions() | 
STYLE_OPTION_NOMNEMONICS );
 
-getAppleScrollBarVariant();
+getAppleScrollBarVariant(aStyleSettings);
 
 // set scrollbar size
 aStyleSettings.SetScrollBarSize( static_cast([NSScroller 
scrollerWidth]) );
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index af547e9..974a67f 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -294,7 +294,6 @@ struct ImplSVNWFData
 boolmbCheckBoxNeedsErase:1; // set true for 
platforms that should draw the
 // window 
background before drawing the native
 // checkbox
-boolmbScrollbarJumpPage:1;  // true for "jump 
to here" behavior
 boolmbCanDrawWidgetAnySize:1;   // set to true 
currently on gtk
 };
 
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 9a0a856..1052b49 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -348,7 +348,10 @@ private:
 sal_uLong   mnPreferredSymbolsStyle;
 sal_uInt16  mnSkipDisabledInMenus;
 sal_BoolmbHideDisabledMenuItems;
-sal_BoolmnAcceleratorsInContextMenus;
+sal_BoolmbAcceleratorsInContextMenus;
+//mbPrimaryButtonWarpsSlider == true for "jump to here" behavior for 
primary button, otherwise
+//primary means scroll by single page. Secondary button takes the 
alternative behaviour
+sal_BoolmbPrimaryButtonWarpsSlider;
 Wallpaper   maWorkspaceGradient;
 DialogStyle maDialogStyle;
 FrameStyle  maFrameStyle;
@@ -649,10 +652,14 @@ public:
 { CopyData(); 
mpData->mbHideDisabledMenuItems = bHideDisabledMenuItems; }
 sal_BoolGetHideDisabledMenuItems() const
 { return 
mpData->mbHideDisabledMenuItems; }
-void   
SetAcceleratorsInContextMenus( sal_Bool bAcceleratorsInContextMenus )
-{ CopyData(); 
mpData->mnAcceleratorsInContextMenus = bAcceleratorsInContextMenus; }
-sal_BoolGetAcceleratorsInContextMenus() const
-{ return 
mpData->mnAcceleratorsInContextMenus; }
+voidSetAcceleratorsInContextMenus( sal_Bool 
bAcceleratorsInContextMenus )
+{ CopyData(); 
mpData->mbAcceleratorsInContextMenus = bAcceleratorsInContextMenus; }
+sal_BoolGetAcceleratorsInContextMenu

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

2012-11-07 Thread Libreoffice Gerrit user 
 instsetoo_native/util/openoffice.lst |   26 +-
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 5d3b43565846f744bb72dfde9dd939870c2b957b
Author: Petr Mladek 
Date:   Wed Nov 7 11:39:00 2012 +0100

bump buildid to 302 and version suffix to -2

The build is based in the upstream 3.6.3 and will be called SUSE 3.6-rc2

Change-Id: I04337c2d4001eec123cfb1fe1043b4955a5bba2d

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 8e80406..0fbf55b 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -13,7 +13,7 @@ Globals
 SERVICETAG_PRODUCTVERSION 3.6
 SERVICETAG_PARENTNAME LibreOffice 3.6
 SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
-SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
+SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-280020a9ed93
 HIDELICENSEDIALOG 0
 PACKAGEPREFIX
 BASISPACKAGEPREFIX libobasis
@@ -51,13 +51,13 @@ LibreOffice
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION -0
+SHORT_PRODUCTEXTENSION -2
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-200
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-302
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -103,21 +103,21 @@ LibreOffice_Dev
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION -0
+SHORT_PRODUCTEXTENSION -2
 UNIXBASISROOTNAME lodev3.6
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-200
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-302
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
 SOLSUREPACKAGEPREFIX lodev
 REGISTRYLAYERNAME LayerDev
-SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
+SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-280020a9ed93
 UPDATEURL http://update.libreoffice.org/check.php
 ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
 ADDSYSTEMINTEGRATION 1
@@ -167,7 +167,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.6
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION -0
+SHORT_PRODUCTEXTENSION -2
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
 PCPFILENAME ure.pcp
@@ -199,7 +199,7 @@ LibreOffice_SDK
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION -0
+SHORT_PRODUCTEXTENSION -2
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.6
@@ -240,7 +240,7 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION -0
+SHORT_PRODUCTEXTENSION -2
 UNIXBASISROOTNAME lodev3.6
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -287,7 +287,7 @@ LibreOffice_Test
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION -0
+SHORT_PRODUCTEXTENSION -2
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.6
@@ -328,7 +328,7 @@ LibreOffice_Dev_Test
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION -0
+SHORT_PRODUCTEXTENSION -2
 UNIXBASISROOTNAME lodev3.6
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -374,13 +374,13 @@ OxygenOffice
 PRODUCTVERSION 3.6
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION -0
+SHORT_PRODUCTEXTENSION -2
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-200
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-302

[Libreoffice-commits] .: readlicense_oo/html readlicense_oo/odt readlicense_oo/txt

2012-11-07 Thread Libreoffice Gerrit user 
 readlicense_oo/html/LICENSE.html |  102 ++-
 readlicense_oo/odt/LICENSE.odt   |binary
 readlicense_oo/txt/license.txt   |   77 +
 3 files changed, 11 insertions(+), 168 deletions(-)

New commits:
commit bc34145b403a9d5ff138a26310835ee9a6ac0496
Author: Andras Timar 
Date:   Wed Nov 7 11:36:52 2012 +0100

update LICENSE document

* add liblangtag
* remove gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg

Change-Id: Ib5cb1e4d85a519eb8523e3ce5cf5896cf4fa38be

diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html
index 6c87f39..d99e195 100644
--- a/readlicense_oo/html/LICENSE.html
+++ b/readlicense_oo/html/LICENSE.html
@@ -542,70 +542,6 @@ latest development version and read online 
documentation.
 can also contact us individually at:
 David
 TurnerRobert WilhelmWerner Lemberg
-gdk-pixbuf
-The
-following software may be included in this product: gdk-pixbuf. Use
-of any of this software is governed by the terms of the license
-below:
-©
-Free Software Foundation, Inc.
-This
-library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-Jump
-to LGPL Version 2
-gettext-runtime
-The
-following software may be included in this product: gettext-runtime.
-Use of any of this software is governed by the terms of the license
-below:
-©
-Free Software Foundation, Inc.
-The
-gettext-runtime package is partially under the LGPL and partially
-underthe GPL.
-The
-following parts are under the LGPL:
-
-   
-   the libintl and libasprintf libraries and their header files,
-   
-   the libintl.jar Java library,
-   
-   the GNU.Gettext.dll C# library,
-   
-   the gettext.sh shells script function library.
-
-The
-following parts are under the GPL:
-
-   
-   the _programs_ gettext, ngettext, envsubst,
-   
-   the documentation.
-   
-
-Jump
-to GPL Version 3
-Jump
-to LGPL Version 2
-glib
-The
-following software may be included in this product: glib. Use of any
-of this software is governed by the terms of the license below:
-©
-Free Software Foundation, Inc.
-This
-library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-Jump
-to LGPL Version 2
 GNU ISO C++ Library
 The
 following software may be included in this product: GNU ISO C++
@@ -1058,12 +994,6 @@ to GPL Version 2
 to LGPL Version 2
 Jump
 to MPL Version 1.1
-libcroco
-The
-following software may be included in this product: libcroco. Use of
-any of this software is governed by the terms of the license below:
-Jump
-to LGPL Version 2
 libcurl
 The
 following software may be included in this product: libcurl. Use of
@@ -1125,12 +1055,13 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-libgsf
+liblangtag
 The
-following software may be included in this product: libgsf. Use of
-any of this software is governed by the terms of the license below:
-Jump
-to LGPL Version 2.1
+following software may be included in this product: liblangtag
+Grammar Checker. Use of any of this software is governed by the terms
+of the license below:
+Jump
+to LGPL Version 3
 libpng
 The
 following software may be included in this product: libpng. Use of
@@ -1206,12 +1137,6 @@ Certified Open Source is acertification mark of the 
Open Source
 Initiative.Glenn Randers-Pehrsonglennrp at
 users.sourceforge.netFebruary 3, 2011
 
-librsvg
-The
-following software may be included in this product: librsvg. Use of
-any of this software is governed by the terms of the license below:
-Jump
-to LGPL Version 2
 libvisio
 The
 following software may be included in this product: libvisio. Use of
@@ -1707,21 +1632,6 @@ license and distribution terms for any publicly 
available version or
 derivative of this code cannot be changed. i.e. this code cannot
 simply be copied and put under another distribution license
 [including the GNU Public License.]
-pango
-The
-following software may be included in this product: pango. Use of any
-of this software is governed by the terms of the license below:
-Jump
-to LGPL Version 2
-Pentaho Reporting Flow Engine
-The
-following software may be included in this product: Pentaho Reporting
-Flow Engine (including core, flow-engine, libbase, libfonts,
-libformula, liblayout, libloader, librepository, libserializer, and
-libxml). Use of any of this software is governed by the terms of the
-lic

Re: [PUSHED 3-6] Fix for fdo#55417

2012-11-07 Thread Petr Mladek 
Noel Power píše v Po 01. 10. 2012 v 15:29 +0100:
> This makes sure alignment and protection specified at a cell style are 
> exported ( basically it seems for alignment & protectecton we need the 
> hard cell attributes need to match those specified in the cell style ). 
> The documentation in the spec is inconclusive but after some playing 
> around with what excel exports this seems to be what is required.
> 
> patch for cherry-picking is
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=78a102e2060a1a8fc003d91fa3193b2bfa841d26

I see this pushed in the 3-6 branch now.


Best Regards,
Petr

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

Re: [PUSHED 3-6] fdo#55418

2012-11-07 Thread Petr Mladek 
Noel Power píše v Po 01. 10. 2012 v 15:42 +0100:
> This one was quite hard to reproduce. The problem is that the 'xfId' 
> written out for the cellstyle is sometimes incorrect, worse of course 
> was that mostly it was correct. Additionally just to improve the 
> debugging experience the way the lists get laid out it seems even when 
> it didn't work it could produce the most bizarre results or even 
> something nearly correct ( like perhaps one cell out of twenty with the 
> wrong format ) :-)
> 
> the patch to cherry-pick is 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=a705c6cac4182d62c3495be7367d4ae34fd47fac

I see this pushed in the 3-6 branch now.


Best Regards,
Petr

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

Re: about parallelized building

2012-11-07 Thread Rene Engelhard 
Hi.

On Wed, Nov 07, 2012 at 11:18:06AM +0100, Jean-Baptiste Faure wrote:
> I noticed that options --with-max-jobs= and --with-num-cpus= are not
> recognized anymore. Instead of that we have only --with-parallelism or
> without-parallelism.
> My question is : does that mean that it is not possible to use
> parallelism but with only a part of the available cpus?

No?

--with-parallelism=X

Regards,

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

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - configmgr/source

2012-11-07 Thread Libreoffice Gerrit user 
 configmgr/source/components.cxx |   13 +
 configmgr/source/components.hxx |7 ++-
 2 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit fa0d70348ab16dfd8b2465dcf190ab760f61f678
Author: Stephan Bergmann 
Date:   Tue Nov 6 16:15:57 2012 +0100

fdo#55138: Do not double-expand bootstrap variables

For some reason that escapes me now, the old code double-expanded URLs in
CONFIGURATION_LAYERS and in extension layer's configmgr.ini SCHEMA/DATA.  
That
produced wrong results when the pathnames represented by those URLs contain
any "$" characters, as apparently routinely happens on Windows with roaming
profiles.

Change-Id: Iff149e7d8736cbcda579376cdc89e24cf99ccc97
(cherry picked from commit 8246bdb500a6d83ea9b61f58fb74e051432e32d7)
Reviewed-on: https://gerrit.libreoffice.org/994
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 5b40d30..abc4045 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -539,7 +539,7 @@ Components::Components(
 n = conf.getLength();
 }
 rtl::OUString type(conf.copy(i, c - i));
-rtl::OUString url(expand(conf.copy(c + 1, n - c - 1)));
+rtl::OUString url(conf.copy(c + 1, n - c - 1));
 if ( type == "xcsxcu" ) {
 parseXcsXcuLayer(layer, url);
 layer += 2; //TODO: overflow
@@ -696,12 +696,11 @@ void Components::parseFiles(
 
 void Components::parseFileList(
 int layer, FileParser * parseFile, rtl::OUString const & urls,
-rtl::Bootstrap const & ini, bool recordAdditions)
+bool recordAdditions)
 {
 for (sal_Int32 i = 0;;) {
 rtl::OUString url(urls.getToken(0, ' ', i));
 if (!url.isEmpty()) {
-ini.expandMacrosFrom(url); //TODO: detect failure
 Additions * adds = 0;
 if (recordAdditions) {
 adds = data_.addExtensionXcuAdditions(url, layer);
@@ -831,9 +830,7 @@ void Components::parseXcsXcuIniLayer(
 // Check if ini file exists (otherwise .override would still read global
 // SCHEMA/DATA variables, which could interfere with unrelated environment
 // variables):
-rtl::Bootstrap ini(url);
-if (ini.getHandle() != 0)
-{
+if (rtl::Bootstrap(url).getHandle() != 0) {
 rtl::OUStringBuffer prefix("${.override:");
 for (sal_Int32 i = 0; i != url.getLength(); ++i) {
 sal_Unicode c = url[i];
@@ -852,13 +849,13 @@ void Components::parseXcsXcuIniLayer(
 rtl::Bootstrap::expandMacros(urls);
 if (!urls.isEmpty())
 {
-parseFileList(layer, &parseXcsFile, urls, ini, false);
+parseFileList(layer, &parseXcsFile, urls, false);
 }
 urls = prefix.makeStringAndClear() + rtl::OUString("DATA}");
 rtl::Bootstrap::expandMacros(urls);
 if (!urls.isEmpty())
 {
-parseFileList(layer + 1, &parseXcuFile, urls, ini, 
recordAdditions);
+parseFileList(layer + 1, &parseXcuFile, urls, recordAdditions);
 }
 }
 }
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index bc4c5d0..e1987c0 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -53,10 +53,7 @@ namespace com { namespace sun { namespace star {
 class XComponentContext;
 }
 } } }
-namespace rtl {
-class Bootstrap;
-class OUString;
-}
+namespace rtl { class OUString; }
 
 namespace configmgr {
 
@@ -142,7 +139,7 @@ private:
 
 void parseFileList(
 int layer, FileParser * parseFile, rtl::OUString const & urls,
-rtl::Bootstrap const & ini, bool recordAdditions);
+bool recordAdditions);
 
 void parseXcdFiles(int layer, rtl::OUString const & url);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

about parallelized building

2012-11-07 Thread Jean-Baptiste Faure 
Hi,

I noticed that options --with-max-jobs= and --with-num-cpus= are not
recognized anymore. Instead of that we have only --with-parallelism or
without-parallelism.
My question is : does that mean that it is not possible to use
parallelism but with only a part of the available cpus?

My problem is that I build LO on my laptop and full parallelism has
several drawbacks for me:

1/ the laptop reaches the alarm threshold for the temperature so I need
to downgrade the CPU frequency

2/ the laptop is not very responsive if I want do something else during
LO building. I had not this problem when I could use --with-max-jobs=2
and --with-num-cpus=2

3/ my laptop has an i7 and Linux (Ubuntu 12.04 x86_64) sees 4 cpus when
there is only 2 physical cpus, because i7 uses hyperthreading to
simulate 2 cpus on each physical core.
In my day job I write parallelized computer codes using OpenMP in
Fortran 2008, and I saw that using 4 cpus, 2 being virtual, is less
efficient than using 2 real cpus on i7 processors. I can't say that it
is the same when building LO, but perhaps.

So I think it should be useful if we could set the number of cpu to use
for building LO.

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oovbaapi/ooo

2012-11-07 Thread Libreoffice Gerrit user 
 oovbaapi/ooo/vba/adodb/DataTypeEnum.idl   |9 +
 oovbaapi/ooo/vba/adodb/ParameterDirectionEnum.idl |9 +
 2 files changed, 18 insertions(+)

New commits:
commit 077b1cded0e599f78a54f5dfc3e6268cac251cda
Author: Noel Power 
Date:   Tue Nov 6 10:28:44 2012 +

add license info

Change-Id: I56653d99e1fac5e1b7cd2a69b4b160df4b75bb5d
(cherry picked from commit a7d38322d6211863024456602da1dff23a8316dd)

Signed-off-by: Caolán McNamara 

diff --git a/oovbaapi/ooo/vba/adodb/DataTypeEnum.idl 
b/oovbaapi/ooo/vba/adodb/DataTypeEnum.idl
index 83741a5..4116112 100644
--- a/oovbaapi/ooo/vba/adodb/DataTypeEnum.idl
+++ b/oovbaapi/ooo/vba/adodb/DataTypeEnum.idl
@@ -1,3 +1,11 @@
+/* -*- 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/.
+ */
 module ooo { module vba { module adodb {
 constants DataTypeEnum {
 const long adArray = 8192;
@@ -42,3 +50,4 @@ module ooo { module vba { module adodb {
 const long adWChar = 130;
 };
 }; }; };
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oovbaapi/ooo/vba/adodb/ParameterDirectionEnum.idl 
b/oovbaapi/ooo/vba/adodb/ParameterDirectionEnum.idl
index 2950921..a67ac56 100644
--- a/oovbaapi/ooo/vba/adodb/ParameterDirectionEnum.idl
+++ b/oovbaapi/ooo/vba/adodb/ParameterDirectionEnum.idl
@@ -1,3 +1,11 @@
+/* -*- 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/.
+ */
 module ooo { module vba { module adodb {
 constants ParameterDirectionEnum {
 const long adParamInput = 1;
@@ -7,3 +15,4 @@ module ooo { module vba { module adodb {
 const long adParamUnknown = 0;
 };
 }; }; };
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fail to build LO on Windows, missing separator not in sal this time but in accessibility

2012-11-07 Thread Michael Meeks 

On Tue, 2012-11-06 at 14:53 -0800, julien2412 wrote:
> I updated today my sources and runned make clean && make.
> In addition, since I still got have a problem to build sources in Windows, I
> used the command provided by Norbert:
> make --debug=c,e tail_build
> 
> logs.zip   
>
> Any idea?

The error being:

make[2]: Entering directory `/home/annie/libreoffice/master/tail_build'
/home/annie/libreoffice/master/accessibility/Library_acc.mk:28: ***
missing separator.  Stop.
make[2]: Leaving directory `/home/annie/libreoffice/master/tail_build'

Which looks odd; for me that reads only:

$(eval $(call gb_Library_Library,acc))

Which seems non-controversial; and no odd encoding issues in the file.

How annoying ! sorry build issues are delaying you; any chance of
remote / ssh / rdesktop access for an expert ? presumably Fridrich or
someone could help out if you poke on IRC ? Hopefully post 4.0 dmake
will be dead, and the gbuild-ness will settle down to a steady state :-)

Thanks !

Michael.

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

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

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - writerfilter/source

2012-11-07 Thread Libreoffice Gerrit user 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2c4d2554726c666ac8dda929204fcda74b084a01
Author: Miklos Vajna 
Date:   Mon Nov 5 16:35:59 2012 +0100

fdo#52989 ignore provided size of JPEG files during RTF import

See commit 66fa759b for rationale, this fix just does the same for JPEG
files as well.

(cherry picked from commit ebc61e11cdb02f5cc33aeabead3d191eaf0d23d3)

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

Change-Id: I6a9ead5f4b4b9c4661cae99501bd7c14a2a79409
Reviewed-on: https://gerrit.libreoffice.org/991
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index dbaa6e5..b84e303 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -640,9 +640,9 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 aExtHeader.yExt = m_aStates.top().aPicture.nHeight;
 OUString aGraphicUrl = m_pGraphicHelper->importGraphicObject(xInputStream, 
&aExtHeader);
 
-if (m_aStates.top().aPicture.nStyle == BMPSTYLE_PNG)
+if (m_aStates.top().aPicture.nStyle != BMPSTYLE_NONE)
 {
-// In case of PNG, the real size is known, don't use the values
+// In case of PNG/JPEG, the real size is known, don't use the values
 // provided by picw and pich.
 OString aURLBS(OUStringToOString(aGraphicUrl, RTL_TEXTENCODING_UTF8));
 const char aURLBegin[] = "vnd.sun.star.GraphicObject:";
@@ -2140,6 +2140,9 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_PNGBLIP:
 m_aStates.top().aPicture.nStyle = BMPSTYLE_PNG;
 break;
+case RTF_JPEGBLIP:
+m_aStates.top().aPicture.nStyle = BMPSTYLE_JPEG;
+break;
 case RTF_POSYT: 
m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, 
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_top); break;
 case RTF_POSYB: 
m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, 
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom); break;
 case RTF_POSYC: 
m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, 
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center); break;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 6d34e8b..6c0608f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -163,7 +163,8 @@ namespace writerfilter {
 enum RTFBmpStyles
 {
 BMPSTYLE_NONE,
-BMPSTYLE_PNG
+BMPSTYLE_PNG,
+BMPSTYLE_JPEG
 };
 
 enum RTFFieldStatus
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - writerfilter/source

2012-11-07 Thread Libreoffice Gerrit user 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 97e6aa6a8f2d7ce486197da03d1711f946562d14
Author: Miklos Vajna 
Date:   Tue Nov 6 10:53:10 2012 +0100

fdo#48442 fix default hori/vert frame anchor during RTF import

We used to send nothing when we got nothing, but this is not correct:
\pvmrg and \phmrg is the default in RTF, but not in Writer.

(cherry picked from commit 7b7bee4ed5722ce59ffd3394a0330d71d69d66b3)

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

Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3
Reviewed-on: https://gerrit.libreoffice.org/993
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index bf981d9..dbaa6e5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3942,12 +3942,14 @@ RTFSprms RTFFrame::getSprms()
 pValue.reset(new RTFValue(nVertPadding));
 break;
 case NS_ooxml::LN_CT_FramePr_hAnchor:
-if ( nHoriAnchor != 0 )
-pValue.reset(new RTFValue(nHoriAnchor));
+if ( nHoriAnchor == 0 )
+nHoriAnchor = 
NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_margin;
+pValue.reset(new RTFValue(nHoriAnchor));
 break;
 case NS_ooxml::LN_CT_FramePr_vAnchor:
-if ( nVertAnchor != 0 )
-pValue.reset(new RTFValue(nVertAnchor));
+if ( nVertAnchor == 0 )
+nVertAnchor = 
NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_margin;
+pValue.reset(new RTFValue(nVertAnchor));
 break;
 case NS_ooxml::LN_CT_FramePr_xAlign:
 pValue.reset(new RTFValue(nHoriAlign));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: fdo#55138: Do not double-expand bootstrap variables

2012-11-07 Thread Michael Meeks (via Code Review) 
Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/994

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff149e7d8736cbcda579376cdc89e24cf99ccc97
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann 
Gerrit-Reviewer: Michael Meeks 

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

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sw/source

2012-11-07 Thread Libreoffice Gerrit user 
 sw/source/ui/shells/drwtxtex.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit fa047d339eb6e534e19656b06e129f1570339f81
Author: Arnaud Versini 
Date:   Sun Nov 4 17:27:13 2012 +0100

Fix fdo#56603 by NULL pointer checking in SwDrawTextShell::Execute

Pushed in master as c954e6e1317f82e06fac66556674bc066b429469

Change-Id: I98f246b2bafcf2669a8f6c3ec4c86ccee56519bf
Reviewed-on: https://gerrit.libreoffice.org/984
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 
Reviewed-on: https://gerrit.libreoffice.org/985
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index be020a9..33bfacc 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -165,8 +165,11 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 if (nSlot == SID_ATTR_CHAR_FONT)
 nScriptTypes = pOLV->GetSelectedScriptType();
 
-aSetItem.PutItemForScriptType( nScriptTypes, pNewAttrs->Get( 
nWhich ) );
-aNewAttr.Put( aSetItem.GetItemSet() );
+if (pNewAttrs)
+{
+aSetItem.PutItemForScriptType( nScriptTypes, pNewAttrs->Get( 
nWhich ) );
+aNewAttr.Put( aSetItem.GetItemSet() );
+}
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source

2012-11-07 Thread Libreoffice Gerrit user 
 sc/source/filter/excel/xestream.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17f3f576b2d01c4fd975bc5044549526ac9ec832
Author: Markus Mohrhard 
Date:   Mon Nov 5 01:01:24 2012 +0100

fix ooxml color export

Change-Id: I4b94883f594e13e9923bdd05593447a152fa8b0a
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/filter/excel/xestream.cxx 
b/sc/source/filter/excel/xestream.cxx
index 67df56f..d2686d6 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -757,7 +757,7 @@ rtl::OUString XclXmlUtils::GetStreamName( const char* 
sStreamDir, const char* sS
 OString XclXmlUtils::ToOString( const Color& rColor )
 {
 char buf[9];
-sprintf( buf, "%.2X%.2X%.2X%.2X", rColor.GetTransparency(), 
rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue() );
+sprintf( buf, "%.2X%.2X%.2X%.2X", 0xFF-rColor.GetTransparency(), 
rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue() );
 buf[8] = '\0';
 return OString( buf );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - configmgr/source

2012-11-07 Thread Libreoffice Gerrit user 
 configmgr/source/components.cxx |   13 +
 configmgr/source/components.hxx |7 ++-
 2 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit cd5b4dcf8ccf0c3a3fac286f0e42d73ef8dbe6a5
Author: Stephan Bergmann 
Date:   Tue Nov 6 16:15:57 2012 +0100

fdo#55138: Do not double-expand bootstrap variables

For some reason that escapes me now, the old code double-expanded URLs in
CONFIGURATION_LAYERS and in extension layer's configmgr.ini SCHEMA/DATA.  
That
produced wrong results when the pathnames represented by those URLs contain
any "$" characters, as apparently routinely happens on Windows with roaming
profiles.

Change-Id: Iff149e7d8736cbcda579376cdc89e24cf99ccc97
(cherry picked from commit 8246bdb500a6d83ea9b61f58fb74e051432e32d7)
Reviewed-on: https://gerrit.libreoffice.org/994
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 5b40d30..abc4045 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -539,7 +539,7 @@ Components::Components(
 n = conf.getLength();
 }
 rtl::OUString type(conf.copy(i, c - i));
-rtl::OUString url(expand(conf.copy(c + 1, n - c - 1)));
+rtl::OUString url(conf.copy(c + 1, n - c - 1));
 if ( type == "xcsxcu" ) {
 parseXcsXcuLayer(layer, url);
 layer += 2; //TODO: overflow
@@ -696,12 +696,11 @@ void Components::parseFiles(
 
 void Components::parseFileList(
 int layer, FileParser * parseFile, rtl::OUString const & urls,
-rtl::Bootstrap const & ini, bool recordAdditions)
+bool recordAdditions)
 {
 for (sal_Int32 i = 0;;) {
 rtl::OUString url(urls.getToken(0, ' ', i));
 if (!url.isEmpty()) {
-ini.expandMacrosFrom(url); //TODO: detect failure
 Additions * adds = 0;
 if (recordAdditions) {
 adds = data_.addExtensionXcuAdditions(url, layer);
@@ -831,9 +830,7 @@ void Components::parseXcsXcuIniLayer(
 // Check if ini file exists (otherwise .override would still read global
 // SCHEMA/DATA variables, which could interfere with unrelated environment
 // variables):
-rtl::Bootstrap ini(url);
-if (ini.getHandle() != 0)
-{
+if (rtl::Bootstrap(url).getHandle() != 0) {
 rtl::OUStringBuffer prefix("${.override:");
 for (sal_Int32 i = 0; i != url.getLength(); ++i) {
 sal_Unicode c = url[i];
@@ -852,13 +849,13 @@ void Components::parseXcsXcuIniLayer(
 rtl::Bootstrap::expandMacros(urls);
 if (!urls.isEmpty())
 {
-parseFileList(layer, &parseXcsFile, urls, ini, false);
+parseFileList(layer, &parseXcsFile, urls, false);
 }
 urls = prefix.makeStringAndClear() + rtl::OUString("DATA}");
 rtl::Bootstrap::expandMacros(urls);
 if (!urls.isEmpty())
 {
-parseFileList(layer + 1, &parseXcuFile, urls, ini, 
recordAdditions);
+parseFileList(layer + 1, &parseXcuFile, urls, recordAdditions);
 }
 }
 }
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index bc4c5d0..e1987c0 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -53,10 +53,7 @@ namespace com { namespace sun { namespace star {
 class XComponentContext;
 }
 } } }
-namespace rtl {
-class Bootstrap;
-class OUString;
-}
+namespace rtl { class OUString; }
 
 namespace configmgr {
 
@@ -142,7 +139,7 @@ private:
 
 void parseFileList(
 int layer, FileParser * parseFile, rtl::OUString const & urls,
-rtl::Bootstrap const & ini, bool recordAdditions);
+bool recordAdditions);
 
 void parseXcdFiles(int layer, rtl::OUString const & url);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source

2012-11-07 Thread Libreoffice Gerrit user 
 sc/source/filter/excel/xestyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23a068bf6e5feba5229bdb30cbdd89a9ccbc8082
Author: Markus Mohrhard 
Date:   Mon Nov 5 01:03:36 2012 +0100

export dxfs at the correct place

Change-Id: I2ab31904169adad4f173d4655d0511855de77464
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index 6740fde..8426a53 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3061,8 +3061,8 @@ void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm 
)
 CreateRecord( EXC_ID_FORMATLIST )->SaveXml( rStrm );
 CreateRecord( EXC_ID_FONTLIST )->SaveXml( rStrm );
 CreateRecord( EXC_ID_XFLIST )->SaveXml( rStrm );
-CreateRecord( EXC_ID_PALETTE )->SaveXml( rStrm );
 CreateRecord( EXC_ID_DXFS )->SaveXml( rStrm );
+CreateRecord( EXC_ID_PALETTE )->SaveXml( rStrm );
 
 aStyleSheet->endElement( XML_styleSheet );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source

2012-11-07 Thread Libreoffice Gerrit user 
 sc/source/core/tool/editutil.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 37c4627c73e5684b845725734cfda4ad56f4c9c6
Author: Kohei Yoshida 
Date:   Mon Nov 5 19:58:02 2012 -0500

fdo#53531: Time field can be represented with an extended time field type.

And Calc's header footer currently don't distinguish between time and
extended time.  Time fields in the header / footer are always dynamic
and never static.

Change-Id: If628d179968c270a63d38cdc3bf6018c01241ac1
Reviewed-on: https://gerrit.libreoffice.org/992
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index dad6a7a..618333c 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -667,7 +667,9 @@ String ScHeaderEditEngine::CalcFieldValue( const 
SvxFieldItem& rField,
 case text::textfield::Type::PAGES:
 aRet = lcl_GetNumStr( aData.nTotalPages,aData.eNumType );
 break;
+case text::textfield::Type::EXTENDED_TIME:
 case text::textfield::Type::TIME:
+// For now, time field in the header / footer is always dynamic.
 aRet = ScGlobal::pLocaleData->getTime(aData.aTime);
 break;
 case text::textfield::Type::DOCINFO_TITLE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source

2012-11-07 Thread Libreoffice Gerrit user 
 sc/source/filter/excel/xestyle.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a68d26c0b626ce78bc2f5ed4da3c0dba462bed31
Author: Noel Power 
Date:   Fri Sep 28 19:02:44 2012 +0100

halt corrupted styles with multi-saved xlsx document fdo#55418

Change-Id: I2d53c88ab121edeec2bf53f7fd177a0edcc05a25
Reviewed-on: https://gerrit.libreoffice.org/958
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index 13b7d40..6740fde 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2229,7 +2229,10 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm )
 }
 else
 sName = XclXmlUtils::ToOString( maName );
-sal_Int32 nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( 
maXFId.mnXFId );
+// get the index in sortedlist associated with the mnXId
+sal_Int32 nXFId = rStrm.GetRoot().GetXFBuffer().GetXFIndex( maXFId.mnXFId 
);
+// get the style index associated with index into sortedlist
+nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( nXFId );
 rStrm.GetCurrentStream()->singleElement( XML_cellStyle,
 XML_name,   sName.getStr(),
 XML_xfId,   OString::valueOf( nXFId ).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

  1   2   >