date:20130930

 fontconfig/ExternalProject_fontconfig.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 514414ca2845d62056730c72fd2c14cbb5ba19c0
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 30 10:51:27 2013 +0300

Fix up the expat dependency

Change-Id: I426779bbe0308a4e1c3bc567fe2ca67805d95e55

diff --git a/fontconfig/ExternalProject_fontconfig.mk 
b/fontconfig/ExternalProject_fontconfig.mk
index b520a11..64ccbe6 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_ExternalProject_ExternalProject,fontconfig))
 
 $(eval $(call gb_ExternalProject_use_packages,fontconfig,\
+   expat \
freetype \
 ))
 
@@ -24,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
--disable-shared \
--with-arch=arm \
--with-expat-includes=$(call 
gb_UnpackedTarball_get_dir,expat)/lib \
-   --with-expat-lib=$(OUTDIR)/lib \
+   --with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
--with-freetype-config=$(OUTDIR)/bin/freetype-config \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 $(MAKE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-30 Thread Philipp Riemer

 sw/source/core/doc/docfmt.cxx  |4 
 sw/source/core/doc/docnum.cxx  |2 +-
 sw/source/core/docnode/ndtbl.cxx   |8 
 sw/source/core/txtnode/ndtxt.cxx   |4 
 sw/source/core/unocore/unoobj2.cxx |2 --
 sw/source/ui/app/docsh2.cxx|1 -
 sw/source/ui/index/cnttab.cxx  |5 +
 sw/source/ui/wrtsh/wrtsh1.cxx  |   25 -
 8 files changed, 2 insertions(+), 49 deletions(-)

New commits:
commit 2b8dc46ef3e6c34d86aa0803611e488b2254849b
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Sun Sep 29 19:06:02 2013 +0200

delete code that was commented out

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

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 7d4a809..2af2290 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -376,7 +376,6 @@ void SwDoc::ResetAttrs( const SwPaM rRg,
 }
 
 // #i96644#
-// SwDataChanged aTmp( *pPam );
 std::auto_ptr SwDataChanged  pDataChanged;
 if ( bSendDataChangedEvents )
 {
@@ -696,8 +695,6 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM rRg, const 
SfxItemSet rChgSet,
 {
 // Set auto flag. Only in the template it's without auto!
 SwFmtPageDesc aNew( *pDesc );
-// 38479: AutoFlag is now being set in the WrtShell
-// aNew.SetAuto();
 
 // Tables now also know line breaks
 if( 0 == (nFlags  nsSetAttrMode::SETATTR_APICALL) 
@@ -1874,7 +1871,6 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl 
rColl )
 
 if(rColl.IsAssignedToListLevelOfOutlineStyle())
 
pNewColl-AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());//-end,zhaojianwei
-//-end
 pNewColl-SetPoolFmtId( rColl.GetPoolFmtId() );
 pNewColl-SetPoolHelpId( rColl.GetPoolHelpId() );
 
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 52f3b1d..5df1a80 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2075,7 +2075,7 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex rIdx, sal_Bool 
bDel )
 {
 if ( !pTxtNd-IsCountedInList() == !bDel)
 {
-sal_Bool bOldNum = bDel; // == pTxtNd-IsCounted();
+sal_Bool bOldNum = bDel;
 sal_Bool bNewNum = bDel ? sal_False : sal_True;
 pTxtNd-SetCountedInList(bNewNum ? true : false);
 
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index cc6cd9c..015136b 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1139,7 +1139,6 @@ const SwTable* SwDoc::TextToTable( const std::vector 
std::vectorSwNodeRange 
 const SwPosition *pStt = aOriginal.GetMark();
 const SwPosition *pEnd = aOriginal.GetPoint();
 
-//SwUndoTxtToTbl* pUndo = 0;
 bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
 if (bUndo)
 {
@@ -3520,13 +3519,6 @@ sal_Bool SwNodes::MergeTable( const SwNodeIndex rPos, 
sal_Bool bWithPrev,
 aFndBox.SetTableLines( rTbl );
 aFndBox.DelFrms( rTbl );
 
-// TL_CHART2: since chart currently does not want to get informed about
-// additional rows/cols there is no need for a modified event in the
-// remaining first table. Also, if it is required it  should be done
-// after the merging and not here...
-// pDoc-UpdateCharts( rTbl.GetFrmFmt()-GetName() );
-
-
 // TL_CHART2:
 // tell the charts about the table to be deleted and have them use their 
own data
 GetDoc()-CreateChartInternalDataProviders( rDelTbl );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 750a649..074b146 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3839,7 +3839,6 @@ int SwTxtNode::GetActualListLevel() const
 
 void SwTxtNode::SetListRestart( bool bRestart )
 {
-//CreateNum()-SetRestart(bRestart);
 if ( !bRestart )
 {
 // attribute not contained in paragraph style's attribute set. Thus,
@@ -3856,7 +3855,6 @@ void SwTxtNode::SetListRestart( bool bRestart )
 
 bool SwTxtNode::IsListRestart() const
 {
-//return GetNum() ? GetNum()-IsRestart() : false;
 const SfxBoolItem aIsRestartItem =
 dynamic_castconst SfxBoolItem(GetAttr( RES_PARATR_LIST_ISRESTART ));
 
@@ -3885,7 +3883,6 @@ bool SwTxtNode::HasVisibleNumberingOrBullet() const
 
 void SwTxtNode::SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber 
nNumber )
 {
-//CreateNum()-SetStart(nNumber);
 const bool bChanged( HasAttrListRestartValue()
  ? GetAttrListRestartValue() != nNumber
  : nNumber != USHRT_MAX );
@@ -3922,7 +3919,6 @@ SwNumberTree::tSwNumTreeNumber

[Bug 54157] LibreOffice 4.0 most annoying bugs

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

mariosv mari...@miguelangel.mobi changed:

   What|Removed |Added

 CC||mari...@miguelangel.mobi
 Depends on||69948

--- Comment #175 from mariosv mari...@miguelangel.mobi ---
Adding https://www.libreoffice.org/bugzilla/show_bug.cgi - EDITING: insert
sheet from file - 'modify link' feature not working. And it is not saved.

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

Re: [Libreoffice-qa] minutes of ESC face-to-face ...


On Sat, 2013-09-28 at 19:03 +0200, bjoern wrote:
 One brainstormed idea From the QA roundtable was: A possibility would be to
 do a commenter on FIXED bugs stats. E.g. when releasing 4.x.1 querying for
 all commenters on RESOLVED/FIXED bugs with target:4.x.1.y and then say
 something like 128 contributors helped triage the bugs fixed in this release.
 Alice (8), Bob (5) and Charly (3) helped triaging the fixed bugs in this
 release most.

Nice idea ! :-) I'd love a commnit to
contrib/dev-tools/scripts/esc-bug-stats.pl that generates that :-)

 With this:

A great idea of course :-)

Thanks !

Michael.

-- 
 michael.me...@collabora.com  , Pseudo Engineer, itinerant idiot

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

About commit cppcheck: some cleanings

2013-09-30 Thread julien2412

Hello,

About commit 30e72a9a36750b7326803fa8fa1b8d40648e7e89 and, in particular,
to:

- sal_Int32 nWindowWidth = ::std::max( nMinWidth, nBrowserWidth );
- nWindowWidth = ::std::min( nMaxWidth, nBrowserWidth );
+ sal_Int32 nWindowWidth = ::std::min( nMaxWidth, nBrowserWidth );

Matteo Casalin thought (and I agree) that if my changes surely keep the
previous behaviour, the original code might be wrong.
Indeed, it seemed that its aim was to bound nWindowWidth between the maximum
and minimum possible values, but it didn't.
So perhaps it should be:

  sal_Int32 nWindowWidth = ::std::max( nMinWidth, nBrowserWidth );
  nWindowWidth = ::std::min( nMaxWidth, nWindowWidth );

Any idea?

Julien

PS: Thank you again Matteo for your suggestion!



--
View this message in context: 
http://nabble.documentfoundation.org/About-commit-cppcheck-some-cleanings-tp4075677.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibreOffice and Samba shares

2013-09-30 Thread Adoslyon

I have installed the ppa/4.0 one, via this ppa : (
https://launchpad.net/~libreoffice/+archive/libreoffice-4-0) . I think it is
the generic. In Ubuntu 12.04 LTS, there isn't LibreOffice 4.0 provided, just
3.5.7 version.



--
View this message in context: 
http://nabble.documentfoundation.org/LibreOffice-and-Samba-shares-tp4075421p4075678.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-09-30 Thread Jan Holesovsky

 source/text/shared/01/05030700.xhp   |2 +-
 source/text/shared/01/06050100.xhp   |2 +-
 source/text/shared/optionen/01010400.xhp |8 
 source/text/shared/optionen/01130200.xhp |4 ++--
 source/text/shared/optionen/01160100.xhp |6 +++---
 source/text/swriter/01/04090002.xhp  |2 +-
 source/text/swriter/01/04090003.xhp  |2 +-
 source/text/swriter/01/05060800.xhp  |2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 824cfdb0fa0c61079cb334b1f52d992fc4abfc34
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Sep 30 11:43:20 2013 +0200

Fix some typos (ahelp hid=hid/..., optfltr insted of optfltrembed).

We should really create some lint tool for this - should be easy to check if
the defined hid path really exists in the said .ui...

diff --git a/source/text/shared/01/05030700.xhp 
b/source/text/shared/01/05030700.xhp
index 148b42c..bc0d519 100644
--- a/source/text/shared/01/05030700.xhp
+++ b/source/text/shared/01/05030700.xhp
@@ -95,7 +95,7 @@
 bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/formattablepage/textdirection id=bm_id3149791 
localize=false/
 bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/columnpage/textdirectionlb id=bm_id3148971 
localize=false/
 paragraph role=heading id=hd_id3154631 xml-lang=en-US level=3 
l10n=U oldref=25Text direction/paragraph
-paragraph role=paragraph id=par_id3157960 xml-lang=en-US l10n=U 
oldref=24ahelp 
hid=hid/modules/swriter/ui/columnpage/textdirectionlbSpecify the text 
direction for a paragraph that uses complex text layout (CTL). This feature is 
only available if complex text layout support is enabled./ahelp/paragraph
+paragraph role=paragraph id=par_id3157960 xml-lang=en-US l10n=U 
oldref=24ahelp hid=modules/swriter/ui/columnpage/textdirectionlbSpecify 
the text direction for a paragraph that uses complex text layout (CTL). This 
feature is only available if complex text layout support is 
enabled./ahelp/paragraph
 /section
 embed href=text/shared/00/0001.xhp#vorschau/
 /body
diff --git a/source/text/shared/01/06050100.xhp 
b/source/text/shared/01/06050100.xhp
index 858829c..5d9fa62 100644
--- a/source/text/shared/01/06050100.xhp
+++ b/source/text/shared/01/06050100.xhp
@@ -42,7 +42,7 @@
   /section
 bookmark xml-lang=en-US branch=hid/cui/ui/pickbulletpage/valueset 
id=bm_id3145629 localize=false/
 paragraph xml-lang=en-US id=hd_id3153255 role=heading level=2 
l10n=U oldref=3Selection/paragraph
-  paragraph xml-lang=en-US id=par_id3155364 role=paragraph l10n=U 
oldref=4ahelp hid=hid/cui/ui/pickbulletpage/valuesetClick the bullet 
style that you want to use./ahelp/paragraph
+  paragraph xml-lang=en-US id=par_id3155364 role=paragraph l10n=U 
oldref=4ahelp hid=cui/ui/pickbulletpage/valuesetClick the bullet style 
that you want to use./ahelp/paragraph
   section id=relatedtopics
  paragraph xml-lang=en-US id=par_id3149549 role=paragraph 
l10n=CHGlink href=text/shared/01/06050600.xhp name=Position tab 
(Numbering/Bullets dialog)Position tab (Bullets and Numbering 
dialog)/link/paragraph
  paragraph xml-lang=en-US id=par_id3154317 role=paragraph 
l10n=Clink href=text/shared/01/06050500.xhp name=Options tab 
(Numbering/Bullets dialog)Options tab (Bullets and Numbering 
dialog)/link/paragraph
diff --git a/source/text/shared/optionen/01010400.xhp 
b/source/text/shared/optionen/01010400.xhp
index 4c29698..1b8d145 100644
--- a/source/text/shared/optionen/01010400.xhp
+++ b/source/text/shared/optionen/01010400.xhp
@@ -53,7 +53,7 @@
 paragraph role=note id=par_id3294778 xml-lang=en-US l10n=NEWThe 
configuration allows for two different directories: one folder where the user 
has write permissions, and one without write permissions. The user can only 
edit and delete the user dictionaries that are located in the writable path. 
Other dictionaries can be read only./paragraph
 bookmark xml-lang=en-US branch=hid/cui/ui/optlingupage/lingumodulesedit 
id=bm_id3154898 localize=false/
 paragraph role=heading id=hd_id3154307 xml-lang=en-US level=3 
l10n=U oldref=36Edit/paragraph
-paragraph role=paragraph id=par_id3145673 xml-lang=en-US l10n=U 
oldref=37ahelp hid=hid/cui/ui/optlingupage/lingumoduleseditTo edit a 
language module, select it and click emphEdit/emph./ahelp The link 
href=text/shared/optionen/01010401.xhp name=Edit ModulesemphEdit /emph
+paragraph role=paragraph id=par_id3145673 xml-lang=en-US l10n=U 
oldref=37ahelp hid=cui/ui/optlingupage/lingumoduleseditTo edit a 
language module, select it and click emphEdit/emph./ahelp The link 
href=text/shared/optionen/01010401.xhp name=Edit ModulesemphEdit /emph
 emphModules/emph/link dialog appears./paragraph
 section id=benutzerwb
 bookmark xml-lang=en-US branch=hid/CUI_HID_CLB_EDIT_MODULES_DICS 
id=bm_id3150503 localize=false/
@@ -62,7 +62,7 @@
 bookmark xml-lang=en-US branch=hid/CUI_HID_OPTIONS_DICT_NEW 
id=bm_id3149670 localize=false/
 bookmark xml-lang=en-US

[Libreoffice-commits] core.git: helpcontent2

2013-09-30 Thread Jan Holesovsky

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

New commits:
commit c1df0ce01b441ffa3e6238d93e49532620a1fc93
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Sep 30 11:43:20 2013 +0200

Updated core
Project: help  824cfdb0fa0c61079cb334b1f52d992fc4abfc34

diff --git a/helpcontent2 b/helpcontent2
index 1008ed3..824cfdb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1008ed32d8e2196c3c26e5aee2c1929377bea919
+Subproject commit 824cfdb0fa0c61079cb334b1f52d992fc4abfc34
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/rtl include/tools sal/rtl svl/source sw/source tools/source ucb/Library_ucpgio1.mk

 include/rtl/character.hxx|  160 ++-
 include/tools/inetmime.hxx   |  151 -
 sal/rtl/strtmpl.cxx  |   84 +++-
 svl/source/misc/inettype.cxx |4 
 svl/source/misc/urihelper.cxx|4 
 sw/source/ui/sidebar/PageSizeControl.cxx |4 
 tools/source/fsys/urlobj.cxx |   16 +--
 tools/source/inet/inetmime.cxx   |   51 +
 ucb/Library_ucpgio1.mk   |2 
 9 files changed, 160 insertions(+), 316 deletions(-)

New commits:
commit cfb09f556d7bc4d7341abf86c6e61af657235432
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 30 11:43:59 2013 +0200

Indirect dependency on boost_headers

...since 2eb36dc4b846ab5886ae71fd2978b56b2a2d1d08 Hack to not leave 
SolarMutex
released after g_main_loop_run call.

Change-Id: Ib4eb92002531af423b3ed4f24f6f4b71dc9cdc0d

diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk
index 000f557..b67c9bb 100644
--- a/ucb/Library_ucpgio1.mk
+++ b/ucb/Library_ucpgio1.mk
@@ -12,6 +12,8 @@ $(eval $(call gb_Library_Library,ucpgio1))
 
 $(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio))
 
+$(eval $(call gb_Library_use_external,ucpgio1,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,ucpgio1))
 
 $(eval $(call gb_Library_use_libraries,ucpgio1,\
commit edecc4e9af189ff8f4c95d4b89a713facb368d71
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 30 11:37:54 2013 +0200

Clean up rtl/character.hxx

It is probably best to base the functions on Unicode code points instead of
scalar values, now that they are also used from sal/rtl/strtmpl.cxx with 
UTF-16
code units and with arbitrary bytes (with values assumed to be a superset of
ASCII, though).  Rename compareAsciiIgnoreCase to compareIgnoreAsciiCase.  
Also,
the corresponding tools::INetMIME functions can be removed completely; no 
need
to keep them around as deprecated.

Change-Id: I8d322177f4909e70a946e8186e3e0f7fa6d9a43e

diff --git a/include/rtl/character.hxx b/include/rtl/character.hxx
index 2218158..4379ecb 100644
--- a/include/rtl/character.hxx
+++ b/include/rtl/character.hxx
@@ -21,179 +21,182 @@
 #define INCLUDED_RTL_CHARACTER_HXX
 
 #include sal/config.h
-#include sal/types.h
-#include sal/log.hxx
 
-#include assert.h
+#include cassert
+
+#include sal/types.h
 
 namespace rtl
 {
+
 /** Check for ASCII character.
 
-@param nUtf32  A Unicode scalar value (represented as a UTF-32 code unit).
+@param code  A Unicode code point.
 
-@return  True if nChar is a ASCII character (0x00--0x7F).
+@return  True if code is an ASCII character (0x00--0x7F).
 
 @since LibreOffice 4.1
  */
-inline bool isAscii(sal_uInt32 nUtf32)
+inline bool isAscii(sal_uInt32 code)
 {
-return nUtf32 = 0x7F;
+assert(code = 0x10);
+return code = 0x7F;
 }
 
 /** Check for ASCII lower case character.
 
-@param nUtf32  A Unicode scalar value (represented as a UTF-32 code unit).
+@param code  A Unicode code point.
 
-@return  True if nChar is a US-ASCII lower case alphabetic character
-(ASCII 'a'--'z').
+@return  True if code is an ASCII lower case alphabetic character (ASCII
+'a'--'z').
 
 @since LibreOffice 4.1
  */
-inline bool isAsciiLowerCase(sal_uInt32 nUtf32)
+inline bool isAsciiLowerCase(sal_uInt32 code)
 {
-return nUtf32 = 'a'  nUtf32 = 'z';
+assert(code = 0x10);
+return code = 'a'  code = 'z';
 }
 
-/** Check for US-ASCII upper case character.
+/** Check for ASCII upper case character.
 
-@param nUtf32  A Unicode scalar value (represented as a UTF-32 code unit).
+@param code  A Unicode code point.
 
-@return  True if nChar is a US-ASCII upper case alphabetic character
-(US-ASCII 'A'--'Z').
+@return  True if code is an ASCII upper case alphabetic character (ASCII
+'A'--'Z').
 
 @since LibreOffice 4.1
  */
-inline bool isAsciiUpperCase(sal_uInt32 nUtf32)
+inline bool isAsciiUpperCase(sal_uInt32 code)
 {
-return nUtf32 = 'A'  nUtf32 = 'Z';
+assert(code = 0x10);
+return code = 'A'  code = 'Z';
 }
 
-/** Check for ASCII alphanumeric character.
+/** Check for ASCII alphabetic character.
 
-@param nUtf32  A Unicode scalar value (represented as a UTF-32 code unit).
+@param code  A Unicode code point.
 
-@return  True if nUtf32 is a US-ASCII alphanumeric character
-(ASCII '0'--'9', 'A'--'Z' or 'a'--'z').
+@return  True if code is an ASCII alphabetic character (ASCII 'A'--'Z' or
+'a'--'z').
 
 @since LibreOffice 4.1
  */
-inline bool isAsciiAlpha(sal_uInt32 nUtf32)
+inline bool isAsciiAlpha(sal_uInt32 code)
 {
-return isAsciiLowerCase(nUtf32) || isAsciiUpperCase(nUtf32);
+assert(code = 0x10);
+return isAsciiLowerCase(code) || isAsciiUpperCase(code);
 }
 
 /** Check for ASCII digit character.
 
-@param nUtf32

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


On 09/29/2013 04:59 PM, Ivan Timofeev wrote:

I have the following error after that commit:

   [build CXX] ucb/source/ucp/gio/gio_content.cxx
   [build CHK] loaded modules: ucb
   In file included from
/home/ivan/libo/master/ucb/source/ucp/gio/gio_content.cxx:65:
   In file included from /home/ivan/libo/master/include/vcl/svapp.hxx:31:
   /home/ivan/libo/master/include/comphelper/solarmutex.hxx:25:10: fatal
error: 'boost/noncopyable.hpp' file not found
   #include boost/noncopyable.hpp
^
   1 error generated.

I don't know how to fix it.


Fixed with 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=cfb09f556d7bc4d7341abf86c6e61af657235432 
Indirect dependency on boost_headers.


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

[Libreoffice-commits] core.git: cui/source editeng/source include/tools padmin/source sc/inc sc/source sw/source

2013-09-30 Thread Caolán McNamara

 cui/source/customize/acccfg.cxx |6 
 cui/source/dialogs/cuihyperdlg.cxx  |8 -
 cui/source/dialogs/hldocntp.cxx |2 
 cui/source/dialogs/hldoctp.cxx  |   14 +-
 cui/source/dialogs/hlinettp.cxx |   39 ++---
 cui/source/dialogs/hlmailtp.cxx |   16 +-
 cui/source/inc/acccfg.hxx   |4 
 cui/source/inc/hldocntp.hxx |2 
 cui/source/inc/hldoctp.hxx  |2 
 cui/source/inc/hlinettp.hxx |8 -
 cui/source/inc/hlmailtp.hxx |4 
 cui/source/inc/hltpbase.hxx |2 
 editeng/source/misc/svxacorr.cxx|8 -
 include/tools/string.hxx|3 
 padmin/source/prtsetup.cxx  |7 -
 sc/inc/compiler.hxx |2 
 sc/source/core/tool/compiler.cxx|   34 ++---
 sc/source/filter/excel/xecontent.cxx|   15 +-
 sw/source/filter/inc/fltshell.hxx   |2 
 sw/source/filter/ww1/fltshell.cxx   |6 
 sw/source/filter/ww1/w1class.hxx|6 
 sw/source/filter/ww1/w1filter.cxx   |  213 
 sw/source/ui/dbui/addresslistdialog.cxx |4 
 sw/source/ui/envelp/label1.cxx  |   11 -
 sw/source/ui/envelp/labelexp.cxx|   19 +-
 25 files changed, 247 insertions(+), 190 deletions(-)

New commits:
commit 64b720dce8d3087ed62da815ecae1375b45149be
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Sep 30 11:03:58 2013 +0100

Related: fdo#38838 remove UniString::SearchAscii

Change-Id: Icb7850aaabe59f96ea26a665a8d25617b2741d68

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 2ec0328..89b8df4 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1485,7 +1485,7 @@ sal_uInt16 
SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode aKey) const
 }
 
 //---
-String SfxAcceleratorConfigPage::GetLabel4Command(const String sCommand)
+OUString SfxAcceleratorConfigPage::GetLabel4Command(const OUString sCommand)
 {
 try
 {
@@ -1516,10 +1516,10 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const 
String sCommand)
 else
 {
 String aRet(OUString(Symbols: ));
-xub_StrLen nPos = 
sCommand.SearchAscii(.uno:InsertSymbol?Symbols:string=);
+sal_Int32 nPos = sCommand.indexOf(.uno:InsertSymbol?Symbols:string=);
 if ( nPos == 0 )
 {
-aRet += String( sCommand, 34, sCommand.Len()-34 );
+aRet += sCommand.copy(34, sCommand.getLength()-34);
 return aRet;
 }
 }
diff --git a/cui/source/dialogs/cuihyperdlg.cxx 
b/cui/source/dialogs/cuihyperdlg.cxx
index 2911204..e8c33f5 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -272,8 +272,8 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
 {
 sal_uInt16 nPageId = RID_SVXPAGE_HYPERLINK_INTERNET;
 
-String aStrURL ( pItem-GetURL() );
-INetURLObject aURL ( aStrURL );
+OUString aStrURL(pItem-GetURL());
+INetURLObject aURL(aStrURL);
 INetProtocol eProtocolTyp = aURL.GetProtocol();
 
 switch ( eProtocolTyp )
@@ -295,12 +295,12 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* 
pItem )
 sal_Char const sNewsSrvScheme[] = news://;;
 // TODO news:// is nonsense
 
-if ( aStrURL.SearchAscii( sNewsSrvScheme ) == 0 )
+if (aStrURL.startsWith(sNewsSrvScheme))
 nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
 else
 {
 sal_Char const sHash[] = #;
-if( aStrURL.SearchAscii( sHash ) == 0 )
+if (aStrURL.startsWith(sHash))
 nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
 else
 {
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index f554ef0..ca83ae3 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -151,7 +151,7 @@ SvxHyperlinkNewDocTp::~SvxHyperlinkNewDocTp ()
 |/
 
 
-void SvxHyperlinkNewDocTp::FillDlgFields ( String /*aStrURL*/ )
+void SvxHyperlinkNewDocTp::FillDlgFields(const OUString /*rStrURL*/)
 {
 }
 
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index a5ab744..e8e9275 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -92,18 +92,18 @@ SvxHyperlinkDocTp::~SvxHyperlinkDocTp ()
 |*
 |/
 
-void SvxHyperlinkDocTp::FillDlgFields ( String aStrURL )
+void SvxHyperlinkDocTp::FillDlgFields(const OUString rStrURL)
 {
-INetURLObject aURL ( aStrURL );
+INetURLObject aURL(rStrURL);
 
-String aStrMark;
-xub_StrLen nPos = aStrURL.SearchAscii( sHash );
+sal_Int32 nPos = rStrURL.indexOf(sHash);
 // path

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

2013-09-30 Thread Laurent Balland-Poirier

 source/text/shared/01/06040400.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a6e10a3d4ef8a1f0f1c4826e300d377d677cf6e3
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Thu Sep 26 22:01:56 2013 +0200

Update help for non-breaking space option in French

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

diff --git a/source/text/shared/01/06040400.xhp 
b/source/text/shared/01/06040400.xhp
index d5954f7..fcaf3bb 100644
--- a/source/text/shared/01/06040400.xhp
+++ b/source/text/shared/01/06040400.xhp
@@ -46,8 +46,8 @@
 paragraph xml-lang=en-US id=par_id31537173 role=paragraph 
l10n=NEWahelp hid=.Select to apply the replacements while you type [T], 
or when you modify existing text [M]./ahelp/paragraph
 
 commentnew feature, cws cbosdo01. 
http://wiki.documentfoundation.org/Non_Breaking_Spaces_Before_Punctuation_In_French_(espaces_ins%C3%A9cables)/comment
-paragraph xml-lang=en-US id=hd_id3159300 role=heading level=2 
l10n=U oldref=25Add non breaking space before specific punctuation marks 
in French text/paragraph
-paragraph xml-lang=en-US id=par_id3153173 role=paragraph l10n=U 
oldref=27Inserts a non breaking space before ;, !, ? and : when the 
character language is set to French (France, Belgium, Luxembourg, Monaco, or 
Switzerland) and before : only when the character language is set to French 
(Canada)./paragraph
+paragraph xml-lang=en-US id=hd_id3159300 role=heading level=2 
l10n=U oldref=25Add non-breaking space before specific punctuation marks 
in French text/paragraph
+paragraph xml-lang=en-US id=par_id3153173 role=paragraph l10n=U 
oldref=27Inserts a non breaking space before ;, !, ?, : and % when 
the character language is set to French (France, Belgium, Luxembourg, Monaco, 
or Switzerland) and before : only when the character language is set to 
French (Canada)./paragraph
 
 commentmoved two paras from 06040100.xhp, cws cbosdo01/comment
 paragraph xml-lang=en-US id=hd_id3159400 role=heading level=2 
l10n=U oldref=25Format ordinal number suffixes (1st ... 
1supst/sup)/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-30 Thread Julien Nabet

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

New commits:
commit ace1c780cdf2e3e49b84199d59a5e565efbb96f4
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Sep 27 22:31:42 2013 +0200

n realloc - 1 malloc + n same assignments - 1 only

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

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 929177f..5d7d7fa 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -785,15 +785,14 @@ bool FormulaGroupInterpreterOpenCL::interpret( 
ScDocument rDoc, const ScAddress
 uint rArraysSize = rArrays.size();
 int nMoreColSize = 0;
 DoubleVectorFormula *SvDoubleTemp = new 
DoubleVectorFormula();
+nSrcDataSize = pDvr-GetArrayLength();
 if( rArraysSize  1 )
 {
-double *dpMoreColData = NULL;
+double *dpMoreColData = (double *) malloc(nSrcDataSize 
* rArraysSize * sizeof(double));
 for ( uint loop=0; loop  rArraysSize; loop++ )
 {
 dpOclSrcData = rArrays[loop].mpNumericArray;
-nSrcDataSize = pDvr-GetArrayLength();
 nMoreColSize += nSrcDataSize;
-dpMoreColData = (double *) 
realloc(dpMoreColData,nMoreColSize * sizeof(double));
 for ( uint j = nMoreColSize - nSrcDataSize, i = 0; 
i  nSrcDataSize; i++, j++ )
 {
 dpMoreColData[j] = dpOclSrcData[i];
@@ -805,7 +804,6 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument 
rDoc, const ScAddress
 else
 {
 dpOclSrcData = rArrays[0].mpNumericArray;
-nSrcDataSize = pDvr-GetArrayLength();
 SvDoubleTemp-mdpInputData = dpOclSrcData;
 SvDoubleTemp-mnInputDataSize = nSrcDataSize;
 SvDoubleTemp-mnInputStartPosition = 
mnpOclStartPos[nCountNum*mnRowSize];
@@ -876,15 +874,14 @@ bool FormulaGroupInterpreterOpenCL::interpret( 
ScDocument rDoc, const ScAddress
 const std::vectorformula::VectorRefArray rArrays = 
pDvr-GetArrays();
 unsigned int rArraysSize = rArrays.size();
 int nMoreColSize = 0;
+nSrcDataSize = pDvr-GetArrayLength();
 if(rArraysSize  1)
 {
-double *dpMoreColData = NULL;
+double *dpMoreColData = (double *) malloc(nSrcDataSize 
* rArraysSize * sizeof(double));
 for( uint loop=0; loop  rArraysSize; loop++ )
 {
 dpOclSrcData = rArrays[loop].mpNumericArray;
-nSrcDataSize = pDvr-GetArrayLength();
 nMoreColSize += nSrcDataSize;
-dpMoreColData = (double *) 
realloc(dpMoreColData,nMoreColSize * sizeof(double));
 for(uint 
j=nMoreColSize-nSrcDataSize,i=0;inSrcDataSize;i++,j++)
 {
 dpMoreColData[j] = dpOclSrcData[i];
@@ -897,7 +894,6 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument 
rDoc, const ScAddress
 else
 {
 dpOclSrcData = rArrays[0].mpNumericArray;
-nSrcDataSize = pDvr-GetArrayLength();
 }
 srdDataPush( new SourceData( 
dpOclSrcData,nSrcDataSize,rArraysSize ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-30 Thread Miklos Vajna

 sw/inc/crsrsh.hxx|4 ++--
 sw/qa/extras/odfimport/data/fdo69862.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx |   19 +++
 sw/source/core/crsr/crsrsh.cxx   |   12 ++--
 sw/source/core/docnode/nodedump.cxx  |6 --
 sw/source/core/edit/eddel.cxx|2 +-
 sw/source/core/edit/edglss.cxx   |2 +-
 sw/source/ui/wrtsh/select.cxx|2 +-
 8 files changed, 34 insertions(+), 13 deletions(-)

New commits:
commit 959711f1276106b0aaee69ab660f1b0d3ece5bbc
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Sep 30 11:45:35 2013 +0200

fdo#69862 SwCrsrShell::ExtendedSelectAll: don't always select footnotes

ExtendedSelectAll() was originally invented to e.g. select the whole
document, change the language of the selection and then inmediately
(before the layout is updated) undo the selection.

When using it for select all and doc starts with a table purposes,
then footnotes shouldn't be selected, just like those are not selected
either, when the doc starts with a normal paragraph. Their anchor is
still selected, and that's enough to have correct delete and copypaste.

Change-Id: I4fc49db628054a4b8a46effc2d0328eaabcaa9f8

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 9166edc..c01d3ea 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -326,9 +326,9 @@ public:
 // SelAll() selects the document body content
 // if ExtendedSelect() is called afterwards, the whole nodes array is 
selected
 // only for usage in special cases allowed!
-void ExtendedSelectAll();
+void ExtendedSelectAll(bool bFootnotes = true);
 /// If ExtendedSelectAll() was called and selection didn't change since 
then.
-bool ExtendedSelectedAll();
+bool ExtendedSelectedAll(bool bFootnotes = true);
 /// If document body starts with a table.
 bool StartsWithTable();
 
diff --git a/sw/qa/extras/odfimport/data/fdo69862.odt 
b/sw/qa/extras/odfimport/data/fdo69862.odt
new file mode 100644
index 000..aec48fd
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo69862.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 34d4f82..f541d22 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -36,6 +36,7 @@ public:
 void testFdo68839();
 void testFdo37606();
 void testFdo37606Copy();
+void testFdo69862();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -62,6 +63,7 @@ void Test::run()
 {fdo68839.odt, Test::testFdo68839},
 {fdo37606.odt, Test::testFdo37606},
 {fdo37606.odt, Test::testFdo37606Copy},
+{fdo69862.odt, Test::testFdo69862},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -426,6 +428,23 @@ void Test::testFdo37606Copy()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables-getCount());
 }
 
+void Test::testFdo69862()
+{
+// The test doc is special in that it starts with a table and it also has 
a footnote.
+SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument 
*(mxComponent.get());
+SwWrtShell* pWrtShell = pTxtDoc-GetDocShell()-GetWrtShell();
+SwShellCrsr* pShellCrsr = pWrtShell-getShellCrsr(false);
+
+pWrtShell-SelAll();
+SwTxtNode rStart = 
dynamic_castSwTxtNode(pShellCrsr-Start()-nNode.GetNode());
+// This was Footnote., as Ctrl-A also selected footnotes, but it should 
not.
+CPPUNIT_ASSERT_EQUAL(OUString(A1), rStart.GetTxt());
+
+SwTxtNode rEnd = 
dynamic_castSwTxtNode(pShellCrsr-End()-nNode.GetNode());
+CPPUNIT_ASSERT_EQUAL(OUString(H \x01 ello.), rEnd.GetTxt());
+
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index e64b63d..106e150 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -227,7 +227,7 @@ void SwCrsrShell::StartAction()
 
 void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
 {
-comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable()  
ExtendedSelectedAll());
+comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable()  
ExtendedSelectedAll(/*bFootnotes =*/ false));
 sal_Bool bVis = m_bSVCrsrVis;
 
 // Idle-formatting?
@@ -520,11 +520,11 @@ sal_Bool SwCrsrShell::SttEndDoc( sal_Bool bStt )
 return bRet;
 }
 
-void SwCrsrShell::ExtendedSelectAll()
+void SwCrsrShell::ExtendedSelectAll(bool bFootnotes)
 {
 SwNodes rNodes = GetDoc()-GetNodes();
 SwPosition* pPos = m_pCurCrsr-GetPoint();
-pPos-nNode = rNodes.GetEndOfPostIts();
+pPos-nNode = bFootnotes ? rNodes.GetEndOfPostIts() : 
rNodes.GetEndOfInserts();
 pPos-nContent.Assign( rNodes.GoNext( pPos-nNode ), 0 );
 pPos = m_pCurCrsr-GetMark();
 pPos-nNode = rNodes.GetEndOfContent();
@@ -532,10 +532,10 @@ void

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

2013-09-30 Thread Olivier Hallot

 sd/AllLangResTarget_sd.mk  |1 
 sd/UIConfig_sdraw.mk   |3 
 sd/source/ui/dlg/dlgpage.cxx   |   42 +-
 sd/source/ui/dlg/dlgpage.src   |   79 ---
 sd/source/ui/inc/dlgpage.hrc   |   21 -
 sd/source/ui/inc/dlgpage.hxx   |4 -
 sd/uiconfig/sdraw/ui/drawpagedialog.ui |  132 +
 7 files changed, 157 insertions(+), 125 deletions(-)

New commits:
commit e5c370e53d8701d863d231c26ce8e5c46385e5eb
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Fri Sep 27 09:55:57 2013 +0200

Convert Draw page dialog to Widget UI

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

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index b4642be..978c415 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/dlg_char.src \
 sd/source/ui/dlg/dlgfield.src \
 sd/source/ui/dlg/dlgolbul.src \
-sd/source/ui/dlg/dlgpage.src \
 sd/source/ui/dlg/inspagob.src \
 sd/source/ui/dlg/ins_paste.src \
 sd/source/ui/dlg/LayerDialog.src \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index f5a5d1f..292955f 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -68,7 +68,8 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/dlgsnap \
sd/uiconfig/sdraw/ui/copydlg \
-sd/uiconfig/sdraw/ui/drawparadialog \
+   sd/uiconfig/sdraw/ui/drawparadialog \
+   sd/uiconfig/sdraw/ui/drawpagedialog \
sd/uiconfig/sdraw/ui/insertlayer \
sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/printeroptions \
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index e0bae00..b6eebfc 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -34,8 +34,11 @@
  * Constructor of tab dialog: appends pages to the dialog
  */
 SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const 
SfxItemSet* pAttr, sal_Bool bAreaPage ) :
-SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ),
-mpDocShell  ( pDocSh )
+SfxTabDialog ( pParent
+  ,DrawPageDialog
+  ,modules/sdraw/ui/drawpagedialog.ui
+  , pAttr ),
+mpDocShell  ( pDocSh )
 {
 SvxColorListItem aColorListItem(*( (const SvxColorListItem*)
 ( mpDocShell-GetItem( SID_COLOR_TABLE ) ) ) );
@@ -51,43 +54,38 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* 
pParent, const SfxItemSet*
 mpHatchingList = aHatchListItem.GetHatchList();
 mpBitmapList = aBitmapListItem.GetBitmapList();
 
-FreeResource();
-
 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, Dialogdiet fail!);
 
-AddTabPage( RID_SVXPAGE_PAGE, pFact-GetTabPageCreatorFunc( 
RID_SVXPAGE_PAGE ), 0 );
-AddTabPage( RID_SVXPAGE_AREA, pFact-GetTabPageCreatorFunc( 
RID_SVXPAGE_AREA ), 0 );
+mnPage = AddTabPage( RID_SVXPAGE_PAGE, pFact-GetTabPageCreatorFunc( 
RID_SVXPAGE_PAGE ), 0 );
+mnArea = AddTabPage( RID_SVXPAGE_AREA, pFact-GetTabPageCreatorFunc( 
RID_SVXPAGE_AREA ), 0 );
 
 if(!bAreaPage)  // I have to add the page before I remove it !
-RemoveTabPage( RID_SVXPAGE_AREA );
+RemoveTabPage( RID_SVXPAGE_AREA );
 }
 
 
 void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage rPage)
 {
 SfxAllItemSet aSet(*(GetInputSetImpl()-GetPool()));
-switch(nId)
+if (nId == mnPage)
 {
-case RID_SVXPAGE_PAGE:
 aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, 
SVX_PAGE_MODE_PRESENTATION));
 aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_START, PAPER_A0));
 aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_END, PAPER_E));
 rPage.PageCreated(aSet);
-break;
-case RID_SVXPAGE_AREA:
-aSet.Put (SvxColorListItem(mpColorList,SID_COLOR_TABLE));
-aSet.Put (SvxGradientListItem(mpGradientList,SID_GRADIENT_LIST));
-aSet.Put (SvxHatchListItem(mpHatchingList,SID_HATCH_LIST));
-aSet.Put (SvxBitmapListItem(mpBitmapList,SID_BITMAP_LIST));
-aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0));
-aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1));
-aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0));
-rPage.PageCreated(aSet);
-break;
+}
+else if (nId == mnArea)
+{
+aSet.Put (SvxColorListItem(mpColorList,SID_COLOR_TABLE));
+aSet.Put (SvxGradientListItem(mpGradientList,SID_GRADIENT_LIST));
+aSet.Put (SvxHatchListItem(mpHatchingList,SID_HATCH_LIST));
+

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

2013-09-30 Thread Olivier Hallot

 sd/AllLangResTarget_sd.mk  |1 
 sd/UIConfig_sdraw.mk   |1 
 sd/source/ui/dlg/dlg_char.src  |   84 --
 sd/source/ui/dlg/dlgchar.cxx   |   42 -
 sd/source/ui/inc/dlg_char.hrc  |   21 
 sd/source/ui/inc/dlg_char.hxx  |6 -
 sd/uiconfig/sdraw/ui/drawchardialog.ui |  147 +
 sd/uiconfig/sdraw/ui/drawpagedialog.ui |1 
 8 files changed, 173 insertions(+), 130 deletions(-)

New commits:
commit a0114eff777c343a16f13c4e6a99d63ef235cdc7
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Fri Sep 27 10:49:38 2013 +0200

Convert Draw char dialog to widget UI

Conflicts:
sd/UIConfig_sdraw.mk

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

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 978c415..f177ed1 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/animobjs.src \
 sd/source/ui/dlg/brkdlg.src \
 sd/source/ui/dlg/dlgass.src \
-sd/source/ui/dlg/dlg_char.src \
 sd/source/ui/dlg/dlgfield.src \
 sd/source/ui/dlg/dlgolbul.src \
 sd/source/ui/dlg/inspagob.src \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 292955f..8446921 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/dlgsnap \
sd/uiconfig/sdraw/ui/copydlg \
+   sd/uiconfig/sdraw/ui/drawchardialog \
sd/uiconfig/sdraw/ui/drawparadialog \
sd/uiconfig/sdraw/ui/drawpagedialog \
sd/uiconfig/sdraw/ui/insertlayer \
diff --git a/sd/source/ui/dlg/dlg_char.src b/sd/source/ui/dlg/dlg_char.src
deleted file mode 100644
index 37be74a..000
--- a/sd/source/ui/dlg/dlg_char.src
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include svx/dialogs.hrc
-#include dlg_char.hrc
-TabDialog TAB_CHAR
-{
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 289 , 176 ) ;
-Text [ en-US ] = Character ;
-Moveable = TRUE ;
- // Closeable = TRUE;   // Dieser Dialog enthaelt OK und/oder Cancel 
Button (KH)
-TabControl 1
-{
-OutputSize = TRUE ;
-Pos = MAP_APPFONT ( 3 , 3 ) ;
-Size = MAP_APPFONT ( 260 , 135 ) ;
-PageList =
-{
-PageItem
-{
-Identifier = RID_SVXPAGE_CHAR_NAME ;
-Text [ en-US ] = Font ;
-PageResID = RID_SVXPAGE_CHAR_NAME ;
-};
-PageItem
-{
-Identifier = RID_SVXPAGE_CHAR_EFFECTS ;
-Text [ en-US ] = Font Effects ;
-PageResID = RID_SVXPAGE_CHAR_EFFECTS ;
-};
-PageItem
-{
-Identifier = RID_SVXPAGE_CHAR_POSITION ;
-PageResID = RID_SVXPAGE_CHAR_POSITION ;
-Text [ en-US ] = Position;
-};
-};
-};
-OKButton 1
-{
-Pos = MAP_APPFONT ( 6 , 151 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-CancelButton 1
-{
-Pos = MAP_APPFONT ( 60 , 151 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-HelpButton 1
-{
-Pos = MAP_APPFONT ( 114 , 151 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-PushButton 1
-{
-Pos = MAP_APPFONT ( 169 , 151 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-Text [ en-US ] = Return ;
-TabStop = TRUE ;
-};
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 93821a3..05f76fc 100644
---

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

 solenv/gbuild/processdelivered.awk  |   27 -
 solenv/gbuild/templates/AllLangResTarget.mk |   40 --
 solenv/gbuild/templates/CppunitTest.mk  |   32 ---
 solenv/gbuild/templates/Executable.mk   |   39 --
 solenv/gbuild/templates/JunitTest.mk|   40 --
 solenv/gbuild/templates/Library.mk  |   76 
 solenv/gbuild/templates/Makefile|   15 -
 solenv/gbuild/templates/Module.mk   |   36 -
 solenv/gbuild/templates/Package.mk  |   33 
 solenv/gbuild/templates/StaticLibrary.mk|   26 -
 10 files changed, 364 deletions(-)

New commits:
commit 456b470e558b0cb995860b68f3d5fb2bab065423
Author: Michael Stahl mst...@redhat.com
Date:   Wed Sep 25 22:09:10 2013 +0200

gbuild: remove templates

Nobody uses those anyway.

Change-Id: Ifa20827c0526a6eb3c9f554e652a354327282f48

diff --git a/solenv/gbuild/templates/AllLangResTarget.mk 
b/solenv/gbuild/templates/AllLangResTarget.mk
deleted file mode 100644
index c1bc14d..000
--- a/solenv/gbuild/templates/AllLangResTarget.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# RES is the name of the resource; its file name will be RES-LOCALE.res
-# MODULE is the name of the code module the makefile is located in
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,RES))
-
-# declaration of images folder (e.g. icon-themes/(name of theme)/MODULE/res)
-$(eval $(call gb_AllLangResTarget_set_reslocation,RES,MODULE))
-
-# declaration of a resource intermediate file (srs)
-$(eval $(call gb_AllLangResTarget_add_srs,RES, RES/res))
-$(eval $(call gb_SrsTarget_SrsTarget,RES/res))
-
-# add any additional include paths here
-$(eval $(call gb_SrsTarget_set_include,RES/res,\
-   $$(INCLUDE) \
-))
-
-# add src files here (complete path relative to repository root)
-$(eval $(call gb_SrsTarget_add_files,RES/res,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/CppunitTest.mk 
b/solenv/gbuild/templates/CppunitTest.mk
deleted file mode 100644
index 246ef95..000
--- a/solenv/gbuild/templates/CppunitTest.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,MODULE_NAME))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,MODULE_NAME, \
-   $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\
-   $$(INCLUDE) \
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Executable.mk 
b/solenv/gbuild/templates/Executable.mk
deleted file mode 100644
index 35ef29d..000
--- a/solenv/gbuild/templates/Executable.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0

[Libreoffice-commits] core.git: cui/uiconfig sd/AllLangResTarget_sd.mk sd/source sd/uiconfig sd/UIConfig_sdraw.mk

2013-09-30 Thread Olivier Hallot

 cui/uiconfig/ui/areadialog.ui  |7 
 cui/uiconfig/ui/textdialog.ui  |5 
 sd/AllLangResTarget_sd.mk  |1 
 sd/UIConfig_sdraw.mk   |1 
 sd/source/ui/dlg/prltempl.cxx  |  149 +++
 sd/source/ui/dlg/prltempl.src  |  152 ---
 sd/source/ui/inc/prltempl.hxx  |   16 +
 sd/uiconfig/sdraw/ui/drawprtldialog.ui |  315 +
 8 files changed, 410 insertions(+), 236 deletions(-)

New commits:
commit 6e8db06aa7f35bc6908545986554cedeeb8f7371
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Sat Sep 28 23:21:31 2013 +0200

Convert Draw object  background dialog to new UI

Conflicts:
sd/UIConfig_sdraw.mk

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

diff --git a/cui/uiconfig/ui/areadialog.ui b/cui/uiconfig/ui/areadialog.ui
index 2e6f26a..707fb9c 100644
--- a/cui/uiconfig/ui/areadialog.ui
+++ b/cui/uiconfig/ui/areadialog.ui
@@ -3,13 +3,14 @@
   !-- interface-requires gtk+ 3.0 --
   object class=GtkDialog id=AreaDialog
 property name=can_focusFalse/property
-property name=border_width5/property
+property name=border_width6/property
+property name=title translatable=yesArea/property
 property name=type_hintdialog/property
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
 property name=can_focusFalse/property
 property name=orientationvertical/property
-property name=spacing2/property
+property name=spacing12/property
 child internal-child=action_area
   object class=GtkButtonBox id=dialog-action_area1
 property name=can_focusFalse/property
@@ -84,6 +85,8 @@
   object class=GtkNotebook id=tabcontrol
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
 child
   placeholder/
 /child
diff --git a/cui/uiconfig/ui/textdialog.ui b/cui/uiconfig/ui/textdialog.ui
index 8434d9f..dae1143 100644
--- a/cui/uiconfig/ui/textdialog.ui
+++ b/cui/uiconfig/ui/textdialog.ui
@@ -3,13 +3,14 @@
   !-- interface-requires gtk+ 3.0 --
   object class=GtkDialog id=TextDialog
 property name=can_focusFalse/property
-property name=border_width5/property
+property name=border_width6/property
+property name=title translatable=yesText/property
 property name=type_hintdialog/property
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
 property name=can_focusFalse/property
 property name=orientationvertical/property
-property name=spacing2/property
+property name=spacing12/property
 child internal-child=action_area
   object class=GtkButtonBox id=dialog-action_area1
 property name=can_focusFalse/property
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index f177ed1..c3ce48d 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/morphdlg.src \
 sd/source/ui/dlg/navigatr.src \
 sd/source/ui/dlg/PaneDockingWindow.src \
-sd/source/ui/dlg/prltempl.src \
 sd/source/ui/dlg/RemoteDialog.src \
 sd/source/ui/dlg/sdpreslt.src \
 sd/source/ui/dlg/tpaction.src \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 8446921..6ff0334 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/drawchardialog \
sd/uiconfig/sdraw/ui/drawparadialog \
sd/uiconfig/sdraw/ui/drawpagedialog \
+   sd/uiconfig/sdraw/ui/drawprtldialog \
sd/uiconfig/sdraw/ui/insertlayer \
sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/printeroptions \
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 3476358..4200f13 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -20,6 +20,7 @@
 #include editeng/outliner.hxx
 
 #include svx/dialogs.hrc
+#include svx/svxdlg.hxx
 #include editeng/flstitem.hxx
 #include svx/drawitem.hxx
 #include svl/style.hxx
@@ -53,7 +54,9 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( 
SfxObjectShell* pDocSh,
 SfxStyleSheetBase rStyleBase,
 PresentationObjects _ePO,
 SfxStyleSheetBasePool* pSSPool ) :
-SfxTabDialog( pParent, DlgId ),
+SfxTabDialog( pParent
+, DrawPRTLDialog
+, modules/sdraw/ui/drawprtldialog.ui),

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/inc

 sc/inc/global.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c7e80fb41e476d2858f7003f294d8688f242a31
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Sep 27 15:59:32 2013 +0200

fdo#69450 - IDF_ATTRIB  IDF_CONTENTS must be disjoint.

Change-Id: Ib971824a7f274334012b872acec65310535ad767
Signed-off-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index e306669..030f7b8 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -191,7 +191,7 @@ const sal_uInt16 IDF_OUTLINE= 0x0800;   /// Sheet / 
outlining (grouping) inf
 const sal_uInt16 IDF_NOCAPTIONS = 0x0200;   /// Internal use only (undo etc.): 
do not copy/delete caption objects of cell notes.
 const sal_uInt16 IDF_ADDNOTES   = 0x0400;   /// Internal use only (copy from 
clip): do not delete existing cell contents when pasting notes.
 const sal_uInt16 IDF_SPECIAL_BOOLEAN = 0x1000;
-const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES | IDF_OUTLINE;
+const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES;
 const sal_uInt16 IDF_CONTENTS   = IDF_VALUE | IDF_DATETIME | IDF_STRING | 
IDF_NOTE | IDF_FORMULA | IDF_OUTLINE;
 const sal_uInt16 IDF_ALL= IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/Bootstrap

 android/Bootstrap/Makefile.shared |   22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit a5730bde116ca6c96f3b2f4dbc16b1a385fbc416
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 30 14:24:23 2013 +0300

3rd party libs need to be listed more individually now, sigh

Change-Id: I604f681a43a209cb6951209e01be1bcc26cdc3c9

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index e7c7d1f..a78a663 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -73,9 +73,29 @@ clean: android_version_setup properties
 #
 # Build / link the single .so for this app
 #
+
+# Sigh, it's sad that now with solver dying we have to list the
+# locations of each needed bundled 3rd-party lib like this. Maybe we
+# really should try to make these experimental Android apps (and the
+# iOS one) buildable with gbuild.
+
 LIBS = \
   -Wl,--start-group \
   $(wildcard $(OUTDIR)/lib/lib*.a) \
+  $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
+  $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \
+  $(HARFBUZZ_LIBS) \
+  $(HUNSPELL_LIBS) \
+  $(HYPHEN_LIB) \
+  $(MYTHES_LIBS) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/libodfgen/src/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/liborcus/src/*/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \
   -Wl,--end-group
 
 WHOLELIBS = \
@@ -88,7 +108,7 @@ WHOLELIBS = \
 
 $(OBJLOCAL)/liblo-native-code.so : $(wildcard $(OUTDIR)/lib/lib*.a) 
native-code.cxx
mkdir -p $(OBJLOCAL)
-   $(CXX) -Wl,--gc-sections 
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o 
$(OBJLOCAL)/liblo-native-code.so -I$(SRCDIR)/include -I$(OUTDIR)/inc 
native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid 
-ljnigraphics -llog -lz
+   $(CXX) -Wl,--gc-sections 
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o 
$(OBJLOCAL)/liblo-native-code.so -I$(SRCDIR)/include -I$(OUTDIR)/inc 
native-code.cxx -L$(OUTDIR)/lib -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) 
$(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz
 
 $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/galaxy sd/source sd/uiconfig

2013-09-30 Thread Samuel Mehrbrodt

 icon-themes/galaxy/cmd/lc_list-add.png   |binary
 icon-themes/galaxy/cmd/lc_playback-start.png |binary
 sd/source/ui/animations/CustomAnimationPane.cxx  |   14 
 sd/source/ui/animations/CustomAnimationPane.hxx  |2 
 sd/uiconfig/simpress/ui/customanimationspanel.ui |  541 +--
 5 files changed, 231 insertions(+), 326 deletions(-)

New commits:
commit eafd376f9f0a23cc1449c5ed7ef77201519a5c8b
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Fri Sep 27 13:22:55 2013 +0200

fdo#62082 Better Layout for Custom Animation Sidebar

* Use a toolbar with Icons instead of buttons with text
* Remove the Start Presentation button - it's already in the global 
toolbar
* Move the List of Animations to the top, the toolbar below it

This has already been discussed in the Design team (see bug report)

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

diff --git a/icon-themes/galaxy/cmd/lc_list-add.png 
b/icon-themes/galaxy/cmd/lc_list-add.png
new file mode 100644
index 000..117ec83
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_list-add.png differ
diff --git a/icon-themes/galaxy/cmd/lc_playback-start.png 
b/icon-themes/galaxy/cmd/lc_playback-start.png
new file mode 100644
index 000..734b889
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_playback-start.png differ
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index e1e24ce..8ab7726 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -187,9 +187,7 @@ CustomAnimationPane::CustomAnimationPane( ::Window* 
pParent, ViewShellBase rBas
 
 get(mpPBMoveUp, move_up);
 get(mpPBMoveDown, move_down);
-get(mpFTChangeOrder, change_order);
 get(mpPBPlay, play);
-get(mpPBSlideShow, slideshow);
 get(mpCBAutoPreview,auto_preview);
 
 maStrProperty = mpFTProperty-GetText();
@@ -207,7 +205,6 @@ CustomAnimationPane::CustomAnimationPane( ::Window* 
pParent, ViewShellBase rBas
 mpPBMoveUp-SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) 
);
 mpPBMoveDown-SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl 
) );
 mpPBPlay-SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
-mpPBSlideShow-SetClickHdl( LINK( this, CustomAnimationPane, 
implControlHdl ) );
 mpCBAutoPreview-SetClickHdl( LINK( this, CustomAnimationPane, 
implControlHdl ) );
 
 maStrModify = mpFTEffect-GetText();
@@ -466,11 +463,9 @@ void CustomAnimationPane::updateControls()
 mpFTSpeed-Enable( mxView.is() );
 mpCBSpeed-Enable( mxView.is() );
 mpCustomAnimationList-Enable( mxView.is() );
-mpFTChangeOrder-Enable( mxView.is() );
 mpPBMoveUp-Enable( mxView.is() );
 mpPBMoveDown-Enable( mxView.is() );
 mpPBPlay-Enable( mxView.is() );
-mpPBSlideShow-Enable( mxView.is() );
 mpCBAutoPreview-Enable( mxView.is() );
 
 if( !mxView.is() )
@@ -600,8 +595,6 @@ void CustomAnimationPane::updateControls()
 }
 
 mpPBPropertyMore-Enable( sal_True );
-
-mpFTChangeOrder-Enable( sal_True );
 }
 else
 {
@@ -611,7 +604,6 @@ void CustomAnimationPane::updateControls()
 mpPBPropertyMore-Enable( sal_False );
 mpFTSpeed-Enable(sal_False);
 mpCBSpeed-Enable(sal_False);
-mpFTChangeOrder-Enable( sal_False );
 mpLBStart-SetNoSelection();
 mpCBSpeed-SetNoSelection();
 mpFTEffect-SetText( maStrModify );
@@ -838,8 +830,6 @@ void CustomAnimationPane::UpdateLook (void)
 mpFTProperty-SetBackground(aBackground);
 if (mpFTSpeed != NULL)
 mpFTSpeed-SetBackground(aBackground);
-if (mpFTChangeOrder != NULL)
-mpFTChangeOrder-SetBackground(aBackground);
 }
 
 
@@ -2047,10 +2037,6 @@ IMPL_LINK( CustomAnimationPane, implControlHdl, 
Control*, pControl )
 moveSelection( false );
 else if( pControl == mpPBPlay )
 onPreview( true );
-else if( pControl == mpPBSlideShow )
-{
-mrBase.StartPresentation();
-}
 else if( pControl == mpCBAutoPreview )
 {
 SdOptions* pOptions = SD_MOD()-GetSdOptions(DOCUMENT_TYPE_IMPRESS);
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx 
b/sd/source/ui/animations/CustomAnimationPane.hxx
index 489f13c..2a12ed6 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -140,11 +140,9 @@ private:
 FixedText*  mpFTSpeed;
 ListBox*   mpCBSpeed;
 CustomAnimationList*mpCustomAnimationList;
-FixedText*  mpFTChangeOrder;
 PushButton* mpPBMoveUp;
 PushButton* mpPBMoveDown;
 PushButton* mpPBPlay;
-PushButton* mpPBSlideShow;
 CheckBox*   mpCBAutoPreview;
 
 OUString

RE: unexpected behaviour whilst fixing fdo#50118

2013-09-30 Thread Winfried Donkers

Hi Eike,
   But when calling 
   Application::GetSettings().GetUILanguageTag().getLocale() again later, 
   when the gobal setting 'Use English function names' has been changed, the 
   call returns an empty locale (i.e. locale.Country is empty)!
  Let me guess, your system locale and UI localization is Dutch, and at 
  that place of the application locale only Country and Variant are 
  empty but Language==nl? I think I know why, need some more digging.

You guessed right ;)

 Commit ecefa40c081a0b6677e946603d553d9382f9b9ca should fix that and the 
 locale should be 'nl-NL'. There may be other places though that previously 
 relied on the implicit fallback whenever
 MsLangId::convert...() were called.

Yes, that makes the locale look OK.
Unfortunately, calling setLocale() still produces a crash when locale is set to 
nl-NL (which it doesn't when locale is en-US); soffice.bin has an invalid 
pointer in munmap_chunk().

It makes me wonder if this [mess] may have been the reason why long ago the 
add-in functions were excluded when changing the formula language...
And, consequently, if I shouldn't leave it with 
https://gerrit.libreoffice.org/#/c/6032/ ?

Winfried


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

[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/inc sc/source

2013-09-30 Thread Laurent Godard

 sc/inc/postit.hxx  |8 
 sc/source/core/data/postit.cxx |   38 ++
 2 files changed, 46 insertions(+)

New commits:
commit 98d104a399adf9825d0519d350e25957a640d60e
Author: Laurent Godard lgodard.li...@laposte.net
Date:   Mon Sep 30 14:21:04 2013 +0200

unify DuplicateNotes for clipboard handlers in ScNoteUtil

- work in progress

Change-Id: Ibe4b2e0f7184206137b756663b8017ff364f55b4

diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index c632817..0fc1c2e 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -241,6 +241,14 @@ public:
 ScDocument rDoc, const ScAddress rPos,
 const OUString rNoteText, bool bShown,
 bool bAlwaysCreateCaption );
+
+/** Duplicate notes using mdds - copy/paste manipulations
+voidDuplicateNotes(
+const ScColumn mrSrcCol, ScColumn mrDestCol,
+SCROW nStartRow, size_t nDataSize,
+ColumnBlockPosition maDestPos );
+
+*/
 };
 
 #endif
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 4d3f175..0278921 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -937,5 +937,43 @@ ScPostIt* ScNoteUtil::CreateNoteFromString(
 }
 return pNote;
 }
+/*
+void ScNoteUtil::DuplicateNotes(const ScColumn mrSrcCol, ScColumn mrDestCol, 
SCROW nStartRow, size_t nDataSize, sc::ColumnBlockPosition maDestPos )
+{
+SCCOL nDestCol = mrDestCol.GetCol();
+SCTAB nDestTab = mrDestCol.GetTab();
+SCCOL nSrcCol = mrSrcCol.GetCol();
+SCTAB nSrcTab = mrSrcCol.GetTab();
+
+SCROW nRowMax = nStartRow + nDataSize;
+
+std::vectorScPostIt* vDestNotes(nDataSize);
 
+sc::CellNoteStoreType maSrcCellNotes = mrSrcCol.GetCellNoteStore();
+sc::CellNoteStoreType::iterator posSrc = maSrcCellNotes.begin();
+
+for (SCROW nRow = nStartRow; nRow  nRowMax; ++nRow)
+{
+sc::CellNoteStoreType::position_type curPosObj = 
maSrcCellNotes.position(posSrc, nRow);
+posSrc = curPosObj.first;
+size_t offset = curPosObj.second;
+if (posSrc-type == sc::element_type_cellnote)
+{
+ScAddress aDestAddress = ScAddress(nDestCol, nRow, nDestTab);
+ScAddress aSrcAddress = ScAddress(nSrcCol, nRow, nSrcTab );
+
+ScPostIt* pSrcNote = sc::cellnote_block::at(*posSrc-data, 
offset);
+ScPostIt* pClonedNote = pSrcNote-Clone(aSrcAddress, 
mrDestCol.GetDoc(), aDestAddress, true );
+
+vDestNotes[nRow-nStartRow] = pClonedNote;
+}
+}
+// set the cloned notes vector in its dest position
+sc::CellNoteStoreType maDestCellNotes = mrDestCol.GetCellNoteStore();
+maDestCellNotes.set_empty(nStartRow, nRowMax-1);
+maDestPos.miCellNotePos = maDestCellNotes.set(
+maDestPos.miCellNotePos, nStartRow, vDestNotes.begin(), 
vDestNotes.end());
+
+}
+*/
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/source

2013-09-30 Thread Laurent Godard

 sc/source/core/data/column.cxx |  136 +++--
 1 file changed, 104 insertions(+), 32 deletions(-)

New commits:
commit dd55f14816f7488d9ba51f85de2f0fe70d485737
Author: Laurent Godard lgodard.li...@laposte.net
Date:   Mon Sep 30 14:19:03 2013 +0200

refactor clipboard handlers loops for notes

Change-Id: Id0198b4e957474afe78060bbaf79c8644d099572

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 4bc37b4..d8ce48a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1264,10 +1264,6 @@ class CopyToClipHandler
 sc::ColumnBlockPosition maDestPos;
 sc::ColumnBlockPosition* mpDestPos;
 bool mbCopyNotes;
-SCCOL nDestCol;
-SCTAB nDestTab;
-SCCOL nSrcCol;
-SCTAB nSrcTab;
 
 void setDefaultAttrsToDest(size_t nRow, size_t nSize)
 {
@@ -1308,6 +1304,50 @@ class CopyToClipHandler
 
 void duplicateNotes(SCROW nStartRow, size_t nDataSize )
 {
+SCCOL nDestCol = mrDestCol.GetCol();
+SCTAB nDestTab = mrDestCol.GetTab();
+SCCOL nSrcCol = mrSrcCol.GetCol();
+SCTAB nSrcTab = mrSrcCol.GetTab();
+
+SCROW nRowMax = nStartRow + nDataSize;
+
+std::vectorScPostIt* vDestNotes;
+vDestNotes.reserve(nDataSize);
+
+sc::CellNoteStoreType maSrcCellNotes = mrSrcCol.GetCellNoteStore();
+sc::CellNoteStoreType::iterator posSrc = maSrcCellNotes.begin();
+
+for (SCROW nRow = nStartRow; nRow  nRowMax; ++nRow)
+{
+sc::CellNoteStoreType::position_type curPosObj = 
maSrcCellNotes.position(posSrc, nRow);
+posSrc = curPosObj.first;
+size_t offset = curPosObj.second;
+if (posSrc-type == sc::element_type_cellnote)
+{
+ScAddress aDestAddress = ScAddress(nDestCol, nRow, nDestTab);
+ScAddress aSrcAddress = ScAddress(nSrcCol, nRow, nSrcTab );
+
+ScPostIt* pSrcNote = sc::cellnote_block::at(*posSrc-data, 
offset);
+ScPostIt* pClonedNote = pSrcNote-Clone(aSrcAddress, 
mrDestCol.GetDoc(), aDestAddress, true );
+
+vDestNotes.push_back(pClonedNote);
+}
+}
+// set the cloned notes vector in its dest position
+sc::CellNoteStoreType maDestCellNotes = mrDestCol.GetCellNoteStore();
+maDestCellNotes.set_empty(nStartRow, nRowMax - 1);
+maDestPos.miCellNotePos = mrDestCol.GetCellNoteStore().set(
+maDestPos.miCellNotePos, nStartRow, vDestNotes.begin(), 
vDestNotes.end());
+}
+
+/* ok
+void duplicateNotes(SCROW nStartRow, size_t nDataSize )
+{
+SCCOL nDestCol = mrDestCol.GetCol();
+SCTAB nDestTab = mrDestCol.GetTab();
+SCCOL nSrcCol = mrSrcCol.GetCol();
+SCTAB nSrcTab = mrSrcCol.GetTab();
+
 SCROW nRowMax = nStartRow + nDataSize;
 
 std::vectorScPostIt* vDestNotes(nDataSize);
@@ -1333,10 +1373,11 @@ class CopyToClipHandler
 }
 // set the cloned notes vector in its dest position
 sc::CellNoteStoreType maDestCellNotes = mrDestCol.GetCellNoteStore();
-maDestCellNotes.set_empty(nStartRow, nRowMax);
+maDestCellNotes.set_empty(nStartRow, nRowMax - 1);
 maDestPos.miCellNotePos = mrDestCol.GetCellNoteStore().set(
 maDestPos.miCellNotePos, nStartRow, vDestNotes.begin(), 
vDestNotes.end());
 }
+*/
 
 public:
 CopyToClipHandler(const ScColumn rSrcCol, ScColumn rDestCol, 
sc::ColumnBlockPosition* pDestPos, bool bCopyNotes) :
@@ -1346,11 +1387,6 @@ public:
 maDestPos = *mpDestPos;
 else
 mrDestCol.InitBlockPosition(maDestPos);
-
-nDestCol = mrDestCol.GetCol();
-nDestTab = mrDestCol.GetTab();
-nSrcCol = mrSrcCol.GetCol();
-nSrcTab = mrSrcCol.GetTab();
 }
 
 ~CopyToClipHandler()
@@ -1689,25 +1725,42 @@ class CopyAsLinkHandler
 setDefaultAttrsToDest(nTopRow, nDataSize);
 }
 
-void duplicateNotes(SCROW nStartRow, size_t nDataSize ) // TODO : notes 
suboptimal
+void duplicateNotes(SCROW nStartRow, size_t nDataSize )
 {
-// the link status is only for cell content as it is not possible to 
un-link a note -- the note is copied
-sc::CellNoteStoreType maSrcCellNotes = mrSrcCol.GetCellNoteStore();
+SCCOL nDestCol = mrDestCol.GetCol();
+SCTAB nDestTab = mrDestCol.GetTab();
+SCCOL nSrcCol = mrSrcCol.GetCol();
+SCTAB nSrcTab = mrSrcCol.GetTab();
+
 SCROW nRowMax = nStartRow + nDataSize;
 
+std::vectorScPostIt* vDestNotes;
+vDestNotes.reserve(nDataSize);
+
+sc::CellNoteStoreType maSrcCellNotes = mrSrcCol.GetCellNoteStore();
+sc::CellNoteStoreType::iterator posSrc = maSrcCellNotes.begin();
+
 for (SCROW nRow = nStartRow; nRow  nRowMax; ++nRow)
 {
-ScPostIt* pSrcNote = maSrcCellNotes.getScPostIt*(nRow);
-if (pSrcNote)
+

[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/source

2013-09-30 Thread Laurent Godard

 sc/source/core/data/column.cxx |   39 ---
 1 file changed, 39 deletions(-)

New commits:
commit 93649a2319a1923d4952ae778dccf0ac9501bf9d
Author: Laurent Godard lgodard.li...@laposte.net
Date:   Mon Sep 30 14:24:23 2013 +0200

clean CopyToClipHandler

Change-Id: I14edf3f2be47bf84fa71d57cd641b6b927aebb50

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index d8ce48a..ab26769 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1340,45 +1340,6 @@ class CopyToClipHandler
 maDestPos.miCellNotePos, nStartRow, vDestNotes.begin(), 
vDestNotes.end());
 }
 
-/* ok
-void duplicateNotes(SCROW nStartRow, size_t nDataSize )
-{
-SCCOL nDestCol = mrDestCol.GetCol();
-SCTAB nDestTab = mrDestCol.GetTab();
-SCCOL nSrcCol = mrSrcCol.GetCol();
-SCTAB nSrcTab = mrSrcCol.GetTab();
-
-SCROW nRowMax = nStartRow + nDataSize;
-
-std::vectorScPostIt* vDestNotes(nDataSize);
-
-sc::CellNoteStoreType maSrcCellNotes = mrSrcCol.GetCellNoteStore();
-sc::CellNoteStoreType::iterator posSrc = maSrcCellNotes.begin();
-
-for (SCROW nRow = nStartRow; nRow  nRowMax; ++nRow)
-{
-sc::CellNoteStoreType::position_type curPosObj = 
maSrcCellNotes.position(posSrc, nRow);
-posSrc = curPosObj.first;
-size_t offset = curPosObj.second;
-if (posSrc-type == sc::element_type_cellnote)
-{
-ScAddress aDestAddress = ScAddress(nDestCol, nRow, nDestTab);
-ScAddress aSrcAddress = ScAddress(nSrcCol, nRow, nSrcTab );
-
-ScPostIt* pSrcNote = sc::cellnote_block::at(*posSrc-data, 
offset);
-ScPostIt* pClonedNote = pSrcNote-Clone(aSrcAddress, 
mrDestCol.GetDoc(), aDestAddress, true );
-
-vDestNotes[nRow-nStartRow] = pClonedNote;
-}
-}
-// set the cloned notes vector in its dest position
-sc::CellNoteStoreType maDestCellNotes = mrDestCol.GetCellNoteStore();
-maDestCellNotes.set_empty(nStartRow, nRowMax - 1);
-maDestPos.miCellNotePos = mrDestCol.GetCellNoteStore().set(
-maDestPos.miCellNotePos, nStartRow, vDestNotes.begin(), 
vDestNotes.end());
-}
-*/
-
 public:
 CopyToClipHandler(const ScColumn rSrcCol, ScColumn rDestCol, 
sc::ColumnBlockPosition* pDestPos, bool bCopyNotes) :
 mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos), 
mbCopyNotes(bCopyNotes)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 solenv/bin/concat-deps.c |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit c3f5bb3e5b2ef9ed95fe32045f47fb05276d7727
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 30 14:42:12 2013 +0200

-Werror,-Wunused-function

Change-Id: I55e586fe1d145be139bf1c5b00f434ea31ba50d7

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 87b6f32..fec98ee 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -258,16 +258,6 @@ void* data;
 }
 
 
-static inline void pool_free(struct pool* pool, void* data)
-{
-assert(pool  data);
-
-/* stack on top of the free list */
-*(void**)data = pool-head_free;
-pool-head_free = data;
-}
-
-
 /* ===
  * Hash implementation custumized to be just tracking
  * a unique list of string (i.e no data associated
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sysui/desktop/macosx/.gitignore |9 +
 1 file changed, 9 insertions(+)

New commits:
commit d3c91ba5c2faf8a59778c35da559e5817772b95f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 30 14:48:29 2013 +0200

gitignore configure-generated Info.plist

Change-Id: I390dfbdedd5c4b53519c51d9953a6be07f403bc0

diff --git a/sysui/desktop/macosx/.gitignore b/sysui/desktop/macosx/.gitignore
new file mode 100644
index 000..f690390
--- /dev/null
+++ b/sysui/desktop/macosx/.gitignore
@@ -0,0 +1,9 @@
+#
+# 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/.
+#
+
+/Info.plist
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: poppler/poppler-nochecknew.patch.1 poppler/UnpackedTarball_poppler.mk

 poppler/UnpackedTarball_poppler.mk |1 +
 poppler/poppler-nochecknew.patch.1 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 10cafea2bcb9d1607a381f9a697b944dd399b51b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 30 15:12:49 2013 +0200

Clang does not support -fno-check-new (and it is the default for GCC anyway)

Change-Id: I7063439eb042f2abfafc06d48c4bccffd6c7762e

diff --git a/poppler/UnpackedTarball_poppler.mk 
b/poppler/UnpackedTarball_poppler.mk
index 35ecaf1..f3bf0db 100644
--- a/poppler/UnpackedTarball_poppler.mk
+++ b/poppler/UnpackedTarball_poppler.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
poppler/poppler-notests.patch.1 \
poppler/poppler-snprintf.patch.1 \
poppler/poppler-mac-fake.patch.1 \
+   poppler/poppler-nochecknew.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/poppler/poppler-nochecknew.patch.1 
b/poppler/poppler-nochecknew.patch.1
new file mode 100644
index 000..1e4890f
--- /dev/null
+++ b/poppler/poppler-nochecknew.patch.1
@@ -0,0 +1,11 @@
+--- poppler-0.22.5/configure
 poppler-0.22.5/configure
+@@ -24014,7 +24014,7 @@
+ fi
+ case $enable_compile_warnings in
+   no) ;;
+-  yes)CXXFLAGS=-Wall -Woverloaded-virtual -Wnon-virtual-dtor 
-Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS;
++  yes)CXXFLAGS=-Wall -Woverloaded-virtual -Wnon-virtual-dtor 
-Wcast-align -fno-exceptions -fno-common $CXXFLAGS;
+ CFLAGS=-Wall $CFLAGS ;;
+   kde)CXXFLAGS=-Wnon-virtual-dtor -Wno-long-long -Wundef \
+   -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-30 Thread Jacobo Aragunde Pérez

 sw/source/ui/app/docst.cxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 723afc607ec3e947afa0f2122751ea537bca62bd
Author: Jacobo Aragunde PÃ©rez jaragu...@igalia.com
Date:   Wed Sep 25 20:44:11 2013 +0200

fdo#43157 - Clean up OSL_ENSURE

Replaced with C's assert() or SAL_WARN_IF depending on the meaning and 
context
of the check.

Change-Id: I70d2fe8128e39b38cce03caacf95fd3757e6974e
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 29c4055..51d4969 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -367,7 +367,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest rReq )
 }
 else
 {
-OSL_ENSURE( pArgs-Count(), SfxBug ItemSet is empty);
+SAL_WARN_IF( !pArgs-Count(), sw.ui, SfxBug ItemSet is 
empty );
 
 SwWrtShell* pShell = GetWrtShell();
 if( SFX_ITEM_SET == pArgs-GetItemState(nSlot, sal_False, 
pItem ))
@@ -604,7 +604,7 @@ sal_uInt16 SwDocShell::Edit(
 SwWrtShell* pActShell,
 const sal_Bool bBasic )
 {
-OSL_ENSURE(GetWrtShell(), No Shell, no Styles);
+assert( GetWrtShell() );
 SfxStyleSheetBase *pStyle = 0;
 
 sal_uInt16 nRet = nMask;
@@ -705,7 +705,7 @@ sal_uInt16 SwDocShell::Edit(
 else
 {
 pStyle = mxBasePool-Find( rName, (SfxStyleFamily)nFamily );
-OSL_ENSURE(pStyle, Vorlage nicht gefunden);
+SAL_WARN_IF( !pStyle, sw.ui, Style not found );
 }
 
 if(!pStyle)
@@ -743,11 +743,11 @@ sal_uInt16 SwDocShell::Edit(
 FieldUnit eMetric = ::GetDfltMetric(0 != (HTMLMODE_ONnHtmlMode));
 SW_MOD()-PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast 
sal_uInt16 (eMetric)));
 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
-OSL_ENSURE(pFact, Dialogdiet fail!);
+assert( pFact );
 SfxAbstractApplyTabDialog* pDlg = pFact-CreateTemplateDialog(
 0, *(xTmp.get()), nFamily, 
sPage,
 pActShell ? pActShell : 
pWrtShell, bNew);
-OSL_ENSURE(pDlg, Dialogdiet fail!);
+assert( pDlg );
 ApplyStyle aApplyStyleHelper(*this, bNew, pStyle, nRet, xTmp, nFamily, 
pDlg, mxBasePool, bModified);
 pDlg-SetApplyHdl(LINK(aApplyStyleHelper, ApplyStyle, ApplyHdl));
 
@@ -818,7 +818,7 @@ sal_uInt16 SwDocShell::Delete(const String rName, 
sal_uInt16 nFamily)
 
 if(pStyle)
 {
-OSL_ENSURE(GetWrtShell(), No Shell, no Styles);
+assert( GetWrtShell() );
 
 GetWrtShell()-StartAllAction();
 mxBasePool-Remove(pStyle);
@@ -835,7 +835,7 @@ sal_uInt16 SwDocShell::Hide(const String rName, sal_uInt16 
nFamily, bool bHidde
 
 if(pStyle)
 {
-OSL_ENSURE(GetWrtShell(), No Shell, no Styles);
+assert( GetWrtShell() );
 
 GetWrtShell()-StartAllAction();
 rtl::Reference SwDocStyleSheet  xTmp( new SwDocStyleSheet( 
*(SwDocStyleSheet*)pStyle ) );
@@ -854,14 +854,14 @@ sal_uInt16 SwDocShell::ApplyStyles(const String rName, 
sal_uInt16 nFamily,
 SwDocStyleSheet* pStyle =
 (SwDocStyleSheet*)mxBasePool-Find(rName, (SfxStyleFamily)nFamily);
 
-OSL_ENSURE(pStyle, Where's the StyleSheet);
+SAL_WARN_IF( !pStyle, sw.ui, Style not found );
 
 if(!pStyle)
 return sal_False;
 
 SwWrtShell *pSh = pShell ? pShell : GetWrtShell();
 
-OSL_ENSURE( pSh, No Shell, no Styles);
+assert( pSh );
 
 pSh-StartAllAction();
 
@@ -913,7 +913,7 @@ sal_uInt16 SwDocShell::ApplyStyles(const String rName, 
sal_uInt16 nFamily,
 // start watering-can
 sal_uInt16 SwDocShell::DoWaterCan(const String rName, sal_uInt16 nFamily)
 {
-OSL_ENSURE(GetWrtShell(), No Shell, no Styles);
+assert( GetWrtShell() );
 
 SwEditWin rEdtWin = pView-GetEditWin();
 SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
@@ -930,7 +930,7 @@ sal_uInt16 SwDocShell::DoWaterCan(const String rName, 
sal_uInt16 nFamily)
 SwDocStyleSheet* pStyle =
 (SwDocStyleSheet*)mxBasePool-Find(rName, (SfxStyleFamily)nFamily);
 
-OSL_ENSURE (pStyle, Where's the StyleSheet);
+SAL_WARN_IF( !pStyle, sw.ui, Where's the StyleSheet );
 
 if(!pStyle) return nFamily;
 
@@ -968,7 +968,7 @@ sal_uInt16 SwDocShell::DoWaterCan(const String rName, 
sal_uInt16 nFamily)
 sal_uInt16 SwDocShell::UpdateStyle(const String rName, sal_uInt16 nFamily, 
SwWrtShell* pShell)
 {
 SwWrtShell* pCurrWrtShell = pShell ? pShell : GetWrtShell();
-OSL_ENSURE(GetWrtShell(), No Shell, no Styles);
+assert( pCurrWrtShell );
 
 SwDocStyleSheet* pStyle =
 (SwDocStyleSheet*)mxBasePool-Find(rName, (SfxStyleFamily)nFamily);
___
Libreoffice-commits mailing list

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

2013-09-30 Thread Miklos Vajna

 sw/qa/extras/rtfexport/data/fdo66743.rtf   |5 +
 sw/qa/extras/rtfexport/rtfexport.cxx   |   10 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit bbf96f4feb309f94741e76bd92ec06f25d3e9734
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Sep 23 10:05:53 2013 +0200

fdo#66743 fix import of some RTF_CLSHDNG values

This should be in sync with model.xml, got broken when the somewhat
random values got fixed to be the same as the ones which are in the ww8
spec.

(Regression from 26d40686128e70916a636e20f5ccc5763bbb6cc8.)

(cherry picked from commit 21e07d473d1ce995ca0f1d0ac0edb03e75a7dfc1)

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

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

diff --git a/sw/qa/extras/rtfexport/data/fdo66743.rtf 
b/sw/qa/extras/rtfexport/data/fdo66743.rtf
new file mode 100644
index 000..81ffc77
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo66743.rtf
@@ -0,0 +1,5 @@
+{\rtf1
+\trowd \clshdng1500\cellx4000
+\pard\plain A1\cell\row
+\pard\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index fafa4f1..442665f 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -65,6 +65,7 @@ public:
 void testTextFrameBorders();
 void testTextframeGradient();
 void testFdo66682();
+void testFdo66743();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -119,6 +120,7 @@ void Test::run()
 {textframe-borders.rtf, Test::testTextFrameBorders},
 {textframe-gradient.rtf, Test::testTextframeGradient},
 {fdo66682.rtf, Test::testFdo66682},
+{fdo66743.rtf, Test::testFdo66743},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -605,6 +607,14 @@ void Test::testFdo66682()
 CPPUNIT_ASSERT_EQUAL(OUString( ), aSuffix);
 }
 
+void Test::testFdo66743()
+{
+uno::Referencetext::XTextTable xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
+uno::Referencetable::XCell xCell = xTable-getCellByName(A1);
+// This was too dark, 0x7f7f7f.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xd8d8d8), getPropertysal_Int32(xCell, 
BackColor));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8ca130b..59e138b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3512,8 +3512,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 {
 case 500: nValue = 2; break;
 case 1000: nValue = 3; break;
-case 1200: nValue = 27; break;
-case 1500: nValue = 28; break;
+case 1200: nValue = 37; break;
+case 1500: nValue = 38; break;
 case 2000: nValue = 4; break;
 case 2500: nValue = 5; break;
 case 3000: nValue = 6; break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/Library_scopencl.mk  |3 +--
 sc/source/core/opencl/openclwrapper.cxx |8 +++-
 sc/source/core/opencl/openclwrapper.hxx |8 
 3 files changed, 4 insertions(+), 15 deletions(-)

New commits:
commit ab683542cd78e225a2e11e405e1cd8cfce99461a
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 30 14:27:38 2013 +0300

Revert Fix OpenCL use on Mac

Nah, do use clew after all. Makes it easier to build against an old
SDK. Do always link against the OpenCL framework, though, and use NULL
instead of some dylib name as the parameter to clewInit() (and thus
dlopen()).

This reverts commit d0fdae78797979949ec7ead20ad52b901c8c7e9a.

Change-Id: I2ec07ddf60941851ea70523113296627fbd80a0c

diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk
index c2ca1f3..cb702e8 100644
--- a/sc/Library_scopencl.mk
+++ b/sc/Library_scopencl.mk
@@ -36,8 +36,7 @@ $(eval $(call gb_Library_use_libraries,scopencl,\
 $(eval $(call gb_Library_add_exception_objects,scopencl,\
 sc/source/core/opencl/formulagroupcl \
 sc/source/core/opencl/openclwrapper \
-$(if $(filter-out MACOSX,$(OS)), \
-sc/source/core/opencl/clcc/clew) \
+sc/source/core/opencl/clcc/clew \
 ))
 
 ifeq ($(OS),LINUX)
diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index 50bb0d1..6fa86cc 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -41,7 +41,9 @@
 fprintf(stderr,[OCL_ERROR] %s\n,str);
 
 #define OPENCL_DLL_NAME OpenCL.dll
-#elif !defined(MACOSX)
+#elif defined(MACOSX)
+#define OPENCL_DLL_NAME NULL
+#else
 #define OPENCL_DLL_NAME libOpenCL.so
 #endif
 
@@ -2609,11 +2611,9 @@ bool createPlatformInfo(cl_platform_id nPlatformId, 
OpenclPlatformInfo rPlatfor
 
 size_t getOpenCLPlatformCount()
 {
-#ifndef MACOSX
 int status = clewInit(OPENCL_DLL_NAME);
 if (status  0)
 return 0;
-#endif
 
 cl_uint nPlatforms;
 cl_int nState = clGetPlatformIDs(0, NULL, nPlatforms);
@@ -2630,11 +2630,9 @@ const std::vectorOpenclPlatformInfo fillOpenCLInfo()
 if(!aPlatforms.empty())
 return aPlatforms;
 
-#ifndef MACOSX
 int status = clewInit(OPENCL_DLL_NAME);
 if (status  0)
 return aPlatforms;
-#endif
 
 cl_uint nPlatforms;
 cl_int nState = clGetPlatformIDs(0, NULL, nPlatforms);
diff --git a/sc/source/core/opencl/openclwrapper.hxx 
b/sc/source/core/opencl/openclwrapper.hxx
index 5fd3991..c81c313 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -21,16 +21,8 @@
 
 #include rtl/string.hxx
 
-#ifdef MACOSX
-
-#include OpenCL/cl.h
-
-#else
-
 #include clcc/clew.h
 
-#endif
-
 // CL_MAP_WRITE_INVALIDATE_REGION is new in OpenCL 1.2.
 
 // When compiling against an older OpenCL, use CL_MAP_WRITE.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-30 Thread Oliver-Rainer Wittmann

 sw/inc/ndtxt.hxx  |8 ++-
 sw/source/core/txtnode/txtedt.cxx |   82 ++
 sw/source/core/undo/untblk.cxx|6 --
 3 files changed, 56 insertions(+), 40 deletions(-)

New commits:
commit 685921ea31de48e26ad33e8aab9c3053cc622a34
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Mon Sep 30 13:42:34 2013 +

123389: - revert change made for 121897 which triggers defect 123389

- method SwTxtAttr::RstAttr(..) - correct consideration of parameter 
bInclRefToxMark used by Undo to fix 121897

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 46d4128..393cd9a 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -285,8 +285,12 @@ public:
 refmarks, toxmarks, and metas will be ignored unless this is true
 ATTENTION: setting bInclRefToxMark is only allowed from UNDO!
  */
-voidRstAttr( const SwIndex rIdx, xub_StrLen nLen, sal_uInt16 nWhich = 
0,
-const SfxItemSet* pSet = 0, sal_Bool bInclRefToxMark = 
sal_False );
+void RstAttr(
+const SwIndex rIdx,
+const xub_StrLen nLen,
+const sal_uInt16 nWhich = 0,
+const SfxItemSet* pSet = 0,
+const sal_Bool bInclRefToxMark = sal_False );
 voidGCAttr();
 
 // loesche das Text-Attribut (muss beim Pool abgemeldet werden!)
diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index 3f0cfca..77469bd 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -394,26 +394,25 @@ inline sal_Bool InRange(xub_StrLen nIdx, xub_StrLen 
nStart, xub_StrLen nEnd) {
  *- nothing to do
  */
 
-void SwTxtNode::RstAttr(const SwIndex rIdx, xub_StrLen nLen, sal_uInt16 
nWhich,
-const SfxItemSet* pSet, sal_Bool bInclRefToxMark )
+void SwTxtNode::RstAttr(
+const SwIndex rIdx,
+const xub_StrLen nLen,
+const sal_uInt16 nWhich,
+const SfxItemSet* pSet,
+const sal_Bool bInclRefToxMark )
 {
-// Attribute?
 if ( !GetpSwpHints() )
 return;
 
-sal_uInt16 i = 0;
-xub_StrLen nStt = rIdx.GetIndex();
-xub_StrLen nEnd = nStt + nLen;
-xub_StrLen nAttrStart;
-SwTxtAttr *pHt;
+const xub_StrLen nStt = rIdx.GetIndex();
+const xub_StrLen nEnd = nStt + nLen;
 
-sal_BoolbChanged = sal_False;
+bool bChanged = false;
 
 // nMin and nMax initialized to maximum / minimum (inverse)
 xub_StrLen nMin = m_Text.Len();
 xub_StrLen nMax = nStt;
-
-const sal_Bool bNoLen = !nMin;
+const bool bNoLen = nMin == 0;
 
 // We have to remember the new attributes, which have
 // been introduced by splitting surrounding attributes (case 4).
@@ -422,15 +421,27 @@ void SwTxtNode::RstAttr(const SwIndex rIdx, xub_StrLen 
nLen, sal_uInt16 nWhich,
 
 // iterate over attribute array until start of attribute is behind
 // deletion range
+sal_uInt16 i = 0;
+xub_StrLen nAttrStart;
+SwTxtAttr *pHt = NULL;
 while ((i  m_pSwpHints-Count()) 
 ((( nAttrStart = *(*m_pSwpHints)[i]-GetStart())  nEnd ) || nLen==0) )
 {
 pHt = m_pSwpHints-GetTextHint(i);
 
 // attributes without end stay in!
-xub_StrLen * const pAttrEnd = pHt-GetEnd();
-if ( !pAttrEnd /*|| pHt-HasDummyChar()*/ ) // see bInclRefToxMark
+// but consider bInclRefToxMark used by Undo
+xub_StrLen* const pAttrEnd = pHt-GetEnd();
+const bool bKeepAttrWithoutEnd =
+pAttrEnd == NULL
+ ( !bInclRefToxMark
+ || ( RES_TXTATR_REFMARK != pHt-Which()
+   RES_TXTATR_TOXMARK != pHt-Which()
+   RES_TXTATR_META != pHt-Which()
+   RES_TXTATR_METAFIELD != pHt-Which() ) );
+if ( bKeepAttrWithoutEnd )
 {
+
 i++;
 continue;
 }
@@ -480,21 +491,22 @@ void SwTxtNode::RstAttr(const SwIndex rIdx, xub_StrLen 
nLen, sal_uInt16 nWhich,
 
 if( nStt = nAttrStart )  // Faelle: 1,3,5
 {
+const xub_StrLen nAttrEnd = pAttrEnd != NULL
+? *pAttrEnd
+: nAttrStart;
 if( nEnd  nAttrStart
-|| ( nEnd == *pAttrEnd  nEnd==nAttrStart ) )
+|| ( nEnd == nAttrEnd  nEnd == nAttrStart ) )
 {
 // Faelle: 1,3
 if ( nMin  nAttrStart )
 nMin = nAttrStart;
-if ( nMax  *pAttrEnd )
-nMax = *pAttrEnd;
+if ( nMax  nAttrEnd )
+nMax = nAttrEnd;
 // Falls wir nur ein nichtaufgespanntes Attribut entfernen,
 // tun wir mal so, als ob sich nichts geaendert hat.
 bChanged = bChanged || nEnd  nAttrStart || bNoLen;
-if( *pAttrEnd = nEnd ) // Fall: 1
+if( nAttrEnd = nEnd ) //

[Libreoffice-commits] core.git: 2 commits - qadevOOo/tests

 qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java |   20 
++
 qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java|   10 ++---
 qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java |4 +-
 qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java  |4 +-
 qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java  |6 +--
 qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java |6 +--
 6 files changed, 28 insertions(+), 22 deletions(-)

New commits:
commit 32e0f451d69b68d69a4aa91c271b81ea6264d3c1
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Sep 30 15:28:17 2013 +0100

junit: add 'r' to creating, and better exception descriptions.

diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java 
b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
index 62d6acb..09cb12e 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
@@ -136,19 +136,19 @@ public class ScAccessibleCell extends TestCase {
 XPropertySet.class,oIndexAccess.getByIndex(1));
 column.setPropertyValue(OptimalWidth, new Boolean(true));
 } catch(com.sun.star.lang.WrappedTargetException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating relation :);
 e.printStackTrace(log);
 } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating relation :);
 e.printStackTrace(log);
 } catch(com.sun.star.beans.UnknownPropertyException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating relation :);
 e.printStackTrace(log);
 } catch(com.sun.star.beans.PropertyVetoException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating relation :);
 e.printStackTrace(log);
 } catch(com.sun.star.lang.IllegalArgumentException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating relation :);
 e.printStackTrace(log);
 }
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java 
b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
index 2b29031..ab2bf0d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
@@ -120,10 +120,10 @@ public class ScAccessibleDocumentPagePreview extends 
TestCase {
 xCell = oSheet.getCellByPosition(0, 0) ;
 xCell.setFormula(ScAccessibleDocumentPagePreview);
 } catch(com.sun.star.lang.WrappedTargetException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating document page preview :);
 e.printStackTrace(log);
 } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating document page preview :);
 e.printStackTrace(log);
 }
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java 
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index 5c595c1..97764dd 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -105,10 +105,10 @@ public class ScAccessiblePageHeader extends TestCase {
 xCell = oSheet.getCellByPosition(0, 0) ;
 xCell.setFormula(ScAccessiblePageHeader);
 } catch(com.sun.star.lang.WrappedTargetException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating page header :);
 e.printStackTrace(log);
 } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating page header :);
 e.printStackTrace(log);
 }
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java 
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index dacfad8..558143a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -99,13 +99,13 @@ public class ScAccessiblePageHeaderArea extends TestCase {
 xCell = oSheet.getCellByPosition(0, 0) ;
 xCell.setFormula(ScAccessiblePageHeaderArea);
 } catch(com.sun.star.lang.WrappedTargetException e) {
-log.println(Exception ceating relation :);
+log.println(Exception creating page header area :);
 e.printStackTrace(log);
 } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
-

[Libreoffice-commits] libexttextcat.git: src/common.h

 src/common.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1120d3fa21211d0a507b829d9aeb7bcc3708cc55
Author: Michael Stahl mst...@redhat.com
Date:   Mon Sep 30 16:25:57 2013 +0200

MSVC 2010 has finally grown a stdint.h

diff --git a/src/common.h b/src/common.h
index 3444cd0..24c7517 100644
--- a/src/common.h
+++ b/src/common.h
@@ -45,7 +45,7 @@ extern C
 {
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)  _MSC_VER  1600
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
 typedef __int16 int16_t;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

North America Pub Chat

2013-09-30 Thread Joel Madero

Hi All,

I hope this email finds everyone doing well. I would like to propose
another North America QA pub chat (this time I may even bring a beer) for
next Friday (the 11th) at the same time (12:00pm EST). If we can get at
least 5 people I think it's worth catching up, see what everyone has been
up to, get an update from Robinson's trip to Milan (yes, Robinson went to
the conference in Milanhe'll make sure to rub it in our face about how
amazing it was), and anything else that comes to mind.

Like always this chat is open to everyone, just the time is set up so that
it's functional for us in North America to make without having to wake up
at 5am.

If you're interested please respond letting me know so that I can get a
head count. If it reaches 5, Robinson and I will work on a tentative agenda
but I'd like this one to be more interactive than the last :)


All the Best,
Joel

-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - bin/benchmark-document-loading sfx2/source sw/source xmloff/qa xmloff/source

 bin/benchmark-document-loading   |1 
 sfx2/source/doc/Metadatable.cxx  |   29 +++-
 sw/source/core/crsr/bookmrk.cxx  |   32 +++--
 sw/source/core/doc/doc.cxx   |   17 +-
 sw/source/core/doc/docnew.cxx|   21 ++-
 sw/source/core/doc/docnum.cxx|   26 +++-
 xmloff/qa/unit/uxmloff.cxx   |6 -
 xmloff/source/style/impastpl.cxx |  230 +++
 xmloff/source/style/impastpl.hxx |4 
 xmloff/source/text/txtlists.cxx  |   24 ++--
 10 files changed, 323 insertions(+), 67 deletions(-)

New commits:
commit dbd6ae7dfdd292f049bbed5beb659f99e963c47b
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 30 16:46:16 2013 +0300

Set LIBO_ONEWAY_STABLE_ODF_EXPORT

Change-Id: I97ef9ba6a3082403a76612cf99e46a0d19c9643e

diff --git a/bin/benchmark-document-loading b/bin/benchmark-document-loading
index feb3a4a..25f354e 100644
--- a/bin/benchmark-document-loading
+++ b/bin/benchmark-document-loading
@@ -156,6 +156,7 @@ class OfficeConnection:
 if --valgrind in self.args:
 argv.append(--valgrind)
 os.putenv(SAL_LOG, -INFO-WARN)
+os.putenv(LIBO_ONEWAY_STABLE_ODF_EXPORT, YES)
 self.pro = subprocess.Popen(argv)
 #print(self.pro.pid)
 
commit c1015fdd51909495cefdc0258c3899cd73d4d2df
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 30 15:23:35 2013 +0300

Add hack to optionally get stable ODF output from the same input

To be used in regression testing and similar scenarios, where the output ODF
is *not* intended to be further manipulated in LibreOffice. An environment
variable LIBO_ONEWAY_STABLE_ODF_EXPORT is used to toggle this behaviour. I 
am
not 100% sure whether the generated ODF with the hack toggled on is even 
fully
correct, but correctness is not the purpose of the hack anyway.

Two classes of issues handled: 1) Automatic style names and 2) use of
randomness.

For class 1), when the hack toggle is in effect, we generate the names at
first as strings based on all the properties of the style, and sort them 
based
on those, and then rename them (for brevity in the output) to the normal
form of a short prefix plus a number (like P12).

Sure, it would have been better to just figure out *why* the automatic style
naming currently is not stable in the first place, but outputs the styles in
different order (with some styles being assigned different numbers) in
separate invokations of LibreOffice), but I was unable to understand that.

Possibly this code could be used in all cases, except that it does break 
some
unit test (can't recall which right now). I don't know whether that is 
simply
because the unit test assumes too much knowledge of the internal workings of
the automatic style name generation, or whether the generated ODF is 
actually
invalid.

For 2), I found a handful of places where randomness was used to generated
various kinds of identifiers in ODF output. I changed those to just use 
large
(64-bit) non-overlapping integers instead. I assume there *is* a point in 
the
original code in each case that explains why randomness is needed, so the 
hack
definitely needs to be optional and used only for the above mentioned
scenarios.

Change-Id: I17b657197e38bcf24abdfe61ad4a277f4339eeae

diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index d7528f6..ae4a723 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -394,19 +394,34 @@ template typename T 
 /*static*/ OUString create_id(const
 ::boost::unordered_map OUString, T, OUStringHash   i_rXmlIdMap)
 {
-static rtlRandomPool s_Pool( rtl_random_createPool() );
+static bool bHack = (getenv(LIBO_ONEWAY_STABLE_ODF_EXPORT) != NULL);
 const OUString prefix(s_prefix);
 typename ::boost::unordered_map OUString, T, OUStringHash 
 ::const_iterator iter;
 OUString id;
-do
+
+if (bHack)
+{
+static sal_Int64 nIdCounter = SAL_CONST_INT64(40);
+do
+{
+id = prefix + OUString::number(nIdCounter++);
+iter = i_rXmlIdMap.find(id);
+}
+while (iter != i_rXmlIdMap.end());
+}
+else
 {
-sal_Int32 n;
-rtl_random_getBytes(s_Pool,  n, sizeof(n));
-id = prefix + OUString::number(abs(n));
-iter = i_rXmlIdMap.find(id);
+static rtlRandomPool s_Pool( rtl_random_createPool() );
+do
+{
+sal_Int32 n;
+rtl_random_getBytes(s_Pool,  n, sizeof(n));
+id = prefix + OUString::number(abs(n));
+iter = i_rXmlIdMap.find(id);
+}
+while (iter != i_rXmlIdMap.end());
 }
-while (iter != i_rXmlIdMap.end());
 return id;
 }
 
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 11e6210..3a4ba43 100644
---

[Libreoffice-commits] core.git: cui/source include/svtools include/svx include/vcl svtools/source svx/source vcl/source

2013-09-30 Thread Caolán McNamara

 cui/source/inc/treeopt.hxx  |2 +-
 cui/source/options/treeopt.cxx  |2 +-
 include/svtools/wizdlg.hxx  |2 +-
 include/svx/sidebar/PanelLayout.hxx |   11 ++-
 include/vcl/dialog.hxx  |2 +-
 include/vcl/layout.hxx  |2 ++
 include/vcl/tabctrl.hxx |2 ++
 include/vcl/window.hxx  |2 +-
 svtools/source/dialogs/wizdlg.cxx   |2 +-
 svx/source/sidebar/PanelLayout.cxx  |   33 +
 vcl/source/control/tabctrl.cxx  |6 ++
 vcl/source/window/dialog.cxx|4 ++--
 vcl/source/window/layout.cxx|6 ++
 vcl/source/window/window2.cxx   |   20 +++-
 14 files changed, 70 insertions(+), 26 deletions(-)

New commits:
commit a48cf78fab4a283ef43c091e8c324c968377f9db
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Sep 30 14:44:37 2013 +0100

merge queue_layout and queue_resize

so that any window derived class, and not just dialogs, can trigger 
layouting
of their children. Merge together the handful of hacked-up impls of this.

Do that then for the sidebar PanelLayout so that when the label of the 
custom
animation frame changes that the frame allocates enough space for the new 
label
to display fully

Change-Id: I9a95f6c3f60cd6cea47656e66cb9ffcc154a3a5a

diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 3968345..adf6563 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -186,7 +186,7 @@ private:
 VectorOfNodes   LoadNodes( Module* pModule, const OUString rExtensionId );
 voidInsertNodes( const VectorOfNodes rNodeList );
 
-virtual void queue_layout();
+virtual void queue_resize();
 void SetPaneSize(Window *pPane);
 
 protected:
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3239304..01c9f22 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -930,7 +930,7 @@ bool OfaTreeOptionsDialog::hasTreePendingLayout() const
 return maTreeLayoutTimer.IsActive();
 }
 
-void OfaTreeOptionsDialog::queue_layout()
+void OfaTreeOptionsDialog::queue_resize()
 {
 if (hasTreePendingLayout())
 return;
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 82212b3..92a26ee 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -263,7 +263,7 @@ public:
 virtual voidActivatePage();
 virtual longDeactivatePage();
 
-virtual void queue_layout();
+virtual voidqueue_resize();
 
 sal_BoolShowPrevPage();
 sal_BoolShowNextPage();
diff --git a/include/svx/sidebar/PanelLayout.hxx 
b/include/svx/sidebar/PanelLayout.hxx
index 3395e7f..2fa82ee 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -14,19 +14,28 @@
 
 #include vcl/builder.hxx
 #include vcl/ctrl.hxx
+#include vcl/timer.hxx
 
 #include com/sun/star/frame/XFrame.hpp
 
 /// This class is the base for the Widget Layout-based sidebar panels.
 class SVX_DLLPUBLIC PanelLayout : public Control, public VclBuilderContainer
 {
+private:
+Timer m_aPanelLayoutTimer;
+bool m_bInClose;
+bool hasPanelPendingLayout() const;
+
+DECL_DLLPRIVATE_LINK( ImplHandlePanelLayoutTimerHdl, void* );
+
 public:
 PanelLayout(Window* pParent, const OString rID, const OUString 
rUIXMLDescription,
 const 
com::sun::star::uno::Referencecom::sun::star::frame::XFrame rFrame);
-virtual ~PanelLayout() {}
+virtual ~PanelLayout();
 
 virtual Size GetOptimalSize() const;
 virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, 
sal_uInt16 nFlags = WINDOW_POSSIZE_ALL);
+virtual void queue_resize();
 };
 
 #endif
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 4e20d63..afaea70 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -104,7 +104,7 @@ public:
 boolisLayoutEnabled() const;
 voidsetOptimalLayoutSize();
 boolisCalculatingInitialLayoutSize() const { return 
mbIsCalculatingInitialLayoutSize; }
-virtual void queue_layout();
+virtual void queue_resize();
 virtual bool set_property(const OString rKey, const OString rValue);
 VclButtonBox* get_action_area();
 VclBox* get_content_area();
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 47b9593..0fa87ec 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -39,6 +39,8 @@ public:
 {
 m_bLayoutDirty = true;
 }
+
+virtual void queue_resize();
 protected:
 //these are the two that need to be implemented by
 //containers, figure out how much space you want...
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 383c923..53b3572 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -201,6

Re: About commit cppcheck: some cleanings

On 30/09/13 11:21, julien2412 wrote:
 Hello,
 
 About commit 30e72a9a36750b7326803fa8fa1b8d40648e7e89 and, in particular,
 to:
 
 - sal_Int32 nWindowWidth = ::std::max( nMinWidth, nBrowserWidth );
 - nWindowWidth = ::std::min( nMaxWidth, nBrowserWidth );
 + sal_Int32 nWindowWidth = ::std::min( nMaxWidth, nBrowserWidth );
 
 Matteo Casalin thought (and I agree) that if my changes surely keep the
 previous behaviour, the original code might be wrong.
 Indeed, it seemed that its aim was to bound nWindowWidth between the maximum
 and minimum possible values, but it didn't.
 So perhaps it should be:
 
   sal_Int32 nWindowWidth = ::std::max( nMinWidth, nBrowserWidth );
   nWindowWidth = ::std::min( nMaxWidth, nWindowWidth );

that looks more sensible than the original; although i don't know
anything about this Chart code...


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

Re: Problems with windows build

On 25/09/13 12:10, spandana wrote:
 Getting the following error when buiding libreoffice-3.6.4.3 in windows 7.
 Not understanding why climaker.exe is getting crashed. What to do to make
 the build succssful?

is there any particular reason why you build the no-longer-supported
libreoffice-3-6 branch?  the build system for these cli_ure libraries
has changed completely on master and libreoffice-4-0/1 so you're
unlikely to interest anybody in investigating why the old and removed
build system didn't work.

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

Adding syphon support to impress to allow access to the rendered output from other applications

2013-09-30 Thread James Sheridan



Hi All,

I'd like to take the output of impress and warp it for use in an igloo 
vision dome (http://www.igloovision.com).


The way that I'd like to do this is through an osx technology known as 
syphon (http://syphon.v002.info/) that allows you to share textures on 
the graphics card between applications.   I've downloaded the sdk and it 
doesn't look like it will give me enough access to do this through an 
extension/plugin so I've now downloaded the source and have a few questions.


1) As this is an osx only technology and probably only appeals to a very 
limited audience is this something I should do on my own or is it 
something that people would like access to?


2) I've had a look through the development wiki but can't find anything 
(in English) mentioning how I might be able to achieve this.   The 
closest thing I can find in the source for where I might be able to get 
access to the opengl texture is the drawinglayer but I couldn't see any 
opengl texture access here.   Could someone please give me a quick 
overview (or point me to some documentation) of how impress draws to the 
screen and how best for me to get access to the texture it uses to draw 
things to the screen.


Thanks in advance - James


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

Re: Adding syphon support to impress to allow access to the rendered output from other applications

 I'd like to take the output of impress

Presumably you mean an Impress slide show, and not the Impress UI (as
used to edit slide decks)?

 and warp it for use in an igloo
 vision dome (http://www.igloovision.com).

As Impress slide shows typically are run full-screen, doesn't your
problem then (simply) become one of displaying the whole contents of
the screen (either the built-in one, or an external one if you have an
external one connected) on the dome? So if you find some way to just
display whatever is displayed on an external display onto the dome, it
will work for whatever application windows happen to be visible on the
screen at any moment. Or am I missing something?

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

[Libreoffice-commits] core.git: bin/benchmark-document-loading

 bin/benchmark-document-loading |4 
 1 file changed, 4 deletions(-)

New commits:
commit e71692739698693ab8ce5cb893e6bca18eb47d03
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 30 18:17:12 2013 +0300

Drop bogus and unneeded os.makedirs() call

It is a (file:) URL anyway, and LO seems to take care of creating the
directory as neded.

Change-Id: I19dd7b67cfe2f77cea14e882c1142fadde2fbdaa

diff --git a/bin/benchmark-document-loading b/bin/benchmark-document-loading
index 25f354e..5bba53e 100644
--- a/bin/benchmark-document-loading
+++ b/bin/benchmark-document-loading
@@ -326,10 +326,6 @@ def loadFromURL(xContext, url, t, component):
 xGEB.removeDocumentEventListener(xListener)
 
 def exportToODF(xContext, xDoc, baseName, t, component):
-try:
-os.makedirs(outdir)
-except OSError:
-pass
 exportFileName = outdir + / + os.path.splitext(baseName)[0] + 
flatODFTypes[component][0]
 print(exportToODF  + baseName +  =  + exportFileName)
 props = [(FilterName, flatODFTypes[component][1]),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-30 Thread Oliver-Rainer Wittmann

 sw/inc/ndtxt.hxx  |8 +++-
 sw/source/core/txtnode/txtedt.cxx |   75 ++
 sw/source/core/undo/untblk.cxx|6 +--
 3 files changed, 53 insertions(+), 36 deletions(-)

New commits:
commit c1c5feaff453cfbb23c43f2b423201b883ff048d
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Mon Sep 30 13:42:34 2013 +

Resolves: #i123389#: revert change made for #i121897#

- method SwTxtAttr::RstAttr(..) - correct consideration of parameter
bInclRefToxMark used by Undo to fix 121897

(cherry picked from commit 685921ea31de48e26ad33e8aab9c3053cc622a34)

Conflicts:
sw/source/core/txtnode/txtedt.cxx
sw/source/core/undo/untblk.cxx

Change-Id: I8c66d535b5d6d51443876f1789e379bcceabfec7

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 71bf013..3eed398 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -267,8 +267,12 @@ public:
 refmarks, toxmarks, and metas will be ignored unless this is true
 ATTENTION: setting bInclRefToxMark is only allowed from UNDO!
  */
-voidRstAttr( const SwIndex rIdx, xub_StrLen nLen, sal_uInt16 nWhich = 
0,
-const SfxItemSet* pSet = 0, sal_Bool bInclRefToxMark = 
sal_False );
+void RstAttr(
+const SwIndex rIdx,
+const xub_StrLen nLen,
+const sal_uInt16 nWhich = 0,
+const SfxItemSet* pSet = 0,
+const sal_Bool bInclRefToxMark = sal_False );
 voidGCAttr();
 
 // Delete text attribute (needs to be deregistered at Pool!)
diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index d7f4b48..6576dcc 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -368,26 +368,26 @@ static bool lcl_HaveCommonAttributes( IStyleAccess 
rStyleAccess,
  * @param pSet ???
  * @param bInclRefToxMark ???
  */
-void SwTxtNode::RstAttr(const SwIndex rIdx, xub_StrLen nLen, sal_uInt16 
nWhich,
-const SfxItemSet* pSet, sal_Bool bInclRefToxMark )
+
+void SwTxtNode::RstAttr(
+const SwIndex rIdx,
+const xub_StrLen nLen,
+const sal_uInt16 nWhich,
+const SfxItemSet* pSet,
+const sal_Bool bInclRefToxMark )
 {
-// Attribute?
 if ( !GetpSwpHints() )
 return;
 
-sal_uInt16 i = 0;
-xub_StrLen nStt = rIdx.GetIndex();
-xub_StrLen nEnd = nStt + nLen;
-xub_StrLen nAttrStart;
-SwTxtAttr *pHt;
+const xub_StrLen nStt = rIdx.GetIndex();
+const xub_StrLen nEnd = nStt + nLen;
 
 bool bChanged = false;
 
 // nMin and nMax initialized to maximum / minimum (inverse)
 xub_StrLen nMin = m_Text.getLength();
 xub_StrLen nMax = nStt;
-
-const bool bNoLen = !nMin;
+const bool bNoLen = nMin == 0;
 
 // We have to remember the new attributes, that have
 // been introduced by splitting surrounding attributes (case 4).
@@ -396,15 +396,27 @@ void SwTxtNode::RstAttr(const SwIndex rIdx, xub_StrLen 
nLen, sal_uInt16 nWhich,
 
 // iterate over attribute array until start of attribute is behind
 // deletion range
+sal_uInt16 i = 0;
+xub_StrLen nAttrStart;
+SwTxtAttr *pHt = NULL;
 while ((i  m_pSwpHints-Count()) 
 ((( nAttrStart = *(*m_pSwpHints)[i]-GetStart())  nEnd ) || nLen==0) )
 {
 pHt = m_pSwpHints-GetTextHint(i);
 
 // attributes without end stay in!
-xub_StrLen * const pAttrEnd = pHt-GetEnd();
-if ( !pAttrEnd /*|| pHt-HasDummyChar()*/ ) // see bInclRefToxMark
+// but consider bInclRefToxMark used by Undo
+xub_StrLen* const pAttrEnd = pHt-GetEnd();
+const bool bKeepAttrWithoutEnd =
+pAttrEnd == NULL
+ ( !bInclRefToxMark
+ || ( RES_TXTATR_REFMARK != pHt-Which()
+   RES_TXTATR_TOXMARK != pHt-Which()
+   RES_TXTATR_META != pHt-Which()
+   RES_TXTATR_METAFIELD != pHt-Which() ) );
+if ( bKeepAttrWithoutEnd )
 {
+
 i++;
 continue;
 }
@@ -453,21 +465,22 @@ void SwTxtNode::RstAttr(const SwIndex rIdx, xub_StrLen 
nLen, sal_uInt16 nWhich,
 
 if( nStt = nAttrStart )  // Faelle: 1,3,5
 {
+const xub_StrLen nAttrEnd = pAttrEnd != NULL
+? *pAttrEnd
+: nAttrStart;
 if( nEnd  nAttrStart
-|| ( nEnd == *pAttrEnd  nEnd==nAttrStart ) )
+|| ( nEnd == nAttrEnd  nEnd == nAttrStart ) )
 {
 // Faelle: 1,3
 if ( nMin  nAttrStart )
 nMin = nAttrStart;
-if ( nMax  *pAttrEnd )
-nMax = *pAttrEnd;
+if ( nMax  nAttrEnd )
+nMax = nAttrEnd;
 // Falls wir nur ein nichtaufgespanntes Attribut entfernen,
 // tun wir mal so,

Re: Docx style

On 18/09/13 12:50, Faisal M. Alotaibi wrote:
Could you please elaborate a bit on exactly what do you want to do?
 
 there a bug where paragraph style effect the RTL paragraph alignment.
 
 when unzip docx file there styles.xml where
 w:style w:type=paragraph w:default=1 w:styleId=Normal
   w:name w:val=Normal/
   w:qFormat/
   w:pPr
w:bidi/
   /w:pPr
 /w:style
 
 i need to check the bidi tag if it is there

the filter has this for the pPr paragraph properties in
writerfilter/source/ooxml/model.xml:

resource name=CT_PPrBase resource=Properties tag=paragraph
...
  element name=bidi tokenid=sprm:PFBiDi/

... which means that the OOXML tokenizer will send a sprm:PFBiDi to the
domain-mapper, which is apparently handled in
writerfilter/source/dmapper/DomainMapper.cxx:

 case NS_sprm::LN_PFBiDi:
 {
 if (nIntValue != 0)
 {
 rContext-Insert(PROP_WRITING_MODE, uno::makeAny( 
 text::WritingMode2::RL_TB ));
 rContext-Insert(PROP_PARA_ADJUST, uno::makeAny( 
 style::ParagraphAdjust_RIGHT ));
 }
 }

... which will probably end up as parameter to some call like
SwXText::finishParagraph()

hope this is enough to get you started on investigating what is going
wrong :)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 68/5921ea31de48e26ad33e8aab9c3053cc622a34

2013-09-30 Thread Caolán McNamara

 68/5921ea31de48e26ad33e8aab9c3053cc622a34 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30fefa5419187944ca402d2a7967fea3e92e9263
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Sep 30 16:50:31 2013 +0100

Notes added by 'git notes add'

diff --git a/68/5921ea31de48e26ad33e8aab9c3053cc622a34 
b/68/5921ea31de48e26ad33e8aab9c3053cc622a34
new file mode 100644
index 000..b37c51b
--- /dev/null
+++ b/68/5921ea31de48e26ad33e8aab9c3053cc622a34
@@ -0,0 +1 @@
+merged as: c1c5feaff453cfbb23c43f2b423201b883ff048d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Adding syphon support to impress to allow access to the rendered output from other applications

2013-09-30 Thread James Sheridan


Hi Tor, thanks for your quick reply


Presumably you mean an Impress slide show, and not the Impress UI (as
used to edit slide decks)?
Yes - I actually just came across the slidshow code (I was looking at 
the drawing layer before) and it looks like it might be where I would 
need to implement the changes - specifically


/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m

which has a function CopyFramebufferToTexture which I'm guessing 
copies the slideshow output to a texture? does anyone have any idea what 
type of texture I would need to create to do this? is there a guide to 
writing slide transitions or the like that might mention this?


As Impress slide shows typically are run full-screen, doesn't your 
problem then (simply) become one of displaying the whole contents of 
the screen (either the built-in one, or an external one if you have an 
external one connected) on the dome? So if you find some way to just 
display whatever is displayed on an external display onto the dome, it 
will work for whatever application windows happen to be visible on the 
screen at any moment. Or am I missing something? --tml 
Currently we do what you mention via displaying the slideshow across 3 
monitors linked into one display (via and AMD eyefinity card) and then 
using hardware capture (via a blackmagic declink quad capture card) to 
capture this into our warping solution (which runs on OSX).   We would 
like to move away from needing a second computer for this though and 
creating an extension/plugin for Libre that just sends the output 
texture to our warping solution.or any other syphon apps, mad 
mapper, resolume, vdmx etc.


I'm guessing this will also mean I'll need to add in some functionality 
that allows me to set the size of the rendering window (to something 
like 5760x1080) when its not in fullscreen mode - so any pointers tips 
as to where I might find this functionality in the code would be greatly 
appreciated.


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

Re: Adding syphon support to impress to allow access to the rendered output from other applications

 /slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m

 which has a function CopyFramebufferToTexture which I'm guessing copies
 the slideshow output to a texture?

That is the OpenGL slide *transition* code, not related to display of
slideshow in general.

(And it is unclear to me at least whether we even use it on the Mac,
despite there being a mac folder there in the source.)

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

[Libreoffice-commits] core.git: include/osl odk/Package_odk_headers.mk sal/Library_sal.mk sal/osl

2013-09-30 Thread Arnaud Versini

 include/osl/util.h |   50 --
 odk/Package_odk_headers.mk |1 
 sal/Library_sal.mk |2 
 sal/osl/all/compat.cxx |4 
 sal/osl/unx/profile.c  |1 
 sal/osl/unx/system.c   |  145 +++
 sal/osl/unx/util.c |  341 -
 sal/osl/w32/profile.cxx|1 
 sal/osl/w32/util.c |   30 ---
 9 files changed, 149 insertions(+), 426 deletions(-)

New commits:
commit c850f000e77eac488347f8fb519e5ffe5afb28cf
Author: Arnaud Versini arnaud.vers...@libreoffice.org
Date:   Sat Sep 28 19:06:15 2013 +0200

API CHANGE: Remove osl_getEthernetAddress and osl/util.h .

Also move osl/util.c on Unix systems to osl/system.c.

Change-Id: Ifff79d9f4f89ecbb4e0e1652b40ab46b7d569adf
Reviewed-on: https://gerrit.libreoffice.org/6065
Tested-by: Arnaud Versini arnaud.vers...@libreoffice.org
Reviewed-by: Arnaud Versini arnaud.vers...@libreoffice.org

diff --git a/include/osl/util.h b/include/osl/util.h
deleted file mode 100644
index e9afe39..000
--- a/include/osl/util.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#ifndef _OSL_UTIL_H_
-#define _OSL_UTIL_H_
-
-#include sal/config.h
-
-#include sal/saldllapi.h
-#include sal/types.h
-
-#ifdef __cplusplus
-extern C {
-#endif
-
-/**
-@param pEthernetAddr 6 bytes of memory
-
-@return sal_True  if the ethernetaddress could be retrieved. br
-sal_False if no address could be found. This may be either because
-   there is no ethernet card or there is no appropriate algorithm
-   implemented on the platform. In this case, pEthernetAddr is
-   unchanged.
-*/
-SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 
*pEthernetAddr );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk
index 3a05a01..be6ff26 100644
--- a/odk/Package_odk_headers.mk
+++ b/odk/Package_odk_headers.mk
@@ -118,7 +118,6 @@ $(eval $(call 
gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
osl/thread.h \
osl/thread.hxx \
osl/time.h \
-   osl/util.h \
rtl/alloc.h \
rtl/allocator.hxx \
rtl/bootstrap.h \
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index f22bac2..86f7289 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -179,7 +179,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/tempfile \
sal/osl/unx/thread \
sal/osl/unx/time \
-   sal/osl/unx/util \
 ))
 $(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \
$(if $(filter $(ENABLE_CRASHDUMP),YES)$(filter $(ENABLE_DBGUTIL),TRUE), 
\
@@ -256,7 +255,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/w32/security \
sal/osl/w32/thread \
sal/osl/w32/time \
-   sal/osl/w32/util \
 ))
 
 endif # ifneq ($(OS),WNT)
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
index 2f86771..efe7877 100644
--- a/sal/osl/all/compat.cxx
+++ b/sal/osl/all/compat.cxx
@@ -31,6 +31,10 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL osl_destroySemaphore(void 
*) {
 std::abort();
 }
 
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_getEthernetAddress(sal_uInt8 *) {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
 SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_releaseSemaphore(void *) {
 for (;;) { std::abort(); } // avoid must return a value warnings
 }
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index a1de729..c9aca5e 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -25,7 +25,6 @@
 #include osl/process.h
 #include osl/thread.h
 #include rtl/alloc.h
-#include osl/util.h
 
 #define LINES_INI   32
 #define LINES_ADD   10
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index eb19fbc..195bd4b 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include unistd.h

Re: Performance profiling

2013-09-30 Thread Nagy Ákos


2013.07.04. 22:52 keltezéssel, José Guilherme Vanz írta:

Hello everybody!

The Brazilian comunity is in the FISL14. Today a Intel employee talked 
with me and Marcos Paulo looking for a test case for Intel performance 
profiling tool. He provided for us the tool that we can runs the 
Libreoffice and test it permofance, identifing problems. We talked 
about some problems importing some huge files in calc,  problems 
reported in bugzilla. But are we interesting in your suggestions, 
maybe some specific. Do you have some ?


Waiting anxiously for your suggestions.


A performance issue example:
https://bugs.freedesktop.org/show_bug.cgi?id=66507
In this case the problem not the file size, but also the very slow 
computing speed of libreoffice, especially in charts.

This make impossible to use LibreOffice in financial or statistical sector.

All the best!
--
Att. José Guilherme Vanz
br.linkedin.com/pub/josé-guilherme-vanz/51/b27/58b/ 
http://br.linkedin.com/pub/jos%C3%A9-guilherme-vanz/51/b27/58b/
O sofrimento é passageiro, desistir é para sempre - Bernardo 
Fonseca, recordista da Antarctic Ice Marathon.



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



--
Ákos

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

Question to code-insider: maximum numbers

2013-09-30 Thread Thomas Krumbein

Hey all,

I do have a customer, who like to know some special borders for an
evuluation study. Unfortunatly I cannot give him an exact answer.

So - maybe someone can help me?

Question Calc (spreadsheet):

How many datapoints can be access for charts?
Means: How many lines can be maximum used for one chart? Is there a
physical border (maximum number?). As I remember, Excel 2003 or 2007 has
a maximum number of 3200 datapoints.

Question Impress (presentation):

What is the maximum number of presentation-pages? Don't worry about
file-size, but is there a physical maximum number?

Thank you for your answers.

Best regards
Thomas


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

Object Linking and Embedding in LibreOffice

2013-09-30 Thread Badal Naik


Hi Team,
for last few of months, I am working on LibreOffice Projects. My current 
pick up is developing Display as icon feature for Libreoffice. For 
that I am trying to understand the files/ folders responsible for 
handling inline embedding. I have studied embedserv ,embeddedobj  
folders, but not getting much out of it.
Can you connect me to folks who developed inline embedding for OLE or 
guide me how can I go about that.


Thanks in advance.

--
**,
Badal K Naik
Ericsson India Global Services Pvt Limited,
DLF IT Park 2 Block 1A Plot no 2F/1
Action Area 2 Rajarhat,
7000156,Kolkata,W.B.India.
email:badal.kumar.n...@ericsson.com,
ECN51847
***

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

Re: Adding syphon support to impress to allow access to the rendered output from other applications

2013-09-30 Thread James Sheridan


On 30/09/13 5:23 PM, Tor Lillqvist wrote:
That is the OpenGL slide *transition* code, not related to display of 
slideshow in general. (And it is unclear to me at least whether we 
even use it on the Mac, despite there being a mac folder there in 
the source.) --tml 


The opengl slide transitions work (on the current 4.1 build of libre) on 
osx and whilst your right I just want the standard display of the slides 
(preferable as a GPU resource - ie a texture/FBO) this seemed like an 
easy way to get them.   Hopefully there is a better way though? as the 
slideshow transitions run really poorly on my 2010 mbp and I'd also need 
access to movie frames which seem to get disabled during transitions



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

[Libreoffice-commits] core.git: dbaccess/Module_dbaccess.mk

2013-09-30 Thread Andrzej J . R . Hunt

 dbaccess/Module_dbaccess.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bdde962f918af1c5ffa5799487941f3bd18e2409
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Mon Sep 30 17:55:57 2013 +0100

Revert Disable HSQLDB unit test for now.

This reverts commit d4a41ab30c805e647c30a3cf10d43e7a15e07cba.

This test failed once on one windows TB, but seems to run on my
local machine. Reenabling to verify whether all TBs fail or if
this is limited to one machine.

Change-Id: I40c121833eaef091aaa9cc4a80fefb88fde2cc5f

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 615c887..e9eb146 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -41,11 +41,11 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_dialog_save \
 ))
 
-#ifeq ($(ENABLE_JAVA),TRUE)
-#$(eval $(call gb_Module_add_check_targets,dbaccess,\
-#CppunitTest_dbaccess_hsqldb_test \
-#))
-#endif
+ifeq ($(ENABLE_JAVA),TRUE)
+$(eval $(call gb_Module_add_check_targets,dbaccess,\
+CppunitTest_dbaccess_hsqldb_test \
+))
+endif
 
 # This runs a suite of peformance tests on embedded firebird and HSQLDB.
 # Instructions on running the test can be found in 
qa/unit/embeddedb_performancetest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 xmloff/source/style/impastpl.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d74ca89ae860025aea98a36cee19fc128a7846e4
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 30 19:26:03 2013 +0300

Include algorithm for std::sort()

Hopefully helps a Gentoo tinderbox.

Change-Id: I2e83b867113ba04a708c9fbb46c728368c4328c0

diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 8aca0b1..c41b5dc 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include algorithm
+
 #include rtl/ustrbuf.hxx
 #include tools/debug.hxx
 #include xmloff/PageMasterStyleMap.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/formula-opencl-work' - 0 commits -

2013-09-30 Thread Unknown

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

Re: Adding syphon support to impress to allow access to the rendered output from other applications

2013-09-30 Thread Thorsten Behrens

James Sheridan wrote:
 Currently we do what you mention via displaying the slideshow across
 3 monitors linked into one display (via and AMD eyefinity card) and
 then using hardware capture (via a blackmagic declink quad capture
 card) to capture this into our warping solution (which runs on OSX).
 We would like to move away from needing a second computer for this
 though and creating an extension/plugin for Libre that just sends
 the output texture to our warping solution.or any other syphon
 apps, mad mapper, resolume, vdmx etc.
 
Hi James,

so there is no ready-to-run texture for you, at least not now, and not
in the general case. If a slideshow contains animations, naturally
even when using opengl, you'd have a number of time-varying textures
composited over another.

I wonder where the need for textures as such comes from - in the end
you want the pixel, no?

The stuff that gets blitted to screen is composited here:

 canvas/source/vcl/spritecanvashelper.cxx, method
 SpriteCanvasHelper::updateScreen() - look into maVDev there

(but sure, on a Mac, that ends up in a texture eventually before
reaching the display - at least the method above gets called exactly
when new content arrives, and cobbles the pixel together)

HTH,

-- Thorsten


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

Re: Checkbox Format Paragraph Text Flow Breaks in Writer

On 26/09/13 17:23, Gay, Matthieu wrote:
 Hello,
 
  Is this possible to have the checkbox
 
 Format  Paragraph  Text Flow  Breaks
 
 always check for a table ?

you mean if the paragraph is in a table then it should always have a
page break?

i'm sure i don't understand what you mean because that doesn't make sense :)

 This bug is demanding it
 https://bugassistant.libreoffice.org/show_bug.cgi?id=39400 and for a
 malformated RTF, I also need it.

suspect the problem could be that paragraph attributes (including the
page break) are copied to the target paragraph; they should be copied
when the whole paragraph is copied but not if less than the whole
paragraph is selected.

the code for that is somewhere in sw/source/core/txtnode/, likely
SwTxtNode::CopyText

 If not, is this possible to tell me where the checkbox is managed int he
 code?

The breaks are represented in Writer as a pool item with id RES_BREAK
and class SvxFmtBreakItem (see include/editeng/formatbreakitem.hxx).

... which uses this enum from svxenum.hxx:

enum SvxBreak
{
SVX_BREAK_NONE,
SVX_BREAK_COLUMN_BEFORE,
SVX_BREAK_COLUMN_AFTER,
SVX_BREAK_COLUMN_BOTH,
SVX_BREAK_PAGE_BEFORE,
SVX_BREAK_PAGE_AFTER,
SVX_BREAK_PAGE_BOTH,
SVX_BREAK_END
};

the item exists in the SwAttrSet of the SwTxtNode... and it's mapped to
the UNO property BreakType.


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

Re: Extensions no longer registered in master Linux 32bit

2013-09-30 Thread David Tardon

Hi,

On Mon, Sep 30, 2013 at 09:48:33AM +0200, Alex Thurgood wrote:
 Hi,
 
 For some reason, extensions no longer appear to be registered as
 components since the switch to instdir.
 
 If I open Tools  Extensions, the Extension Manager shows an empty window.
 
 Running unopkg.bin from instdir also indicates that no extensions
 are registered.
 
 However, I see them in
 solver/unxlngi6.pro/bin/
 
 and also some of them in
 workdir/unxlngi6.pro/Extension

Extensions are created as .oxt archives during build. They must be
unpacked into the installation tree; the old installer handled this
through the infamous ARCHIVE flag in scp2, but gbuild does not do that.
When we replaced ARCHIVE by FILELIST half a year ago, I briefly
considered updating the extension handling stuff too, but it would have
been a nontrivial change with a high probability of regressions for a
minimal gain, so I decided not to.

Anyway, there is just 2-3 of them, so you can unpack them by hand if you
really need them (that was necessary in the dev-install times too, for
rebuilds, so there is no big change).

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

[Libreoffice-commits] core.git: Changes to 'private/kohei/calc-shared-string'

New branch 'private/kohei/calc-shared-string' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 configure.ac |   56 +++-
 1 file changed, 39 insertions(+), 17 deletions(-)

New commits:
commit 739ddcfd83dc48c723cce9af5093b32f3caac54c
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 30 22:07:42 2013 +0300

Check separately and more thoroughly what the C++ library is

I.e., GNU libstdc++, LLVM libc++, or Microsoft. Also, do the grepping
for visibility push only in the libstdc++ case.

Change-Id: Ibf1038e37780774d9595eccfe47894dd88fc5591

diff --git a/configure.ac b/configure.ac
index 3b9d800..7da4edf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -430,10 +430,6 @@ DLLPOST=.so
 
 LINKFLAGSNOUNDEFS=-Wl,-z,defs
 
-# Most platforms use GNU libstdc++
-CPP_LIBRARY=GLIBCXX
-AC_SUBST(CPP_LIBRARY)
-
 INSTROOTSUFFIX=
 SDKDIRNAME=sdk
 
@@ -2781,7 +2777,6 @@ if test $_os = Darwin; then
 fi
 # Use libc++ instead of libstdc++ when possible
 stdlib=-stdlib=libc++
-CPP_LIBRARY=LIBCPP
 fi
 if test $ENABLE_LTO = TRUE; then
 lto=-flto
@@ -2797,14 +2792,6 @@ if test $_os = Darwin; then
 ;;
 esac
 AC_MSG_RESULT([$CC and $CXX])
-else
-# In case somebody insists on passing in CXX, and perhaps CFLAGS or 
CXXFLAGS to choose
-# compiler. Not really something we encourage or support.
-case $CXX $CFLAGS $CXXFLAGS in
-*-stdlib=libc++*)
-CPP_LIBRARY=LIBCPP
-;;
-esac
 fi
 
 case $with_macosx_version_max_allowed in
@@ -3858,7 +3845,6 @@ cygwin*)
 OS=WNT
 RTL_OS=Windows
 P_SEP=;
-CPP_LIBRARY=MSVCRT
 
 case $host_cpu in
 i*86|x86_64)
@@ -6148,6 +6134,40 @@ if test $HAVE_CXX11 = TRUE; then
 CXXFLAGS=$save_CXXFLAGS
 fi
 
+AC_MSG_CHECKING([What the C++ library is])
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include utility
+#ifndef __GLIBCXX__
+foo bar
+#endif
+]])],
+[CPP_LIBRARY=GLIBCXX
+ cpp_library_name=GNU libstdc++
+],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include utility
+#ifndef _LIBCPP_VERSION
+foo bar
+#endif
+]])],
+[CPP_LIBRARY=LIBCPP
+ cpp_library_name=LLVM libc++
+],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include utility
+#ifndef _MSC_VER
+foo bar
+#endif
+]])],
+[CPP_LIBRARY=MSVCRT
+ cpp_library_name=Microsoft
+],
+AC_MSG_ERROR([Could not figure out what C++ library this is]
+AC_MSG_RESULT([$cpp_library_name])
+AC_LANG_POP([C++])
+AC_SUBST(CPP_LIBRARY)
+
 if test $HAVE_CXX11 = TRUE; then
 AC_DEFINE(HAVE_CXX11)
 elif test -n $CXXFLAGS_CXX11; then
@@ -6340,14 +6360,16 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes 
\); then
 CPPFLAGS=-isysroot $MACOSX_SDK_PATH $CPPFLAGS
 fi
 
-if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE; then
+# Assume visibility is not broken with libc++ even if libc++ headers. The 
below test is very much
+# designed for libstdc++ only.
+if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE -a \( $COM_GCC_IS_CLANG 
!= TRUE -o $CPP_LIBRARY != LIBCPP \); then
 dnl gcc#19664, gcc#22482, rhbz#162935
 AC_MSG_CHECKING([if STL headers are visibility safe (GCC bug 22482)])
 AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
 AC_MSG_RESULT([$stlvisok])
 if test $stlvisok = no; then
-AC_MSG_WARN([Your gcc STL headers are not visibility safe. 
Disabling visibility])
-add_warning Your gcc STL headers are not visibility safe. 
Disabling visibility
+AC_MSG_WARN([Your libstdc++ headers are not visibility safe. 
Disabling visibility])
+add_warning Your libstdc++ headers are not visibility safe. 
Disabling visibility
 unset HAVE_GCC_VISIBILITY_FEATURE
 fi
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 configure.ac |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit aa6eee03c6082a7882a35d6e3c822e7473eec6f7
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 30 22:32:58 2013 +0300

Simiplify test

Change-Id: I8ab1842ef1eb6f2988a547f0837daa81bbaff595

diff --git a/configure.ac b/configure.ac
index 7da4edf..8cb15d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6360,9 +6360,9 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes \); 
then
 CPPFLAGS=-isysroot $MACOSX_SDK_PATH $CPPFLAGS
 fi
 
-# Assume visibility is not broken with libc++ even if libc++ headers. The 
below test is very much
-# designed for libstdc++ only.
-if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE -a \( $COM_GCC_IS_CLANG 
!= TRUE -o $CPP_LIBRARY != LIBCPP \); then
+# Assume visibility is not broken with libc++. The below test is very much 
designed for libstdc++
+# only.
+if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE -a $CPP_LIBRARY = 
GLIBCXX; then
 dnl gcc#19664, gcc#22482, rhbz#162935
 AC_MSG_CHECKING([if STL headers are visibility safe (GCC bug 22482)])
 AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/iosremote

2013-09-30 Thread Siqi LIU

 ios/iosremote/iosremote/en.lproj/Localizable.strings |binary
 1 file changed

New commits:
commit 762274102c74169b3be5518bc69b5fb03708ea9c
Author: Siqi LIU m...@siqi.fr
Date:   Wed Sep 25 20:23:01 2013 +0200

translation fix

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

diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings 
b/ios/iosremote/iosremote/en.lproj/Localizable.strings
index 91d55d4..0686174 100644
Binary files a/ios/iosremote/iosremote/en.lproj/Localizable.strings and 
b/ios/iosremote/iosremote/en.lproj/Localizable.strings differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/iosremote

2013-09-30 Thread Siqi LIU

 ios/iosremote/en.lproj/iPad_autosize.storyboard  |4 ++--
 ios/iosremote/en.lproj/iPad_autosize_old.storyboard  |4 ++--
 ios/iosremote/fr.lproj/iPad_autosize.storyboard  |4 ++--
 ios/iosremote/fr.lproj/iPad_autosize_old.storyboard  |4 ++--
 ios/iosremote/iosremote/Classes/BasePresentationViewController.m |4 ++--
 ios/iosremote/iosremote/Classes/ControlVariables.h   |8 
+---
 ios/iosremote/iosremote/Classes/HorizontalSlideCell.h|1 +
 ios/iosremote/iosremote/Classes/NewServerViewController.h|5 +
 ios/iosremote/iosremote/Classes/SlideShowPreviewViewController.h |5 +
 ios/iosremote/iosremote/Classes/SlideShowSwipeInList~ipad.m  |7 +++
 ios/iosremote/iosremote/Classes/Timer.h  |3 ++-
 ios/iosremote/iosremote/Communication/CommandInterpreter.h   |1 +
 ios/iosremote/iosremote/Communication/CommunicationManager.h |8 
+++-
 ios/iosremote/iosremote/Communication/SlideShow.h|8 
+++-
 ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard  |2 +-
 ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard  |2 +-
 ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard |4 ++--
 ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard |4 ++--
 18 files changed, 44 insertions(+), 34 deletions(-)

New commits:
commit f8cf0e8af3fe734461492400ca2b84bddc73a214
Author: Siqi LIU m...@siqi.fr
Date:   Sun Sep 22 01:00:17 2013 +0200

adding some comments

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

diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard 
b/ios/iosremote/en.lproj/iPad_autosize.storyboard
index da90368..04bc217 100644
--- a/ios/iosremote/en.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard
@@ -559,10 +559,10 @@
 autoresizingMask key=autoresizingMask/
 subviews
 imageView userInteractionEnabled=NO 
tag=1 contentMode=scaleToFill image=Default.png id=dn1-99-Dde
-rect key=frame x=44 y=3.5 
width=233 height=163/
+rect key=frame x=44 y=7 
width=233 height=163/
 /imageView
 label opaque=NO clipsSubviews=YES 
userInteractionEnabled=NO tag=2 contentMode=left text=1 
textAlignment=center lineBreakMode=tailTruncation 
baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO id=b5V-aR-n9S
-rect key=frame x=245 y=145 
width=32 height=21/
+rect key=frame x=245 y=149 
width=32 height=21/
 autoresizingMask 
key=autoresizingMask flexibleMaxX=YES flexibleMaxY=YES/
 color key=backgroundColor 
white=0.8014655565996 alpha=1 colorSpace=calibratedWhite/
 fontDescription 
key=fontDescription type=system pointSize=17/
diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard 
b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
index da90368..04bc217 100644
--- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
@@ -559,10 +559,10 @@
 autoresizingMask key=autoresizingMask/
 subviews
 imageView userInteractionEnabled=NO 
tag=1 contentMode=scaleToFill image=Default.png id=dn1-99-Dde
-rect key=frame x=44 y=3.5 
width=233 height=163/
+rect key=frame x=44 y=7 
width=233 height=163/
 /imageView
 label opaque=NO clipsSubviews=YES 
userInteractionEnabled=NO tag=2 contentMode=left text=1 
textAlignment=center lineBreakMode=tailTruncation 
baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO id=b5V-aR-n9S
-rect key=frame x=245 y=145 
width=32 height=21/
+rect key=frame x=245 y=149 
width=32 height=21/
 autoresizingMask 
key=autoresizingMask flexibleMaxX=YES flexibleMaxY=YES/
 color key=backgroundColor 
white=0.8014655565996 alpha=1 colorSpace=calibratedWhite/
 fontDescription 
key=fontDescription type=system

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

2013-09-30 Thread Prashant Pandey

 sfx2/source/sidebar/SidebarController.cxx |   48 ++
 1 file changed, 36 insertions(+), 12 deletions(-)

New commits:
commit 8965bfda9753568a038303d9935f7a451282a857
Author: Prashant Pandey prashant3.yi...@gmail.com
Date:   Sat Sep 14 23:16:38 2013 +0530

Fixing the problem with Sidebar-alignment

Currently, when the sidebar is taken from right side of
the screen to left side of the screen, the vertical tab
-bar is still attached towards the right side of deck.
Ideally, when the sidebar is attched towards the left
side of the screen, the tab-bar should automatically set
towards the left side of deck.

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

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 9dbb178..02bd076 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -361,22 +361,45 @@ void SidebarController::NotifyResize (void)
 else
 bIsDeckVisible = false;
 
-// Place the deck.
-if (mpCurrentDeck)
+SfxSplitWindow* pSplitWindow = GetSplitWindow();
+if ( mpCurrentDeck  pSplitWindow )
 {
-if (bIsDeckVisible)
+// Find out that which side of the Window do we need to attach the 
Sidebar?
+if ( pSplitWindow-GetAlign() == WINDOWALIGN_RIGHT )// attach 
the Sidebar towards the right-side of screen
 {
-mpCurrentDeck-setPosSizePixel(0,0, 
nWidth-TabBar::GetDefaultWidth(), nHeight);
-mpCurrentDeck-Show();
-mpCurrentDeck-RequestLayout();
+// Place the deck first.
+{
+if (bIsDeckVisible)
+{
+mpCurrentDeck-setPosSizePixel(0,0, 
nWidth-TabBar::GetDefaultWidth(), nHeight);
+mpCurrentDeck-Show();
+mpCurrentDeck-RequestLayout();
+}
+else
+mpCurrentDeck-Hide();
+}
+
+// Now place the tab bar.
+
mpTabBar-setPosSizePixel(nWidth-TabBar::GetDefaultWidth(),0,TabBar::GetDefaultWidth(),nHeight);
+mpTabBar-Show();
 }
-else
-mpCurrentDeck-Hide();
-}
+else if ( pSplitWindow-GetAlign() == WINDOWALIGN_LEFT) // attach 
the Sidebar towards the left-side of screen
+{
+// Place the tab bar first.
+mpTabBar-setPosSizePixel(0,0,TabBar::GetDefaultWidth(),nHeight);
+mpTabBar-Show();
 
-// Place the tab bar.
-
mpTabBar-setPosSizePixel(nWidth-TabBar::GetDefaultWidth(),0,TabBar::GetDefaultWidth(),nHeight);
-mpTabBar-Show();
+// Now place the deck.
+if (bIsDeckVisible)
+{
+mpCurrentDeck-setPosSizePixel(TabBar::GetDefaultWidth(),0, 
nWidth-TabBar::GetDefaultWidth(), nHeight);
+mpCurrentDeck-Show();
+mpCurrentDeck-RequestLayout();
+}
+else
+mpCurrentDeck-Hide();
+}
+}
 
 // Determine if the closer of the deck can be shown.
 sal_Int32 nMinimalWidth = 0;
@@ -667,6 +690,7 @@ void SidebarController::SwitchToDeck (
 0,
 mpParentWindow-GetSizePixel().Width()-TabBar::GetDefaultWidth(),
 mpParentWindow-GetSizePixel().Height());
+
 mpCurrentDeck-SetPanels(aNewPanels);
 mpCurrentDeck-Show();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-30 Thread Prashant Pandey

 svx/source/sidebar/line/LinePropertyPanel.cxx |5 -
 svx/source/tbxctrls/tbxcolorupdate.cxx|6 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 9379a922c07df3cdb7d567cc88dfaaa39ead3681
Author: Prashant Pandey prashant3.yi...@gmail.com
Date:   Fri Sep 13 01:27:39 2013 +0530

Sidebar: Show default line-color in 'Draw'

Currently, the default color shown in SidebarLineColor
is yellow and is not updated until and unless one hovers a
mouse on top of it. This is wrong and the default color of
the line-color should be updated and shown by default.

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

diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx 
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 45c64d6..d4e632e 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -337,6 +337,9 @@ void LinePropertyPanel::NotifyItemUpdate(
 (void)bIsEnabled;
 const bool bDisabled(SFX_ITEM_DISABLED == eState);
 
+// By default, fill and show the color of existing line-color
+mpColorUpdater-Update( maColor );
+
 switch(nSID)
 {
 case SID_ATTR_LINE_COLOR:
@@ -359,7 +362,7 @@ void LinePropertyPanel::NotifyItemUpdate(
 {
 maColor = pItem-GetColorValue();
 mbColorAvailable = true;
-mpColorUpdater-Update(maColor);
+mpColorUpdater-Update( maColor );
 break;
 }
 }
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx 
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index b3e4fc7..53376bf 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -92,7 +92,11 @@ namespace svx
 if( aColor.GetColor() == COL_AUTO )
 aColor = Color( COL_TRANSPARENT );
 
-if( ( maCurColor != aColor ) || bSizeChanged || bDisplayModeChanged )
+// For a shape selected in 'Draw', when color selected in Sidebar  
Line  Color
+// is COL_BLACK, then (maCurColor != aColor) becomes 'false', 
therefore we take
+// explicit care of COL_BLACK from the last argument in the condition 
so that the
+// Update() does its routine job appropriately !
+if( ( maCurColor != aColor ) || bSizeChanged || bDisplayModeChanged || 
( aColor == COL_BLACK ) )
 {
 // create an empty bitmap, and copy the original bitmap inside
 // (so that it grows in case the original bitmap was smaller)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cppuhelper/source/shlib.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 43c47af0181ada27b558a30b02c51dc665169b99
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 30 22:09:42 2013 +0200

Special-case Mac OS X .jnilib

Change-Id: I824e83271997888712f126f4197252d7beefccc1

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index fc8b6a8..0933ddb 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -227,7 +227,11 @@ static OUString makeComponentPath(
 if (rPath[ rPath.getLength() -1 ] != '/')
 buf.append( (sal_Unicode) '/' );
 }
-if (! rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION ))
+if (!rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION )
+#if defined MACOSX
+ !rLibName.endsWithIgnoreAsciiCase(.jnilib)
+#endif
+)
 {
 #if defined SAL_DLLPREFIX
 if (! rLibName.endsWithIgnoreAsciiCase( .uno ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-30 Thread Matteo Casalin

 scp2/source/ooo/common_brand.scp |2 +-
 sw/inc/editsh.hxx|2 +-
 sw/source/core/edit/edfldexp.cxx |2 +-
 sw/source/ui/uiview/view2.cxx|2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 267e507fd6ebaa46a1121f19c263b2553968d7c9
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Sun Sep 29 21:13:01 2013 +0200

String to OUString

Change-Id: I93200c35bf33da16efc6f0dc5dfe2c79d8752250
Reviewed-on: https://gerrit.libreoffice.org/6095
Reviewed-by: Matteo Casalin matteo.casa...@yahoo.com
Tested-by: Matteo Casalin matteo.casa...@yahoo.com

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index d1eb77b..4f5212e 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -390,7 +390,7 @@ public:
 sal_Bool IsAnyDatabaseFieldInDoc()const;
 
 /// Check whether DB fields point to an available data source and returns 
it.
-sal_Bool IsFieldDataSourceAvailable(String rUsedDataSource) const;
+sal_Bool IsFieldDataSourceAvailable(OUString rUsedDataSource) const;
 void UpdateExpFlds(sal_Bool bCloseDB = sal_False);/// only every 
expression fields update
 void LockExpFlds();
 void UnlockExpFlds();
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index b7a0d6a..452fa56 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -35,7 +35,7 @@
 
 using namespace com::sun::star;
 
-sal_Bool SwEditShell::IsFieldDataSourceAvailable(String rUsedDataSource) const
+sal_Bool SwEditShell::IsFieldDataSourceAvailable(OUString rUsedDataSource) 
const
 {
 const SwFldTypes * pFldTypes = GetDoc()-GetFldTypes();
 const sal_uInt16 nSize = pFldTypes-size();
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 9bb1e6a..cb5faee 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -2337,7 +2337,7 @@ void SwView::GenerateFormLetter(sal_Bool 
bUseCurrentDocument)
 else
 {
 // check whether the
-String sSource;
+OUString sSource;
 if(!GetWrtShell().IsFieldDataSourceAvailable(sSource))
 {
 SwMergeSourceWarningBox_Impl aWarning( 
GetViewFrame()-GetWindow());
commit 9d6eb23cdfaa4e2176866c6aab8f47b1f4e99060
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 30 23:09:03 2013 +0200

Consistently (but arbitrarily?) exclude gdbtrace on Mac OS X

Change-Id: Ia5acd5b6be61364aab2e799088bd2592bd2b4b62

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8eb6ac6..1b2e7df 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -489,7 +489,7 @@ File gid_Brand_File_Html_Thirdpartylicensereadme
 TXT_FILE_BODY;
 End
 
-#if defined UNX  !defined ENABLE_MACOSX_SANDBOX  !defined 
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+#if defined UNX  !defined MACOSX
 
 File gid_Brand_File_Gdb_Trace
 TXT_FILE_BODY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl |   91 ++--
 bridges/source/cpp_uno/gcc3_ios_arm/helper.s |  324 +++
 2 files changed, 218 insertions(+), 197 deletions(-)

New commits:
commit e669d631a746d9f2cb9dc6da707a7ed73bd9401a
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Oct 1 00:52:52 2013 +0300

Untabify and add mode lines

Change-Id: I185befe8aebdc13df601b1151b45c62e7291b5c0

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl 
b/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
index 43dd6fc..c89f2ed 100755
--- a/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w # -*- tab-width: 4; indent-tabs-mode: nil; 
cperl-indent-level: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -51,11 +51,11 @@ printf (\n);
 
 foreach my $funIndex (0 .. $nFunIndexes-1)
 {
-foreach my $vtableOffset (0 .. $nVtableOffsets-1)
-{
-   gen_arm ($funIndex, $vtableOffset);
-   gen_arm ($funIndex|0x8000, $vtableOffset);
-}
+   foreach my $vtableOffset (0 .. $nVtableOffsets-1)
+   {
+   gen_arm ($funIndex, $vtableOffset);
+   gen_arm ($funIndex|0x8000, $vtableOffset);
+   }
 }
 
 printf (#else\n);
@@ -65,13 +65,13 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
 {
 foreach my $vtableOffset (0 .. $nVtableOffsets-1)
 {
-   foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 
'Class')
-   {
-   gen_x86 ($funIndex, $vtableOffset, $executor);
-   gen_x86 ($funIndex|0x8000, $vtableOffset, $executor);
-   }
+foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 
'Class')
+{
+gen_x86 ($funIndex, $vtableOffset, $executor);
+gen_x86 ($funIndex|0x8000, $vtableOffset, $executor);
+}
 }
-}
+  }
 
 printf (#endif\n);
 
@@ -90,15 +90,17 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
 {
 foreach my $vtableOffset (0 .. $nVtableOffsets-1)
 {
-   printf (#if defined(__arm) || defined(__arm64)\n);
+printf (#if defined(__arm) || defined(__arm64)\n);
 printf (.long codeSnippet_%08x_%d - _codeSnippets\n, $funIndex, 
$vtableOffset);
 printf (.long codeSnippet_%08x_%d - _codeSnippets\n, 
$funIndex|0x8000, $vtableOffset);
-   printf (#else\n);
-   foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 
'Class')
-   {
+printf (#else\n);
+foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 
'Class')
+{
 printf (.long codeSnippet_%08x_%d_%s - _codeSnippets\n, 
$funIndex, $vtableOffset, $executor);
 printf (.long codeSnippet_%08x_%d_%s - _codeSnippets\n, 
$funIndex|0x8000, $vtableOffset, $executor);
-   }
-   printf (#endif\n);
+}
+printf (#endif\n);
 }
 }
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 6a3493adb70c53a345456e220213dc645a05a155
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Oct 1 00:44:02 2013 +0300

Add dummy code for the ARM64 case

Change-Id: I88a871374ecc8d9d59f9b33b5198c0e6c9a2458d

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl 
b/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
index 822afff..43dd6fc 100755
--- a/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
@@ -14,7 +14,12 @@ sub gen_arm ($$)
 {
 my ($funIndex, $vtableOffset) = @_;
 printf (codeSnippet_%08x_%d:\n, $funIndex, $vtableOffset);
+printf (#ifdef __arm\n);
+# Note: pc is the address of instruction being executed plus 8
 printf (mov ip, pc\n);
+printf (#else\n);
+printf (adr x15, .+8\n);
+printf (#endif\n);
 printf (b _privateSnippetExecutor\n);
 printf (.long %#08x\n, $funIndex);
 printf (.long %d\n, $vtableOffset);
@@ -31,11 +36,11 @@ sub gen_x86 ($$$)
 
 printf (.text\n);
 
-printf (#ifdef __arm\n);
+printf (#if defined(__arm) || defined(__arm64)\n);
 
 printf (\n);
-printf (// Each codeSnippetX function stores pc into ip and branches to 
_privateSnippetExecutor\n);
-printf (// The branch instruction is followed by two longs (that ip thus 
points to):\n);
+printf (// Each codeSnippetX function stores into ip/x15 an address and 
branches to _privateSnippetExecutor\n);
+printf (// The branch instruction is followed by two longs that ip/x15 points 
to:\n);
 printf (// - the function index, as such and with the 0x8000 bit set\n);
 printf (//   (to indicate a hidden parameter for returning large values)\n);
 printf (// - the vtable offset\n);
@@ -85,7 +90,7 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
 {
 foreach my $vtableOffset (0 .. $nVtableOffsets-1)
 {
-   printf (#ifdef __arm\n);
+   printf (#if

[Bug 54157] LibreOffice 4.0 most annoying bugs

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

mariosv mari...@miguelangel.mobi changed:

   What|Removed |Added

 Depends on||69984

--- Comment #176 from mariosv mari...@miguelangel.mobi ---
Added https://bugs.freedesktop.org/show_bug.cgi?id=69984 - PIVOTTABLE: Pivot
table reset sorting after editing layaout

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

[Libreoffice-commits] core.git: 7 commits - cppuhelper/source cpputools/source include/cppuhelper jurt/com stoc/source

 cppuhelper/source/compat.cxx   |   27 -
 cppuhelper/source/shlib.cxx|  314 +
 cpputools/source/unoexe/unoexe.cxx |   43 -
 include/cppuhelper/shlib.hxx   |   70 --
 jurt/com/sun/star/comp/loader/RegistrationClassFinder.java |   58 --
 stoc/source/loader/dllcomponentloader.cxx  |   23 
 6 files changed, 69 insertions(+), 466 deletions(-)

New commits:
commit d2e1dd559f4009a83f3ce6cb6617dfced010be74
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Oct 1 01:15:30 2013 +0200

[API CHANGE] Stricter requirements for shlib.hxx function arguments

rLibName - uri must be an (absolute file) URI, rPath must be empty, and 
xKey
must be null in loadSharedLibComponentFactory.  While incompatible in 
theory,
these functions should only be called internally, anyway.

Change-Id: Iab144b199e4e7db62358283efec6877a5da19bab

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 00c21d2..09b7004 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -19,11 +19,7 @@
 
 #include sal/config.h
 
-#include osl/diagnose.h
-#include osl/file.hxx
-#include osl/mutex.hxx
 #include osl/module.hxx
-#include rtl/ustrbuf.hxx
 #include uno/environment.h
 #include uno/mapping.hxx
 #include cppuhelper/factory.hxx
@@ -47,67 +43,12 @@ using namespace ::com::sun::star::uno;
 
 using rtl::OString;
 using rtl::OUString;
-using rtl::OUStringBuffer;
 
 namespace cppu
 {
 
 #ifndef DISABLE_DYNLOADING
 
-static OUString makeComponentPath(
-const OUString  rLibName, const OUString  rPath )
-{
-#if OSL_DEBUG_LEVEL  0
-// No system path allowed here !
-{
-OUString aComp;
-OSL_ASSERT( FileBase::E_None ==
-FileBase::getSystemPathFromFileURL( rLibName, aComp ) );
-OSL_ASSERT(
-rPath.isEmpty() ||
-FileBase::E_None ==
-  FileBase::getSystemPathFromFileURL( rPath, aComp ) );
-}
-#endif
-
-OUStringBuffer buf( rPath.getLength() + rLibName.getLength() + 12 );
-
-if (!rPath.isEmpty())
-{
-buf.append( rPath );
-if (rPath[ rPath.getLength() -1 ] != '/')
-buf.append( (sal_Unicode) '/' );
-}
-if (!rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION )
-#if defined MACOSX
- !rLibName.endsWithIgnoreAsciiCase(.jnilib)
-#endif
-)
-{
-#if defined SAL_DLLPREFIX
-if (! rLibName.endsWithIgnoreAsciiCase( .uno ))
-{
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX) );
-}
-#endif
-buf.append( rLibName );
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLEXTENSION) );
-}
-else // name is completely pre/postfixed
-{
-buf.append( rLibName );
-}
-
-OUString out( buf.makeStringAndClear() );
-#if OSL_DEBUG_LEVEL  1
-OString str( OUStringToOString( out, RTL_TEXTENCODING_ASCII_US ) );
-OSL_TRACE(OSL_LOG_PREFIX component path=%s, str.getStr());
-#endif
-
-return out;
-}
-
-//==
 static void getLibEnv(oslModulelib,
   uno::Environment   * pEnv,
   OUString   * pSourceEnv_name,
@@ -176,13 +117,12 @@ extern C {static void s_getFactory(va_list * pParam)
 
 /* For backwards compatibility */
 Reference XInterface  SAL_CALL loadSharedLibComponentFactory(
-OUString const  rLibName, OUString const  rPath,
-OUString const  rImplName,
+OUString const  uri, OUString const  rPath, OUString const  rImplName,
 Reference lang::XMultiServiceFactory  const  xMgr,
 Reference registry::XRegistryKey  const  xKey )
 SAL_THROW( (loader::CannotActivateFactoryException) )
 {
-return loadSharedLibComponentFactory( rLibName, rPath, rImplName, xMgr, 
xKey, rtl::OUString() );
+return loadSharedLibComponentFactory( uri, rPath, rImplName, xMgr, xKey, 
rtl::OUString() );
 }
 
 namespace
@@ -194,7 +134,6 @@ Reference XInterface  invokeComponentFactory(
 OUString const  rModulePath,
 OUString const  rImplName,
 Reference ::com::sun::star::lang::XMultiServiceFactory  const  xMgr,
-Reference ::com::sun::star::registry::XRegistryKey  const  xKey,
 OUString const  rPrefix,
 OUString rExcMsg )
 {
@@ -244,18 +183,11 @@ Reference XInterface  invokeComponentFactory(
 {
 void * pSMgr = aCurrent2Env.mapInterface(
 xMgr.get(), ::getCppuType( xMgr ) );
-void * pKey = aCurrent2Env.mapInterface(
-xKey.get(), ::getCppuType( xKey ) );
 
 void * pSSF = NULL;
 
-env.invoke(s_getFactory, pGetter, aImplName, pSMgr, pKey, pSSF);
+env.invoke(s_getFactory, pGetter, aImplName, pSMgr, 0, pSSF);
 
-if (pKey)
-{
-

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

 sc/source/core/data/bcaslot.cxx |   22 +++
 sc/source/core/inc/bcaslot.hxx  |   20 +++---
 sc/source/core/opencl/openclwrapper.cxx |   94 +++-
 3 files changed, 89 insertions(+), 47 deletions(-)

New commits:
commit 0d0d3a0540dad2d0f417e21df1183dfc33964357
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Oct 1 01:36:04 2013 +0200

make source code opencl 1.0 compliant

Change-Id: Id6055194eb225b85a5c66c5cf9fb44ad342df1a7

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index 6d92708..c59f055 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -259,11 +259,12 @@ OString createFileName(cl_device_id deviceId, const char* 
clFileName)
 
 std::vectorboost::shared_ptrosl::File  OpenclDevice::binaryGenerated( 
const char * clFileName, cl_context context )
 {
-cl_uint numDevices=0;
+size_t numDevices=0;
 
 std::vectorboost::shared_ptrosl::File  aGeneratedFiles;
-cl_int clStatus = clGetContextInfo( context, CL_CONTEXT_NUM_DEVICES,
-sizeof(numDevices), numDevices, NULL );
+cl_int clStatus = clGetContextInfo( context, CL_CONTEXT_DEVICES,
+0, NULL, numDevices );
+numDevices /= sizeof(numDevices);
 
 if(clStatus != CL_SUCCESS)
 return aGeneratedFiles;
@@ -465,9 +466,10 @@ int OpenclDevice::compileKernelFile( GPUEnv *gpuInfo, 
const char *buildOption )
 
 idx = gpuInfo-mnFileCount;
 
-cl_uint numDevices;
-clStatus = clGetContextInfo( gpuInfo-mpContext, CL_CONTEXT_NUM_DEVICES,
-sizeof(numDevices), numDevices, NULL );
+size_t numDevices;
+clStatus = clGetContextInfo( gpuInfo-mpContext, CL_CONTEXT_DEVICES,
+0, NULL, numDevices );
+numDevices /= sizeof(numDevices);
 CHECK_OPENCL( clStatus, clGetContextInfo );
 
 std::vectorboost::shared_ptrosl::File  aGeneratedFiles = 
binaryGenerated(
commit 19e48764f7396e4a462d3a97c4bbe7848572b7d5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Oct 1 00:55:27 2013 +0200

hash platform version, device name, driver version into binary name

Change-Id: Id34e7c6dad0587e2a8ea583c6df9bdc145f193bc

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index 58850ca..6d92708 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -36,6 +36,8 @@
 #endif
 
 #define DEVICE_NAME_LENGTH 1024
+#define DRIVER_VERSION_LENGTH 1024
+#define PLATFORM_VERSION_LENGTH 1024
 
 using namespace std;
 
@@ -48,16 +50,12 @@ int OpenclDevice::isInited =0;
 
 namespace {
 
-OString generateHashForSource()
+OString generateMD5(const void* pData, size_t length)
 {
 sal_uInt8 pBuffer[RTL_DIGEST_LENGTH_MD5];
-
-#ifndef NDEBUG
-size_t nLength = strlen(kernel_src);
-rtlDigestError aError = rtl_digest_MD5(kernel_src, nLength,
+rtlDigestError aError = rtl_digest_MD5(pData, length,
 pBuffer, RTL_DIGEST_LENGTH_MD5);
-assert(aError == rtl_Digest_E_None);
-#endif
+SAL_WARN_IF(aError != rtl_Digest_E_None, sc, md5 generation failed);
 
 OStringBuffer aBuffer;
 const char* pString = 0123456789ABCDEF;
@@ -70,6 +68,12 @@ OString generateHashForSource()
 return aBuffer.makeStringAndClear();
 }
 
+OString generateHashForSource()
+{
+size_t nLength = strlen(kernel_src);
+return generateMD5(kernel_src, nLength);
+}
+
 OString getCacheFolder()
 {
 OUString url(${$BRAND_BASE_DIR/ LIBO_ETC_FOLDER / 
SAL_CONFIGFILE(bootstrap) :UserInstallation}/cache/);
@@ -230,8 +234,25 @@ OString createFileName(cl_device_id deviceId, const char* 
clFileName)
 char deviceName[DEVICE_NAME_LENGTH] = {0};
 clGetDeviceInfo(deviceId, CL_DEVICE_NAME,
 sizeof(deviceName), deviceName, NULL);
+
+char driverVersion[DRIVER_VERSION_LENGTH] = {0};
+clGetDeviceInfo(deviceId, CL_DRIVER_VERSION,
+sizeof(driverVersion), driverVersion, NULL);
+
+cl_platform_id platformId;
+clGetDeviceInfo(deviceId, CL_DEVICE_PLATFORM,
+sizeof(platformId), platformId, NULL);
+
+char platformVersion[PLATFORM_VERSION_LENGTH] = {0};
+clGetPlatformInfo(platformId, CL_PLATFORM_VERSION, sizeof(platformVersion),
+platformVersion, NULL);
+
+// create hash for deviceName + driver version + platform version
+OString aString = OString(deviceName) + driverVersion + platformVersion;
+OString aHash = generateMD5(aString.getStr(), aString.getLength());
+
 return OpenclDevice::maCacheFolder + fileName + - +
-deviceName + - + OpenclDevice::maSourceHash + .bin;
+aHash + - + OpenclDevice::maSourceHash + .bin;
 }
 
 }
commit 25580075e08f2e20f0c842cf7da96e280884c9de
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Sep 30 22:46:38 2013 +0200

remove unused macros

Change-Id:

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

 xmloff/source/style/impastpl.cxx |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit ab314659448e3a1f6f3aaf9e9e7408cfcb4f0c7e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Oct 1 02:43:37 2013 +0200

fix Mac OSX build

diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index c41b5dc..e52e00d 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -594,6 +594,15 @@ struct AutoStylePoolExport
 AutoStylePoolExport() : mpParent(NULL), mpProperties(NULL) {}
 };
 
+struct StyleComparator
+{
+bool operator() (const AutoStylePoolExport a, const AutoStylePoolExport 
b)
+{
+return (a.mpProperties-GetName()  b.mpProperties-GetName() ||
+(a.mpProperties-GetName() == b.mpProperties-GetName()  
*a.mpParent  *b.mpParent));
+}
+};
+
 }
 
 void SvXMLAutoStylePoolP_Impl::exportXML(
@@ -653,15 +662,8 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
 
 if (bHack)
 {
-struct {
-bool operator() (AutoStylePoolExport a, AutoStylePoolExport b)
-{
-return (a.mpProperties-GetName()  b.mpProperties-GetName() 
||
-(a.mpProperties-GetName() == 
b.mpProperties-GetName()  *a.mpParent  *b.mpParent));
-}
-} aComparator;
 
-std::sort(aExpStyles.begin(), aExpStyles.end(), aComparator);
+std::sort(aExpStyles.begin(), aExpStyles.end(), StyleComparator());
 
 for (size_t i = 0; i  nCount; i++)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cppuhelper/source/shlib.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f189b1ab9bab8fb8a68a21c03c038c7d19751841
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Oct 1 02:48:53 2013 +0200

prevent WaE with unused parameters

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 09b7004..9ffb8c1 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -265,6 +265,8 @@ Reference XInterface  SAL_CALL 
loadSharedLibComponentFactory(
 {
 assert(rPath.isEmpty());
 assert(!xKey.is());
+(void) rPath;
+(void) xKey;
 #ifndef DISABLE_DYNLOADING
 OUString moduleUri(uri);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-3' - 5 commits - sc/source

 sc/source/core/opencl/openclwrapper.cxx |  296 +++-
 sc/source/core/opencl/openclwrapper.hxx |2 
 2 files changed, 182 insertions(+), 116 deletions(-)

New commits:
commit 5ccbc4ddf6b15a7f013049b79ebd1b7d3286ca7a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Oct 1 05:56:34 2013 +0200

make sure that we really fall back to new compile if binary failed

If anything during binary import fails fall back to compiling from
source. That includes a failure during building the binary file.

Change-Id: I0f021f17c9be061fc9eb9f28ab470257d61f03cb

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index f304695..ff6 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -452,21 +452,104 @@ int OpenclDevice::cachedOfKernerPrg( const GPUEnv 
*gpuEnvCached, const char * cl
 return 0;
 }
 
-int OpenclDevice::compileKernelFile( GPUEnv *gpuInfo, const char *buildOption )
+namespace {
+
+bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx)
 {
-cl_int clStatus = 0;
-int binary_status, idx;
-const char* filename = kernel.cl;
-fprintf(stderr, compileKernelFile ... \n);
-if ( cachedOfKernerPrg(gpuInfo, filename) == 1 )
+cl_int clStatus;
+//char options[512];
+// create a cl program executable for all the devices specified
+printf(BuildProgram.\n);
+if (!gpuInfo-mnIsUserCreated)
 {
-return 1;
+clStatus = clBuildProgram(gpuInfo-mpArryPrograms[idx], 1, 
gpuInfo-mpArryDevsID,
+   buildOption, NULL, NULL);
+}
+else
+{
+clStatus = clBuildProgram(gpuInfo-mpArryPrograms[idx], 1, 
(gpuInfo-mpDevID),
+   buildOption, NULL, NULL);
 }
 
-idx = gpuInfo-mnFileCount;
+if ( clStatus != CL_SUCCESS )
+{
+size_t length;
+printf (BuildProgram error!\n);
+if ( !gpuInfo-mnIsUserCreated )
+{
+clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx], 
gpuInfo-mpArryDevsID[0],
+   CL_PROGRAM_BUILD_LOG, 0, NULL, length );
+}
+else
+{
+clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx], 
gpuInfo-mpDevID,
+   CL_PROGRAM_BUILD_LOG, 0, NULL, length);
+}
+if ( clStatus != CL_SUCCESS )
+{
+printf(opencl create build log fail\n);
+return 0;
+}
+
+boost::scoped_arraychar buildLog(new char[length]);
+if ( !gpuInfo-mnIsUserCreated )
+{
+clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx], 
gpuInfo-mpArryDevsID[0],
+   CL_PROGRAM_BUILD_LOG, length, buildLog.get(), 
length );
+}
+else
+{
+clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx], 
gpuInfo-mpDevID,
+   CL_PROGRAM_BUILD_LOG, length, buildLog.get(), 
length );
+}
+if ( clStatus != CL_SUCCESS )
+{
+printf(opencl program build info fail\n);
+return false;
+}
+
+OString aBuildLogFileURL = OpenclDevice::maCacheFolder + 
kernel-build.log;
+osl::File aBuildLogFile(rtl::OStringToOUString(aBuildLogFileURL, 
RTL_TEXTENCODING_UTF8));
+osl::FileBase::RC status = aBuildLogFile.open(
+osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
+
+if(status != osl::FileBase::E_None)
+return false;
+
+sal_uInt64 nBytesWritten = 0;
+aBuildLogFile.write( buildLog.get(), length, nBytesWritten );
+
+return false;
+}
+
+return true;
+}
+
+}
+
+bool OpenclDevice::buildProgramFromSource(const char* buildOption, GPUEnv* 
gpuInfo, const char* filename, int idx)
+{
+cl_int clStatus = 0;
+// create a CL program using the kernel source
+fprintf(stderr, Create kernel from source\n);
+size_t source_size[1];
+
+source_size[0] = strlen( kernel_src );
+gpuInfo-mpArryPrograms[idx] = clCreateProgramWithSource( 
gpuInfo-mpContext, 1, kernel_src,
+source_size, clStatus);
+
+if(clStatus != CL_SUCCESS)
+return false;
 
+bool bSuccess = buildProgram(buildOption, gpuInfo, idx);
+generatBinFromKernelSource( gpuInfo-mpArryPrograms[idx], filename );
+return bSuccess;
+}
+
+bool OpenclDevice::buildProgramFromBinary(const char* buildOption, GPUEnv* 
gpuInfo, const char* filename, int idx)
+{
 size_t numDevices;
-clStatus = clGetContextInfo( gpuInfo-mpContext, CL_CONTEXT_DEVICES,
+cl_int clStatus = clGetContextInfo( gpuInfo-mpContext, CL_CONTEXT_DEVICES,
 0, NULL, numDevices );
 numDevices /= sizeof(numDevices);
 CHECK_OPENCL( clStatus, clGetContextInfo );
@@ -474,10 +557,8 @@ int OpenclDevice::compileKernelFile( GPUEnv *gpuInfo, 
const char *buildOption )

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

 sc/source/core/opencl/openclwrapper.cxx |  205 +---
 sc/source/core/opencl/openclwrapper.hxx |2 
 2 files changed, 115 insertions(+), 92 deletions(-)

New commits:
commit e000b3fc7852b7879729694436170c01cb6b9fa8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Oct 1 05:56:34 2013 +0200

make sure that we really fall back to new compile if binary failed

If anything during binary import fails fall back to compiling from
source. That includes a failure during building the binary file.

Change-Id: I0f021f17c9be061fc9eb9f28ab470257d61f03cb

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index c59f055..77f802e 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -453,21 +453,104 @@ int OpenclDevice::cachedOfKernerPrg( const GPUEnv 
*gpuEnvCached, const char * cl
 return 0;
 }
 
-int OpenclDevice::compileKernelFile( GPUEnv *gpuInfo, const char *buildOption )
+namespace {
+
+bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx)
 {
-cl_int clStatus = 0;
-int binary_status, idx;
-const char* filename = kernel.cl;
-fprintf(stderr, compileKernelFile ... \n);
-if ( cachedOfKernerPrg(gpuInfo, filename) == 1 )
+cl_int clStatus;
+//char options[512];
+// create a cl program executable for all the devices specified
+printf(BuildProgram.\n);
+if (!gpuInfo-mnIsUserCreated)
 {
-return 1;
+clStatus = clBuildProgram(gpuInfo-mpArryPrograms[idx], 1, 
gpuInfo-mpArryDevsID,
+   buildOption, NULL, NULL);
+}
+else
+{
+clStatus = clBuildProgram(gpuInfo-mpArryPrograms[idx], 1, 
(gpuInfo-mpDevID),
+   buildOption, NULL, NULL);
 }
 
-idx = gpuInfo-mnFileCount;
+if ( clStatus != CL_SUCCESS )
+{
+size_t length;
+printf (BuildProgram error!\n);
+if ( !gpuInfo-mnIsUserCreated )
+{
+clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx], 
gpuInfo-mpArryDevsID[0],
+   CL_PROGRAM_BUILD_LOG, 0, NULL, length );
+}
+else
+{
+clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx], 
gpuInfo-mpDevID,
+   CL_PROGRAM_BUILD_LOG, 0, NULL, length);
+}
+if ( clStatus != CL_SUCCESS )
+{
+printf(opencl create build log fail\n);
+return 0;
+}
+
+boost::scoped_arraychar buildLog(new char[length]);
+if ( !gpuInfo-mnIsUserCreated )
+{
+clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx], 
gpuInfo-mpArryDevsID[0],
+   CL_PROGRAM_BUILD_LOG, length, buildLog.get(), 
length );
+}
+else
+{
+clStatus = clGetProgramBuildInfo( gpuInfo-mpArryPrograms[idx], 
gpuInfo-mpDevID,
+   CL_PROGRAM_BUILD_LOG, length, buildLog.get(), 
length );
+}
+if ( clStatus != CL_SUCCESS )
+{
+printf(opencl program build info fail\n);
+return false;
+}
+
+OString aBuildLogFileURL = OpenclDevice::maCacheFolder + 
kernel-build.log;
+osl::File aBuildLogFile(rtl::OStringToOUString(aBuildLogFileURL, 
RTL_TEXTENCODING_UTF8));
+osl::FileBase::RC status = aBuildLogFile.open(
+osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
+
+if(status != osl::FileBase::E_None)
+return false;
+
+sal_uInt64 nBytesWritten = 0;
+aBuildLogFile.write( buildLog.get(), length, nBytesWritten );
+
+return false;
+}
+
+return true;
+}
+
+}
+
+bool OpenclDevice::buildProgramFromSource(const char* buildOption, GPUEnv* 
gpuInfo, const char* filename, int idx)
+{
+cl_int clStatus = 0;
+// create a CL program using the kernel source
+fprintf(stderr, Create kernel from source\n);
+size_t source_size[1];
+
+source_size[0] = strlen( kernel_src );
+gpuInfo-mpArryPrograms[idx] = clCreateProgramWithSource( 
gpuInfo-mpContext, 1, kernel_src,
+source_size, clStatus);
+
+if(clStatus != CL_SUCCESS)
+return false;
 
+bool bSuccess = buildProgram(buildOption, gpuInfo, idx);
+generatBinFromKernelSource( gpuInfo-mpArryPrograms[idx], filename );
+return bSuccess;
+}
+
+bool OpenclDevice::buildProgramFromBinary(const char* buildOption, GPUEnv* 
gpuInfo, const char* filename, int idx)
+{
 size_t numDevices;
-clStatus = clGetContextInfo( gpuInfo-mpContext, CL_CONTEXT_DEVICES,
+cl_int clStatus = clGetContextInfo( gpuInfo-mpContext, CL_CONTEXT_DEVICES,
 0, NULL, numDevices );
 numDevices /= sizeof(numDevices);
 CHECK_OPENCL( clStatus, clGetContextInfo );
@@ -475,10 +558,8 @@ int OpenclDevice::compileKernelFile( GPUEnv *gpuInfo, 
const char *buildOption )

Re: [Libreoffice-qa] minutes of ESC face-to-face ...


On Sat, 2013-09-28 at 19:03 +0200, bjoern wrote:
 One brainstormed idea From the QA roundtable was: A possibility would be to
 do a commenter on FIXED bugs stats. E.g. when releasing 4.x.1 querying for
 all commenters on RESOLVED/FIXED bugs with target:4.x.1.y and then say
 something like 128 contributors helped triage the bugs fixed in this release.
 Alice (8), Bob (5) and Charly (3) helped triaging the fixed bugs in this
 release most.

Nice idea ! :-) I'd love a commnit to
contrib/dev-tools/scripts/esc-bug-stats.pl that generates that :-)

 With this:

A great idea of course :-)

Thanks !

Michael.

-- 
 michael.me...@collabora.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-qa] Doubled Help and Close in Find Replace window

Hello @ll,
maybe I have not seen it before, but now I stumbled upon the 
following:

1. Start LO
2. Start Writer (but it is the same in Calc ... :( )
3. Press Ctrl+H
4. Click Other Options

Now you have a Help and a Close button below Similarity Search 
and a Help and a Close button at the right bottom of this window 
(which seem not to have any functionality ... :( ). I have tested it 
with LO Version: 4.1.1.2 Build ID: 
7e4286b58adc75a14f6d83f53a03b6c11fa2903 and Version: 4.1.2.2
Build ID: 281b75f427729060b6446ddb3777b32f957a8fb, both with 
installed Germanophone help- as well as langpack under Debian 
Testing AMD64. And it is the same, if I switch the UI language to 
English ... :(

Can someone confirm it with an other OS/architecture, please? And 
maybe knows an already reported bug for it?
TIA
Thomas.

-- 
NP: Godflesh – Locust Furnace

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

[Libreoffice-qa] Ctrl+Z seem not to lead to an unchanged document in Calc

Hello @ll,
and another one ... :(
1. Open Calc
2. Enter some values like 1, 2, 3 in the first column and 2, 4, 6 in 
the second column.
3. Press Ctrl+Z as long as all values are removed.
4. Press Ctrl+W to close the window.
The Save document dialog opens. But I would expect, that Calc 
closes this window without any Save document dialog ... :( Is this 
a bug or a feature?

Tested with
LO: Version: 4.1.1.2 Build ID: 
7e4286b58adc75a14f6d83f53a03b6c11fa2903 and Version: 4.1.2.2
Build ID: 281b75f427729060b6446ddb3777b32f957a8fb, both with 
installed Germanophone lang- as well as helppack
OS: Debian Testing AMD64

Could someone else with a different OS/architecture test it as well, 
please?
TIA
Thomas.

-- 
NP: Godflesh – Head Dirt

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

Re: [Libreoffice-qa] Doubled Help and Close in Find Replace window

2013-09-30 Thread Pedro

Hi Thomas

I don't see any duplicated buttons (it would be better if you attached an
image, not to the email but to Nabble)

However there are some odd half buttons...

In LO 4.1.2.2 (under Windows XP x86 en_US) it looks like this

http://nabble.documentfoundation.org/file/n4075710/Similarity.png 

Notice the half button in front of Similarity.

But I just noticed that two options have been removed since version 4.1.1.2:
Match character width and Sounds like (Japanese) which also had an
half button. Maybe these functions weren't used? Or is this a regression?

Pedro



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Doubled-Help-and-Close-in-Find-Replace-window-tp4075693p4075710.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Doubled Help and Close in Find Replace window

2013-09-30 Thread V Stuart Foote

Similar fully formed GUI elements with LO 4.1.2.2 on Fedora 19 64-bit.  So
not sure what might be up with the WM  in Debian.

Version: 4.1.2.2
Build ID: 4.1.2.2-1.fc19

http://nabble.documentfoundation.org/file/n4075717/FindReplacePanel_expandedOtherOptions_LO4.1.1.2_Fedora19_GNOME.png
 


@Thomas,  regards  And most netiquettes say, that you should not send
attachments to an ML.  The Nabble ML services does not send the attached
image, only a link to it as held on Nabble's web servers. So depending on
one's mail reader will either see the URL or a rendered version of the
image.  As such, Nabble can be very efficient in exchanging technical
details captured in screen shots.








--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Doubled-Help-and-Close-in-Find-Replace-window-tp4075693p4075717.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Ctrl+Z seem not to lead to an unchanged document in Calc

Hello Pedro, *,
On Montag, 30. September 2013 15:54 Pedro wrote:
 Thomas Hackert wrote
 and another one ... :(
 1. Open Calc
 2. Enter some values like 1, 2, 3 in the first column and 2, 4, 6
 in the second column.
 3. Press
 Ctrl
 +
 Z
  as long as all values are removed.
 4. Press
 Ctrl
 +
 W
  to close the window.
 The Save document dialog opens. But I would expect, that Calc
 closes this window without any Save document dialog ... :( Is
 this a bug or a feature?
 
 In fact you just need to type 1 and press Enter. Pressing Ctrl+Z
 will remove the value but pressing Ctrl+W opens the Save dialog.

that sounded too lazy to me, so I added a couple more numbers ... ;)

 IMO this is a bug not a feature. If you save the document and then
 type 2 in another cell, even if you Undo, it will still ask to
 save. This means that pressing Enter on a non-empty cell triggers
 the Save action even if you Undo all actions.

Thanks for your explanation :) Then I only need to find out, if it 
is reported in BZ or if I have to report a new bug ... :(

 Hope this helps ;)

Indeed, it did :) Thank you very much
Thomas.

-- 
NP: Godflesh – Perfect Skin Dub

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

Re: [Libreoffice-qa] Doubled Help and Close in Find Replace window

2013-09-30 Thread Pedro

Hi again Thomas


Thomas Hackert wrote
 I cannot confirm this on my system ... ;) Did you enable Show UI 
 elements for East Asian writings in Tools – Options – Language 
 Settings – Languages? On my system they are both full buttons and 
 they are both there ... ;)

You are correct. That option was enabled by mistake in 4.1.1.2
Un-selecting it removes the two extra options. So all is good except for the
half buttons :)

Curiously the whole Enhanced Language Support section has been removed in
4.2 Alpha (at least in Version: 4.2.0.0.alpha0+
Build ID: a8865e5df62b5f33aa769d459b9823eb5b110d4b
TinderBox: Win-x86@6-debug, Branch:master, Time: 2013-09-03_14:36:22 which
is the latest Master version available for Windows XP)

Pedro



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Doubled-Help-and-Close-in-Find-Replace-window-tp4075693p4075719.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Doubled Help and Close in Find Replace window

2013-09-30 Thread V Stuart Foote

@Thomas,

Glad it has been sorted at the 4.1.2.3 RC.  But what was wonky with the
Debian for  4.1.1.2 and 4.1.2.2?  Any chance of firing up a different WM to
see if it was unique to your primary WM?

Stuart



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Doubled-Help-and-Close-in-Find-Replace-window-tp4075693p4075718.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Doubled Help and Close in Find Replace window

Hello Stuart, *,
On Montag, 30. September 2013 16:23 V Stuart Foote wrote:
Similar fully formed GUI elements with LO 4.1.2.2 on Fedora 19
64-bit. So
not sure what might be up with the WM in Debian.

I am using KDE 4.10-5, but I am not sure, if this is somehow
relevant ... ;)

http://nabble.documentfoundation.org/file/n4075717/FindReplacePanel_expandedOtherOptions_LO4.1.1.2_Fedora19_GNOME.png

Thanks for this screenshot :)

@Thomas, regards And most netiquettes say, that you should not
send
attachments to an ML. The Nabble ML services does not send the
attached image, only a link to it as held on Nabble's web servers.
So depending on one's mail reader will either see the URL or a
rendered version of the
image.

Ah, O.K. Thank you for your explanation :) Interestingly, some of
them where visible inside a mail, others only had a link to it ...
;)

But still I am not subscribed to Nabble, but to GMane ... :( I
think, I have to find out, how GMane handle attachments ... ;)

As such, Nabble can be very efficient in exchanging
technical details captured in screen shots.

O.K.
Thank you for your answer
Thomas.

--
NP: Godflesh – Stateman

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

Re: [Libreoffice-qa] Doubled Help and Close in Find Replace window

Hello Stuart, *,
On Montag, 30. September 2013 16:29 V Stuart Foote wrote:
 Glad it has been sorted at the 4.1.2.3 RC.  But what was wonky
 with the
 Debian for  4.1.1.2 and 4.1.2.2?

I have not the faintest idea ... :( Maybe my PC gets too old, as it 
is behaving strange and flaky from time to time the last months ... 
:(

 Any chance of firing up a
 different WM to see if it was unique to your primary WM?

Oh, I think I have to install one then ... :( But not today, as I 
have to do some stuff now and do not want to logout at the moment 
... ;)
Thomas.

-- 
NP: Godflesh – Perfect Skin

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

[Libreoffice-qa] Half buttons in Find Replace window (was: Doubled Help and Close in Find Replace window)

Hello Pedro, *,
On Montag, 30. September 2013 16:30 Pedro wrote:
 Thomas Hackert wrote
 I cannot confirm this on my system ... ;) Did you enable Show UI
 elements for East Asian writings in Tools – Options – Language
 Settings – Languages? On my system they are both full buttons
 and they are both there ... ;)
 
 You are correct. That option was enabled by mistake in 4.1.1.2
 Un-selecting it removes the two extra options. So all is good
 except for the half buttons :)

like I have written before, I cannot confirm it with LO Version: 
4.1.2.3 Build ID: 40b2d7fde7e8d2d7bc5a449dc65df4d08a7dd38 and 
installed Germanophone lang- as well as helppack under Debian 
Testing AMD64 ... :( Just out of interest: Which graphics card/chip 
are you using? Have you tried to install a newer driver for it? And 
what monitor resolution do you use?

 Curiously the whole Enhanced Language Support section has been
 removed in 4.2 Alpha (at least in Version: 4.2.0.0.alpha0+
 Build ID: a8865e5df62b5f33aa769d459b9823eb5b110d4b
 TinderBox: Win-x86@6-debug, Branch:master, Time:
 2013-09-03_14:36:22 which is the latest Master version available
 for Windows XP)

Interesting. But I am not able to test it, as there are no 4.2 
master builds for Debian Testing AMD64 on dev-builds.libreoffice.org 
since December (IIRC) ... :(
Thomas.

-- 
NP: Godflesh – Someone Somewhere Scorned

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

Re: [Libreoffice-qa] Doubled Help and Close in Find Replace window

2013-09-30 Thread V Stuart Foote

@Thomas,

Also had clean formation of button widgets on the LO 4.1.1.2 CTL+H panel
with KDE-Plasma WM on Fedora 19.

http://nabble.documentfoundation.org/file/n4075735/FindReplacePanel_expandedOtherOptions_LO4.1.1.2_Fedora19_KDE-Plasma.png
 

So does not appear to be a WM/DE issue.

Stuart




--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Doubled-Help-and-Close-in-Find-Replace-window-tp4075693p4075735.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Doubled Help and Close in Find Replace window

Hello Stuart, *,
On Montag, 30. September 2013 17:09 V Stuart Foote wrote:
 Also had clean formation of button widgets on the LO 4.1.1.2
 CTL+H panel with KDE-Plasma WM on Fedora 19.

O.K. Thank you for your  answer :)

 
http://nabble.documentfoundation.org/file/n4075735/FindReplacePanel_expandedOtherOptions_LO4.1.1.2_Fedora19_KDE-Plasma.png
 
 So does not appear to be a WM/DE issue.

O.K.
Thanks you again
Thomas.

-- 
NP: Godflesh – Slavestate (Total State Mix)

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

Re: [Libreoffice-qa] Ctrl+Z seem not to lead to an unchanged document in Calc

Hello Pedro, *,
On Montag, 30. September 2013 15:54 Pedro wrote:
and again ... ;)

 Thomas Hackert wrote
[Calc's Undo does not change the status of a document]
 In fact you just need to type 1 and press Enter. Pressing Ctrl+Z
 will remove the value but pressing Ctrl+W opens the Save dialog.
 
 IMO this is a bug not a feature.

I have reported it to Bugzilla 
(https://bugs.freedesktop.org/show_bug.cgi?id=69972). Would you be 
so kind to confirm it, please?
TIA
Thomas.

-- 
NP: Godflesh – Mothra

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

[Libreoffice-bugs] [Bug 54513] Label Horizontal Pitch Not to specific Label dimensions

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

--- Comment #5 from Winfried Donkers winfrieddonk...@libreoffice.org ---
I will try to reproduce it with version 4. If so, I will see if I can solve the
problem (and assign myself to this bug).
(And if it's the same issue as bug 51770, I will mark this bug as a duplicate
bug.)

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

[Libreoffice-bugs] [Bug 51770] Label creation ignores Horizontal pitch

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

--- Comment #5 from Winfried Donkers winfrieddonk...@libreoffice.org ---
I will try to reproduce it with version 4. If so, I will see if I can solve the
problem (and assign myself to this bug).

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

[Libreoffice-bugs] [Bug 60889] FILEOPEN: Incorrect opening XLSX file (that happens to be not valid according to OOXML, may be produced by software like 1C:Enterprise)

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

--- Comment #30 from Draga dr...@smolpk.ru ---
WinXp SP3 
http://dev-builds.libreoffice.org/daily/master/Win-x86@39/current/
master~2013-09-30_01.41.28_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi
30-Sep-2013 03:45

Start C:\Program Files\LibreOfficeDev 4\program\soffice.exe
Error message:
... not found msvcr110.dll ...

I installed the Visual C++ Runtime VS2012 (vcredist_x86.exe)

Now new error message (my translate from Russian):

soffice.exe - Entry point not found
The procedure entry point GetTickCount64 could not be located in the DLL
KERNEL32.DLL

What else should I install?


http://msdn.microsoft.com/en-us/library/windows/desktop/ms724411%28v=vs.85%29.aspx
MSDN about GetTickCount64: Minimum supported client - Windows Vista
LO 4.2:  Minimum supported client - Windows Vista ?

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

[Libreoffice-bugs] [Bug 69947] New: FILEOPEN !!br0ken!! string instead of double quote

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

  Priority: medium
Bug ID: 69947
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FILEOPEN !!br0ken!! string instead of double quote
  Severity: normal
Classification: Unclassified
OS: All
  Reporter: davian...@gmail.com
  Hardware: Other
Status: UNCONFIRMED
   Version: 4.2.0.0.alpha0+ Master
 Component: Spreadsheet
   Product: LibreOffice

When opening a text file containing ' ' string (no outer ticks) in one of the
fields, it is imported as !!br0ken!! string, even if Treat quoted values as
strings option is switched off.

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

[Libreoffice-bugs] [Bug 68944] Get rid of the recovery window after a crash.

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

--- Comment #2 from Lionel Dricot lio...@lanedo.com ---
1. The recovery code does *not* work. I've never witnessing anybody that told
me it works great. 


2. There should not be any recovery windows at all. The document should open as
it was when LibreOffice crashed, that's it. The recovery process is confusing
(and, as pointed out above, does not work).


In the current situation, not having anything at all (no recovery, no windows)
would be far better.

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

[Libreoffice-bugs] [Bug 60889] FILEOPEN: Incorrect opening XLSX file (that happens to be not valid according to OOXML, may be produced by software like 1C:Enterprise)

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

--- Comment #31 from Urmas davian...@gmail.com ---
Master builds are not compatible with XP. That's OK.

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

[Libreoffice-bugs] [Bug 68944] Get rid of the recovery window after a crash.