LibreOffice Gerrit News for core on 2014-01-11

2014-01-10 Thread gerrit 
Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things ! 
+ sax: Simplify constructor functions.
  in https://gerrit.libreoffice.org/7376 from Matúš Kukan
  about module sax
+ fdo#69613 : Fix for TOC with flag '\u' should get preserved after RT.
  in https://gerrit.libreoffice.org/7202 from Pallavi Jadhav
  about module sw
+ fdo#70942 Preserve original shape type, if shape contains text. Currently
  in https://gerrit.libreoffice.org/7372 from Nikhil Walvekar
  about module include, oox, sw
+ Fixed preservation of FrameGrabBag properties.
  in https://gerrit.libreoffice.org/7371 from Nikhil Walvekar
  about module writerfilter
+ Export MailMerge cancel functionality via UNO.
  in https://gerrit.libreoffice.org/7190 from Jan-Marek Glogowski
  about module offapi, sw
+ fdo#69616: Fix for VML part missing for group.
  in https://gerrit.libreoffice.org/7276 from Rohit Deshmukh
  about module filter, include, oox, sc, svx, sw
+ convert custom list implementation to regular std::vector
  in https://gerrit.libreoffice.org/7369 from Noel Grandin
  about module scaddins
+ fdo#73247: Code fixed for Shape rotation not preserved in RT
  in https://gerrit.libreoffice.org/7367 from Yogesh Bharate
  about module oox, sw, writerfilter
+ API remove image : change document state #i74651#
  in https://gerrit.libreoffice.org/7286 from Maxime de Roucy
  about module svx
+ fdo#72563 : Pageref field tag not preserved
  in https://gerrit.libreoffice.org/7074 from Rajashri Udhoji
  about module sw
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
  about module include
+ Copied icons based on the GNOME icon theme from tango-testing to tango
  in https://gerrit.libreoffice.org/7251 from Alexander Wilms
  about module icon-themes
+ Fix for files are getting corrupted due to wrong place of  tags
  in https://gerrit.libreoffice.org/7359 from Rohit Deshmukh
  about module sw
+ removed some unused code (svx, svtools, unotest)
  in https://gerrit.libreoffice.org/7329 from Petr Vorel
  about module build, svtools, svx, unotest
 End of freshness 



* Merged changes on master for project core changed in the last 25 hours:

+ remove unused code from writerfilter
  in https://gerrit.libreoffice.org/7327 from Petr Vorel
+ fdo#69613: Code changes for TOC with flag '\z' should get preserved after
  in https://gerrit.libreoffice.org/7217 from Yogesh Bharate
+ fdo#69613: Fix for DOCX Export loses Table-of-Contents flags
  in https://gerrit.libreoffice.org/7203 from Tushar Bende
+ Use bool
  in https://gerrit.libreoffice.org/7363 from Stephan Bergmann
+ fdo#69613 DOCX export: Fix for '\o' flag field should export once.
  in https://gerrit.libreoffice.org/7206 from Priyanka Gaikwad
+ fdo#70807: Improve unit test using custom styles
  in https://gerrit.libreoffice.org/7373 from Marcos Souza
+ fdo#71834: Fix for floating table
  in https://gerrit.libreoffice.org/7364 from Umesh Kadam
+ fdo#73227: Fix for corruption after RT
  in https://gerrit.libreoffice.org/7292 from Pallavi Jadhav
+ re-write SvStream operator<< to non-overloaded methods
  in https://gerrit.libreoffice.org/7342 from Michael Stahl
+ Clang plugin to re-write SvStream operator<< to non-overloaded methods
  in https://gerrit.libreoffice.org/7307 from Noel Grandin
+ fdo#72520 : Exporting embedding data folder from grab bag.
  in https://gerrit.libreoffice.org/7213 from Sushil Shinde
+ fdo#72520 : Added embedded data of docx file to InteropGrabBag.
  in https://gerrit.libreoffice.org/7211 from Sushil Shinde
+ Use filelist in some packages
  in https://gerrit.libreoffice.org/7311 from Marcos Souza
+ fdo#70807: UT to verify used styles in document
  in https://gerrit.libreoffice.org/7351 from Marcos Souza


* Abandoned changes on master for project core changed in the last 25 hours:

+ fdo#72865: Fix for overlap tables.
  in https://gerrit.libreoffice.org/6854 from Rohit Deshmukh


* Open changes needing tweaks, but being untouched for more than a week:

+ fdo#72804 Add firebird.msg to install.
  in https://gerrit.libreoffice.org/7254 from Andrzej Hunt
+ Export CoreText-related SPI stuff
  in https://gerrit.libreoffice.org/7143 from Douglas Mencken
+ remove BluetoothOperator wrapper
  in https://gerrit.libreoffice.org/7092 from Christian Lohmaier
+ fix previous commit
  in https://gerrit.libreoffice.org/7101 from Markus Mohrhard
+ CID#736173: Out-of-bound read
  in https://gerrit.libreoffice.org/6973 from Julien Nabet
+ move from ActionBarSherlock to corresponding android support lib
  in https://gerrit.libreoffice.org/7082 from Christian Lohmaier
+ fdo#60698: Merge animcore into sd and slideshow
  in https://gerrit.libreoffice.org/7108 from Marcos Souza
+ fix Bluetooth lifecycle problems and respect UI guidelines
  in https://gerrit.libreoffice.org/7083 from Christian Lohmaier
+ Double toolbar icon size for HiDPI screens.

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

2014-01-10 Thread Armin Le Grand 
 svx/inc/svx/svxids.hrc |4 
 1 file changed, 4 insertions(+)

New commits:
commit c0c3722c0fdbd2af0a8c5cab744d3b4b41e7510c
Author: Armin Le Grand 
Date:   Fri Jan 10 21:55:48 2014 +

outlined seemingly free slot as not free (someone else may win time knowing 
this)

diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index fdc4535..70e8cf0 100755
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -1249,6 +1249,10 @@
 #define SID_CHAR_DLG_PREVIEW_STRING (SID_SVX_START+1090)
 #define SID_RECHECK_DOCUMENT(SID_SVX_START+1091)
 
+// 1092: CAUTION! This slot looks free, butr it is used by 
SID_ATTR_PARA_OUTLINE_LEVEL in
+// editeng, used in SW. Do NOT use (!), this WILL collide in 
SfxRequest::GetItem when
+// converted to WhichID using the ItemInfos from Writer's ItemPool
+
 #define SID_OBJECT_MIRROR   (SID_SVX_START+1093)
 
 #define SID_DELETE_POSTIT   (SID_SVX_START+1094)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 45904] move java based api tests to c++

2014-01-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=45904

--- Comment #13 from Ricardo  ---
(In reply to comment #11)
> Can I work on it? If so, I will assign to me.
> 
> Thanks in advance!

Have you worked on any of the tests?  I'd like to hack at these too, but if you
have already worked on something that's not on the main branch yet, it'd be
nice to know.

-- 
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: Advice needed : making options dialog slightly wider

2014-01-10 Thread Jean-Baptiste Faure 
Le 10/01/2014 20:33, Caolán McNamara a écrit :
> On Thu, 2014-01-09 at 19:42 +0100, Jean-Baptiste Faure wrote:
>> So I checked each option dialog and it remains only one truncated label
>> in French : in Language Settings > Languages the label "Complex text
>> layout (CTL)" is truncated in French (I see only the C in "(CTL)").
> 
> Fixed that now I believe.

Indeed, thank you. :-)
> 
>> In LibreOffice Impress > General there is what seems to be a
>> misplacement of the checkboxes under "Presentation". Both checkboxes
>> could be on the same row allowing the checkbox and its label under
>> Compatibility to be visible.
> 
> I bet you are referring to a black entry in col 1 row of that grid
> because the "enable remote control" thing is an optional feature which
> might not be in your build. Resorted those now to put the optional stuff
> in a row on its own.

So I discovered that there is two, not one, checkboxes under
Compatibility :-)
The second one is only partially visible. Perhaps the four checkboxes
under Settings could be rearranged in two columns ?

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-01-10 Thread Caolán McNamara 
 cui/source/factory/dlgfact.cxx|   11 +++
 cui/source/inc/dbregister.hxx |2 +-
 cui/source/options/dbregister.cxx |   14 +++---
 cui/uiconfig/ui/dbregisterpage.ui |2 ++
 4 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit 8cfd13d44798954983aaedd21eba9b5b7ca911ee
Author: Caolán McNamara 
Date:   Fri Jan 10 20:52:16 2014 +

Resolves: fdo#73260 fix Registered Database single tab dialog

Change-Id: I71bfe44b3d1f88a44a2c53b10c6880c2a3a4ede0
(cherry picked from commit 5ac26a7f0054ca3d1af41f3483dc0e32a343bb96)

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 8193a1c..78ecf1f 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1630,16 +1630,14 @@ SfxAbstractDialog* 
AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
 )
 {
 
-// TODO will fix this ugly hack when all cases are in SfxSingleTabDialog
-SfxNoLayoutSingleTabDialog* pDlg=NULL;
-SfxSingleTabDialog* pDlg1=NULL;
+SfxSingleTabDialog* pDlg=NULL;
 switch ( nResId )
 {
 case RID_SVXPAGE_MEASURE :
-pDlg1 = new SvxMeasureDialog( pParent, rAttr, pView );
+pDlg = new SvxMeasureDialog( pParent, rAttr, pView );
 break;
 case RID_SVXPAGE_CONNECTION :
-pDlg1 = new SvxConnectionDialog( pParent, rAttr, pView );
+pDlg = new SvxConnectionDialog( pParent, rAttr, pView );
 break;
 case RID_SFXPAGE_DBREGISTER :
 pDlg = new DatabaseRegistrationDialog( pParent, rAttr );
@@ -1651,9 +1649,6 @@ SfxAbstractDialog* 
AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
 if ( pDlg )
 return new CuiAbstractSfxDialog_Impl( pDlg );
 
-if ( pDlg1 )
-return new CuiAbstractSfxDialog_Impl( pDlg1 );
-
 return 0;
 }
 
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 6d3219d..fec0f96 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -126,7 +126,7 @@ namespace svx
 //= DatabaseRegistrationDialog
 //
 class DatabaseRegistrationDialog:public RegistrationItemSetHolder
-,public SfxNoLayoutSingleTabDialog
+,public SfxSingleTabDialog
 {
 public:
 DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr );
diff --git a/cui/source/options/dbregister.cxx 
b/cui/source/options/dbregister.cxx
index 269e33a..e7a59a3 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -26,6 +26,7 @@
 #include "svtools/treelistentry.hxx"
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -74,13 +75,12 @@ RegistrationItemSetHolder::~RegistrationItemSetHolder()
 // class DatabaseRegistrationDialog  

 
 DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const 
SfxItemSet& rInAttrs )
-:RegistrationItemSetHolder( rInAttrs )
-,SfxNoLayoutSingleTabDialog( pParent, getRegistrationItems(), 
RID_SFXPAGE_DBREGISTER )
+: RegistrationItemSetHolder(rInAttrs)
+, SfxSingleTabDialog(pParent, getRegistrationItems())
 {
-SfxTabPage* page = DbRegistrationOptionsPage::Create( this, 
getRegistrationItems() );
-
-SetTabPage( page );
-SetText( page->GetText() );
+SfxTabPage* page = DbRegistrationOptionsPage::Create(get_content_area(), 
getRegistrationItems());
+setTabPage(page);
+SetText(page->get("frame1")->get_label());
 }
 
 DatabaseRegistrationDialog::~DatabaseRegistrationDialog()
@@ -89,7 +89,7 @@ DatabaseRegistrationDialog::~DatabaseRegistrationDialog()
 
 short DatabaseRegistrationDialog::Execute()
 {
-short result = SfxNoLayoutSingleTabDialog::Execute();
+short result = SfxSingleTabDialog::Execute();
 if ( result == RET_OK )
 {
 DBG_ASSERT( GetOutputItemSet(), "DatabaseRegistrationDialog::Execute: 
no output items!" );
diff --git a/cui/uiconfig/ui/dbregisterpage.ui 
b/cui/uiconfig/ui/dbregisterpage.ui
index bc7425b..29db15f 100644
--- a/cui/uiconfig/ui/dbregisterpage.ui
+++ b/cui/uiconfig/ui/dbregisterpage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -32,6 +33,7 @@
   
 True
 False
+True
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Caolán McNamara 
 cui/source/factory/dlgfact.cxx|   11 +++
 cui/source/inc/dbregister.hxx |2 +-
 cui/source/options/dbregister.cxx |   14 +++---
 cui/uiconfig/ui/dbregisterpage.ui |2 ++
 4 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit 5ac26a7f0054ca3d1af41f3483dc0e32a343bb96
Author: Caolán McNamara 
Date:   Fri Jan 10 20:52:16 2014 +

Resolves: fdo#73260 fix Registered Database single tab dialog

Change-Id: I71bfe44b3d1f88a44a2c53b10c6880c2a3a4ede0

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 3a7bca7..3ab8e86 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1615,16 +1615,14 @@ SfxAbstractDialog* 
AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
 )
 {
 
-// TODO will fix this ugly hack when all cases are in SfxSingleTabDialog
-SfxNoLayoutSingleTabDialog* pDlg=NULL;
-SfxSingleTabDialog* pDlg1=NULL;
+SfxSingleTabDialog* pDlg=NULL;
 switch ( nResId )
 {
 case RID_SVXPAGE_MEASURE :
-pDlg1 = new SvxMeasureDialog( pParent, rAttr, pView );
+pDlg = new SvxMeasureDialog( pParent, rAttr, pView );
 break;
 case RID_SVXPAGE_CONNECTION :
-pDlg1 = new SvxConnectionDialog( pParent, rAttr, pView );
+pDlg = new SvxConnectionDialog( pParent, rAttr, pView );
 break;
 case RID_SFXPAGE_DBREGISTER :
 pDlg = new DatabaseRegistrationDialog( pParent, rAttr );
@@ -1636,9 +1634,6 @@ SfxAbstractDialog* 
AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
 if ( pDlg )
 return new CuiAbstractSfxDialog_Impl( pDlg );
 
-if ( pDlg1 )
-return new CuiAbstractSfxDialog_Impl( pDlg1 );
-
 return 0;
 }
 
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index b74d31c..b47b784 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -125,7 +125,7 @@ namespace svx
 //= DatabaseRegistrationDialog
 //
 class DatabaseRegistrationDialog:public RegistrationItemSetHolder
-,public SfxNoLayoutSingleTabDialog
+,public SfxSingleTabDialog
 {
 public:
 DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr );
diff --git a/cui/source/options/dbregister.cxx 
b/cui/source/options/dbregister.cxx
index 269e33a..e7a59a3 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -26,6 +26,7 @@
 #include "svtools/treelistentry.hxx"
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -74,13 +75,12 @@ RegistrationItemSetHolder::~RegistrationItemSetHolder()
 // class DatabaseRegistrationDialog  

 
 DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const 
SfxItemSet& rInAttrs )
-:RegistrationItemSetHolder( rInAttrs )
-,SfxNoLayoutSingleTabDialog( pParent, getRegistrationItems(), 
RID_SFXPAGE_DBREGISTER )
+: RegistrationItemSetHolder(rInAttrs)
+, SfxSingleTabDialog(pParent, getRegistrationItems())
 {
-SfxTabPage* page = DbRegistrationOptionsPage::Create( this, 
getRegistrationItems() );
-
-SetTabPage( page );
-SetText( page->GetText() );
+SfxTabPage* page = DbRegistrationOptionsPage::Create(get_content_area(), 
getRegistrationItems());
+setTabPage(page);
+SetText(page->get("frame1")->get_label());
 }
 
 DatabaseRegistrationDialog::~DatabaseRegistrationDialog()
@@ -89,7 +89,7 @@ DatabaseRegistrationDialog::~DatabaseRegistrationDialog()
 
 short DatabaseRegistrationDialog::Execute()
 {
-short result = SfxNoLayoutSingleTabDialog::Execute();
+short result = SfxSingleTabDialog::Execute();
 if ( result == RET_OK )
 {
 DBG_ASSERT( GetOutputItemSet(), "DatabaseRegistrationDialog::Execute: 
no output items!" );
diff --git a/cui/uiconfig/ui/dbregisterpage.ui 
b/cui/uiconfig/ui/dbregisterpage.ui
index bc7425b..29db15f 100644
--- a/cui/uiconfig/ui/dbregisterpage.ui
+++ b/cui/uiconfig/ui/dbregisterpage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -32,6 +33,7 @@
   
 True
 False
+True
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/calc-cell-borders'

2014-01-10 Thread Kohei Yoshida 
New branch 'feature/calc-cell-borders' available with the following commits:
commit a62b2ad6d9cf0814e41383a83da3d8da63fddad7
Author: Kohei Yoshida 
Date:   Fri Jan 10 15:36:36 2014 -0500

Test Excel document that contains all cell borders that Excel supports.

Plus some screenshots of what they look like in Excel.

Change-Id: Ic7e59182739b871cab34582b174a78850b9f7ef9

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx

2014-01-10 Thread Julien Nabet 
 vcl/unx/gtk/a11y/atkutil.cxx   |2 ++
 vcl/unx/gtk/a11y/atkwindow.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit da966e07c6fb26f54e3538ccaf0a13f857ed2993
Author: Julien Nabet 
Date:   Wed Oct 9 23:11:28 2013 +0200

Use SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP part2

Change-Id: Id3691ab81af466dd21cc86592c5ac0c2c7a1c8f7
Reviewed-on: https://gerrit.libreoffice.org/6244
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 2f8757e961d6156d529c2ab9131747071236f085)
Reviewed-on: https://gerrit.libreoffice.org/7362
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index e1cb134..adeda2b 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -86,7 +86,9 @@ atk_wrapper_focus_idle_handler (gpointer data)
 #ifdef ENABLE_TRACING
 fprintf(stderr, "notifying focus event for %p\n", atk_obj);
 #endif
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 atk_focus_tracker_notify(atk_obj);
+SAL_WNODEPRECATED_DECLARATIONS_POP
 // #i93269#
 // emit text_caret_moved event for  object,
 // if cursor is inside the  object.
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index fd396c8..0bddf07 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -122,7 +122,9 @@ static gint
 ooo_window_wrapper_clear_focus(gpointer)
 {
 SolarMutexGuard aGuard;
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 atk_focus_tracker_notify( NULL );
+SAL_WNODEPRECATED_DECLARATIONS_POP
 return FALSE;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Michael Stahl 
 dbaccess/source/core/dataaccess/databasedocument.cxx |   30 ++-
 1 file changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 634a5950920e82384993f1d88e2dd054d814d175
Author: Michael Stahl 
Date:   Fri Jan 10 17:59:52 2014 +0100

dbaccess: ODF export: set "Version" property on target Storage

... like SfxObjectShell::SetupStorage() does, and not on the property
set that is passed to the XML export filters where it probably does
nothing.

(cherry picked from commit f60b61b2cf87e89938c760877a56bc4dd5c577a9)

Conflicts:
dbaccess/source/core/dataaccess/databasedocument.cxx

Change-Id: I21da1b92fc921eb47e492169e69ef15ac2f0e19d
Reviewed-on: https://gerrit.libreoffice.org/7381
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 0b7dd0a..9fd49c4 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1624,31 +1624,33 @@ void ODatabaseDocument::impl_writeStorage_throw( const 
Reference< XStorage >& _r
 if ( aSaveOpt.IsSaveRelFSys() )
 xInfoSet->setPropertyValue("BaseURI", 
uno::makeAny(_rMediaDescriptor.getOrDefault("URL",OUString(;
 
-OUString aVersion;
-SvtSaveOptions::ODFDefaultVersion nDefVersion = 
aSaveOpt.GetODFDefaultVersion();
+sal_Int32 nArgsLen = aDelegatorArguments.getLength();
+aDelegatorArguments.realloc(nArgsLen+1);
+aDelegatorArguments[nArgsLen++] <<= xInfoSet;
 
-// older versions can not have this property set, it exists only starting 
from ODF1.2
-if ( nDefVersion >= SvtSaveOptions::ODFVER_012 )
+Reference< XPropertySet > xProp( _rxTargetStorage, UNO_QUERY_THROW );
+xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( 
(OUString)MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ) );
+
+OUString aVersion;
+SvtSaveOptions::ODFDefaultVersion const nDefVersion =
+aSaveOpt.GetODFDefaultVersion();
+// older versions can not have this property set,
+// it exists only starting from ODF1.2
+if (nDefVersion >= SvtSaveOptions::ODFVER_012)
 aVersion = ODFVER_012_TEXT;
 
-if ( !aVersion.isEmpty() )
+if (!aVersion.isEmpty())
 {
 try
 {
-xInfoSet->setPropertyValue( "Version" , uno::makeAny( aVersion ) );
+xProp->setPropertyValue("Version" , uno::makeAny(aVersion));
 }
-catch( const uno::Exception& )
+catch (const uno::Exception& e)
 {
+SAL_WARN("dbaccess", "exception setting Version: " << e.Message);
 }
 }
 
-sal_Int32 nArgsLen = aDelegatorArguments.getLength();
-aDelegatorArguments.realloc(nArgsLen+1);
-aDelegatorArguments[nArgsLen++] <<= xInfoSet;
-
-Reference< XPropertySet > xProp( _rxTargetStorage, UNO_QUERY_THROW );
-xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( 
(OUString)MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ) );
-
 Reference< XComponent > xComponent( *const_cast< ODatabaseDocument* >( 
this ), UNO_QUERY_THROW );
 
 Sequence< PropertyValue > aMediaDescriptor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Stephan Bergmann 
 codemaker/source/codemaker/global.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit cfb3455bba641f43178abd2600ffc57b05930bf6
Author: Stephan Bergmann 
Date:   Fri Jan 10 10:16:48 2014 +0100

codemaker: fix^2 invalid string index access

...originally the past-the-end checks in destination where always true, and 
thus
happend to work as intended for empty destionation, but
614e04019a672cdd61b86699d99250d80f169f95 broke that, so calling cppumaker 
w/o
-O was broken now.

Change-Id: I8d41dfe8d4c12e4a73a9782d4d5e7c9fa4d9df81
(cherry picked from commit d320760dc1c9d6501d84849219b4d9fc6c62b85b)
Reviewed-on: https://gerrit.libreoffice.org/7361
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/codemaker/source/codemaker/global.cxx 
b/codemaker/source/codemaker/global.cxx
index ba3f424..54ceeb1 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -87,11 +87,8 @@ OString createFileNameFromType( const OString& destination,
 length += prefix.getLength() + type.getLength() + postfix.getLength();
 
 sal_Bool withSeparator = sal_False;
-if (!destination.isEmpty() &&
-destination[destination.getLength() - 1] != '\\' &&
-destination[destination.getLength() - 1] != '/' &&
-type[0] != '\\' &&
-type[0] != '/')
+if (!(destination.endsWith("\\") || destination.endsWith("/"))
+&& !(type.startsWith("\\") || type.startsWith("/")))
 {
 length++;
 withSeparator = sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source

2014-01-10 Thread Petr Vorel 
 unusedcode.easy   |1 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |   10 --
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2 -
 writerfilter/source/ooxml/OOXMLFastHelper.hxx |   28 --
 writerfilter/source/ooxml/factoryimpl_ns.xsl  |   10 --
 5 files changed, 51 deletions(-)

New commits:
commit 957676441635d236743b61ccb74128821d07d0d0
Author: Petr Vorel 
Date:   Thu Jan 9 08:35:11 2014 +0100

remove unused code from writerfilter

Not sure whether void OOXMLFastHelper::mark(OOXMLFastContextHandler * 
pHandler, Id nId, const OUString & rValue) is really unused (tested on linux 
build seems to be unused).
If it IS unused the commit should NOT be included and 
writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const&, 
boost::shared_ptr) is to be put into 
unusedcode.exclude.


Change-Id: I5ae08427e62f89df3d4112486837d8eb5fa752f0
Reviewed-on: https://gerrit.libreoffice.org/7327
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/unusedcode.easy b/unusedcode.easy
index 6eb8fa6..35f844a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -210,4 +210,3 @@ 
writerfilter::dump(writerfilter::OutputWithDepth, std::allocator > >&, char const*, 
boost::shared_ptr >)
 writerfilter::dump(writerfilter::OutputWithDepth, std::allocator > >&, char const*, rtl::OUString 
const&)
 writerfilter::dump(writerfilter::OutputWithDepth, std::allocator > >&, char const*, unsigned int)
-writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const&, 
boost::shared_ptr)
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 2d192ad..b1af30f 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -550,16 +550,6 @@ Token_t OOXMLFastContextHandler::getToken() const
 return mnToken;
 }
 
-void OOXMLFastContextHandler::mark(const Id & rId, OOXMLValue::Pointer_t pVal)
-{
-OOXMLPropertySetImpl::Pointer_t pPropSet(new OOXMLPropertySetImpl());
-OOXMLPropertyImpl::Pointer_t pProperty
-(new OOXMLPropertyImpl(rId, pVal, OOXMLPropertyImpl::ATTRIBUTE));
-
-pPropSet->add(pProperty);
-mpStream->props(pPropSet);
-}
-
 void OOXMLFastContextHandler::setParent
 (OOXMLFastContextHandler * pParent)
 {
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 86a3b25..c5909bf 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -151,8 +151,6 @@ public:
 virtual void setToken(Token_t nToken);
 virtual Token_t getToken() const;
 
-void mark(const Id & rId, OOXMLValue::Pointer_t pVal);
-
 void resolveFootnote(const sal_Int32 nId);
 void resolveEndnote(const sal_Int32 nId);
 void resolveComment(const sal_Int32 nId);
diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx 
b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
index 7198494..9a5f941 100644
--- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
@@ -52,10 +52,6 @@ public:
 static void newProperty(OOXMLFastContextHandler * pHandler,
 Id nId, sal_Int32 nValue);
 
-static void mark(OOXMLFastContextHandler * pHandler,
- Id nId,
- const OUString & rValue);
-
 static void attributes
 (OOXMLFastContextHandler * pContext,
  const uno::Reference < xml::sax::XFastAttributeList > & Attribs);
@@ -216,30 +212,6 @@ void 
OOXMLFastHelper::newProperty(OOXMLFastContextHandler * pHandler,
 pHandler->newProperty(nId, pVal);
 }
 
-template 
-void OOXMLFastHelper::mark(OOXMLFastContextHandler * pHandler,
-  Id nId,
-  const OUString & rValue)
-{
-OOXMLValue::Pointer_t pVal(new T(rValue));
-
-#ifdef DEBUG_HELPER
-string aStr = (*QNameToString::Instance())(nId);
-
-debug_logger->startElement("helper.mark");
-debug_logger->attribute("name", aStr);
-debug_logger->attribute("value",
-OUStringToOString
-(rValue, RTL_TEXTENCODING_ASCII_US).getStr());
-
-if (aStr.empty())
-debug_logger->element("unknown-qname");
-
-debug_logger->endElement();
-#endif
-
-pHandler->mark(nId, pVal);
-}
 }}
 #endif // INCLUDED_FAST_HELPER_HXX
 
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl 
b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index bd913d6..e92fda1 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -532,16 +532,6 @@ CreateElementMapPointer 
 
 ");
 
-
-  
-OOXMLFastHelper::mark(pHandler, 
-
-  
-
-, "
-
-");
-

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

2014-01-10 Thread Caolán McNamara 
 chart2/source/controller/dialogs/tp_DataSource.cxx |   15 ++-
 chart2/uiconfig/ui/datarangedialog.ui  |4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 32372b8541b665f9c5127c3d0e21742abdf6d829
Author: Caolán McNamara 
Date:   Fri Jan 10 20:20:06 2014 +

fix title of dialog

Change-Id: Id252755104f5dd8f5590511a267935b1fc434561

diff --git a/chart2/uiconfig/ui/datarangedialog.ui 
b/chart2/uiconfig/ui/datarangedialog.ui
index e234b37..c4473ac 100644
--- a/chart2/uiconfig/ui/datarangedialog.ui
+++ b/chart2/uiconfig/ui/datarangedialog.ui
@@ -1,11 +1,11 @@
 
-
+
 
   
   
 False
 6
-Customize
+Data Ranges
 dialog
 
   
commit 7b2d1ee5051efd6381485ff66cff3cce91e290a4
Author: Caolán McNamara 
Date:   Fri Jan 10 20:15:31 2014 +

Resolves: fdo#72814 Fix Chart Data Ranges Dialog

revert part of b193123b8e658d2eb25af5debe9de9e1b2386ef8

That "hidden" column conatined data which is important to make the dialog 
work.
If the hidden data is causing a11y problems then it needs to be reworked in 
a
different way rather than removed in one place but still being looked for in
another

Change-Id: I2990ac940a52d97da193af2147f2b61281e11020

diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx 
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 891ab40..42f9eed 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -58,11 +58,16 @@ const OUString lcl_aLabelRole( "label" );
 OUString lcl_GetRoleLBEntry(
 const OUString & rRole, const OUString & rRange )
 {
-OUStringBuffer 
aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI(rRole));
+OUStringBuffer aEntry( rRole );
 aEntry.append( "\t" );
-aEntry.append(rRange);
+aEntry.append( OUString(
+::chart::DialogModel::ConvertRoleFromInternalToUI( rRole )) );
+aEntry.append( "\t" );
+aEntry.append(OUString( rRange ));
 
-return aEntry.makeStringAndClear();
+OUString sFoo = aEntry.makeStringAndClear();
+fprintf(stderr, "ConvertRoleFromInternalToUI :%s:\n", 
OUStringToOString(sFoo, RTL_TEXTENCODING_UTF8).getStr());
+return sFoo;
 }
 
 void lcl_UpdateCurrentRange(
@@ -126,8 +131,8 @@ OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry 
* pEntry )
 }
 
 static long lcl_pRoleListBoxTabs[] =
-{   2,// Number of Tabs
-0, 75
+{   3,// Number of Tabs
+0, 0, 75
 };
 
 void lcl_ShowChooserButton(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Kohei Yoshida 
 sc/inc/scextopt.hxx|7 +++
 sc/source/ui/view/scextopt.cxx |   12 
 sc/source/ui/view/viewdata.cxx |4 
 3 files changed, 23 insertions(+)

New commits:
commit 3e87471b6815a3cad48cab2ef81073bad5453c56
Author: Kohei Yoshida 
Date:   Fri Jan 10 15:10:23 2014 -0500

fdo#73484: Ensure that we import all tab settings from Excel.

The old code would not import settings of the last sheet if maTabData was
not large enough before the loop begins. Enlarge maTabData ahead of time
to ensure we load all tab settings.

Change-Id: I9093a93ef26ccba9fef06a8929d1d86311f5c55d

diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
index a4893cf..bcdaa2c 100644
--- a/sc/inc/scextopt.hxx
+++ b/sc/inc/scextopt.hxx
@@ -96,6 +96,13 @@ public:
 
 /** @return read access to the settings of a sheet, if extant; otherwise 
0. */
 const ScExtTabSettings* GetTabSettings( SCTAB nTab ) const;
+
+/**
+ * @return index of the last sheet that has settings, or -1 if no tab
+ * settings are present.
+ */
+SCTAB GetLastTab() const;
+
 /** @return read/write access to the settings of a sheet, may create a new 
struct. */
 ScExtTabSettings&   GetOrCreateTabSettings( SCTAB nTab );
 
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index 4390d46..800f523 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -68,6 +68,8 @@ public:
 const ScExtTabSettings* GetTabSettings( SCTAB nTab ) const;
 ScExtTabSettings&   GetOrCreateTabSettings( SCTAB nTab );
 
+SCTAB GetLastTab() const;
+
 private:
 typedef ::boost::shared_ptr< ScExtTabSettings > ScExtTabSettingsRef;
 typedef ::std::map< SCTAB, ScExtTabSettingsRef >ScExtTabSettingsMap;
@@ -109,6 +111,11 @@ ScExtTabSettings& 
ScExtTabSettingsCont::GetOrCreateTabSettings( SCTAB nTab )
 return *rxTabSett;
 }
 
+SCTAB ScExtTabSettingsCont::GetLastTab() const
+{
+return maMap.empty() ? -1 : maMap.rbegin()->first;
+}
+
 void ScExtTabSettingsCont::CopyFromMap( const ScExtTabSettingsMap& rMap )
 {
 maMap.clear();
@@ -183,6 +190,11 @@ const ScExtTabSettings* ScExtDocOptions::GetTabSettings( 
SCTAB nTab ) const
 return mxImpl->maTabSett.GetTabSettings( nTab );
 }
 
+SCTAB ScExtDocOptions::GetLastTab() const
+{
+return mxImpl->maTabSett.GetLastTab();
+}
+
 ScExtTabSettings& ScExtDocOptions::GetOrCreateTabSettings( SCTAB nTab )
 {
 return mxImpl->maTabSett.GetOrCreateTabSettings( nTab );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 7c91dfb..8444ce8 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2466,6 +2466,10 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& 
rDocOpt )
 pView->SetPendingRelTabBarWidth( rDocSett.mfTabBarWidth );
 
 // sheet settings
+SCTAB nLastTab = rDocOpt.GetLastTab();
+if (static_cast(maTabData.size()) <= nLastTab)
+maTabData.resize(nLastTab+1);
+
 for( SCTAB nTab = 0; nTab < static_cast(maTabData.size()); ++nTab )
 {
 if( const ScExtTabSettings* pTabSett = rDocOpt.GetTabSettings( nTab ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 50350] Setup source and symbol server for Windows

2014-01-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=50350

Christian Lohmaier  changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED
 CC||lohma...@gmx.de

--- Comment #9 from Christian Lohmaier  ---
Hi *,

And with 4.2.0rc2, the symbol files are also source-indexed, so closing this
one as fixed :-)

source-fetching command is using powershell command to download from
cgit.freedesktop.org (that means Windows XP and Vista users need to install it
manually, as I think it is not installed automatically with SP3) - if you have
other suggestion that works across windows versions and is a better option,
feel free to suggest alternatives.

The source-indexing only covers files that are used untouched from the
checkout. I.e. created headers or files from the external components that are
built as part of LibreOffice are not included.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac

2014-01-10 Thread Michael Stahl 
 configure.ac |8 
 1 file changed, 8 insertions(+)

New commits:
commit 123a5a7079426d7d4cb6b980b384339d6150a0a8
Author: Michael Stahl 
Date:   Thu Jan 9 22:34:45 2014 +0100

configure: check for ICE and SM libraries too

Change-Id: Id86b09c9f2fe8770da8cc6b13672e2bf37201962
(cherry picked from commit 415dfd0d89f550268dc66d4e7d447c1975a8aa44)
Reviewed-on: https://gerrit.libreoffice.org/7349
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index ccf2704..4164d29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9199,6 +9199,14 @@ if test "$WANT_X11" = "yes"; then
 dnl ===
 AC_CHECK_HEADERS(X11/extensions/shape.h,[],[AC_MSG_ERROR([libXext headers 
not found])],
  [#include ])
+
+# vcl needs ICE and SM
+AC_CHECK_HEADERS(X11/ICE/ICElib.h,[],[AC_MSG_ERROR([libICE headers not 
found])])
+AC_CHECK_LIB([ICE], [IceConnectionNumber], [:],
+[AC_MSG_ERROR(ICE library not found)])
+AC_CHECK_HEADERS(X11/SM/SMlib.h,[],[AC_MSG_ERROR([libSM headers not 
found])])
+AC_CHECK_LIB([SM], [SmcOpenConnection], [:],
+[AC_MSG_ERROR(SM library not found)])
 fi
 
 dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac

2014-01-10 Thread Michael Stahl 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba5c3753f736cdca9b6ffea4bf3db2e9b31d4ee2
Author: Michael Stahl 
Date:   Thu Jan 9 22:10:23 2014 +0100

configure: we need both cups header and library

Change-Id: Ie27a67b7d1086fbbce5eb40a56b4d154afb3faf8
(cherry picked from commit 3b3c8c4796a89a76ce7574908096a91993412523)
Reviewed-on: https://gerrit.libreoffice.org/7348
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 9887963..ccf2704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4647,7 +4647,7 @@ if test "$test_cups" = "yes"; then
 AC_MSG_CHECKING([whether cups support is present])
 AC_CHECK_LIB([cups], [cupsPrintFiles], [:])
 AC_CHECK_HEADER(cups/cups.h, AC_DEFINE(HAVE_CUPS_H))
-if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -a 
"$ac_cv_header_cups_cups_h" != "yes"; then
+if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -o 
"$ac_cv_header_cups_cups_h" != "yes"; then
 AC_MSG_ERROR([Could not find CUPS. Install libcupsys2-dev or 
cups-devel.])
 fi
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/libxmlsec

2014-01-10 Thread Michael Stahl 
 external/libxmlsec/ExternalProject_xmlsec.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33e089f8c57a9a945cc77f583c8031c5ea9919d0
Author: Michael Stahl 
Date:   Thu Jan 9 22:01:48 2014 +0100

libxmlsec: openssl conditional was accidentally inverted

... in commit bf6d1f77420dcc9ece4d9f4eae1e37b427d85c6a.  And it just
happens to not build with clang here.

Change-Id: Ic467abc894b9c98c81fa64cb57eafaa4cfcaa66e
(cherry picked from commit e32f828e2b7a136ac255bfe1cc7e4858fa965e8d)
Reviewed-on: https://gerrit.libreoffice.org/7347
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk 
b/external/libxmlsec/ExternalProject_xmlsec.mk
index dc79899..2c4b18a 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -55,7 +55,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
autoreconf \
&& ./configure \
--with-pic --disable-shared --disable-crypto-dl 
--without-libxslt --without-gnutls \
-   $(if $(filter ANDROID,$(OS)),$(if 
$(DISABLE_OPENSSL),--without-openssl,--with-openssl=$(call 
gb_UnpackedTarball_get_dir,openssl))) \
+   $(if $(or $(filter-out 
ANDROID,$(OS)),$(DISABLE_OPENSSL)),--without-openssl,--with-openssl=$(call 
gb_UnpackedTarball_get_dir,openssl)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(filter NO,$(SYSTEM_NSS))$(filter 
MACOSX,$(OS)),--disable-pkgconfig) \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac

2014-01-10 Thread Michael Stahl 
 configure.ac |4 
 1 file changed, 4 insertions(+)

New commits:
commit 21c682d54aa4368d9c9566f3875a425926d6ec0b
Author: Michael Stahl 
Date:   Thu Jan 9 21:42:19 2014 +0100

configure: ENABLE_NPAPI_FROM_BROWSER requires Xt library

Change-Id: I023927897787ae046baf2751d0e56bfca3fb688f
(cherry picked from commit 1366a41c320a9bb173dc5e066ab532d679d89bcc)
Reviewed-on: https://gerrit.libreoffice.org/7346
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 41b1cba..9887963 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9190,6 +9190,10 @@ if test "$WANT_X11" = "yes"; then
 AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt headers not found])],
  [#include ])
 
+# ENABLE_NPAPI_FROM_BROWSER requires Xt library
+AC_CHECK_LIB([Xt], [XtToolkitInitialize], [:],
+[AC_MSG_ERROR(Xt library not found)])
+
 dnl ===
 dnl Check for extension headers
 dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building LibreOffice on Windows

2014-01-10 Thread Christian Lohmaier 
Hi Alfreen, *,

On Fri, Jan 10, 2014 at 3:26 PM, Afreen Bano  wrote:
>
> After runnning the command "/opt/lo/bin/make" I got the below error:
>
> "make[1]:INTERNAL: Exiting with 1jobserver token available should be 2!
> make:***[build] Error2"
> [...]
> Please  anyone tell me what should I do to build Libreoffice successfully on
> windows.

Those two messages are unrelated.
That make looses jobserver tokens happens sometimes on windows, but
can be safely ignored - other than not using the desired amount of
parallel instances, there is no other problem.

The other line is from a error that very likely is printed way up in
the log. Scroll up and look for the actual error, or just run make
again to see where the error is.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/libxml2

2014-01-10 Thread Michael Stahl 
 external/libxml2/ExternalProject_xml2.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 39872b0e50806541f14ab7200b9a627e7323a29c
Author: Michael Stahl 
Date:   Thu Jan 9 21:14:48 2014 +0100

libxml2: don't grow dependency on liblzma if that happens to be installed

Change-Id: Ifd46fc5dc531bd5bdb489c7550476f9c07a0a976
(cherry picked from commit b202af672cf7d1825b68adc352374031bf68c6f2)
Reviewed-on: https://gerrit.libreoffice.org/7345
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/libxml2/ExternalProject_xml2.mk 
b/external/libxml2/ExternalProject_xml2.mk
index a2d613d..5d8eba4 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -18,6 +18,7 @@ ifeq ($(COM),GCC)
 $(call gb_ExternalProject_get_state_target,xml2,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-ipv6 --without-python --without-zlib \
+   --without-lzma \
--disable-static --without-debug 
lt_cv_cc_dll_switch="-shared" \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CC="$(CC) -mthreads $(if $(filter 
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
@@ -39,6 +40,7 @@ else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,xml2,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-ipv6 --without-python --without-zlib 
--with-sax1 \
+   --without-lzma \
$(if $(debug),--with-run-debug) \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__URELIB)
 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Michael Stahl 
 unoxml/source/rdf/librdf_repository.cxx |  485 +---
 1 file changed, 333 insertions(+), 152 deletions(-)

New commits:
commit f2394e4c9cd7a27a1eb1e0e2476997fd18ae2508
Author: Michael Stahl 
Date:   Wed Jan 8 23:43:03 2014 +0100

fdo#72928: fix deadlocks in librdf_Repository

Refactor to do all calls on parameters before locking the mutex.
This requires splitting up some librdf_TypeConverter methods into an
extract function and a make function, with an intermediate
representation between.
Also rename some internal functions to make it clear which are called
with Lock and which with NoLock.

(cherry picked from commit 7db6b2f7968d8063b12312737136f09cb7549805)

squashed: librdf_Repository: make older compilers happy
(cherry picked from commit d3aad81268298c05163136e2e953e1dfe0728d9e)

Change-Id: Iddc42461d95351785578ef6a80fbf5d056356c16
Reviewed-on: https://gerrit.libreoffice.org/7337
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jan-Marek Glogowski 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/unoxml/source/rdf/librdf_repository.cxx 
b/unoxml/source/rdf/librdf_repository.cxx
index b3c77e5..d56cfad 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -93,7 +94,7 @@ const char s_nsOOo  [] = 
"http://openoffice.org/2004/office/rdfa/";;
 
 
 
-//FIXME: this approach is not ideal. can we use blind nodes instead?
+//FIXME: this approach is not ideal. can we use blank nodes instead?
 bool isInternalContext(librdf_node *i_pNode) throw ()
 {
 OSL_ENSURE(i_pNode, "isInternalContext: context null");
@@ -176,6 +177,53 @@ static void safe_librdf_free_uri(librdf_uri *const uri)
 class librdf_TypeConverter
 {
 public:
+
+// some wrapper classes to temporarily hold values of UNO XNodes
+struct Node
+{
+virtual ~Node() {}
+};
+struct Resource : public Node { };
+struct URI : public Resource
+{
+OString const value;
+URI(OString const& i_rValue)
+: value(i_rValue)
+{ }
+};
+struct BlankNode : public Resource
+{
+OString const value;
+BlankNode(OString const& i_rValue)
+: value(i_rValue)
+{ }
+};
+struct Literal : public Node
+{
+OString const value;
+OString const language;
+::boost::optional const type;
+Literal(OString const& i_rValue, OString const& i_rLanguage,
+::boost::optional const& i_rType)
+: value(i_rValue)
+, language(i_rLanguage)
+, type(i_rType)
+{ }
+};
+struct Statement
+{
+::boost::shared_ptr const pSubject;
+::boost::shared_ptr const pPredicate;
+::boost::shared_ptr const pObject;
+Statement(::boost::shared_ptr const& i_pSubject,
+  ::boost::shared_ptr const& i_pPredicate,
+  ::boost::shared_ptr const& i_pObject)
+: pSubject(i_pSubject)
+, pPredicate(i_pPredicate)
+, pObject(i_pObject)
+{ }
+};
+
 librdf_TypeConverter(
 uno::Reference< uno::XComponentContext > const & i_xContext,
 librdf_Repository &i_rRep)
@@ -183,17 +231,23 @@ public:
 , m_rRep(i_rRep)
 { };
 
-librdf_world *createWorld() const;
-librdf_storage *createStorage(librdf_world *i_pWorld) const;
-librdf_model *createModel(librdf_world *i_pWorld,
+librdf_world *createWorld_Lock() const;
+librdf_storage *createStorage_Lock(librdf_world *i_pWorld) const;
+librdf_model *createModel_Lock(librdf_world *i_pWorld,
 librdf_storage * i_pStorage) const;
-librdf_uri* mkURI( librdf_world* i_pWorld,
-const uno::Reference< rdf::XURI > & i_xURI) const;
-librdf_node* mkResource( librdf_world* i_pWorld,
+librdf_uri* mkURI_Lock(librdf_world* i_pWorld,
+const OString & i_rURI) const;
+librdf_node* mkResource_Lock(librdf_world* i_pWorld,
+const Resource * i_pResource) const;
+librdf_node* mkNode_Lock(librdf_world* i_pWorld,
+const Node * i_pNode) const;
+librdf_statement* mkStatement_Lock(librdf_world* i_pWorld,
+Statement const& i_rStatement) const;
+::boost::shared_ptr extractResource_NoLock(
 const uno::Reference< rdf::XResource > & i_xResource) const;
-librdf_node* mkNode( librdf_world* i_pWorld,
+::boost::shared_ptr extractNode_NoLock(
 const uno::Reference< rdf::XNode > & i_xNode) const;
-librdf_statement* mkStatement( librdf_world* i_pWorld,
+Statement extractStatement_NoLock(
 const uno::Reference< rdf::XResource > & i_xSubject,
 const uno::Reference< rdf::XURI > & i_xPredicate,
 const un

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

2014-01-10 Thread Michael Stahl 
 unoxml/source/rdf/librdf_repository.cxx |   19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 33f97a124df7e10c6b9045e7fb12121bdd09db9e
Author: Michael Stahl 
Date:   Thu Jan 9 00:10:02 2014 +0100

librdf_Repository: fix missing mutex lock in various destructors

Change-Id: I5756ab6ff6de0b2532bef9866063f361e330a009
(cherry picked from commit 62fd1aa382c75feaa72f8aa09af4d3fc0b387dcc)
Reviewed-on: https://gerrit.libreoffice.org/7338
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/unoxml/source/rdf/librdf_repository.cxx 
b/unoxml/source/rdf/librdf_repository.cxx
index a595af4..b3c77e5 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -413,7 +413,13 @@ public:
 , m_pStream(i_pStream)
 { };
 
-virtual ~librdf_GraphResult() {}
+virtual ~librdf_GraphResult()
+{
+::osl::MutexGuard g(m_rMutex); // lock mutex when destroying members
+const_cast& >(m_pStream).reset();
+const_cast& >(m_pContext).reset();
+const_cast& >(m_pQuery).reset();
+}
 
 // ::com::sun::star::container::XEnumeration:
 virtual ::sal_Bool SAL_CALL hasMoreElements()
@@ -520,7 +526,13 @@ public:
 , m_BindingNames(i_rBindingNames)
 { };
 
-virtual ~librdf_QuerySelectResult() {}
+virtual ~librdf_QuerySelectResult()
+{
+::osl::MutexGuard g(m_rMutex); // lock mutex when destroying members
+const_cast& >(m_pQueryResult)
+.reset();
+const_cast& >(m_pQuery).reset();
+}
 
 // ::com::sun::star::container::XEnumeration:
 virtual ::sal_Bool SAL_CALL hasMoreElements()
@@ -795,6 +807,8 @@ librdf_Repository::librdf_Repository(
 
 librdf_Repository::~librdf_Repository()
 {
+::osl::MutexGuard g(m_aMutex);
+
 // must destroy these before world!
 m_pModel.reset();
 m_pStorage.reset();
@@ -803,7 +817,6 @@ librdf_Repository::~librdf_Repository()
 //   (via raptor_sax2_finish) call xmlCleanupParser, which will
 //   free libxml2's globals! ARRRGH!!! => never call librdf_free_world
 #if 0
-::osl::MutexGuard g(m_aMutex);
 if (!--m_NumInstances) {
 m_pWorld.reset();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Advice needed : making options dialog slightly wider

2014-01-10 Thread Caolán McNamara 
On Thu, 2014-01-09 at 19:42 +0100, Jean-Baptiste Faure wrote:
> So I checked each option dialog and it remains only one truncated label
> in French : in Language Settings > Languages the label "Complex text
> layout (CTL)" is truncated in French (I see only the C in "(CTL)").

Fixed that now I believe.

> In LibreOffice Impress > General there is what seems to be a
> misplacement of the checkboxes under "Presentation". Both checkboxes
> could be on the same row allowing the checkbox and its label under
> Compatibility to be visible.

I bet you are referring to a black entry in col 1 row of that grid
because the "enable remote control" thing is an optional feature which
might not be in your build. Resorted those now to put the optional stuff
in a row on its own.

C.

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-01-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 72005, which changed state.

Bug 72005 Summary: Background color for legend area hides the legend
https://bugs.freedesktop.org/show_bug.cgi?id=72005

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - cui/uiconfig sd/uiconfig

2014-01-10 Thread Caolán McNamara 
 cui/uiconfig/ui/optlanguagespage.ui  |   23 +++
 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |   23 +--
 2 files changed, 24 insertions(+), 22 deletions(-)

New commits:
commit 6301820d72bca8ab065ed9c3c41ea4a3d04333e4
Author: Caolán McNamara 
Date:   Fri Jan 10 19:16:59 2014 +

swap entries to optional checkbox is on last row

so there isn't a hole if the remote control option is
hidden

Change-Id: I514b76d35ef831f4c74ea43f18b2fa812059cfd2
(cherry picked from commit 4e7333c6a66382e740748ee7dd8c48179ba62b7b)

diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui 
b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index d68cf1b..750c9f9 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -264,10 +265,7 @@
   
 True
 False
-7
 True
-0
-1
   
   
 1
@@ -313,7 +311,6 @@
 True
 True
 •
-True
 adjustment1
 2
   
@@ -375,8 +372,8 @@
 12
 True
 
-  
-Enable remote 
control
+  
+Enable Presenter 
Console
 True
 True
 False
@@ -385,15 +382,15 @@
 True
   
   
-0
+1
 0
 1
 1
   
 
 
-  
-Enable Presenter 
Console
+  
+Always with 
current page
 True
 True
 False
@@ -402,15 +399,15 @@
 True
   
   
-1
+0
 0
 1
 1
   
 
 
-  
-Always with 
current page
+  
+Enable remote 
control
 True
 True
 False
@@ -567,7 +564,6 @@
 False
 True
 •
-True
   
   
 1
@@ -597,7 +593,6 @@
 False
 True
 •
-True
   
   
 3
commit 316496e1c0c42a02cc3850b494b6a5134d836543
Author: Caolán McNamara 
Date:   Fri Jan 10 19:13:04 2014 +

select elements that are to shrink when not enough space

options->language settings (fr)

Change-Id: I32ccb9c7d1b131d91b99ed983cbba46f7d9a6821
(cherry picked from commit 1a25a0c9b506294bc40397d2f1cc860290f1ae55)

diff --git a/cui/uiconfig/ui/optlanguagespage.ui 
b/cui/uiconfig/ui/optlanguagespage.ui
index bf14d21..83129a0 100644
--- a/cui/uiconfig/ui/optlanguagespage.ui
+++ b/cui/uiconfig/ui/optlanguagespage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -32,7 +33,6 @@
   
 True
 False
-True
 0
 _User 
interface
 True
@@ -49,7 +49,6 @@
   
 True
 False
-True
 0
 Locale 
setting
 True
@@ -66,7 +65,6 @@
   
 True
 False
-True
 0
 Decimal 
separator key
 True
@@ -83,7 +81,6 @@
   
 True
 False
-True
 0
 _Default 
currency
 True
@@ -100,7 +97,6 @@
   
 True
 False
-True
 0
 Date acceptance 
_patterns
 True
@@ -117,6 +113,8 @@
   
 True
 False
+start
+False
   
   
 1
@@ -129,6 +127,8 @@
   
 True
 False
+start
+True

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

2014-01-10 Thread Caolán McNamara 
 cui/uiconfig/ui/optlanguagespage.ui  |   23 +++
 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |   23 +--
 2 files changed, 24 insertions(+), 22 deletions(-)

New commits:
commit 4e7333c6a66382e740748ee7dd8c48179ba62b7b
Author: Caolán McNamara 
Date:   Fri Jan 10 19:16:59 2014 +

swap entries to optional checkbox is on last row

so there isn't a hole if the remote control option is
hidden

Change-Id: I514b76d35ef831f4c74ea43f18b2fa812059cfd2

diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui 
b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index d68cf1b..750c9f9 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -264,10 +265,7 @@
   
 True
 False
-7
 True
-0
-1
   
   
 1
@@ -313,7 +311,6 @@
 True
 True
 •
-True
 adjustment1
 2
   
@@ -375,8 +372,8 @@
 12
 True
 
-  
-Enable remote 
control
+  
+Enable Presenter 
Console
 True
 True
 False
@@ -385,15 +382,15 @@
 True
   
   
-0
+1
 0
 1
 1
   
 
 
-  
-Enable Presenter 
Console
+  
+Always with 
current page
 True
 True
 False
@@ -402,15 +399,15 @@
 True
   
   
-1
+0
 0
 1
 1
   
 
 
-  
-Always with 
current page
+  
+Enable remote 
control
 True
 True
 False
@@ -567,7 +564,6 @@
 False
 True
 •
-True
   
   
 1
@@ -597,7 +593,6 @@
 False
 True
 •
-True
   
   
 3
commit 1a25a0c9b506294bc40397d2f1cc860290f1ae55
Author: Caolán McNamara 
Date:   Fri Jan 10 19:13:04 2014 +

select elements that are to shrink when not enough space

options->language settings (fr)

Change-Id: I32ccb9c7d1b131d91b99ed983cbba46f7d9a6821

diff --git a/cui/uiconfig/ui/optlanguagespage.ui 
b/cui/uiconfig/ui/optlanguagespage.ui
index bf14d21..83129a0 100644
--- a/cui/uiconfig/ui/optlanguagespage.ui
+++ b/cui/uiconfig/ui/optlanguagespage.ui
@@ -1,4 +1,5 @@
 
+
 
   
   
@@ -32,7 +33,6 @@
   
 True
 False
-True
 0
 _User 
interface
 True
@@ -49,7 +49,6 @@
   
 True
 False
-True
 0
 Locale 
setting
 True
@@ -66,7 +65,6 @@
   
 True
 False
-True
 0
 Decimal 
separator key
 True
@@ -83,7 +81,6 @@
   
 True
 False
-True
 0
 _Default 
currency
 True
@@ -100,7 +97,6 @@
   
 True
 False
-True
 0
 Date acceptance 
_patterns
 True
@@ -117,6 +113,8 @@
   
 True
 False
+start
+False
   
   
 1
@@ -129,6 +127,8 @@
   
 True
 False
+start
+True
   
   
 1
@@ -141,6 +141,8 @@
   
 True
 Fals

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - chart2/source include/svx offapi/com offapi/UnoApi_offapi.mk svx/source

2014-01-10 Thread Kohei Yoshida 
 chart2/source/view/inc/AbstractShapeFactory.hxx |   17 +---
 chart2/source/view/inc/OpenglShapeFactory.hxx   |   13 +++---
 chart2/source/view/inc/ShapeFactory.hxx |   13 +++---
 chart2/source/view/main/OpenglShapeFactory.cxx  |   12 +++---
 chart2/source/view/main/ShapeFactory.cxx|   21 +++---
 chart2/source/view/main/VLegend.cxx |2 -
 include/svx/unoshape.hxx|   14 +--
 offapi/UnoApi_offapi.mk |1 
 offapi/com/sun/star/drawing/XShapes2.idl|   47 
 svx/source/unodraw/unoshap2.cxx |   39 +++
 10 files changed, 136 insertions(+), 43 deletions(-)

New commits:
commit 3a9aad596ac874e086acc897edcf8fe0212d65a8
Author: Kohei Yoshida 
Date:   Fri Jan 10 11:30:59 2014 -0500

fdo#72005: Insert the border rectangle to the bottom of the stack.

This will make the border and fill shape to be drawn first, then everything
else drawn on top.

This commit may look large, but it's actually a very trivial change. The
important part is in SvxShapeGroup where new methods have been added to 
allow
different insertion positions for the new shapes being inserted, and have
the chart2 code make use of it to insert the fill rectangle to the bottom
rather than to the top.

(cherry picked from commit 10840ad753b60886ea5175060cb0ec2a77e1579a)
(cherry picked from commit d1846cd8d4530d620b996f27a0ea7ab0c91639b5)

Change-Id: I999160daf6fc9ce3d7e641f57b1998543df1cc4e
Reviewed-on: https://gerrit.libreoffice.org/7379
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx 
b/chart2/source/view/inc/AbstractShapeFactory.hxx
index 36b2554..73fbf69 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -60,6 +60,8 @@ class AbstractShapeFactory
 {
 public:
 
+enum StackPosition { Top, Bottom };
+
 static AbstractShapeFactory* 
getOrCreateShapeFactory(::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory> xFactory);
 
 virtual ~AbstractShapeFactory() {};
@@ -211,12 +213,13 @@ public:
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
-const ::com::sun::star::uno::Reference<
-::com::sun::star::drawing::XShapes >& xTarget
-, const ::com::sun::star::awt::Size& rSize
-, const ::com::sun::star::awt::Point& rPosition
-, const tNameSequence& rPropNames
-, const tAnySequence& rPropValues ) = 0;
+const com::sun::star::uno::Reference<
+com::sun::star::drawing::XShapes >& xTarget,
+const com::sun::star::awt::Size& rSize,
+const com::sun::star::awt::Point& rPosition,
+const tNameSequence& rPropNames,
+const tAnySequence& rPropValues,
+StackPosition ePos = Top ) = 0;
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx 
b/chart2/source/view/inc/OpenglShapeFactory.hxx
index 7d8ebdc..164ba93 100644
--- a/chart2/source/view/inc/OpenglShapeFactory.hxx
+++ b/chart2/source/view/inc/OpenglShapeFactory.hxx
@@ -162,12 +162,13 @@ public:
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
-const ::com::sun::star::uno::Reference<
-::com::sun::star::drawing::XShapes >& xTarget
-, const ::com::sun::star::awt::Size& rSize
-, const ::com::sun::star::awt::Point& rPosition
-, const tNameSequence& rPropNames
-, const tAnySequence& rPropValues );
+const com::sun::star::uno::Reference<
+com::sun::star::drawing::XShapes >& xTarget,
+const com::sun::star::awt::Size& rSize,
+const com::sun::star::awt::Point& rPosition,
+const tNameSequence& rPropNames,
+const tAnySequence& rPropValues,
+StackPosition ePos = Top );
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
diff --git a/chart2/source/view/inc/ShapeFactory.hxx 
b/chart2/source/view/inc/ShapeFactory.hxx
index 5afb686..ed592d2 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -177,12 +177,13 @@ public:
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
-const ::com::sun::star::uno::Reference<
-::com::sun::star::drawing::XShapes >& xTarget
-, const ::

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

2014-01-10 Thread tsahi glik 
 vcl/quartz/salgdicommon.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit bbff44e5aac6cb98582ecbab8bb478c54eaefcbf
Author: tsahi glik 
Date:   Fri Jan 10 10:26:07 2014 -0800

Normalized aqua graphics line and fill colors to RGBA

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index cc45334..c2b1c8e 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1452,7 +1452,8 @@ void AquaSalGraphics::SetLineColor()
 maLineColor.SetAlpha( 0.0 );   // transparent
 if( CheckContext() )
 {
-CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
+CGContextSetRGBStrokeColor( mrContext, maLineColor.GetRed(), 
maLineColor.GetGreen(),
+maLineColor.GetBlue(), 
maLineColor.GetAlpha() );
 }
 }
 
@@ -1461,7 +1462,8 @@ void AquaSalGraphics::SetLineColor( SalColor nSalColor )
 maLineColor = RGBAColor( nSalColor );
 if( CheckContext() )
 {
-CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
+CGContextSetRGBStrokeColor( mrContext, maLineColor.GetRed(), 
maLineColor.GetGreen(),
+   maLineColor.GetBlue(), 
maLineColor.GetAlpha() );
 }
 }
 
@@ -1470,7 +1472,8 @@ void AquaSalGraphics::SetFillColor()
 maFillColor.SetAlpha( 0.0 );   // transparent
 if( CheckContext() )
 {
-CGContextSetFillColor( mrContext, maFillColor.AsArray() );
+CGContextSetRGBFillColor( mrContext, maFillColor.GetRed(), 
maFillColor.GetGreen(),
+  maFillColor.GetBlue(), 
maFillColor.GetAlpha() );
 }
 }
 
@@ -1479,7 +1482,8 @@ void AquaSalGraphics::SetFillColor( SalColor nSalColor )
 maFillColor = RGBAColor( nSalColor );
 if( CheckContext() )
 {
-CGContextSetFillColor( mrContext, maFillColor.AsArray() );
+CGContextSetRGBFillColor( mrContext, maFillColor.GetRed(), 
maFillColor.GetGreen(),
+ maFillColor.GetBlue(), maFillColor.GetAlpha() 
);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Zolnai Tamás 
 sfx2/source/control/recentdocsviewitem.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7ebac02b35700b7ca96e636d5729b65115c2c708
Author: Zolnai Tamás 
Date:   Fri Jan 10 17:12:46 2014 +0100

fdo#72947 Startcenter: handle file urls and non-file urls on a different way

Thanks Stephan Bergmann for the idea.

Change-Id: Ifdde1b7eaaefd30a176c47385bc9bfec48d5b86c
(cherry picked from commit 340e70e248824a3a4959fa1dee90c5650f257ae8)
Reviewed-on: https://gerrit.libreoffice.org/7377
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index d741675..d1947e9 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -21,7 +21,12 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, 
const OUString &rUR
 {
 OUString aTitle(rTitle);
 INetURLObject aURLObj(rURL);
-m_sHelpText = aURLObj.GetURLPath();
+
+if( aURLObj.GetProtocol() == INET_PROT_FILE )
+m_sHelpText = aURLObj.getFSysPath(INetURLObject::FSYS_DETECT);
+if( m_sHelpText.isEmpty() )
+m_sHelpText = aURLObj.GetURLNoPass();
+
 RecentDocsView& rRecentView = dynamic_cast(rView);
 long nThumbnailSize = rRecentView.GetThumbnailSize();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Thomas Arnhold 
 sc/source/core/tool/interpr3.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 28412c1d477b43397f684aea9af7557ddcbce3a5
Author: Thomas Arnhold 
Date:   Fri Jan 10 19:09:57 2014 +0100

restore original comment

Thanks to Sven Wehner for pointing this out.

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 946fb7b..eb5d076 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -905,7 +905,8 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, 
double fB)
 
 /*
 x^a * (1-x)^b
-Ix(a,b)* result of ContFraca * Beta(a,b)
+I_x(a,b) =   * result of ContFrac
+a * Beta(a,b)
 */
 static double lcl_GetBetaHelperContFrac(double fX, double fA, double fB)
 {   // like old version
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Zolnai Tamás 
 sfx2/source/control/recentdocsview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b0a9123ea2c7d616555c1d4808813a9f4478d48
Author: Zolnai Tamás 
Date:   Fri Jan 10 15:49:00 2014 +0100

Startcenter: ignore repeated clicks inside recent docs view

Change-Id: Ia433adb26e820b89c4d207d018d0daf42654b4a0
(cherry picked from commit 264fc270a73de32a7a4d86442c06d14acdd14ef2)
Reviewed-on: https://gerrit.libreoffice.org/7374
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index b083736..78733fe 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -182,7 +182,7 @@ void RecentDocsView::MouseButtonDown( const MouseEvent& 
rMEvt )
 {
 if ( rMEvt.IsLeft() )
 {
-if( rMEvt.GetClicks() == 2 )
+if( rMEvt.GetClicks() > 1 )
 return;
 
 size_t nPos = ImplGetItem(rMEvt.GetPosPixel());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Caolán McNamara 
 svx/source/svdraw/svdotextdecomposition.cxx |   35 +++-
 1 file changed, 34 insertions(+), 1 deletion(-)

New commits:
commit b72f3f40828cf6761a8a3cee0dfe2f8a9d4e4a21
Author: Caolán McNamara 
Date:   Fri Jan 10 16:49:19 2014 +

Resolves: fdo#35779 set the bg color of the editeng from the text shape

Change-Id: I75feaea2dbd6c703cb3093c119a69985ecd89419
(cherry picked from commit 76a0b3170664b19c3eb66edc8fccb04dc5485387)
Reviewed-on: https://gerrit.libreoffice.org/7380
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 970ddf8..b01aab4 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -18,8 +18,10 @@
  */
 
 
-#include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -882,6 +884,36 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
 rOutliner.SetMinAutoPaperSize(aNullSize);
 rOutliner.SetMaxAutoPaperSize(Size(100,100));
 
+// Resolves: fdo#35779 set background color of this shape as the editeng 
background if there
+// is one. Check the shape itself, then the host page, then that page's 
master page.
+// That color needs to be restored on leaving this method
+Color aOriginalBackColor(rOutliner.GetBackgroundColor());
+const SfxItemSet* pBackgroundFillSet = &GetObjectItemSet();
+
+if (XFILL_NONE == ((const 
XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
+{
+SdrPage *pOwnerPage = GetPage();
+if (pOwnerPage)
+{
+pBackgroundFillSet = 
&pOwnerPage->getSdrPageProperties().GetItemSet();
+
+if (XFILL_NONE == ((const 
XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
+{
+if (!pOwnerPage->IsMasterPage() && 
pOwnerPage->TRG_HasMasterPage())
+{
+pBackgroundFillSet = 
&pOwnerPage->TRG_GetMasterPage().getSdrPageProperties().GetItemSet();
+}
+}
+}
+}
+
+if (XFILL_NONE != ((const 
XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
+{
+Color aColor(rOutliner.GetBackgroundColor());
+GetDraftFillColor(*pBackgroundFillSet, aColor);
+rOutliner.SetBackgroundColor(aColor);
+}
+
 // add one to rage sizes to get back to the old Rectangle and outliner 
measurements
 const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 
1L));
 const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 
1L));
@@ -1058,6 +1090,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
 aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, 
aClipRange);
 
 // cleanup outliner
+rOutliner.SetBackgroundColor(aOriginalBackColor);
 rOutliner.Clear();
 rOutliner.setVisualizedPage(0);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Stephan Bergmann 
 codemaker/source/codemaker/global.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 910d761a10662cfe6d32c4af43556834064223aa
Author: Stephan Bergmann 
Date:   Fri Jan 10 10:16:48 2014 +0100

codemaker: fix^2 invalid string index access

...originally the past-the-end checks in destination where always true, and 
thus
happend to work as intended for empty destionation, but
614e04019a672cdd61b86699d99250d80f169f95 broke that, so calling cppumaker 
w/o
-O was broken now.

Change-Id: I8d41dfe8d4c12e4a73a9782d4d5e7c9fa4d9df81
(cherry picked from commit d320760dc1c9d6501d84849219b4d9fc6c62b85b)
Reviewed-on: https://gerrit.libreoffice.org/7360
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/codemaker/source/codemaker/global.cxx 
b/codemaker/source/codemaker/global.cxx
index ba3f424..54ceeb1 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -87,11 +87,8 @@ OString createFileNameFromType( const OString& destination,
 length += prefix.getLength() + type.getLength() + postfix.getLength();
 
 sal_Bool withSeparator = sal_False;
-if (!destination.isEmpty() &&
-destination[destination.getLength() - 1] != '\\' &&
-destination[destination.getLength() - 1] != '/' &&
-type[0] != '\\' &&
-type[0] != '/')
+if (!(destination.endsWith("\\") || destination.endsWith("/"))
+&& !(type.startsWith("\\") || type.startsWith("/")))
 {
 length++;
 withSeparator = sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: scripts/gerrit-filter-domain

2014-01-10 Thread Miklos Vajna 
 scripts/gerrit-filter-domain |   86 +++
 1 file changed, 86 insertions(+)

New commits:
commit e3ff3fa2032839d62739cfaa323dbf7d0352cdc7
Author: Miklos Vajna 
Date:   Fri Jan 10 18:28:55 2014 +0100

scripts: add a gerrit script that can filter by domain

Change-Id: I1cd353f9f4db45fa1c9dafadd7fec14b9028f2ae

diff --git a/scripts/gerrit-filter-domain b/scripts/gerrit-filter-domain
new file mode 100755
index 000..4e5f78f
--- /dev/null
+++ b/scripts/gerrit-filter-domain
@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+#
+# 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/.
+#
+# Simple script that tries to do more than a simple query:
+# - can filter for the owner's domains (e.g. you can filter for gmail.com to 
see volunteer patches)
+# - can exclude areas you're not familiar with
+#
+
+import json
+import subprocess
+import sys
+
+
+def dumpChange(change):
+print(json.dumps(change, sort_keys=True, indent=4, separators=(',', ': ')))
+
+
+def filterDomain(changes, domain):
+ret = []
+for i in changes:
+if i['owner']['email'].endswith(domain):
+ret.append(i)
+return ret
+
+
+def main(argv):
+domain = argv[0]
+blacklist = argv[1:]
+buf = subprocess.check_output(['ssh', 'logerrit', 'gerrit', 'query', 
'status:open', '--format', 'JSON', '--all-approvals', '--files'])
+changes = []
+for line in buf.decode('utf-8').split('\n'):
+i = json.loads(line)
+if 'type' in i:
+break
+changes.append(i)
+changes.sort(key=lambda i: int(i['number']))
+domainChanges = filterDomain(changes, domain)
+
+skippedChanges = []
+for i in domainChanges:
+skip = False
+
+files = (set([fileobj['file'] for pset in i['patchSets'] for fileobj 
in pset['files']]))
+files.remove('/COMMIT_MSG')
+
+try:
+for j in files:
+for k in blacklist:
+if k in j:
+skippedChanges.append((i, k))
+skip = True
+break
+if skip:
+break
+for j in i['patchSets'][-1]['approvals']:
+if j['value'] == "-1":
+skippedChanges.append((i, "-1 review"))
+skip = True
+break
+except:
+pass
+if skip:
+continue
+print("http://gerrit.libreoffice.org/%s [%s] %s" % (i['number'], 
i['branch'], i['subject']))
+print("Changed files: %s" % ', '.join(files))
+print()
+print("Found %s changes to review" % (len(domainChanges) - 
len(skippedChanges)))
+print()
+print("Skipped %s changes:" % len(skippedChanges))
+for i in skippedChanges:
+print("%s: %s" % (i[0]['number'], i[1]))
+
+if __name__ == "__main__":
+try:
+main(sys.argv[1:])
+except IndexError:
+print("Usage: gerrit-filter-domain @example.com 
[exclude-path-pattern1, exclude-path-pattern2, ...]")
+print()
+print("Example: gerrit-filter-domain @gmail.com chart")
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: odb ODF standard conformance [was: minutes of ESC call ...]

2014-01-10 Thread Michael Stahl 
On 07/01/14 17:20, Lionel Elie Mamane wrote:
> On Mon, Jan 06, 2014 at 09:45:54PM +0100, Michael Stahl wrote:
>> On 20/12/13 14:40, Lionel Elie Mamane wrote:

>>> 2) manifest:manifest without version attribute: I have no clue what
>>>version I should put there. Any hint?
> 
>> to expand on Thorsten's answer, "1.2", but only if that's the ODF
>> version; the attribute did not exist in ODF 1.1/1.0.
> 
> I don't find how to set the manifest:manifest version. It seems to be
> in the GetVersion() of the m_pRootFolder of ZipPackage
> (package/source/zippackage/ZipPackage.cxx), but I don't see how that
> is ever set except when reading the file (that is, parsing the
> manifest). So where/when is it set when *writing* the file?
> 
> I pushed a maybe-related fix, but in my testing it still does not set
> the version in the manifest... See
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=67db0c190ed2fe0629380ca32d153d3f5ab475dc
> 
> Help appreciated.

the relevant line for other files is in SfxObjectShell::SetupStorage():

> xProps->setPropertyValue("Version", uno::makeAny( 
> ODFVER_012_TEXT ) );

xProps is the XStorage; dbaccess (and chart2) do not use SfxBaseModel so
they're missing that bit.

i'm not seeing any code to set "Version" in sw/source/filter/xml,
probably the "Version" you added in the above commit (which was
half-there is a broken way before) doesn't do anything?

ok i've pushed f60b61b2cf87e89938c760877a56bc4dd5c577a9 based on the
above, seems to work here.

>>> I need help on these:
> 
>>> 1) fdo36288-2.odb/forms/Obj42/content.xml[2,17145]:  Error: attribute
>>>"xlink:href" has a bad value: ".uno:FormController/saveRecord" does
>>>not satisfy the "anyURI" type
> 
>>>What is the "right" way to put a .uno URI?
> 
>> anyURI is actually an IRI reference in ODF (not that it makes a
>> difference here).  RFC3987 says:
> 
>>scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
> 
>> ... so the problem is that it starts with "." where only ALPHA is
>> allowed.  was that perhaps legal in a previous URI RFC or how did we end
>> up with this?
> 
>  I don't know the history, but as far as I can see, that's how
> UNO commands are stored as a URI; that's also used extensively within
> LibreOffice, e.g. to give the action of a toolbar button.

hmm... the only option to make that conforming is to do some hack to
write "uno:" instead and add a "." when reading that ... but it would
create interop issues with older versions, and the ".uno:" urls are
specific to this code-base anyway, it's not like MSO will ever
understand those, so there are no real-world benefits to gain here...


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

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

2014-01-10 Thread Michael Stahl 
 dbaccess/source/core/dataaccess/databasedocument.cxx |   31 +--
 1 file changed, 16 insertions(+), 15 deletions(-)

New commits:
commit f60b61b2cf87e89938c760877a56bc4dd5c577a9
Author: Michael Stahl 
Date:   Fri Jan 10 17:59:52 2014 +0100

dbaccess: ODF export: set "Version" property on target Storage

... like SfxObjectShell::SetupStorage() does, and not on the property
set that is passed to the XML export filters where it probably does
nothing.

Change-Id: I21da1b92fc921eb47e492169e69ef15ac2f0e19d

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 5dbf3a1..007a3b3 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1615,7 +1615,6 @@ void ODatabaseDocument::impl_writeStorage_throw( const 
Reference< XStorage >& _r
 { OUString("BaseURI"), 0, ::getCppuType( (OUString *)0 
),beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString("StreamName"), 0, ::getCppuType( (OUString *)0 
),beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString("UsePrettyPrinting"), 0, ::getCppuType((sal_Bool*)0), 
beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString("Version"), 0, ::getCppuType( (OUString *)0 
),beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString(), 0, css::uno::Type(), 0, 0 }
 };
 uno::Reference< beans::XPropertySet > xInfoSet( 
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( 
aExportInfoMap ) ) );
@@ -1625,31 +1624,33 @@ void ODatabaseDocument::impl_writeStorage_throw( const 
Reference< XStorage >& _r
 if ( aSaveOpt.IsSaveRelFSys() )
 xInfoSet->setPropertyValue("BaseURI", 
uno::makeAny(_rMediaDescriptor.getOrDefault("URL",OUString(;
 
-OUString aVersion;
-SvtSaveOptions::ODFDefaultVersion nDefVersion = 
aSaveOpt.GetODFDefaultVersion();
+sal_Int32 nArgsLen = aDelegatorArguments.getLength();
+aDelegatorArguments.realloc(nArgsLen+1);
+aDelegatorArguments[nArgsLen++] <<= xInfoSet;
 
-// older versions can not have this property set, it exists only starting 
from ODF1.2
-if ( nDefVersion >= SvtSaveOptions::ODFVER_012 )
+Reference< XPropertySet > xProp( _rxTargetStorage, UNO_QUERY_THROW );
+xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( 
(OUString)MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ) );
+
+OUString aVersion;
+SvtSaveOptions::ODFDefaultVersion const nDefVersion =
+aSaveOpt.GetODFDefaultVersion();
+// older versions can not have this property set,
+// it exists only starting from ODF1.2
+if (nDefVersion >= SvtSaveOptions::ODFVER_012)
 aVersion = ODFVER_012_TEXT;
 
-if ( !aVersion.isEmpty() )
+if (!aVersion.isEmpty())
 {
 try
 {
-xInfoSet->setPropertyValue( "Version" , uno::makeAny( aVersion ) );
+xProp->setPropertyValue("Version" , uno::makeAny(aVersion));
 }
-catch( const uno::Exception& )
+catch (const uno::Exception& e)
 {
+SAL_WARN("dbaccess", "exception setting Version: " << e.Message);
 }
 }
 
-sal_Int32 nArgsLen = aDelegatorArguments.getLength();
-aDelegatorArguments.realloc(nArgsLen+1);
-aDelegatorArguments[nArgsLen++] <<= xInfoSet;
-
-Reference< XPropertySet > xProp( _rxTargetStorage, UNO_QUERY_THROW );
-xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( 
(OUString)MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ) );
-
 Reference< XComponent > xComponent( *const_cast< ODatabaseDocument* >( 
this ), UNO_QUERY_THROW );
 
 Sequence< PropertyValue > aMediaDescriptor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2014-01-10 Thread Kohei Yoshida 
 offapi/com/sun/star/drawing/XShapes2.idl |9 +
 1 file changed, 9 insertions(+)

New commits:
commit d1846cd8d4530d620b996f27a0ea7ab0c91639b5
Author: Kohei Yoshida 
Date:   Fri Jan 10 12:03:05 2014 -0500

fdo#72005: Add @since tag to the API documentation.

Change-Id: Ib59648f1427e3d6f662f7c4eddea66ad03817dbb

diff --git a/offapi/com/sun/star/drawing/XShapes2.idl 
b/offapi/com/sun/star/drawing/XShapes2.idl
index c63981c..80b9936 100644
--- a/offapi/com/sun/star/drawing/XShapes2.idl
+++ b/offapi/com/sun/star/drawing/XShapes2.idl
@@ -14,12 +14,19 @@
 
 module com {  module sun {  module star { module drawing {
 
+/**
+ * Extend XShapes to allow insertion of shapes at different positions.
+ *
+ * @since LibreOffice 4.2
+ */
 interface XShapes2 : com::sun::star::drawing::XShapes
 {
 /**
  * Insert a new shape to the top of the stack.
  *
  * @param xShape shape to be inserted.
+ *
+ * @since LibreOffice 4.2
  */
 void addTop( [in] com::sun::star::drawing::XShape xShape );
 
@@ -27,6 +34,8 @@ interface XShapes2 : com::sun::star::drawing::XShapes
  * Insert a new shape to the bottom of the stack.
  *
  * @param xShape shape to be inserted.
+ *
+ * @since LibreOffice 4.2
  */
 void addBottom( [in] com::sun::star::drawing::XShape xShape );
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3d/a7c8da81d5fd05ced97b965d127cab1694bfd4

2014-01-10 Thread Caolán McNamara 
 3d/a7c8da81d5fd05ced97b965d127cab1694bfd4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 28b356c6f7968d1c91325c98bbbede0a0320125b
Author: Caolán McNamara 
Date:   Fri Jan 10 16:54:34 2014 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 20/a6f8163ffab9aeed1b2886e771a254a43120ec

2014-01-10 Thread Caolán McNamara 
 20/a6f8163ffab9aeed1b2886e771a254a43120ec |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4e9791fcf892f883fddffdf2de9fb2d697d003c2
Author: Caolán McNamara 
Date:   Fri Jan 10 16:56:28 2014 +

Notes added by 'git notes add'

diff --git a/20/a6f8163ffab9aeed1b2886e771a254a43120ec 
b/20/a6f8163ffab9aeed1b2886e771a254a43120ec
new file mode 100644
index 000..9ce5cc1
--- /dev/null
+++ b/20/a6f8163ffab9aeed1b2886e771a254a43120ec
@@ -0,0 +1 @@
+prefer: f804c72a090f8d5f170fed700ba7cf1826e5b3a2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Caolán McNamara 
 dd/7d71f0b2f2056017e32f58b3b8c3d5ea993344 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6fca1b423e7a31b2a5700e359fad14ffbf7f0b36
Author: Caolán McNamara 
Date:   Fri Jan 10 16:54:50 2014 +

Notes added by 'git notes add'

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

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

2014-01-10 Thread Stephan Bergmann 
 drawinglayer/source/attribute/fillgraphicattribute.cxx|2 -
 drawinglayer/source/attribute/fillhatchattribute.cxx  |2 -
 drawinglayer/source/attribute/fontattribute.cxx   |   14 +-
 drawinglayer/source/attribute/linestartendattribute.cxx   |2 -
 drawinglayer/source/attribute/sdrfillgraphicattribute.cxx |6 ++--
 drawinglayer/source/attribute/sdrlightattribute3d.cxx |2 -
 drawinglayer/source/attribute/sdrlinestartendattribute.cxx|8 ++---
 drawinglayer/source/attribute/sdrobjectattribute3d.cxx|   10 +++
 drawinglayer/source/attribute/sdrsceneattribute3d.cxx |2 -
 drawinglayer/source/processor3d/zbufferprocessor3d.cxx|   12 
 include/drawinglayer/primitive2d/animatedprimitive2d.hxx  |2 -
 include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx|2 -
 include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx   |2 -
 include/drawinglayer/primitive2d/sceneprimitive2d.hxx |2 -
 include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx |   10 +++
 include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx   |2 -
 include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx|   12 
 include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx  |   12 
 include/drawinglayer/primitive3d/shadowprimitive3d.hxx|2 -
 include/drawinglayer/primitive3d/textureprimitive3d.hxx   |4 +-
 include/drawinglayer/processor2d/hittestprocessor2d.hxx   |8 ++---
 include/drawinglayer/processor2d/linegeometryextractor2d.hxx  |2 -
 include/drawinglayer/processor3d/defaultprocessor3d.hxx   |6 ++--
 include/drawinglayer/processor3d/shadow3dextractor.hxx|6 ++--
 include/drawinglayer/texture/texture3d.hxx|2 -
 25 files changed, 67 insertions(+), 67 deletions(-)

New commits:
commit 70863f08d83dec5c9ee51d06b64bbca59e9daaef
Author: Stephan Bergmann 
Date:   Fri Jan 10 17:52:34 2014 +0100

Use bool

Change-Id: I2d06ae03650b318a1318d0e2b026352e22404fdd

diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx 
b/drawinglayer/source/attribute/fillgraphicattribute.cxx
index f92b06d..2fc61e1 100644
--- a/drawinglayer/source/attribute/fillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx
@@ -34,7 +34,7 @@ namespace drawinglayer
 basegfx::B2DRange   maGraphicRange;
 
 // bitfield
-unsignedmbTiling : 1;
+boolmbTiling : 1;
 
 // tiling definitions, offsets in X/Y in percent for each 2nd row.
 // If both are set, Y is ignored (X has precedence)
diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx 
b/drawinglayer/source/attribute/fillhatchattribute.cxx
index 1d56bad..fad8ca3 100644
--- a/drawinglayer/source/attribute/fillhatchattribute.cxx
+++ b/drawinglayer/source/attribute/fillhatchattribute.cxx
@@ -38,7 +38,7 @@ namespace drawinglayer
 sal_uInt32  mnMinimalDiscreteDistance;
 
 // bitfield
-unsignedmbFillBackground : 1;
+boolmbFillBackground : 1;
 
 ImpFillHatchAttribute(
 HatchStyle eStyle,
diff --git a/drawinglayer/source/attribute/fontattribute.cxx 
b/drawinglayer/source/attribute/fontattribute.cxx
index 16f1785..f0b438c 100644
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
@@ -36,13 +36,13 @@ namespace drawinglayer
 sal_uInt16  mnWeight;   // 
Font weight
 
 /// bitfield
-unsignedmbSymbol : 1;   // 
Symbol Font Flag
-unsignedmbVertical : 1; // 
Vertical Text Flag
-unsignedmbItalic : 1;   // 
Italic Flag
-unsignedmbOutline : 1;  // 
Outline Flag
-unsignedmbRTL : 1;  // 
RTL Flag
-unsignedmbBiDiStrong : 1;   // 
BiDi Flag
-unsignedmbMonospaced : 1;
+boolmbSymbol : 1;   // 
Symbol Font Flag
+boolmbVertical : 1; // 
Vertical Text Flag
+boolmbItalic : 1;   // 
Italic Flag
+boolmbOutline : 1;  // 
Outline Flag
+boolmbRTL : 1;  // 
RTL Flag
+b

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

2014-01-10 Thread Caolán McNamara 
 cui/source/options/optinet2.cxx |1 
 svx/source/svdraw/svdotextdecomposition.cxx |   35 +++-
 2 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 76a0b3170664b19c3eb66edc8fccb04dc5485387
Author: Caolán McNamara 
Date:   Fri Jan 10 16:49:19 2014 +

Resolves: fdo#35779 set the bg color of the editeng from the text shape

Change-Id: I75feaea2dbd6c703cb3093c119a69985ecd89419

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 970ddf8..b01aab4 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -18,8 +18,10 @@
  */
 
 
-#include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -882,6 +884,36 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
 rOutliner.SetMinAutoPaperSize(aNullSize);
 rOutliner.SetMaxAutoPaperSize(Size(100,100));
 
+// Resolves: fdo#35779 set background color of this shape as the editeng 
background if there
+// is one. Check the shape itself, then the host page, then that page's 
master page.
+// That color needs to be restored on leaving this method
+Color aOriginalBackColor(rOutliner.GetBackgroundColor());
+const SfxItemSet* pBackgroundFillSet = &GetObjectItemSet();
+
+if (XFILL_NONE == ((const 
XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
+{
+SdrPage *pOwnerPage = GetPage();
+if (pOwnerPage)
+{
+pBackgroundFillSet = 
&pOwnerPage->getSdrPageProperties().GetItemSet();
+
+if (XFILL_NONE == ((const 
XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
+{
+if (!pOwnerPage->IsMasterPage() && 
pOwnerPage->TRG_HasMasterPage())
+{
+pBackgroundFillSet = 
&pOwnerPage->TRG_GetMasterPage().getSdrPageProperties().GetItemSet();
+}
+}
+}
+}
+
+if (XFILL_NONE != ((const 
XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
+{
+Color aColor(rOutliner.GetBackgroundColor());
+GetDraftFillColor(*pBackgroundFillSet, aColor);
+rOutliner.SetBackgroundColor(aColor);
+}
+
 // add one to rage sizes to get back to the old Rectangle and outliner 
measurements
 const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 
1L));
 const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 
1L));
@@ -1058,6 +1090,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
 aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, 
aClipRange);
 
 // cleanup outliner
+rOutliner.SetBackgroundColor(aOriginalBackColor);
 rOutliner.Clear();
 rOutliner.setVisualizedPage(0);
 
commit e068dfc6fb42a8017afdb9347692c9fdcd3fdf1a
Author: Caolán McNamara 
Date:   Fri Jan 10 15:12:20 2014 +

stray FOO

Change-Id: I3185356d9c61f730c613b5a4b7e62d510bc0424e

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 3064bca..f3486ac 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -591,7 +591,6 @@ SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, 
const SfxItemSet& rSet)
 Size 
aSize(m_pSavePasswordsCB->CalcMinimumSize(56*approximate_char_width()));
 if (aPrefSize.Width() > aSize.Width())
 {
-fprintf(stderr, "FOO\n");
 m_pSavePasswordsCB->set_width_request(aSize.Width());
 m_pSavePasswordsCB->set_height_request(aSize.Height());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source sfx2/uiconfig

2014-01-10 Thread Tamas Zolnai 
2014 Január 10, Péntek 15:24 GMT dátummal, Stephan Bergmann 
 ezt írta: 
 
> On 01/10/2014 02:13 PM, Zolnai Tamás wrote:
> > commit 60c7ed80643a6c397feebdd1492d6c3ef4d810be
> > Author: Zolnai Tamás 
> > Date:   Fri Jan 10 03:31:46 2014 +0100
> >
> >  fdo#72947 Startcenter: display more userfriendly file urls in tooltips
> >
> >  Use INetURLObject to get a readable url (it displayes special 
> > characters
> >  too). It is a side effect that 'file:///' prefix disappear
> >  which seems a good thing.
> >  Plus some cleanup: remove second INetURLObject.
> >
> >  Change-Id: I4aab5e2546ae70e5a3d85b12e26e021bfa244999
> >
> > diff --git a/include/sfx2/recentdocsviewitem.hxx 
> > b/include/sfx2/recentdocsviewitem.hxx
> > index be94b78..410e74b 100644
> > --- a/include/sfx2/recentdocsviewitem.hxx
> > +++ b/include/sfx2/recentdocsviewitem.hxx
> > @@ -23,6 +23,9 @@ public:
> >   virtual OUString getHelpText() const;
> >
> >   OUString maURL;
> > +
> > +private:
> > +OUString m_sHelpText;
> >   };
> >
> >   #endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
> > diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
> > b/sfx2/source/control/recentdocsviewitem.cxx
> > index c35c16b..d741675 100644
> > --- a/sfx2/source/control/recentdocsviewitem.cxx
> > +++ b/sfx2/source/control/recentdocsviewitem.cxx
> > @@ -21,6 +21,7 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView 
> > &rView, const OUString &rUR
> >   {
> >   OUString aTitle(rTitle);
> >   INetURLObject aURLObj(rURL);
> > +m_sHelpText = aURLObj.GetURLPath();
> 
> If m_sHelpText is what gets displayed in the "bubble help" when hovering 
> over a document in start center, I'd suggest against unconditionally > 
> displaying merely the URL's path component (which can be rather 
> meaningless).  How about first trying 
> INetURLObject::getFSysPath(INetURLObject::FSYS_DETECT) to get a pathname 
> for file URLs and if that fails (i.e., returns an empty string) use > 
> INetURLObject::GetURLNoPass() to get the full (non-file) URL (where > 
> "NoPass" strips any password from the authority component, just in case).

You're right. I correct it using your idea.

Thanks!
Tamás 
 
 

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

[Libreoffice-commits] core.git: chart2/source include/svx offapi/com offapi/UnoApi_offapi.mk svx/source

2014-01-10 Thread Kohei Yoshida 
 chart2/source/view/inc/AbstractShapeFactory.hxx |   17 ++
 chart2/source/view/inc/OpenglShapeFactory.hxx   |   13 
 chart2/source/view/inc/ShapeFactory.hxx |   13 
 chart2/source/view/main/OpenglShapeFactory.cxx  |   12 ---
 chart2/source/view/main/ShapeFactory.cxx|   21 +---
 chart2/source/view/main/VLegend.cxx |2 -
 include/svx/unoshape.hxx|   14 ++--
 offapi/UnoApi_offapi.mk |1 
 offapi/com/sun/star/drawing/XShapes2.idl|   38 +++
 svx/source/unodraw/unoshap2.cxx |   39 +++-
 10 files changed, 127 insertions(+), 43 deletions(-)

New commits:
commit 10840ad753b60886ea5175060cb0ec2a77e1579a
Author: Kohei Yoshida 
Date:   Fri Jan 10 11:30:59 2014 -0500

fdo#72005: Insert the border rectangle to the bottom of the stack.

This will make the border and fill shape to be drawn first, then everything
else drawn on top.

This commit may look large, but it's actually a very trivial change. The
important part is in SvxShapeGroup where new methods have been added to 
allow
different insertion positions for the new shapes being inserted, and have
the chart2 code make use of it to insert the fill rectangle to the bottom
rather than to the top.

Change-Id: I999160daf6fc9ce3d7e641f57b1998543df1cc4e

diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx 
b/chart2/source/view/inc/AbstractShapeFactory.hxx
index 36b2554..73fbf69 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -60,6 +60,8 @@ class AbstractShapeFactory
 {
 public:
 
+enum StackPosition { Top, Bottom };
+
 static AbstractShapeFactory* 
getOrCreateShapeFactory(::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory> xFactory);
 
 virtual ~AbstractShapeFactory() {};
@@ -211,12 +213,13 @@ public:
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
-const ::com::sun::star::uno::Reference<
-::com::sun::star::drawing::XShapes >& xTarget
-, const ::com::sun::star::awt::Size& rSize
-, const ::com::sun::star::awt::Point& rPosition
-, const tNameSequence& rPropNames
-, const tAnySequence& rPropValues ) = 0;
+const com::sun::star::uno::Reference<
+com::sun::star::drawing::XShapes >& xTarget,
+const com::sun::star::awt::Size& rSize,
+const com::sun::star::awt::Point& rPosition,
+const tNameSequence& rPropNames,
+const tAnySequence& rPropValues,
+StackPosition ePos = Top ) = 0;
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx 
b/chart2/source/view/inc/OpenglShapeFactory.hxx
index 7d8ebdc..164ba93 100644
--- a/chart2/source/view/inc/OpenglShapeFactory.hxx
+++ b/chart2/source/view/inc/OpenglShapeFactory.hxx
@@ -162,12 +162,13 @@ public:
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
-const ::com::sun::star::uno::Reference<
-::com::sun::star::drawing::XShapes >& xTarget
-, const ::com::sun::star::awt::Size& rSize
-, const ::com::sun::star::awt::Point& rPosition
-, const tNameSequence& rPropNames
-, const tAnySequence& rPropValues );
+const com::sun::star::uno::Reference<
+com::sun::star::drawing::XShapes >& xTarget,
+const com::sun::star::awt::Size& rSize,
+const com::sun::star::awt::Point& rPosition,
+const tNameSequence& rPropNames,
+const tAnySequence& rPropValues,
+StackPosition ePos = Top );
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
diff --git a/chart2/source/view/inc/ShapeFactory.hxx 
b/chart2/source/view/inc/ShapeFactory.hxx
index 5afb686..ed592d2 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -177,12 +177,13 @@ public:
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >
 createRectangle(
-const ::com::sun::star::uno::Reference<
-::com::sun::star::drawing::XShapes >& xTarget
-, const ::com::sun::star::awt::Size& rSize
-, const ::com::sun::star::awt::Point& rPosition
-, const tNameSequence& rPropNames
-, const tAnySequence& rPropValues );
+const com::sun::star::uno::Refer

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

2014-01-10 Thread Stephan Bergmann 
 canvas/source/cairo/cairo_canvashelper.cxx |2 +-
 canvas/source/opengl/ogl_canvastools.cxx   |2 +-
 canvas/source/tools/verifyinput.cxx|   20 ++--
 canvas/source/vcl/backbuffer.cxx   |2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit fe23abd3812e08015facbbb2eb725dd990d63fa0
Author: Stephan Bergmann 
Date:   Fri Jan 10 17:35:25 2014 +0100

Be explicit when using bool as integral value

Change-Id: I3a6b9df9b1b6c48d5db506942d651f66cefdaa18

diff --git a/canvas/source/cairo/cairo_canvashelper.cxx 
b/canvas/source/cairo/cairo_canvashelper.cxx
index 34886b0..8121a0d 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -983,7 +983,7 @@ namespace cairocanvas
 // to correctly render closed curves, need to output first
 // point twice (so output one additional point)
 const sal_uInt32 nExtendedPointCount( nPointCount +
-  
aPolygon.isClosed()*aPolygon.areControlPointsUsed() );
+  int(aPolygon.isClosed() && 
aPolygon.areControlPointsUsed()) );
 
 if( nPointCount > 1)
 {
diff --git a/canvas/source/opengl/ogl_canvastools.cxx 
b/canvas/source/opengl/ogl_canvastools.cxx
index a3a73db..36693f3 100644
--- a/canvas/source/opengl/ogl_canvastools.cxx
+++ b/canvas/source/opengl/ogl_canvastools.cxx
@@ -69,7 +69,7 @@ namespace oglcanvas
 const ::basegfx::B2DPolygon& rPolygon( aPolyPoly.getB2DPolygon(i) 
);
 
 const sal_uInt32 nPts=rPolygon.count();
-const sal_uInt32 nExtPts=nPts + rPolygon.isClosed();
+const sal_uInt32 nExtPts=nPts + int(rPolygon.isClosed());
 for( sal_uInt32 j=0; j 0
 const sal_Int32 nBinaryState(
-10 * !::rtl::math::isFinite( matrix.m00 ) +
- 1 * !::rtl::math::isFinite( matrix.m01 ) +
-  1000 * !::rtl::math::isFinite( matrix.m02 ) +
-   100 * !::rtl::math::isFinite( matrix.m10 ) +
-10 * !::rtl::math::isFinite( matrix.m11 ) +
- 1 * !::rtl::math::isFinite( matrix.m12 ) );
+10 * int(!::rtl::math::isFinite( matrix.m00 )) +
+ 1 * int(!::rtl::math::isFinite( matrix.m01 )) +
+  1000 * int(!::rtl::math::isFinite( matrix.m02 )) +
+   100 * int(!::rtl::math::isFinite( matrix.m10 )) +
+10 * int(!::rtl::math::isFinite( matrix.m11 )) +
+ 1 * int(!::rtl::math::isFinite( matrix.m12 )) );
 
 if( nBinaryState )
 {
@@ -252,10 +252,10 @@ namespace canvas
 
 #if OSL_DEBUG_LEVEL > 0
 const sal_Int32 nBinaryState(
-1000 * !::rtl::math::isFinite( matrix.m00 ) +
- 100 * !::rtl::math::isFinite( matrix.m01 ) +
-  10 * !::rtl::math::isFinite( matrix.m10 ) +
-   1 * !::rtl::math::isFinite( matrix.m11 ) );
+1000 * int(!::rtl::math::isFinite( matrix.m00 )) +
+ 100 * int(!::rtl::math::isFinite( matrix.m01 )) +
+  10 * int(!::rtl::math::isFinite( matrix.m10 )) +
+   1 * int(!::rtl::math::isFinite( matrix.m11 )) );
 
 if( nBinaryState )
 {
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 2666c61..73d6320 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -26,7 +26,7 @@ namespace vclcanvas
 BackBuffer::BackBuffer( const OutputDevice& rRefDevice,
 boolbMonochromeBuffer ) :
 maVDev( new VirtualDevice( rRefDevice,
-   bMonochromeBuffer ) )
+   sal_uInt16(bMonochromeBuffer) ) )
 {
 if( !bMonochromeBuffer )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Tushar Bende 
 sw/qa/extras/ooxmlexport/data/toc_doc.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   18 ++
 sw/source/filter/ww8/ww8atr.cxx|2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 9f9c2bb4d5907be5726f50cfd5dfa8ae1d251dcf
Author: Tushar Bende 
Date:   Thu Dec 26 19:30:08 2013 +0530

fdo#69613: Fix for DOCX Export loses Table-of-Contents flags

(This is partial fix for this bug includes flag 'f' processing)

Issue description:
Export logic for all TOC field flags was enclosed inside
if( nsSwTOXElement::TOX_MARK & pTOX->GetCreateType() ) in ww8atr.cxx,
which gets true for 'f' flag, this was the reason if there is 'f' flag
present in original doc then only other flags like \o \h used to come after 
RoundTrip.

Added Unit test case to verify even if there is no 'f' flag in original 
doc,other flags
eg. \h is getting preserved after RT.

Conflicts:
sw/source/filter/ww8/ww8atr.cxx
Reviewed on:
https://gerrit.libreoffice.org/7203

Change-Id: I29d22b363cc91ae5fabffca959786134bf1ba1cc

diff --git a/sw/qa/extras/ooxmlexport/data/toc_doc.docx 
b/sw/qa/extras/ooxmlexport/data/toc_doc.docx
new file mode 100644
index 000..26fa3dc
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/toc_doc.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4f189e1..a3850cb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2318,6 +2318,24 @@ 
DECLARE_OOXMLEXPORT_TEST(testFieldFlagO,"TOC_field_f.docx")
 CPPUNIT_ASSERT(contents.match(" TOC \\f \\o \"1-3\" \\h"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTOCFlag_f, "toc_doc.docx")
+{
+// Export logic for all TOC field flags was enclosed inside
+// if( nsSwTOXElement::TOX_MARK & pTOX->GetCreateType() ) in ww8atr.cxx 
which gets true for \f,
+// this was the reason if there is \f flag present in original doc then 
only other flags like
+// \o \h \n used to come after RoundTrip.
+// This test case is to verify even if there is no \f flag in original 
doc, \h flag is getting
+// preserved after RT.
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+// FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
+// not to insert an empty paragraph before TOC.
+xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[2]/w:r[2]/w:instrText");
+xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
+OUString contents = OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content));
+CPPUNIT_ASSERT(contents.endsWith("\\h"));
+}
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index e9d1069..b04d7d4 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2120,6 +2120,7 @@ void AttributeOutputBase::StartTOX( const SwSection& 
rSect )
 sStr += OUString((sal_Char)( 'A' + GetExport( 
).GetId( *pTOX->GetTOXType() ) ));
 sStr += sEntryEnd;
 }
+}
 if( nsSwTOXElement::TOX_OUTLINELEVEL & 
pTOX->GetCreateType() )
 {
 // Take the TOC value of the max level to evaluate 
to as
@@ -2287,7 +2288,6 @@ void AttributeOutputBase::StartTOX( const SwSection& 
rSect )
 
 if (lcl_IsHyperlinked(pTOX->GetTOXForm(), nTOXLvl))
 sStr += "\\h";
-}
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Zolnai Tamás 
 sfx2/source/control/recentdocsviewitem.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 340e70e248824a3a4959fa1dee90c5650f257ae8
Author: Zolnai Tamás 
Date:   Fri Jan 10 17:12:46 2014 +0100

fdo#72947 Startcenter: handle file urls and non-file urls on a different way

Thanks Stephan Bergmann for the idea.

Change-Id: Ifdde1b7eaaefd30a176c47385bc9bfec48d5b86c

diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index d741675..d1947e9 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -21,7 +21,12 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, 
const OUString &rUR
 {
 OUString aTitle(rTitle);
 INetURLObject aURLObj(rURL);
-m_sHelpText = aURLObj.GetURLPath();
+
+if( aURLObj.GetProtocol() == INET_PROT_FILE )
+m_sHelpText = aURLObj.getFSysPath(INetURLObject::FSYS_DETECT);
+if( m_sHelpText.isEmpty() )
+m_sHelpText = aURLObj.GetURLNoPass();
+
 RecentDocsView& rRecentView = dynamic_cast(rView);
 long nThumbnailSize = rRecentView.GetThumbnailSize();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Tsutomu Uchino 
 sd/source/ui/slideshow/slideshowimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20a6f8163ffab9aeed1b2886e771a254a43120ec
Author: Tsutomu Uchino 
Date:   Fri Jan 10 15:30:03 2014 +

#i97129# fix hidden slide shown when going back to previous slide from 
finish screen

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 9ceaac2..59b95d4 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3381,7 +3381,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool 
bSkipAllMainSequenceEffects)
 const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
 if( eMode == SHOWWINDOWMODE_END )
 {
-const sal_Int32 nLastSlideIndex = 
mpSlideController->getSlideIndexCount() - 1;
+const sal_Int32 nLastSlideIndex = 
mpSlideController->getCurrentSlideIndex();
 if( nLastSlideIndex >= 0 )
 mpShowWindow->RestartShow( nLastSlideIndex );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread PriyankaGaikwad 
 sw/qa/extras/ooxmlexport/data/TOC_field_f.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   14 ++
 sw/source/filter/ww8/ww8atr.cxx|   17 -
 3 files changed, 14 insertions(+), 17 deletions(-)

New commits:
commit b4e9e7726f0c67938e8b80e6b7c2883459d0b533
Author: PriyankaGaikwad 
Date:   Fri Dec 27 10:26:51 2013 +0530

fdo#69613 DOCX export: Fix for '\o' flag field should export once.

(This is partial fix for this bug)
Description:
TOC flag field '\o' exported twice after roundtrip because the export logic 
for '\o' is repeated in ww8atr.cxx.

XML file difference
In document.xml
Before :

 TOC \o "1-3" \o "1-3" \h


After :

 TOC \o "1-3" \h


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

Change-Id: I136744927b8d5a48869a2bfc87278bede697c655

diff --git a/sw/qa/extras/ooxmlexport/data/TOC_field_f.docx 
b/sw/qa/extras/ooxmlexport/data/TOC_field_f.docx
new file mode 100644
index 000..ea0958a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/TOC_field_f.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 26dc77a..4f189e1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2304,6 +2304,20 @@ DECLARE_OOXMLEXPORT_TEST(testFDO71834, "fdo71834.docx")
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl[4]/w:tr[2]/w:tc[1]/w:tcPr[1]/w:tcW[1]","type", "dxa");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFieldFlagO,"TOC_field_f.docx")
+{
+   // This test case is to verify \o flag should come once.
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+// FIXME "p[2]" will have to be "p[1]", once the TOC import code is fixed
+// not to insert an empty paragraph before TOC.
+xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[2]/w:r[2]/w:instrText");
+xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
+OUString contents = OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content));
+CPPUNIT_ASSERT(contents.match(" TOC \\f \\o \"1-3\" \\h"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4a800b1..e9d1069 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2120,23 +2120,6 @@ void AttributeOutputBase::StartTOX( const SwSection& 
rSect )
 sStr += OUString((sal_Char)( 'A' + GetExport( 
).GetId( *pTOX->GetTOXType() ) ));
 sStr += sEntryEnd;
 }
-
-if( nsSwTOXElement::TOX_OUTLINELEVEL & 
pTOX->GetCreateType() )
-{
-const int nMinLvl = nTOXLvl;
-if ( nMinLvl > 0 )
-{
-int nTmpLvl = nMinLvl;
-if (nTmpLvl > WW8ListManager::nMaxLevel)
-nTmpLvl = WW8ListManager::nMaxLevel;
-
-sStr += "\\o \"1-";
-sStr += OUString::number(nTmpLvl);
-sStr += sEntryEnd;
-
-}
-}
-
 if( nsSwTOXElement::TOX_OUTLINELEVEL & 
pTOX->GetCreateType() )
 {
 // Take the TOC value of the max level to evaluate 
to as
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source sfx2/uiconfig

2014-01-10 Thread Stephan Bergmann 

On 01/10/2014 02:13 PM, Zolnai Tamás wrote:

commit 60c7ed80643a6c397feebdd1492d6c3ef4d810be
Author: Zolnai Tamás 
Date:   Fri Jan 10 03:31:46 2014 +0100

 fdo#72947 Startcenter: display more userfriendly file urls in tooltips

 Use INetURLObject to get a readable url (it displayes special characters
 too). It is a side effect that 'file:///' prefix disappear
 which seems a good thing.
 Plus some cleanup: remove second INetURLObject.

 Change-Id: I4aab5e2546ae70e5a3d85b12e26e021bfa244999

diff --git a/include/sfx2/recentdocsviewitem.hxx 
b/include/sfx2/recentdocsviewitem.hxx
index be94b78..410e74b 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -23,6 +23,9 @@ public:
  virtual OUString getHelpText() const;

  OUString maURL;
+
+private:
+OUString m_sHelpText;
  };

  #endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index c35c16b..d741675 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -21,6 +21,7 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, 
const OUString &rUR
  {
  OUString aTitle(rTitle);
  INetURLObject aURLObj(rURL);
+m_sHelpText = aURLObj.GetURLPath();


If m_sHelpText is what gets displayed in the "bubble help" when hovering 
over a document in start center, I'd suggest against unconditionally 
displaying merely the URL's path component (which can be rather 
meaningless).  How about first trying 
INetURLObject::getFSysPath(INetURLObject::FSYS_DETECT) to get a pathname 
for file URLs and if that fails (i.e., returns an empty string) use 
INetURLObject::GetURLNoPass() to get the full (non-file) URL (where 
"NoPass" strips any password from the authority component, just in case).


Stephan


  RecentDocsView& rRecentView = dynamic_cast(rView);
  long nThumbnailSize = rRecentView.GetThumbnailSize();

@@ -38,10 +39,9 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, 
const OUString &rUR
  Size aExtSize(aExt.GetSizePixel());

  // attempt to make it appear as if it is on a piece of paper
-INetURLObject aUrl(rURL);
  long nPaperHeight;
  long nPaperWidth;
-if( RecentDocsView::typeMatchesExtension(TYPE_IMPRESS, 
aUrl.getExtension()) )
+if( RecentDocsView::typeMatchesExtension(TYPE_IMPRESS, 
aURLObj.getExtension()) )
  {
  // Swap width and height (PAPER_SCREEN_4_3 definition make it 
needed)
  PaperInfo aInfo(PAPER_SCREEN_4_3);
@@ -86,7 +86,7 @@ void RecentDocsViewItem::setEditTitle (bool edit, bool 
bChangeFocus)

  OUString RecentDocsViewItem::getHelpText() const
  {
-return maURL;
+return m_sHelpText;
  }

  /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

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

2014-01-10 Thread Marcos Paulo de Souza 
 sw/qa/extras/uiwriter/data/fdo70807.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx  |   18 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit b1236dd7e86f40e54b7efb6082fad0967edb92d2
Author: Marcos Paulo de Souza 
Date:   Fri Jan 10 12:53:03 2014 -0200

fdo#70807: Improve unit test using custom styles

As the bug talks about issues in custom styles, now they're tested too.

Change-Id: I5f727718ec3591e29c44c49750a7c7a0841a8c61
Reviewed-on: https://gerrit.libreoffice.org/7373
Reviewed-by: Marcos Souza 
Tested-by: Marcos Souza 

diff --git a/sw/qa/extras/uiwriter/data/fdo70807.odt 
b/sw/qa/extras/uiwriter/data/fdo70807.odt
index 6dad55e..c22e24f 100644
Binary files a/sw/qa/extras/uiwriter/data/fdo70807.odt and 
b/sw/qa/extras/uiwriter/data/fdo70807.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 2e6a79b..8b2c122 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -126,13 +126,21 @@ void SwUiWriterTest::testFdo70807()
 uno::Reference xStyle(stylesIter->getByIndex(i), 
uno::UNO_QUERY);
 uno::Reference xName(xStyle, uno::UNO_QUERY);
 
-sal_Bool isUsed = xStyle->isInUse();
-sal_Bool used = sal_False; // just "Right Page" is used
+sal_Bool expectedUsedStyle = sal_False;
+sal_Bool expectedUserDefined = sal_False;
 
-if (xName->getName() == "Right Page")
-used = sal_True;
+OUString styleName(xName->getName());
 
-CPPUNIT_ASSERT_EQUAL(used, isUsed);
+// just these styles are user defined styles
+if (styleName == "pagestyle1" || styleName == "pagestyle2")
+expectedUserDefined = sal_True;
+
+// just these styles are used in the document
+if (styleName == "Right Page" || styleName == "pagestyle1" || 
styleName == "pagestyle2")
+expectedUsedStyle = sal_True;
+
+CPPUNIT_ASSERT_EQUAL(expectedUserDefined, xStyle->isUserDefined());
+CPPUNIT_ASSERT_EQUAL(expectedUsedStyle, xStyle->isInUse());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Caolán McNamara 
 cui/source/options/optinet2.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c02f3a7c8fcb4a3702aae0c73dc7178315450183
Author: Caolán McNamara 
Date:   Fri Jan 10 15:11:28 2014 +

stray FOO

Change-Id: Iee524cb40ce8cc6098f67231a11362c9eaf8777f

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 3064bca..f3486ac 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -591,7 +591,6 @@ SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, 
const SfxItemSet& rSet)
 Size 
aSize(m_pSavePasswordsCB->CalcMinimumSize(56*approximate_char_width()));
 if (aPrefSize.Width() > aSize.Width())
 {
-fprintf(stderr, "FOO\n");
 m_pSavePasswordsCB->set_width_request(aSize.Width());
 m_pSavePasswordsCB->set_height_request(aSize.Height());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Zolnai Tamás 
 sfx2/source/control/recentdocsview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1ae9feedf13f20a6c10e7bf2261d1f9257e60f87
Author: Zolnai Tamás 
Date:   Fri Jan 10 15:49:00 2014 +0100

Startcenter: ignore repeated clicks inside recent docs view

Change-Id: Ia433adb26e820b89c4d207d018d0daf42654b4a0

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index ea77013..e1b1c0c 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -183,7 +183,7 @@ void RecentDocsView::MouseButtonDown( const MouseEvent& 
rMEvt )
 {
 if ( rMEvt.IsLeft() )
 {
-if( rMEvt.GetClicks() == 2 )
+if( rMEvt.GetClicks() > 1 )
 return;
 
 size_t nPos = ImplGetItem(rMEvt.GetPosPixel());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread umeshkadam 
 sw/qa/extras/ooxmlexport/data/fdo71834.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   34 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |7 +
 4 files changed, 45 insertions(+), 4 deletions(-)

New commits:
commit 89a3acbdb590c3552a3184137ba0aad7f97f1549
Author: umeshkadam 
Date:   Fri Jan 10 16:46:58 2014 +0530

fdo#71834: Fix for floating table

Issue :
- When we have overlapping tables the first table gets
  exported as a table and the second table gets exported
  as a DML/VML shape.
- While exporting, the system starts with the table row &
  the cell, within which it starts exporting the overlapped
  table, while doing so the previous table attributes were
  being referred since the variable was shared.

Implementation:
- Save and reset the table related attributes before
  calling the WriteDMLTextFrame & writeVMLTextFrame
  functions.
- Restore the table attributes for further processing after
  having written the shape.

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

Change-Id: I0052a08c74ffbbebd3eb91a7075a43a4c225b670

diff --git a/sw/qa/extras/ooxmlexport/data/fdo71834.docx 
b/sw/qa/extras/ooxmlexport/data/fdo71834.docx
new file mode 100644
index 000..62262d9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo71834.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ecad7b0..26dc77a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2296,6 +2296,14 @@ DECLARE_OOXMLEXPORT_TEST(testSmartArtAnchoredInline, 
"fdo73227.docx")
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/w:drawing[2]/wp:anchor/wp:docPr","name","Picture");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFDO71834, "fdo71834.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl[4]/w:tr[2]/w:tc[1]/w:tcPr[1]/w:tcW[1]","type", "dxa");
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1606038..26a7507 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -368,6 +368,23 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 m_pSerializer->startElementNS(XML_mc, XML_Choice,
 XML_Requires, "wps",
 FSEND);
+/** FDO#71834 :
+   We should probably be renaming the function
+   switchHeaderFooter to something like SaveRetrieveTableReference.
+   Save the table reference attributes before calling 
WriteDMLTextFrame,
+   otherwise the StartParagraph function will use the previous existing
+   table reference attributes since the variable is being shared.
+*/
+switchHeaderFooter(true,1);
+/** Save the table info's before writing the shape
+as there might be a new table that might get
+spawned from within the VML & DML block and alter
+the contents.
+*/
+ww8::WW8TableInfo::Pointer_t pOldTableInfo = m_rExport.mpTableInfo;
+//Reset the table infos after saving.
+m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new 
ww8::WW8TableInfo());
+
 WriteDMLTextFrame(pParentFrame);
 m_pSerializer->endElementNS(XML_mc, XML_Choice);
 
@@ -375,9 +392,17 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 // in case the text frame had table(s) and we try to export the
 // same table second time.
 m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new 
ww8::WW8TableInfo());
+//reset the tableReference.
+switchHeaderFooter(false,0);
 
 m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND);
 m_rExport.SdrExporter().writeVMLTextFrame(pParentFrame);
+/* FDO#71834 :Restore the data here after having written the Shape
+   for further processing.
+*/
+switchHeaderFooter(false,-1);
+m_rExport.mpTableInfo = pOldTableInfo;
+
 m_pSerializer->endElementNS(XML_mc, XML_Fallback);
 m_pSerializer->endElementNS(XML_mc, XML_AlternateContent);
 
@@ -563,6 +588,9 @@ void DocxAttributeOutput::EndParagraphProperties( const 
boost::shared_ptrmergeTopMarks( );
+
 // Write 'Paragraph Mark' properties
 if ( pRedlineParagraphMarkerDeleted || pRedlineParagraphMarkerInserted || 
pParagraphMarkerProperties)
 {
@@ -617,9 +645,6 @@ void DocxAttribute

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

2014-01-10 Thread Christian Lohmaier 
 scp2/source/ooo/directory_ooo_macosx.scp  |1 -
 solenv/bin/modules/installer.pm   |2 --
 solenv/bin/modules/installer/scriptitems.pm   |   15 ---
 solenv/bin/modules/installer/simplepackage.pm |   25 -
 4 files changed, 12 insertions(+), 31 deletions(-)

New commits:
commit 26f9f060a0a0475d984dfb385e3659e75e5ac2eb
Author: Christian Lohmaier 
Date:   Fri Jan 10 00:50:10 2014 +0100

fix help packaging for Mac OS X language packs

helpcontent was not packaged into the tarball that is extracted into the
user's installation directory (and thus never was installed)

simplify the packaging by getting rid of the special "collect" dir
(LangPackHostName) that was the cause for the problem to begin with:
LanguagePack files were collected in LangPackHostName based directory,
while HelpPack files were collected in regular directory.
And that value wasn't even used for the actual path that is delivered to
the user, so get rid of it and the associated code.

Change-Id: Iadd24382a45722bbe8d58bd97be79609fd03021b
(cherry picked from commit deb39c012031b7981360665cc19dc81d3342a3ad)
Reviewed-on: https://gerrit.libreoffice.org/7350
Reviewed-by: Tor Lillqvist 
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/scp2/source/ooo/directory_ooo_macosx.scp 
b/scp2/source/ooo/directory_ooo_macosx.scp
index 6cd14ab..0bc7bfd 100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -22,7 +22,6 @@
 Directory gid_Dir_Bundle
 ParentID = PD_PROGDIR;
 HostName = "%PRODUCTNAME.app";
-LangPackHostName = "%PRODUCTNAME Language Pack.app";
 End
 
 Directory gid_Dir_Bundle_Contents
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index a081456..237947d 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -291,8 +291,6 @@ sub run {
 
 my $dirsinproductarrayref = 
installer::setupscript::get_all_items_from_script($setupscriptref, "Directory");
 
-if ( $installer::globals::languagepack ) { 
installer::scriptitems::use_langpack_hostname($dirsinproductarrayref); }
-
 if ( $allvariableshashref->{'SHIFT_BASIS_INTO_BRAND_LAYER'} ) { 
$dirsinproductarrayref = 
installer::scriptitems::shift_basis_directory_parents($dirsinproductarrayref); }
 if ( $allvariableshashref->{'OFFICEDIRECTORYNAME'} ) { 
installer::scriptitems::set_officedirectory_name($dirsinproductarrayref, 
$allvariableshashref->{'OFFICEDIRECTORYNAME'}); }
 
diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 3310951..4c384ce 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -489,21 +489,6 @@ sub get_children
 }
 
 

-# Using different HostName for language packs
-
-
-sub use_langpack_hostname
-{
-my ($dirsref) = @_;
-
-for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-{
-my $onedir = ${$dirsref}[$i];
-if (( $onedir->{'LangPackHostName'} ) && ( 
$onedir->{'LangPackHostName'} ne "" )) { $onedir->{'HostName'} = 
$onedir->{'LangPackHostName'}; }
-}
-}
-
-
 # Using langpack copy action for language packs
 

 
diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index da58b40..118d420 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -289,23 +289,21 @@ sub create_package
 
 if (( $installer::globals::languagepack ) || ( 
$installer::globals::helppack ))
 {
+# LanguagePack and HelpPack files are collected in $srcfolder, 
packaged into
+# tarball.tar.bz2 and finally the Language Pack.app is assembled 
in $appfolder
 $localtempdir = "$tempdir/$packagename";
-if ( $installer::globals::helppack ) { $volume_name = 
"$volume_name Help Pack"; }
-if ( $installer::globals::languagepack )
-{
-$volume_name = "$volume_name Language Pack";
-$volume_name_classic = "$volume_name_classic Language Pack";
-$volume_name_classic_app = "$volume_name_classic_app Language 
Pack";
-}
+my $srcfolder = $localtempdir . "/" . $volume_name_classic_app . 
"\.app";
+
+$volume_name .= " Language Pack";
+$volume_name_classic .= " Language Pack";
+$volume_name_classic_app .= " Language Pack";
 
-# Create tar ball named tarball.tar.bz2
-# my $a

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

2014-01-10 Thread Pallavi Jadhav 
 sw/qa/extras/ooxmlexport/data/fdo73227.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   22 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |6 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx |4 +-
 sw/source/filter/ww8/docxsdrexport.cxx   |   39 +--
 sw/source/filter/ww8/docxsdrexport.hxx   |4 +-
 6 files changed, 42 insertions(+), 33 deletions(-)

New commits:
commit 3a6fdd146a37a1dbdec56b6a1d4eff3a8a28a3f8
Author: Pallavi Jadhav 
Date:   Tue Jan 7 17:10:42 2014 +0530

fdo#73227: Fix for corruption after RT

Issue:
1] Document containing SmartArt inside 
   tag gets saved with , due to which
   value of attribute "id" of  gets
   incorrectly written.
   Which was causing the corruption.
2] LO was exporting SmartArt inside 
   bydefault. Hence "ids" of  and 
   were same for value 1 and document gets corrupt.

Implementation:
1] Added code to export SmartArt inside 
   in DocxSdrExport::writeDiagram().
2] Added export Unit test.

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

Change-Id: I5b2efcba030d1736203cf4571d8498fd87600d79

diff --git a/sw/qa/extras/ooxmlexport/data/fdo73227.docx 
b/sw/qa/extras/ooxmlexport/data/fdo73227.docx
new file mode 100644
index 000..015beb9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo73227.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a584047..ecad7b0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2274,6 +2274,28 @@ DECLARE_OOXMLEXPORT_TEST(testFDO73034, "FDO73034.docx")
 CPPUNIT_ASSERT(getXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:u", "val").match("single"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testSmartArtAnchoredInline, "fdo73227.docx")
+{
+/* Given file conatins 3 DrawingML objects as 1Picture,1SmartArt and 
1Shape.
+ * Check for SmartArt.
+*  SmartArt shoould get written as "Floating Object" i.e. inside 
 tag.
+*  Also check for value of attribute "id" of  . It should be 
unique for
+*  all 3 DrawingML objects in a document.
+*/
+
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/w:drawing[1]/wp:anchor/wp:docPr","id","1");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/w:drawing[1]/wp:anchor/wp:docPr","name","Diagram1");
+
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp:docPr","id","2");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp:docPr","name","10-Point
 Star 3");
+
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/w:drawing[2]/wp:anchor/wp:docPr","id","3");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/w:drawing[2]/wp:anchor/wp:docPr","name","Picture");
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 84ffa58..1606038 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1248,7 +1248,7 @@ void DocxAttributeOutput::WritePostponedDiagram()
 for( std::list< PostponedDiagram >::const_iterator it = 
m_postponedDiagram->begin();
  it != m_postponedDiagram->end();
  ++it )
-m_rExport.SdrExporter().writeDiagram( it->object, it->size );
+m_rExport.SdrExporter().writeDiagram( it->object, *(it->frame), 
m_anchorId++ );
 delete m_postponedDiagram;
 m_postponedDiagram = NULL;
 }
@@ -3269,10 +3269,10 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame &rFrame, const Po
 if ( IsDiagram( pSdrObj ) )
 {
 if ( m_postponedDiagram == NULL )
-m_rExport.SdrExporter().writeDiagram( pSdrObj, 
rFrame.GetLayoutSize() );
+m_rExport.SdrExporter().writeDiagram( pSdrObj, 
rFrame.GetFrmFmt(), m_anchorId++);
 else // we are writing out attributes, but w:drawing 
should not be inside w:rPr,
 {// so write it out later
-m_postponedDiagram->push_back( PostponedDiagram( 
pSdrObj, rFrame.GetSize() ) );
+m_postponedDiagram->push_back( PostponedDiagram( 
pSdrObj, &(rFrame.GetFrmFmt()) ));
 }
 }
 else
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 9d55df6..53c0ce0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx

Re: Building LibreOffice on Windows

2014-01-10 Thread Afreen Bano 
Hello, 

I am trying to build Libreoffice on windows7 (32bit), for this I referred to 
the below link:

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

I installed Visual studio 2012 along with Cygwin version 4.

After runnning the command "/opt/lo/bin/make" I got the below error:

"make[1]:INTERNAL: Exiting with 1jobserver token available should be 2!
make:***[build] Error2"

Libreoffice source commit is 

#git show|head-1

Output: commit 4819ccc1ccf245b7df12df7d6bc1c4c53375e36.


Please  anyone tell me what should I do to build Libreoffice successfully on 
windows.


Regards, 
Afreen Bano


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

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-01-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=60270

Mihkel Tõnnov  changed:

   What|Removed |Added

 Depends on||67104, 68806

--- Comment #128 from Mihkel Tõnnov  ---
Nominating:

Bug 67104 - Default value of "Show cell grid lines" checkbox on sidebar. Highly
visible new feature semi-broken, several duplicates, seems annoying enough.

Bug 68806 - SIDEBAR: Wrong Paragraph spacing values after opening Properties
deck. Again, new and visible feature half-broken, making the sidebar pretty
annoying to use for me.

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - nss/nss_linux.patch

2014-01-10 Thread Herbert Dürr 
 nss/nss_linux.patch |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit dd7d71f0b2f2056017e32f58b3b8c3d5ea993344
Author: Herbert Dürr 
Date:   Fri Jan 10 13:15:50 2014 +

#i123637# fix the NSS build on AOO's current Linux baseline

where binutils assembler doesn't support AVX or AES-NI instructions

diff --git a/nss/nss_linux.patch b/nss/nss_linux.patch
index 80dd2294c..ee601bb1 100644
--- a/nss/nss_linux.patch
+++ b/nss/nss_linux.patch
@@ -9,3 +9,16 @@
  OS_LIBS   = $(OS_PTHREAD) -ldl -lc
  
  ifdef USE_PTHREADS
+--- misc/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile   2013-01-31 
02:08:59.0 +0100
 misc/build/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile 
2014-01-10 13:57:48.0 +0100
+@@ -186,8 +186,8 @@
+ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+ #   DEFINES += -DMPI_AMD64_ADD
+ # comment the next two lines to turn off intel HW accelleration
+-DEFINES += -DUSE_HW_AES
+-ASFILES += intel-aes.s intel-gcm.s
++#DEFINES += -DUSE_HW_AES
++#ASFILES += intel-aes.s intel-gcm.s
+ EXTRA_SRCS += intel-gcm-wrap.c
+ INTEL_GCM = 1
+ MPI_SRCS += mpi_amd64.c mp_comba.c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-01-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 68961, which changed state.

Bug 68961 Summary: VIEWING:  Cells scrolled in show contents of other cells.
https://bugs.freedesktop.org/show_bug.cgi?id=68961

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

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

2014-01-10 Thread Zolnai Tamás 
 include/sfx2/recentdocsviewitem.hxx|3 +++
 sfx2/source/control/recentdocsviewitem.cxx |6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 943dd8bfd8695f11773b90fbfebd4179eee9f492
Author: Zolnai Tamás 
Date:   Fri Jan 10 03:31:46 2014 +0100

fdo#72947 Startcenter: display more userfriendly file urls in tooltips

Use INetURLObject to get a readable url (it displayes special characters
too). It is a side effect that 'file:///' prefix disappear
which seems a good thing.
Plus some cleanup: remove second INetURLObject.

Change-Id: I4aab5e2546ae70e5a3d85b12e26e021bfa244999
(cherry picked from commit 31dfeee42e9b08ed7031b6c50d0c674122d5245c)
Reviewed-on: https://gerrit.libreoffice.org/7366
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/sfx2/recentdocsviewitem.hxx 
b/include/sfx2/recentdocsviewitem.hxx
index be94b78..410e74b 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -23,6 +23,9 @@ public:
 virtual OUString getHelpText() const;
 
 OUString maURL;
+
+private:
+OUString m_sHelpText;
 };
 
 #endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index c35c16b..d741675 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -21,6 +21,7 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, 
const OUString &rUR
 {
 OUString aTitle(rTitle);
 INetURLObject aURLObj(rURL);
+m_sHelpText = aURLObj.GetURLPath();
 RecentDocsView& rRecentView = dynamic_cast(rView);
 long nThumbnailSize = rRecentView.GetThumbnailSize();
 
@@ -38,10 +39,9 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, 
const OUString &rUR
 Size aExtSize(aExt.GetSizePixel());
 
 // attempt to make it appear as if it is on a piece of paper
-INetURLObject aUrl(rURL);
 long nPaperHeight;
 long nPaperWidth;
-if( RecentDocsView::typeMatchesExtension(TYPE_IMPRESS, 
aUrl.getExtension()) )
+if( RecentDocsView::typeMatchesExtension(TYPE_IMPRESS, 
aURLObj.getExtension()) )
 {
 // Swap width and height (PAPER_SCREEN_4_3 definition make it 
needed)
 PaperInfo aInfo(PAPER_SCREEN_4_3);
@@ -86,7 +86,7 @@ void RecentDocsViewItem::setEditTitle (bool edit, bool 
bChangeFocus)
 
 OUString RecentDocsViewItem::getHelpText() const
 {
-return maURL;
+return m_sHelpText;
 }
 
 /* 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 'libreoffice-4-2' - sc/source

2014-01-10 Thread Kohei Yoshida 
 sc/source/ui/inc/tabview.hxx   |6 ++
 sc/source/ui/view/tabview.cxx  |4 
 sc/source/ui/view/tabview3.cxx |   13 +
 sc/source/ui/view/tabview4.cxx |   10 +-
 4 files changed, 24 insertions(+), 9 deletions(-)

New commits:
commit 1f349d3240115651346da04daeb3459b31782301
Author: Kohei Yoshida 
Date:   Thu Jan 9 20:31:25 2014 -0500

fdo#68961: Check visible range during scrolling, and re-paint if necessary.

Change-Id: I47383cc0c4cf0ec48ce621ba5acac33db44ba313
(cherry picked from commit e36c8a674845ab19577fc06d44b780549757e1e7)
Reviewed-on: https://gerrit.libreoffice.org/7352
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index e13d088..0569425 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -208,6 +208,12 @@ private:
 
 voidPaintRangeFinderEntry (ScRangeFindData* pData, SCTAB nTab);
 
+/**
+ * Check the visible grid area to see if the visible range has changed. If
+ * so, update the stored visible range, and re-paint the grid area.
+ */
+void UpdateGrid();
+
 protected:
 voidUpdateHeaderWidth( const ScVSplitPos* pWhich = NULL,
 const SCROW* pPosY = NULL );
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 1c52550..219653b 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1236,6 +1236,8 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos 
eWhich, bool bUpdBars )
 if (pColOutline[eWhich]) pColOutline[eWhich]->ScrollPixel( nDiff );
 if (bUpdBars)
 UpdateScrollBars();
+else
+UpdateGrid();
 }
 
 if (nDeltaX==1 || nDeltaX==-1)
@@ -1321,6 +1323,8 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos 
eWhich, bool bUpdBars )
 if (pRowOutline[eWhich]) pRowOutline[eWhich]->ScrollPixel( nDiff );
 if (bUpdBars)
 UpdateScrollBars();
+else
+UpdateGrid();
 }
 
 if (nDeltaY==1 || nDeltaY==-1)
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index cedb9ba..9553184 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2105,6 +2105,19 @@ void ScTabView::PaintRangeFinderEntry (ScRangeFindData* 
pData, const SCTAB nTab)
 }
 }
 
+void ScTabView::UpdateGrid()
+{
+if (!aViewData.IsActive())
+return;
+
+if (!UpdateVisibleRange())
+// Visible range hasn't changed. No need to re-paint.
+return;
+
+SC_MOD()->AnythingChanged();// if visible area has changed
+PaintGrid();
+}
+
 void ScTabView::PaintRangeFinder( long nNumber )
 {
 ScInputHandler* pHdl = SC_MOD()->GetInputHdl( aViewData.GetViewShell() );
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 3aa9a47..ab02081 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -424,15 +424,7 @@ void ScTabView::UpdateScrollBars()
 }
 
 //  set visible area for online spelling
-
-if ( aViewData.IsActive() )
-{
-if (UpdateVisibleRange())
-{
-SC_MOD()->AnythingChanged();// if visible area has 
changed
-PaintGrid();
-}
-}
+UpdateGrid();
 }
 
 #ifndef HDR_SLIDERSIZE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Zolnai Tamás 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a227af3c5588679ff4e5dceecc16e60e0e544262
Author: Zolnai Tamás 
Date:   Fri Jan 10 03:25:40 2014 +0100

Updated core
Project: help  575bdc7ccc52b73b55f12c3d82f5b6b2750d784d

diff --git a/helpcontent2 b/helpcontent2
index ced1a84..575bdc7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ced1a84353e7bc399b078b55b2f911dabcce9ba2
+Subproject commit 575bdc7ccc52b73b55f12c3d82f5b6b2750d784d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Zolnai Tamás 
 source/text/shared/guide/startcenter.xhp |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 575bdc7ccc52b73b55f12c3d82f5b6b2750d784d
Author: Zolnai Tamás 
Date:   Fri Jan 10 03:25:40 2014 +0100

fdo#72420 Startcenter: help button point to local/wiki help, help part

Change-Id: Iec82887c2b8476037f4069aa979763d363e17690
(cherry picked from commit 72d802a9eb9fb042e18ad74dc15c956a301b0462)

diff --git a/source/text/shared/guide/startcenter.xhp 
b/source/text/shared/guide/startcenter.xhp
index 071c535..77bd3a1 100644
--- a/source/text/shared/guide/startcenter.xhp
+++ b/source/text/shared/guide/startcenter.xhp
@@ -31,6 +31,8 @@
   start center
 
 
+
+
 Start Center
 
   Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME application help. Press F1 whenever 
you need help using the %PRODUCTNAME software.
@@ -76,4 +78,4 @@
   The Open a document icon presents a file open 
dialog.the four icons show a short explanation 
already
 

-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Zolnai Tamás 
 source/text/shared/guide/startcenter.xhp |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 72d802a9eb9fb042e18ad74dc15c956a301b0462
Author: Zolnai Tamás 
Date:   Fri Jan 10 03:25:40 2014 +0100

fdo#72420 Startcenter: help button point to local/wiki help, help part

Change-Id: Iec82887c2b8476037f4069aa979763d363e17690

diff --git a/source/text/shared/guide/startcenter.xhp 
b/source/text/shared/guide/startcenter.xhp
index 071c535..77bd3a1 100644
--- a/source/text/shared/guide/startcenter.xhp
+++ b/source/text/shared/guide/startcenter.xhp
@@ -31,6 +31,8 @@
   start center
 
 
+
+
 Start Center
 
   Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME application help. Press F1 whenever 
you need help using the %PRODUCTNAME software.
@@ -76,4 +78,4 @@
   The Open a document icon presents a file open 
dialog.the four icons show a short explanation 
already
 

-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Zolnai Tamás 
 include/sfx2/recentdocsviewitem.hxx|3 +++
 sfx2/source/control/recentdocsviewitem.cxx |6 +++---
 sfx2/source/dialog/backingwindow.cxx   |3 ---
 sfx2/uiconfig/ui/startcenter.ui|3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 60c7ed80643a6c397feebdd1492d6c3ef4d810be
Author: Zolnai Tamás 
Date:   Fri Jan 10 03:31:46 2014 +0100

fdo#72947 Startcenter: display more userfriendly file urls in tooltips

Use INetURLObject to get a readable url (it displayes special characters
too). It is a side effect that 'file:///' prefix disappear
which seems a good thing.
Plus some cleanup: remove second INetURLObject.

Change-Id: I4aab5e2546ae70e5a3d85b12e26e021bfa244999

diff --git a/include/sfx2/recentdocsviewitem.hxx 
b/include/sfx2/recentdocsviewitem.hxx
index be94b78..410e74b 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -23,6 +23,9 @@ public:
 virtual OUString getHelpText() const;
 
 OUString maURL;
+
+private:
+OUString m_sHelpText;
 };
 
 #endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index c35c16b..d741675 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -21,6 +21,7 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, 
const OUString &rUR
 {
 OUString aTitle(rTitle);
 INetURLObject aURLObj(rURL);
+m_sHelpText = aURLObj.GetURLPath();
 RecentDocsView& rRecentView = dynamic_cast(rView);
 long nThumbnailSize = rRecentView.GetThumbnailSize();
 
@@ -38,10 +39,9 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, 
const OUString &rUR
 Size aExtSize(aExt.GetSizePixel());
 
 // attempt to make it appear as if it is on a piece of paper
-INetURLObject aUrl(rURL);
 long nPaperHeight;
 long nPaperWidth;
-if( RecentDocsView::typeMatchesExtension(TYPE_IMPRESS, 
aUrl.getExtension()) )
+if( RecentDocsView::typeMatchesExtension(TYPE_IMPRESS, 
aURLObj.getExtension()) )
 {
 // Swap width and height (PAPER_SCREEN_4_3 definition make it 
needed)
 PaperInfo aInfo(PAPER_SCREEN_4_3);
@@ -86,7 +86,7 @@ void RecentDocsViewItem::setEditTitle (bool edit, bool 
bChangeFocus)
 
 OUString RecentDocsViewItem::getHelpText() const
 {
-return maURL;
+return m_sHelpText;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit adf932c6569fe9b50883b54f8b959968188476d3
Author: Zolnai Tamás 
Date:   Fri Jan 10 03:21:27 2014 +0100

fdo#72420 Startcenter: help button point to local/wiki help, ui part

Change-Id: I7ac4b51868d1a5828c810b1ac629d5a56ffb6f50

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index ea3dd21..60ce65f 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -230,7 +230,6 @@ void BackingWindow::initControls()
 setupButton( mpImpressAllButton );
 setupButton( mpMathAllButton );
 
-mpHelpButton->SetClickHdl(LINK(this, BackingWindow, ExtLinkClickHdl));
 mpExtensionsButton->SetClickHdl(LINK(this, BackingWindow, 
ExtLinkClickHdl));
 
 // setup nice colors
@@ -360,8 +359,6 @@ IMPL_LINK(BackingWindow, ExtLinkClickHdl, Button*, pButton)
 
 if (pButton == mpExtensionsButton)
 aNode = "AddFeatureURL";
-else if (pButton == mpHelpButton)
-aNode = "InfoURL";
 
 if (!aNode.isEmpty())
 {
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 831e1bf..4e0e04b 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -260,13 +260,14 @@
 vertical
 
   
-_Help
+gtk-help
 True
 True
 True
 True
 none
 True
+True
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2014-01-10 Thread Zolnai Tamás 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14c8638a82624bafaa4d16fc41d7c2c1984ecad3
Author: Zolnai Tamás 
Date:   Fri Jan 10 03:25:40 2014 +0100

Updated core
Project: help  72d802a9eb9fb042e18ad74dc15c956a301b0462

diff --git a/helpcontent2 b/helpcontent2
index 940af86..72d802a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 940af86cc78e1c5a74bb5eb19efa163c22d058ec
+Subproject commit 72d802a9eb9fb042e18ad74dc15c956a301b0462
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Michael Stahl 
 sw/source/core/txtnode/fmtatr2.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit be5131060c6d9d314802ee945e9b99947ad8dfc4
Author: Michael Stahl 
Date:   Fri Jan 10 13:58:21 2014 +0100

sw: fix sw_unoapi UnvisitedCharStyleName regression

Some copypasta in 74593273655e475017bb2bd45aba3c6b132e372d

Change-Id: I2854ea5485153d32a7001f988524f02465d5c82f

diff --git a/sw/source/core/txtnode/fmtatr2.cxx 
b/sw/source/core/txtnode/fmtatr2.cxx
index a6680ac..b94e99d 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -328,9 +328,9 @@ bool SwFmtINetFmt::QueryValue( uno::Any& rVal, sal_uInt8 
nMemberId ) const
 break;
 case MID_URL_UNVISITED_FMT:
 {
-OUString sVal = msVisitedFmtName;
-if (sVal.isEmpty() && mnVisitedFmtId != 0)
-SwStyleNameMapper::FillUIName(mnVisitedFmtId, sVal);
+OUString sVal = msINetFmtName;
+if (sVal.isEmpty() && mnINetFmtId != 0)
+SwStyleNameMapper::FillUIName(mnINetFmtId, sVal);
 if (!sVal.isEmpty())
 SwStyleNameMapper::FillProgName(sVal, sVal,
 nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread sushil_shinde 
 sw/source/filter/ww8/docxexport.cxx |   62 
 sw/source/filter/ww8/docxexport.hxx |3 +
 2 files changed, 65 insertions(+)

New commits:
commit a37043b8d1508b3a3a2844e9092e4af05d726f28
Author: sushil_shinde 
Date:   Fri Dec 27 14:34:03 2013 +0530

fdo#72520 : Exporting embedding data folder from grab bag.

Change-Id: I3eeff18f0f39f97c2d0fc95eba427b478c95e80d
Reviewed-on: https://gerrit.libreoffice.org/7213
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index ece1c41..e67b538 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -400,6 +400,8 @@ void DocxExport::ExportDocument_Impl()
 
 WriteActiveX();
 
+WriteEmbeddings();
+
 delete pStyles, pStyles = NULL;
 delete m_pSections, m_pSections = NULL;
 }
@@ -1105,6 +1107,66 @@ void DocxExport::WriteActiveX()
  }
 }
 
+void DocxExport::WriteEmbeddings()
+{
+uno::Reference< beans::XPropertySet > xPropSet( 
pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference< beans::XPropertySetInfo > xPropSetInfo = 
xPropSet->getPropertySetInfo();
+OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
+if ( !xPropSetInfo->hasPropertyByName( pName ) )
+return;
+
+uno::Sequence< beans::PropertyValue > embeddingsList;
+uno::Sequence< beans::PropertyValue > propList;
+xPropSet->getPropertyValue( pName ) >>= propList;
+for ( sal_Int32 nProp=0; nProp < propList.getLength(); ++nProp )
+{
+OUString propName = propList[nProp].Name;
+if ( propName == "OOXEmbeddings" )
+{
+ propList[nProp].Value >>= embeddingsList;
+ break;
+}
+}
+for (sal_Int32 j = 0; j < embeddingsList.getLength(); j++)
+{
+OUString embeddingPath = embeddingsList[j].Name;
+uno::Reference embeddingsStream;
+embeddingsList[j].Value >>= embeddingsStream;
+if ( embeddingsStream.is() )
+{
+uno::Reference< io::XOutputStream > xOutStream = 
GetFilter().openFragmentStream(embeddingPath,
+
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+try
+{
+sal_Int32 nBufferSize = 512;
+uno::Sequence< sal_Int8 > aDataBuffer(nBufferSize);
+sal_Int32 nRead;
+do
+{
+nRead = embeddingsStream->readBytes( aDataBuffer, 
nBufferSize );
+if( nRead )
+{
+if( nRead < nBufferSize )
+{
+nBufferSize = nRead;
+aDataBuffer.realloc(nRead);
+}
+xOutStream->writeBytes( aDataBuffer );
+}
+}
+while( nRead );
+xOutStream->flush();
+}
+catch(const uno::Exception&)
+{
+SAL_WARN("sw.ww8", "WriteEmbeddings() ::Failed to copy 
Inputstream to outputstream exception catched!");
+}
+xOutStream->closeOutput();
+}
+}
+}
+
 VMLExport& DocxExport::VMLExporter()
 {
 return *m_pVMLExport;
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index abf22eb..d371fa1 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -227,6 +227,9 @@ private:
 /// Write word/activeX/activeX[n].xml
 void WriteActiveX();
 
+/// Write word/embeddings/Worksheet[n].xlsx
+void WriteEmbeddings();
+
 /// All xml namespaces to be used at the top of any text .xml file (main 
doc, headers, footers,...)
 sax_fastparser::XFastAttributeListRef MainXmlNamespaces( 
sax_fastparser::FSHelperPtr serializer );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread sushil_shinde 
 writerfilter/inc/ooxml/OOXMLDocument.hxx|3 -
 writerfilter/source/filter/ImportFilter.cxx |6 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   68 
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |4 +
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx   |   12 +++-
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx   |1 
 6 files changed, 91 insertions(+), 3 deletions(-)

New commits:
commit 0e114b9967ddfb490cd9865220520701004db7ab
Author: sushil_shinde 
Date:   Fri Dec 27 14:25:16 2013 +0530

fdo#72520 : Added embedded data of docx file to InteropGrabBag.

   - Added embedded exel sheet data for charts to grab bag.

Change-Id: I7f52b56de2306671fea9247c8a789c0e2a5a8874
Reviewed-on: https://gerrit.libreoffice.org/7211
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx 
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 13f365e..4bbc31b 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -76,7 +76,7 @@ class WRITERFILTER_OOXML_DLLPUBLIC OOXMLStream
 {
 public:
 enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, WEBSETTINGS, FONTTABLE, 
NUMBERING,
-FOOTNOTES, ENDNOTES, COMMENTS, THEME, CUSTOMXML, CUSTOMXMLPROPS, 
ACTIVEX, ACTIVEXBIN, GLOSSARY, SETTINGS, VBAPROJECT };
+FOOTNOTES, ENDNOTES, COMMENTS, THEME, CUSTOMXML, CUSTOMXMLPROPS, 
ACTIVEX, ACTIVEXBIN, GLOSSARY, CHARTS, EMBEDDINGS, SETTINGS, VBAPROJECT };
 typedef boost::shared_ptr Pointer_t;
 
 virtual ~OOXMLStream() {}
@@ -248,6 +248,7 @@ public:
 virtual uno::Sequence > 
getCustomXmlDomPropsList( ) = 0;
 virtual uno::Sequence > 
getActiveXDomList( ) = 0;
 virtual uno::Sequence > 
getActiveXBinList() = 0;
+virtual uno::Sequence getEmbeddingsList() = 0;
 };
 
 
diff --git a/writerfilter/source/filter/ImportFilter.cxx 
b/writerfilter/source/filter/ImportFilter.cxx
index 90c4c98..ac2902d 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -119,7 +119,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< 
beans::PropertyValue >& aDes
 pDocument->resolve(*pStream);
 
 // Adding some properties to the document's grab bag for 
interoperability purposes:
-uno::Sequence aGrabBagProperties(8);
+uno::Sequence aGrabBagProperties(9);
 
 // Adding the saved Theme DOM
 aGrabBagProperties[0].Name = "OOXTheme";
@@ -147,6 +147,10 @@ sal_Bool WriterFilter::filter( const uno::Sequence< 
beans::PropertyValue >& aDes
 aGrabBagProperties[7].Name = "OOXGlossaryDom";
 aGrabBagProperties[7].Value = uno::makeAny( 
pDocument->getGlossaryDomList() );
 
+// Adding the saved embedding document to document's grab bag
+aGrabBagProperties[8].Name = "OOXEmbeddings";
+aGrabBagProperties[8].Value = uno::makeAny( 
pDocument->getEmbeddingsList() );
+
 putPropertiesToDocumentGrabBag( aGrabBagProperties );
 
 writerfilter::ooxml::OOXMLStream::Pointer_t  
pVBAProjectStream(writerfilter::ooxml::OOXMLDocumentFactory::createStream( 
pDocStream, writerfilter::ooxml::OOXMLStream::VBAPROJECT ));
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index cf4de5c..05292a5 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -35,6 +35,7 @@
 
 // this extern variable is declared in OOXMLStreamImpl.hxx
 OUString customTarget;
+OUString embeddingsTarget;
 using ::com::sun::star::xml::sax::SAXException;
 namespace writerfilter {
 namespace ooxml
@@ -157,6 +158,10 @@ uno::Reference 
OOXMLDocumentImpl::importSubStream(OOXMLStre
 {
 importSubStreamRelations(pStream, OOXMLStream::ACTIVEXBIN);
 }
+if(OOXMLStream::CHARTS == nType)
+{
+importSubStreamRelations(pStream, OOXMLStream::EMBEDDINGS);
+}
 
 return xRet;
 }
@@ -207,6 +212,11 @@ void 
OOXMLDocumentImpl::importSubStreamRelations(OOXMLStream::Pointer_t pStream,
 // imporing activex.bin files for activex.xml from activeX folder.
 mxActiveXBin = xcpInputStream;
 }
+else if(OOXMLStream::EMBEDDINGS == nType)
+{
+// imporing activex.bin files for activex.xml from activeX folder.
+mxEmbeddings = xcpInputStream;
+}
 }
 
 
@@ -441,6 +451,9 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
 mxGlossaryDocDom = importSubStream(OOXMLStream::GLOSSARY);
 if (mxGlossaryDocDom.is())
 resolveGlossaryStream(rStream);
+
+resolveEmbeddingsStream(rStream);
+
 // Custom xml's are handled as part of grab bag.
 resolveCustomXmlStream(rStream);
 
@@ -627,6 +640,56 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & 
/*rStream*/)
   }
 }
 
+void OOXMLDocumentImpl::resolveEmbeddingsStream(Strea

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

2014-01-10 Thread Tsutomu Uchino 
 sc/source/ui/app/inputwin.cxx |   38 --
 1 file changed, 36 insertions(+), 2 deletions(-)

New commits:
commit ff1d1ea1f5f15ce7888957d09f4783d8055c7654
Author: Tsutomu Uchino 
Date:   Fri Jan 10 11:47:19 2014 +

#i42309# change behavior for equal button of input line according to the 
current content of the cell

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index cbc7d43..3351f92 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -461,12 +461,46 @@ void __EXPORT ScInputWindow::Select()
 if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt
 {
 aTextWindow.GrabFocus();
-aTextWindow.SetTextString( '=' );
+
+xub_StrLen nStartPos = 1;
+xub_StrLen nEndPos = 1;
+
+ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, 
SfxViewShell::Current() );
+if ( pViewSh )
+{
+const String& aString = aTextWindow.GetTextString();
+const xub_StrLen nLen = aString.Len();
+
+ScDocument* pDoc = pViewSh->GetViewData()->GetDocument();
+CellType eCellType = pDoc->GetCellType( 
pViewSh->GetViewData()->GetCurPos() );
+switch ( eCellType )
+{
+case CELLTYPE_VALUE:
+{
+nEndPos = nLen +1;
+String aNewStr( '=' );
+aNewStr.Append( aString );
+aTextWindow.SetTextString( aNewStr );
+break;
+}
+case CELLTYPE_STRING:
+case CELLTYPE_EDIT:
+nStartPos = 0;
+nEndPos = nLen;
+break;
+case CELLTYPE_FORMULA:
+nEndPos = nLen;
+break;
+default:
+aTextWindow.SetTextString( '=' );
+break;
+}
+}
 
 EditView* pView = aTextWindow.GetEditView();
 if (pView)
 {
-pView->SetSelection( ESelection(0,1, 0,1) );
+pView->SetSelection( ESelection(0, nStartPos, 0, nEndPos) 
);
 pScMod->InputChanged(pView);
 SetOkCancelMode();
 pView->SetEditEngineUpdateMode(sal_True);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: when running gdb I cannot find crti.S

2014-01-10 Thread Stephan Bergmann 

On 01/10/2014 10:15 AM, Alex McMurchy wrote:

Though it does seem a bit bizarre that setting up CFLAG external to
autogen.sh can overwrite the internally generated CFLAG, i'd have
thought it should have concatenated the two - is this a bug?


I think it is by design (but personally have lost track on what exactly 
our story's supposed to be here a long while ago).


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

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 4 commits - chart2/source

2014-01-10 Thread Markus Mohrhard 
 chart2/source/view/main/DummyXShape.cxx  |2 
 chart2/source/view/main/OpenGLRender.cxx |  103 +++
 chart2/source/view/main/OpenGLRender.hxx |   17 ++---
 3 files changed, 60 insertions(+), 62 deletions(-)

New commits:
commit 82a4bf0dd099dab8c93ac3d531bf6354e04237d6
Author: Markus Mohrhard 
Date:   Fri Jan 10 11:47:45 2014 +0100

first round int to bool

Change-Id: I01126ea293c6880bbf53cbc912d54fe8a9842e31

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index cc1df8d..da55485 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -906,6 +906,7 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape 
> xTarget):
 m_iFboIdx(0),
 m_fLineAlpha(1.0),
 mxRenderTarget(xTarget),
+m_iArbMultisampleSupported(false),
 m_TextVertexID(0),
 m_TextTexCoordID(1),
 m_ClearColor(glm::vec4(1.0f, 1.0f, 1.0f, 1.0f))
@@ -925,7 +926,6 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape 
> xTarget):
 m_TextureObj[1] = 0;
 m_RboID[0] = 0;
 m_RboID[1] = 0;
-m_iArbMultisampleSupported = 0;
 m_iArbMultisampleFormat = 0;
 
 //TODO: moggi: use STL
@@ -1031,7 +1031,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, 
WPARAM wParam, LPARAM l
 }
 }
 
-int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd)
+bool OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd)
 {
 HWND hWnd = NULL;
 //create a temp windwo to check whether support multi-sample, if support, 
get the format
@@ -1044,7 +1044,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR 
pfd)
 // See If The String Exists In WGL!
 if (!WGLisExtensionSupported("WGL_ARB_multisample"))
 {
-m_iArbMultisampleSupported = 0;
+m_iArbMultisampleSupported = false;
 SAL_WARN("chart2.opengl", "Device doesn't support multi sample\n");
 return false;
 }
@@ -1052,7 +1052,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR 
pfd)
 PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB = 
(PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB");
 if (!wglChoosePixelFormatARB)
 {
-m_iArbMultisampleSupported = 0;
+m_iArbMultisampleSupported = false;
 return false;
 }
 // Get Our Current Device Context
@@ -1086,7 +1086,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR 
pfd)
 // If We Returned True, And Our Format Count Is Greater Than 1
 if (valid && numFormats >= 1)
 {
-m_iArbMultisampleSupported = 1;
+m_iArbMultisampleSupported = true;
 m_iArbMultisampleFormat = pixelFormat;
 wglMakeCurrent(NULL, NULL);
 wglDeleteContext(glWin.hRC);
@@ -1099,7 +1099,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR 
pfd)
 valid = 
wglChoosePixelFormatARB(hDC,iAttributes,fAttributes,1,&pixelFormat,&numFormats);
 if (valid && numFormats >= 1)
 {
-m_iArbMultisampleSupported = 1;
+m_iArbMultisampleSupported = true;
 m_iArbMultisampleFormat = pixelFormat;
 wglMakeCurrent(NULL, NULL);
 wglDeleteContext(glWin.hRC);
@@ -1116,7 +1116,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR 
pfd)
 }
 #endif
 
-int OpenGLRender::GetMSAASupport()
+bool OpenGLRender::GetMSAASupport()
 {
 return m_iArbMultisampleSupported;
 }
@@ -1169,7 +1169,7 @@ int OpenGLRender::InitTempWindow(HWND *hwnd, int width, 
int height, PIXELFORMATD
 return 0;
 }
 
-int OpenGLRender::WGLisExtensionSupported(const char *extension)
+bool OpenGLRender::WGLisExtensionSupported(const char *extension)
 {
 const size_t extlen = strlen(extension);
 const char *supported = NULL;
diff --git a/chart2/source/view/main/OpenGLRender.hxx 
b/chart2/source/view/main/OpenGLRender.hxx
index c3ec8ac..72c29a4 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -159,9 +159,9 @@ public:
 void SetLine2DWidth(int width);
 BitmapEx GetAsBitmap();
 #if defined( _WIN32 )
-int InitMultisample(PIXELFORMATDESCRIPTOR pfd);
+bool InitMultisample(PIXELFORMATDESCRIPTOR pfd);
 #endif
-int GetMSAASupport();
+bool GetMSAASupport();
 int GetMSAAFormat();
 void SetColor(sal_uInt32 color);
 int Bubble2DShapePoint(float x, float y, float directionX, float 
directionY);
@@ -192,8 +192,8 @@ private:
 int RenderTexture2FBO(GLuint TexID);
 #if defined( _WIN32 )
 int InitTempWindow(HWND *hwnd, int width, int height, 
PIXELFORMATDESCRIPTOR inPfd);
+bool WGLisExtensionSupported(const char *extension);
 #endif
-int WGLisExtensionSupported(const char *extension);
 int CreateMultiSampleFrameBufObj();
 int Create2DCircle(int detail);
 void SetBackGroundColor(sal_uInt32 color1, sal_uInt32 color2);
@@ -277,10 +277,10 @@ private:
 std::list  m_Line2DShapePointList;
 
 com::sun:

[Libreoffice-commits] core.git: RepositoryExternal.mk scp2/source

2014-01-10 Thread Michael Stahl 
 RepositoryExternal.mk|2 +-
 scp2/source/ooo/file_library_ooo.scp |   20 +++-
 2 files changed, 4 insertions(+), 18 deletions(-)

New commits:
commit ae8e579515fff84cbef1ccc2da78fa769fb079ec
Author: Michael Stahl 
Date:   Fri Jan 10 12:07:31 2014 +0100

scp2: fix windows build

913bf64b0bf1330a5055c26770faedf2ad7fc3c5 had some issues with redland
stuff that is built as Library on windows, and the libxslt package is
actually called "xslt" for unknown reasons; unfortunately the buildbot
did not actually try to create an installation set so it was not
detected.

Change-Id: I0437f09228f62b21036a6c26e3d17029d1aab79e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 98736fc..721eb9d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -986,7 +986,7 @@ endef
 ifneq ($(OS),ANDROID)
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
raptor2 \
rasqal \
rdf \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index f9aa5c4..c90e28a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -275,23 +275,7 @@ File gid_File_Lib_Xslt
 LIB_FILE_BODY;
 Styles = (FILELIST);
 Dir = FILELIST_DIR;
-Name = "libxslt.filelist";
-End
-File gid_File_Lib_eXslt
-PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT4(libexslt,UNXSUFFIX,.,0));
-#endif
-  #else
-   #ifdef _gcc3
-Name = "libexslt-0.dll";
-   #else
-Name = "libexslt.dll";
-   #endif
-  #endif
+Name = "xslt.filelist";
 End
 #endif
 
@@ -369,6 +353,7 @@ End
 #endif
 
 #ifndef SYSTEM_REDLAND
+#ifndef WNT
 File gid_File_Lib_Raptor
 LIB_FILE_BODY;
 Styles = (FILELIST);
@@ -389,5 +374,6 @@ File gid_File_Lib_Rdf
 Dir = FILELIST_DIR;
 Name = "redland.filelist";
 End
+#endif // WNT
 #endif // SYSTEM_REDLAND
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

2014-01-10 Thread Markus Mohrhard 
 chart2/source/view/main/OpenGLRender.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit dd1a1e1ddf3cf61e6019399fc39c0981ad7f9fc6
Author: Markus Mohrhard 
Date:   Fri Jan 10 11:16:47 2014 +0100

more clean-up

Change-Id: I63ddc71825ce8127c764c57d5435c3b5bcee6725

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index cf2a0fc..a097aec 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -9,7 +9,6 @@
 
 #include 
 #include 
-#include 
 #include "OpenGLRender.hxx"
 #include 
 #include 
@@ -35,15 +34,14 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
-using namespace com::sun::star;
-
 #include 
 
+using namespace com::sun::star;
+
 using namespace std;
 
 #define RENDER_TO_FILE 0
@@ -58,6 +56,8 @@ using namespace std;
 #define WGL_SAMPLES_ARB  0x2042
 #endif
 
+//begin shaders
+
 const char *CommonFragmemtShader = OPENGL_SHADER (
 
 varying vec4 fragmentColor;
@@ -162,7 +162,7 @@ void main()
 
 );
 
-
+// end shaders
 
 static GLfloat squareVertices[] = {
 -1.0f, -1.0f, -1.0,
@@ -184,6 +184,7 @@ static GLfloat square2DVertices[] = {
 1.0f,  1.0f,
 -1.0f,  1.0f
 };
+
 #if 0
 static const GLfloat g_vertex_buffer_data[] = {
 -1.0f,-1.0f,-1.0f,
@@ -264,6 +265,7 @@ static const GLfloat g_color_buffer_data[] = {
 0.982f,  0.099f,  0.879f
 };
 #endif
+
 int static checkGLError(const char *file, int line)
 {
 GLenum glErr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-10 Thread Herbert Dürr 
 avmedia/source/quicktime/makefile.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3da7c8da81d5fd05ced97b965d127cab1694bfd4
Author: Herbert Dürr 
Date:   Fri Jan 10 09:47:59 2014 +

#i114728# fix quicktime integration for OSX<10.7 build targets

diff --git a/avmedia/source/quicktime/makefile.mk 
b/avmedia/source/quicktime/makefile.mk
index 7d386b1..69f3d79 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -42,6 +42,7 @@ CFLAGSCXX+=$(OBJCXXFLAGS)
 
 SLOFILES= \
 $(SLO)$/quicktimeuno.obj  \
+$(SLO)$/framegrabber.obj\
 $(SLO)$/manager.obj   \
 $(SLO)$/window.obj\
 $(SLO)$/player.obj
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Annoying green square in top left hand corner of Writer document window

2014-01-10 Thread Alex Thurgood 
Le 10/01/2014 10:30, Tor Lillqvist a écrit :

Hi Tor,

> It is an intentional debugging aid and is present only when LO is
> built with --enable-dbgutil.
> 

Ah ok, thanks, good to know.


Alex



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

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

2014-01-10 Thread Stephan Bergmann 
 svtools/source/table/tablecontrol_impl.cxx |1 -
 svtools/source/table/tablecontrol_impl.hxx |3 ---
 2 files changed, 4 deletions(-)

New commits:
commit dd8961ade2d221663eea695795428867ac38fe2d
Author: Stephan Bergmann 
Date:   Fri Jan 10 10:56:25 2014 +0100

Unused member

Change-Id: I17e34c4c906416f295d88484ad4e99840453226a

diff --git a/svtools/source/table/tablecontrol_impl.cxx 
b/svtools/source/table/tablecontrol_impl.cxx
index 7a849be..b4ac861 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -435,7 +435,6 @@ namespace svt { namespace table
 ,m_nRowHeaderWidthPixel ( 0 )
 ,m_nColumnCount ( 0 )
 ,m_nRowCount( 0 )
-,m_bColumnsFit  ( true  )
 ,m_nCurColumn   ( COL_INVALID   )
 ,m_nCurRow  ( ROW_INVALID   )
 ,m_nLeftColumn  ( 0 )
diff --git a/svtools/source/table/tablecontrol_impl.hxx 
b/svtools/source/table/tablecontrol_impl.hxx
index c03ae72..9d43ea3 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -110,9 +110,6 @@ namespace svt { namespace table
 /// the number of rows in the table control. Cached model value.
 TableSize   m_nRowCount;
 
-/// denotes whether or not the columns fitted into the available 
width, last time we checked
-longm_bColumnsFit;
-
 ColPos  m_nCurColumn;
 RowPos  m_nCurRow;
 ColPos  m_nLeftColumn;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-01-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

V Stuart Foote  changed:

   What|Removed |Added

 Depends on||73464

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

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

2014-01-10 Thread Miklos Vajna 
 sw/source/core/text/inftxt.hxx |2 +-
 sw/source/core/text/portxt.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fc0bd38051c7c8f4c68a1407aed32a96b2564510
Author: Miklos Vajna 
Date:   Fri Jan 10 10:32:12 2014 +0100

fdo#73466 SwTxtSizeInfo / SwTxtInputFldPortion: invalid string access

Change-Id: Ibd74e3b0cd45fa3bf6fd4135866b22acd16e372e

diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 51f42eb..c429690 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -268,7 +268,7 @@ public:
 inline const  SwViewOption &GetOpt() const { return *m_pOpt; }
 inline const OUString &GetTxt() const { return *m_pTxt; }
 inline sal_Unicode GetChar( const sal_Int32 nPos ) const
-{ if (m_pTxt && !m_pTxt->isEmpty()) return (*m_pTxt)[ nPos ]; return 0; }
+{ if (m_pTxt && nPos < m_pTxt->getLength()) return (*m_pTxt)[ nPos ]; 
return 0; }
 
 KSHORT  GetTxtHeight() const;
 
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 5be6852..815ea8f 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -780,7 +780,7 @@ sal_Bool SwTxtInputFldPortion::GetExpTxt( const 
SwTxtSizeInfo &rInf, OUString &r
 {
 --nLen;
 }
-rTxt = rInf.GetTxt().copy( nIdx, nLen );
+rTxt = rInf.GetTxt().copy( nIdx, std::min( nLen, rInf.GetTxt().getLength() 
- nIdx ) );
 
 return sal_True;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Annoying green square in top left hand corner of Writer document window

2014-01-10 Thread Tor Lillqvist 
It is an intentional debugging aid and is present only when LO is
built with --enable-dbgutil.

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

Re: [lo-4.2] regview fails to show rdb files

2014-01-10 Thread Stephan Bergmann 

On 01/10/2014 09:46 AM, Stephan Bergmann wrote:

* Looks like starting with LO 4.2 cppumaker has a problem when the
specified output directory is not an absolute path (incl. the case where
you do not explicitly specify an output directory via -O at all).  As a
workaround, try


cppumaker -O $PWD -Gc offapi.rdb types.rdb myfile.rdb


and I'll see to get this fixed.


Fixed on master now as 
 
"codemaker: fix^2 invalid string index access," backports to LO 4.2[.0] 
pending.


Stephan

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

Annoying green square in top left hand corner of Writer document window

2014-01-10 Thread Alex Thurgood 
Hi all,

This might just be due to my particular build setup, but has anyone else
noticed a systematic bright green square (2x2 pixels ?) that gets
displayed in the top left hand corner of any Writer document window ?

Linux Mint Cinnamon 16
CPU : AMD E-350 APU with Radeon HD Graphics x2
GPU : AMD Radeon Wrestler (Radeon HD 6310)



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

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

2014-01-10 Thread Stephan Bergmann 
 codemaker/source/codemaker/global.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d320760dc1c9d6501d84849219b4d9fc6c62b85b
Author: Stephan Bergmann 
Date:   Fri Jan 10 10:16:48 2014 +0100

codemaker: fix^2 invalid string index access

...originally the past-the-end checks in destination where always true, and 
thus
happend to work as intended for empty destionation, but
614e04019a672cdd61b86699d99250d80f169f95 broke that, so calling cppumaker 
w/o
-O was broken now.

Change-Id: I8d41dfe8d4c12e4a73a9782d4d5e7c9fa4d9df81

diff --git a/codemaker/source/codemaker/global.cxx 
b/codemaker/source/codemaker/global.cxx
index ba3f424..54ceeb1 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -87,11 +87,8 @@ OString createFileNameFromType( const OString& destination,
 length += prefix.getLength() + type.getLength() + postfix.getLength();
 
 sal_Bool withSeparator = sal_False;
-if (!destination.isEmpty() &&
-destination[destination.getLength() - 1] != '\\' &&
-destination[destination.getLength() - 1] != '/' &&
-type[0] != '\\' &&
-type[0] != '/')
+if (!(destination.endsWith("\\") || destination.endsWith("/"))
+&& !(type.startsWith("\\") || type.startsWith("/")))
 {
 length++;
 withSeparator = sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: when running gdb I cannot find crti.S

2014-01-10 Thread Alex McMurchy 
It was something I'd done!


On 28th December 2013, in a separate post,I reported this -

> It seems I may have became a victim of a regression in gcc
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 which helped me with this
> statement -
> 
> "it breaks with -march=i686 but works with -march=i586."
> 
> I then noticed I hadn't set these flags -
> 
> export LDFLAGS=""
> export CXXFLAGS="-march=i486 -mtune=i486"
> export CFLAGS="-march=i486 -mtune=i486"
> 
> Once I'd set the flags the compile went through to a successful conclusion


Well though the compile went through successfully I hadn't noticed that that my 
export of CFLAGS seems to have overwritten the autogen.sh generated CFLAGS.


So I've managed to replace 

-O0 -gddb2

with 

-march=i486 -mtune=i486

I've fixed the problem, temporarily, by hacking config_host.mk

diff config_host.mk.bak config_host.mk
77c77
< export CXX=/usr/bin/ccache g++
---
> export CXX=/usr/bin/ccache g++ -ggdb2


So my way forward is to decide which of the following options to go for 
 *  remove my externally set flags to see whether my original problem has 
gone away
 *  to see whether I can supply compiler flags external to autogen.sh 
without overiding the compiler flags generated by autogen .sh.
 *  I could go back to GCC version 4.7 series
 *  try the latest from git as bug 58864 was fixed on 3rd December 2013.
or maybe there's something I hadn't thought of?

Though it does seem a bit bizarre that setting up CFLAG external to autogen.sh 
can overwrite the internally generated CFLAG, i'd have thought it should have 
concatenated the two - is this a bug?


Alex




On Friday 10 Jan 2014 08:43:49 Stephan Bergmann wrote:
> On 01/09/2014 11:50 AM, Alex McMurchy wrote:
> > All this seems to suggest that I haven't compiled correctly to get the
> > best out of gdb. I've only ever used --enable-dbgutil flag and compiled with
> 
> Yes, looks like missing debug information, but --enable-dbgutil should 
> provide that.  No idea what's going wrong for you.
> 
> Stephan
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-01-10 Thread Marcos Paulo de Souza 
 sw/qa/extras/uiwriter/data/fdo70807.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx  |   23 +++
 2 files changed, 23 insertions(+)

New commits:
commit 16ae82c772cd818316a19ce303d349657f6cb863
Author: Marcos Paulo de Souza 
Date:   Thu Jan 9 22:33:09 2014 -0200

fdo#70807: UT to verify used styles in document

Change-Id: Ief2eef638bc3f9e44358addf0d1c655a790834a2
Reviewed-on: https://gerrit.libreoffice.org/7351
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/uiwriter/data/fdo70807.odt 
b/sw/qa/extras/uiwriter/data/fdo70807.odt
new file mode 100644
index 000..6dad55e
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/fdo70807.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 12c76b8..2e6a79b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -23,11 +23,13 @@ public:
 //EDITING: undo search&replace corrupt text when searching backward
 void testReplaceBackward();
 void testFdo69893();
+void testFdo70807();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
 CPPUNIT_TEST(testReplaceBackward);
 CPPUNIT_TEST(testFdo69893);
+CPPUNIT_TEST(testFdo70807);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -113,6 +115,27 @@ void SwUiWriterTest::testFdo69893()
 CPPUNIT_ASSERT_EQUAL(OUString("Para after table."), rEnd.GetTxt());
 }
 
+void SwUiWriterTest::testFdo70807()
+{
+load(DATA_DIRECTORY, "fdo70807.odt");
+
+uno::Reference 
stylesIter(getStyles("PageStyles"), uno::UNO_QUERY);
+
+for (sal_Int32 i = 0; i < stylesIter->getCount(); ++i)
+{
+uno::Reference xStyle(stylesIter->getByIndex(i), 
uno::UNO_QUERY);
+uno::Reference xName(xStyle, uno::UNO_QUERY);
+
+sal_Bool isUsed = xStyle->isInUse();
+sal_Bool used = sal_False; // just "Right Page" is used
+
+if (xName->getName() == "Right Page")
+used = sal_True;
+
+CPPUNIT_ASSERT_EQUAL(used, isUsed);
+}
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [lo-4.2] regview fails to show rdb files

2014-01-10 Thread Stephan Bergmann 

On 01/09/2014 05:33 PM, Neeraj Rai wrote:

3. cppumaker -BUCR -Gc offapi.rdb types.rdb myfile.rdb
   4.2 doesn't support options -BUR so I took them out leaving -C and it
builds but the output dirname is .org instead of org


* Yes, -BUCR is gone since LO 4.1, see 
.


* Looks like starting with LO 4.2 cppumaker has a problem when the 
specified output directory is not an absolute path (incl. the case where 
you do not explicitly specify an output directory via -O at all).  As a 
workaround, try



cppumaker -O $PWD -Gc offapi.rdb types.rdb myfile.rdb


and I'll see to get this fixed.

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