[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 74077, which changed state.

Bug 74077 Summary: Calc changing formulas unadvertidely between 4.1 and 4.2
https://bugs.freedesktop.org/show_bug.cgi?id=74077

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

RE: fdo#70798 Add new Excel functions, move from add-in module?

[Winfried Donkers]

Hi Eike,

>It seems we'll need a genereal plan how to handle the functions that Excel 
>newly introduces but are in fact implementations of ODFF under a new name. 
>Also various of the statistic functions you implemented match that criteria..

>As I wanted to come up with a renaming plan for the FLOOR/CEILING problem 
>anyway I may as well think about this.. seems related.

Yes, it does need some action.
I will leave ERF, ERFC, NETWORKDAYS and WORKDAY for the moment and start on 
AGGREGATE, which is a beast.

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

LibreOffice Gerrit News for dev-tools on 2014-02-04

[gerrit]

Moin!

* Open changes on master for project dev-tools changed in the last 25 hours:

None

* Merged changes on master for project dev-tools changed in the last 25 hours:

+ Finally fix the new commiters issue in mail digest
  in https://gerrit.libreoffice.org/7752 from Mathias M


* Abandoned changes on master for project dev-tools changed in the last 25 
hours:

None

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

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for submodules on 2014-02-04

[gerrit]

Moin!



~~ Project dictionaries ~~

Nothing moved in the project for the last 25 hours

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

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

None

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

+ desc. of non-standard hyphenation patterns in user-defined dict.
  in https://gerrit.libreoffice.org/7805 from Németh László


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

None

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

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for core on 2014-02-04

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ fdo#54938 Convert dtrans, remoteb., reportd., ucbhelper to cppu::supports
  in https://gerrit.libreoffice.org/7762 from Alexandre Vicenzi
  about module dtrans, remotebridges, reportdesign, ucbhelper
+ fdo#54938 Convert comphelper and vcl to cppu::supportsService
  in https://gerrit.libreoffice.org/7757 from Alexandre Vicenzi
  about module comphelper, vcl
+ fdo#35105 -  A heading in writer document doesn't expose ROLE_HEADING
  in https://gerrit.libreoffice.org/7834 from Ioan Radu
  about module vcl
+ DOCX Export of 'Table Row Redline' (like insert row or delete row)
  in https://gerrit.libreoffice.org/7825 from Adam CloudOn
  about module sw
+ Add XML dumping of the new 'SwExtraRedlineTbl'
  in https://gerrit.libreoffice.org/7824 from Adam CloudOn
  about module sw
+ Added some 'To-Do' notes regarding the new 'SwExtraRedlineTbl'
  in https://gerrit.libreoffice.org/7823 from Adam CloudOn
  about module sw
+ DOCX import sends 'table row redline' to SW core, and core stores it
  in https://gerrit.libreoffice.org/7822 from Adam CloudOn
  about module sw, writerfilter
+ Add support for 'Table Row Redlines' in SW core
  in https://gerrit.libreoffice.org/7821 from Adam CloudOn
  about module sw
+ Nit-pick: Added a 'default' clause for a switch-case
  in https://gerrit.libreoffice.org/7819 from Adam CloudOn
  about module writerfilter
+ Add some property IDs in the DOCX importer (for future table redline patc
  in https://gerrit.libreoffice.org/7818 from Adam CloudOn
  about module writerfilter
+ Refactor the code for converting 'Date' string to 'DateTime'
  in https://gerrit.libreoffice.org/7817 from Adam CloudOn
  about module writerfilter
+ Refactor some code for handling redline in DOCX importer
  in https://gerrit.libreoffice.org/7807 from Adam CloudOn
  about module writerfilter
+ fdo#74111 3D Rotation is wrong after Round trip for bar chart
  in https://gerrit.libreoffice.org/7806 from Priyanka Gaikwad
  about module chart2, oox
+ Add 'Track Changes Handler' for 'Extra' redlines
  in https://gerrit.libreoffice.org/7802 from Adam CloudOn
  about module writerfilter
+ Add tokens for 'table row' redlines (future patch)
  in https://gerrit.libreoffice.org/7801 from Adam CloudOn
  about module oox
+ fdo#51525 Fix duplicate "Paste Special" entries in Calc.
  in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
  about module officecfg
+ fdo#35143 PDF import: Reimplementation of whitespace detection function
  in https://gerrit.libreoffice.org/7564 from Vort
  about module sdext
 End of freshness 

+ fdo#72468 Always check array bound
  in https://gerrit.libreoffice.org/7775 from Arnaud Versini
  about module sax
+ Improve usability of the outline
  in https://gerrit.libreoffice.org/7832 from Rob Snelders
  about module sd
+ sidebar: more cleanup of text panel
  in https://gerrit.libreoffice.org/7826 from Maxim Monastirsky
  about module svx
+ fdo#74424 Use Window::GetOutDev() to access ImplReleaseGraphics()
  in https://gerrit.libreoffice.org/7790 from Chris Sherlock
  about module include, vcl
+ fdo#74141 :In  Right margin gets added even if not present in orig
  in https://gerrit.libreoffice.org/7816 from Tushar Bende
  about module editeng, include, sw
+ fdo#74153 : Preservation of Column Break with column_count = 0
  in https://gerrit.libreoffice.org/7815 from Pallavi Jadhav
  about module sw
+ fdo#74424 Start to decouple Window class from OutputDevice
  in https://gerrit.libreoffice.org/7786 from Chris Sherlock
  about module include, vcl
+ fdo#74424 Use Window::GetOutDev() to access ImplIsRecordLayout()
  in https://gerrit.libreoffice.org/7814 from Chris Sherlock
  about module vcl
+ fdo#74424 Use Window::GetOutDev() to access ImplDrawFrameDev()
  in https://gerrit.libreoffice.org/7808 from Chris Sherlock
  about module vcl
+ fdo#73070 - UI: "Insert shapes" does not belong under "Properties"
  in https://gerrit.libreoffice.org/7804 from Rob Snelders
  about module officecfg
+ Add a line what you need to build to see your changes in officecfg
  in https://gerrit.libreoffice.org/7803 from Rob Snelders
  about module officecfg
+ fdo#74424 Use Window::GetOutDev() to access ImplLogicToDevicePixel()
  in https://gerrit.libreoffice.org/7800 from Chris Sherlock
  about module vcl
+ fdo#74424 Use Window::GetOutDev()
  in https://gerrit.libreoffice.org/7799 from Chris Sherlock
  about module vcl
+ convert specialised SvStream::operator>> methods to ReadXXX methods
  in https://gerrit.libreoffice.org/7798 from Noel Grandin
  about module chart2, cppcanvas, dbaccess, editeng, filter, include, sc, sd, 
sfx2, sot, svl, svtools, svx, sw, toolkit, tools, vcl
+ fdo#74424 Use Window::GetOutDev() to access ImplSelectClipRegion()
  in https://gerrit.libreoffice.org/7797 from Chris Sherlock
  about module vcl
+ fdo#74424 - added TODO
  in https://gerrit.libreoffice.org/7796 from C

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 74077, which changed state.

Bug 74077 Summary: Calc changing formulas unadvertidely between 4.1 and 4.2
https://bugs.freedesktop.org/show_bug.cgi?id=74077

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

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

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #42 from Commit Notification 
 ---
Alexandre Vicenzi committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=56b404001ef83cc151727cc5a489dc493c6b65ec

fdo#54938 Convert oox and scaddins to cppu::supportsService



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

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

[Alexandre Vicenzi]

 oox/source/core/filterbase.cxx|   45 +++
 scaddins/source/analysis/analysis.cxx |  138 ++
 scaddins/source/datefunc/datefunc.cxx |   76 +-
 scaddins/source/pricing/pricing.cxx   |   75 +-
 4 files changed, 37 insertions(+), 297 deletions(-)

New commits:
commit 56b404001ef83cc151727cc5a489dc493c6b65ec
Author: Alexandre Vicenzi 
Date:   Mon Feb 3 22:42:24 2014 -0200

fdo#54938 Convert oox and scaddins to cppu::supportsService

Change-Id: If75e6e96887d63a555094a2a9c73ca8a157fe964
Reviewed-on: https://gerrit.libreoffice.org/7836
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Marcos Souza 

diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 8d8ffc9..cad97b6 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -17,20 +17,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "oox/core/filterbase.hxx"
-
-#include 
 #include 
+#include 
 #include 
-#include 
 #include 
+#include 
 #include 
-#include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
+
+#include "oox/core/filterbase.hxx"
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
 #include "oox/helper/graphichelper.hxx"
@@ -41,8 +42,6 @@
 namespace oox {
 namespace core {
 
-// 
-
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::graphic;
@@ -58,8 +57,6 @@ using ::comphelper::SequenceAsHashMap;
 using ::oox::ole::OleObjectHelper;
 using ::oox::ole::VbaProject;
 
-// 
-
 namespace {
 
 struct UrlPool
@@ -70,8 +67,6 @@ struct UrlPool
 
 struct StaticUrlPool : public ::rtl::Static< UrlPool, StaticUrlPool > {};
 
-// 
-
 /** This guard prevents recursive loading/saving of the same document. */
 class DocumentOpenedGuard
 {
@@ -111,8 +106,6 @@ DocumentOpenedGuard::~DocumentOpenedGuard()
 
 } // namespace
 
-// 
-
 /** Specifies whether this filter is an import or export filter. */
 enum FilterDirection
 {
@@ -121,8 +114,6 @@ enum FilterDirection
 FILTERDIRECTION_EXPORT
 };
 
-// 
-
 struct FilterBaseImpl
 {
 typedef ::boost::shared_ptr< GraphicHelper >GraphicHelperRef;
@@ -161,8 +152,6 @@ struct FilterBaseImpl
 voidinitializeFilter();
 };
 
-// 
-
 FilterBaseImpl::FilterBaseImpl( const Reference< XComponentContext >& 
rxContext ) throw( RuntimeException ) :
 meDirection( FILTERDIRECTION_UNKNOWN ),
 meVersion( ECMA_DIALECT ),
@@ -352,7 +341,7 @@ void FilterBase::commitStorage() const
 mxImpl->mxStorage->commit();
 }
 
-// helpers 
+// helpers
 
 GraphicHelper& FilterBase::getGraphicHelper() const
 {
@@ -399,7 +388,7 @@ bool FilterBase::importBinaryData( StreamDataSequence& 
orDataSeq, const OUString
 return true;
 }
 
-// com.sun.star.lang.XServiceInfo interface ---
+// com.sun.star.lang.XServiceInfo interface
 
 OUString SAL_CALL FilterBase::getImplementationName() throw( RuntimeException )
 {
@@ -408,9 +397,7 @@ OUString SAL_CALL FilterBase::getImplementationName() 
throw( RuntimeException )
 
 sal_Bool SAL_CALL FilterBase::supportsService( const OUString& rServiceName ) 
throw( RuntimeException )
 {
-return
-(rServiceName == "com.sun.star.document.ImportFilter" ) ||
-(rServiceName == "com.sun.star.document.ExportFilter" );
+return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL FilterBase::getSupportedServiceNames() throw( 
RuntimeException )
@@ -421,7 +408,7 @@ Sequence< OUString > SAL_CALL 
FilterBase::getSupportedServiceNames() throw( Runt
 return aServiceNames;
 }
 
-// com.sun.star.lang.XInitialization interface 
+// com.sun.star.lang.XInitialization interface
 
 void SAL_CALL FilterBase::initialize( const Sequence< Any >& rArgs ) throw( 
Exception, RuntimeException )
 {
@@ -434,7 +421,7 @@ void SAL_CALL FilterBase::initialize( const Sequence< Any 
>& rArgs ) throw( Exce
 }
 }
 
-// com.sun.star.document.XImporter interface --
+// com.sun.star.document.XImporter interface
 
 void SAL_CALL FilterBase::setTargetDocument( const Reference< XComponent >& 
rxDocument ) throw( IllegalArgumentException, RuntimeException )
 {
@@ -442,7 +429,7 @@ void SAL_CALL FilterBase::setTargetDocument( const 
Reference< X

[ANN] LibreOffice 4.1.5 RC2 available

[Christian Lohmaier]

Dear Community,

The Document Foundation is pleased to announce the second release
candidate of LibreOffice 4.1.5. The upcoming 4.1.5 will be the fifth
in a sequence of frequent bugfix releases for our feature-packed 4.1
line. Please be aware that LibreOffice 4.1.5 RC2 is not been flagged as ready
for production use yet, you should continue to use LibreOffice 4.1.4 for that.

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.libreoffice.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

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

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 4.1.5 RC2 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/4.1.5/RC2

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

On behalf of the Community,

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

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #41 from Alexandre Vicenzi  ---
(In reply to comment #35)
> (In reply to comment #34)
> > sal_Bool SAL_CALL FilterBase::supportsService( const OUString& rServiceName
> > ) throw( RuntimeException )
> > {
> >return
> >(rServiceName == "com.sun.star.document.ImportFilter" ) ||
> >(rServiceName == "com.sun.star.document.ExportFilter" );
> > }
> 
> Please always give a pointer to the relevant file, apparently
> oox/source/core/filterbase.cxx in this case.
> 
> As currrent FilterBase::supportsService behavior is in line with
> FilterBase::getSupportedServiceNames behavior (defined just afterwards), the
> usual approach of forwarding to cppu::supportsService just works here.  Or
> what am I missing?

It's OK. I forgot to check getSupportedServiceNames.

-- 
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: vcl/unx

[Michael Stahl]

 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ff5ad7e379315faa3f4afa009d23f34c7d231d9a
Author: Michael Stahl 
Date:   Mon Feb 3 23:58:31 2014 +0100

fdo#44270: vcl: GTK+ file picker: fix non-grouped filter patterns

lcl_CreateAutoMarkFileDlg calls appendFilter() with "... (*.sdi)" and the
GTK+ file picker then strips off the (*.sdi) in the string given to GTK+
and then doesn't compare result properly with its stored filters; only
filters added with appendFilterGroup() work but not appendFilter() ones.

Change-Id: I0ac9272b5606ff8b81f0c14160fc6972789bb1ea

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index dc9c889..372b8bf 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -521,7 +521,8 @@ namespace {
 sal_Bool bMatch;
 if( !_rEntry.hasSubFilters() )
 // a real filter
-bMatch = ( _rEntry.getTitle() == rTitle );
+bMatch = (_rEntry.getTitle() == rTitle)
+  || (shrinkFilterName(_rEntry.getTitle()) == rTitle);
 else
 // a filter group -> search the sub filters
 bMatch =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 editeng/source/editeng/impedit3.cxx |2 +-
 hwpfilter/source/grammar.cxx|4 ++--
 sc/source/filter/excel/xerecord.cxx |2 +-
 sw/source/core/doc/docedt.cxx   |2 +-
 sw/source/core/layout/pagechg.cxx   |4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a40d3f3686eccf604333ad8ed2ac4442d44720de
Author: Julien Nabet 
Date:   Mon Feb 3 23:02:53 2014 +0100

cppcheck: Clarify calculation precedence for '%' and '?'

Change-Id: Idf3c4f31f9abd974d623d4a1cf08eeb167e1ef25

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index aa9727b..ff80d97 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4307,7 +4307,7 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* 
pOutDev, sal_Int32 nPara,
 short nScriptType = GetI18NScriptType( EditPaM( pNode, nIndex+1 ) );
 bCTL = nScriptType == i18n::ScriptType::COMPLEX;
 // this change was discussed in issue 37190
-bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
+bR2L = (GetRightToLeft( nPara, nIndex + 1) % 2) ? sal_True : sal_False;
 // it also works for issue 55927
 }
 
commit a45c79da3211bf3b564886097d9441cca2669362
Author: Julien Nabet 
Date:   Mon Feb 3 23:02:04 2014 +0100

cppcheck: Clarify calculation precedence for '%' and '?'

Change-Id: I59f9763651ba576a5d0dc970283d46a18f806024

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 9508435..59dbaaa 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1287,7 +1287,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, 
sal_Bool bFtn )
 if ( rDesc.GetNumOffset() )
 {
 ::boost::optional oNumOffset = rDesc.GetNumOffset();
-bWishedOdd = (oNumOffset ? oNumOffset.get() : 0) % 2 ? true : 
false;
+bWishedOdd = ((oNumOffset ? oNumOffset.get() : 0) % 2) ? true : 
false;
 //Die Gelegenheit nutzen wir um das Flag an der Root zu pflegen.
 pRoot->SetVirtPageNum( sal_True );
 }
@@ -1568,7 +1568,7 @@ void SwRootFrm::AssertFlyPages()
 {
 //Die Seiten werden ausgehend von der letzten Seite konsequent
 //nach den Regeln der PageDescs weitergefuehrt.
-sal_Bool bOdd = pPage->GetPhyPageNum() % 2 ? sal_True : sal_False;
+sal_Bool bOdd = (pPage->GetPhyPageNum() % 2) ? sal_True : sal_False;
 SwPageDesc *pDesc = pPage->GetPageDesc();
 SwFrm *pSibling = pPage->GetNext();
 for ( i = pPage->GetPhyPageNum(); i < nMaxPg; ++i  )
commit 43627f2aab112cb9b5666d98c0c9e15bc6124cfb
Author: Julien Nabet 
Date:   Mon Feb 3 22:59:26 2014 +0100

cppcheck: Clarify calculation precedence for '<<' and '?'

Change-Id: Id02a6ce439862e1bdb33927d26f4c12cf5690d4c

diff --git a/sc/source/filter/excel/xerecord.cxx 
b/sc/source/filter/excel/xerecord.cxx
index 94f0d31..a305afc 100644
--- a/sc/source/filter/excel/xerecord.cxx
+++ b/sc/source/filter/excel/xerecord.cxx
@@ -180,7 +180,7 @@ void XclExpValueRecord::SaveXml( XclExpXmlStream& 
rStrm )
 
 void XclExpBoolRecord::WriteBody( XclExpStream& rStrm )
 {
-rStrm << static_cast< sal_uInt16 >( mbValue ? 1 : 0 );
+rStrm << (static_cast< sal_uInt16 >( mbValue ? 1 : 0 ));
 }
 
 void XclExpBoolRecord::SaveXml( XclExpXmlStream& rStrm )
commit 384a55e188adbdd6b5fc8d03519a44c89a346600
Author: Julien Nabet 
Date:   Mon Feb 3 22:54:41 2014 +0100

cppcheck: Clarify expression with parentheses

Change-Id: I82cc35fd94ddff433319139d712254138e51daff

diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index e10c598..4ff34a5 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -1125,7 +1125,7 @@ yyerrlab:   /* here on detecting error */
 
   count = 0;
   /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-  for (x = (yyn < 0 ? -yyn : 0);
+  for (x = ((yyn < 0) ? -yyn : 0);
x < (sizeof(yytname) / sizeof(char *)); x++)
 if (yycheck[x + yyn] == x)
   size += strlen(yytname[x]) + 15, count++;
@@ -1137,7 +1137,7 @@ yyerrlab:   /* here on detecting error */
   if (count < 5)
 {
   count = 0;
-  for (x = (yyn < 0 ? -yyn : 0);
+  for (x = ((yyn < 0) ? -yyn : 0);
x < (sizeof(yytname) / sizeof(char *)); x++)
 if (yycheck[x + yyn] == x)
   {
commit 9a09e8174b98bc0f6cf089d87d63f8b137e9ac48
Author: Julien Nabet 
Date:   Mon Feb 3 22:53:19 2014 +0100

cppcheck: Clarify expression with parentheses

Change-Id: I387df0d3b895148b9f2029898e236cd2caf83fea

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 87d601b..7e414c0 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -264,7 +264,7 @@ void _SaveFlyInRange( const SwPa

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

[Gabor Kelemen]

 sw/uiconfig/swriter/ui/outlinenumbering.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6c03db336e97fbde1647cf355637d816d36311a
Author: Gabor Kelemen 
Date:   Mon Feb 3 22:43:41 2014 +0100

fdo#74477: Restore the title of the Outline Numbering window

Change-Id: I095e2c9f2a74c1052e93f222c67f9e946edfc3fc
Reviewed-on: https://gerrit.libreoffice.org/7833
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/uiconfig/swriter/ui/outlinenumbering.ui 
b/sw/uiconfig/swriter/ui/outlinenumbering.ui
index 60dbfe7..d90a99a 100644
--- a/sw/uiconfig/swriter/ui/outlinenumbering.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumbering.ui
@@ -4,7 +4,7 @@
   
 False
 6
-Character
+Outline Numbering
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/source/view/inc/DummyXShape.hxx  |5 +++
 chart2/source/view/main/DummyXShape.cxx |   52 
 2 files changed, 57 insertions(+)

New commits:
commit 30f8d566bb11d2b514af0c449d00683a445505d8
Author: Markus Mohrhard 
Date:   Mon Feb 3 22:17:48 2014 +0100

improve diagram rendering

Size and positioning look much better right now.

Change-Id: I3422087967af1231e9e9fbaf87f1c7c2db25958a

diff --git a/chart2/source/view/inc/DummyXShape.hxx 
b/chart2/source/view/inc/DummyXShape.hxx
index eae679b..4ce530a 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -417,6 +417,11 @@ class DummyGroup2D : public DummyXShapes
 {
 public:
 DummyGroup2D(const OUString& rName);
+
+virtual ::com::sun::star::awt::Point SAL_CALL getPosition() 
throw(::com::sun::star::uno::RuntimeException);
+virtual ::com::sun::star::awt::Size SAL_CALL getSize() 
throw(::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& 
aPosition ) throw(::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) 
throw(::com::sun::star::beans::PropertyVetoException, 
::com::sun::star::uno::RuntimeException);
 };
 
 class DummyGroup3D : public DummyXShapes
diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 003afd2..9e957d2 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -805,6 +805,58 @@ DummyGroup2D::DummyGroup2D(const OUString& rName)
 setName(rName);
 }
 
+awt::Point DummyGroup2D::getPosition()
+throw(uno::RuntimeException)
+{
+long nTop = std::numeric_limits::max();
+long nLeft = std::numeric_limits::max();
+for(std::vector::iterator itr = maShapes.begin(),
+itrEnd = maShapes.end(); itr != itrEnd; ++itr)
+{
+awt::Point aPoint = (*itr)->getPosition();
+if(aPoint.X >= 0 && aPoint.Y >= 0)
+{
+nLeft = std::min(nLeft, aPoint.X);
+nTop = std::min(nTop, aPoint.Y);
+}
+}
+
+return awt::Point(nTop, nLeft);
+}
+
+awt::Size DummyGroup2D::getSize()
+throw(uno::RuntimeException)
+{
+long nTop = std::numeric_limits::max();
+long nLeft = std::numeric_limits::max();
+long nBottom = 0;
+long nRight = 0;
+for(std::vector::iterator itr = maShapes.begin(),
+itrEnd = maShapes.end(); itr != itrEnd; ++itr)
+{
+awt::Point aPoint = (*itr)->getPosition();
+nLeft = std::min(nLeft, aPoint.X);
+nTop = std::min(nTop, aPoint.Y);
+awt::Size aSize = (*itr)->getSize();
+nRight = std::max(nRight, aPoint.X + aSize.Width);
+nBottom = std::max(nBottom, aPoint.Y + aSize.Height);
+}
+
+return awt::Size(nRight - nLeft, nBottom - nTop);
+}
+
+void DummyGroup2D::setPosition( const awt::Point& )
+throw(uno::RuntimeException)
+{
+SAL_WARN("chart2.opengl", "set position on group shape");
+}
+
+void DummyGroup2D::setSize( const awt::Size& )
+throw( beans::PropertyVetoException, uno::RuntimeException )
+{
+SAL_WARN("chart2.opengl", "set size on group shape");
+}
+
 DummyGraphic2D::DummyGraphic2D(const drawing::Position3D& rPos, const 
drawing::Direction3D& rSize,
 const uno::Reference< graphic::XGraphic > xGraphic ):
 mxGraphic(xGraphic)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 svtools/source/control/tabbar.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 6f50837b5ee950776ddca9ceb78caed3015e8ccd
Author: Michael Meeks 
Date:   Mon Feb 3 22:15:04 2014 +0100

ensure selected calc sheet tab is always visible, and we use space sensibly.

Change-Id: I0f935f324ba31784185959a4a4d2c306d4b592d8

diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index f410a7d..62ca370 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -645,7 +645,7 @@ void TabBar::ImplFormat()
 pItem->maRect.SetEmpty();
 else
 {
-// Slightly befor the tab before the first visible page
+// Slightly before the tab before the first visible page
 // should also be visible
 if ( n+1 == mnFirstPos )
 pItem->maRect.Left() = x-pItem->mnWidth;
@@ -1535,6 +1535,20 @@ void TabBar::Resize()
 {
 if ( ImplCalcWidth() )
 Invalidate();
+
+ImplFormat();
+
+// Ensure as many tabs as possible are visible:
+sal_uInt16 nLastFirstPos = ImplGetLastFirstPos();
+if ( mnFirstPos > nLastFirstPos )
+{
+mnFirstPos = nLastFirstPos;
+mbFormat = sal_True;
+Invalidate();
+}
+// Ensure the currently selected page is visible
+ImplShowPage( GetPagePos( mnCurPageId ) );
+
 ImplFormat();
 }
 
___
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

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Depends on|74460   |

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Depends on||74148

-- 
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

OS X Accessibility regression bug 74121

[V Stuart Foote]

Have a nasty regression in Apple OS X  accessibility  fdo#74121
  

Looks to have been caused by an AOO contributed refactoring attempting to
isolate VCL Window type naming  from NS Window and NS View type naming.  

Something was not quite correct in the process and accessibility in OS X has
been buggered since mid-December.

 



--
View this message in context: 
http://nabble.documentfoundation.org/OS-X-Accessibility-regression-bug-74121-tp4095330.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 74460, which changed state.

Bug 74460 Summary: Templatemanagement Dialog To Change/Edit Existing Template 
will crash LibreOffice
https://bugs.freedesktop.org/show_bug.cgi?id=74460

   What|Removed |Added

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

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

--- Comment #135 from Gerco-Kees  ---
Bug - 67712; FORMCONTROLS: anchored to cell but changes position after
reopening
There is regression and Data Loss

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Gerco-Kees  changed:

   What|Removed |Added

 CC||gercok...@gmail.com
 Depends on||67712

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Cor Nouws  changed:

   What|Removed |Added

 Depends on||74460

--- Comment #80 from Cor Nouws  ---
add Bug 74460 - Templatemanagement Dialog To Change/Edit Existing Template will
crash LibreOffice

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

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

[Kohei Yoshida]

 sc/qa/unit/ucalc_column.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 79d2132d29dd56bcd549c9911d37f3b49bcfee7b
Author: Kohei Yoshida 
Date:   Mon Feb 3 14:58:18 2014 -0500

This is a redundant check. Chuck it.

Change-Id: Ia37e9c5ae599c00eb4c00e6d944fae35a4fa41de

diff --git a/sc/qa/unit/ucalc_column.cxx b/sc/qa/unit/ucalc_column.cxx
index 0ed75b4..69218d0 100644
--- a/sc/qa/unit/ucalc_column.cxx
+++ b/sc/qa/unit/ucalc_column.cxx
@@ -79,7 +79,6 @@ void Test::testColumnFindEditCells()
 
 nResRow = m_pDoc->GetFirstEditTextRow(ScAddress(1,11,0));
 CPPUNIT_ASSERT_EQUAL(static_cast(11), nResRow);
-CPPUNIT_ASSERT_MESSAGE("String with mixed script types is considered an 
edit cell.", nResRow == 11);
 nResRow = m_pDoc->GetFirstEditTextRow(ScAddress(1,12,0));
 CPPUNIT_ASSERT_EQUAL(static_cast(12), nResRow);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/opengl/symbolFragmentShader.glsl  |   37 +--
 chart2/source/view/main/OpenGLRender.cxx |   20 
 chart2/source/view/main/OpenGLRender.hxx |   18 +--
 3 files changed, 48 insertions(+), 27 deletions(-)

New commits:
commit 6183af64de3d18a1342747bc8186ab429d6dd7db
Author: Markus Mohrhard 
Date:   Mon Feb 3 20:52:47 2014 +0100

no need for typedefs here

Change-Id: I93c6a2ead9dfa25799376e4cfc88d77e18a4c9fd

diff --git a/chart2/source/view/main/OpenGLRender.hxx 
b/chart2/source/view/main/OpenGLRender.hxx
index 864a58c..b5aeba3 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -58,22 +58,22 @@
 #define DEBUG_POSITIONING 0
 #define RENDER_TO_FILE 0
 
-typedef struct PosVecf3
+struct PosVecf3
 {
 float x;
 float y;
 float z;
-}PosVecf3;
+};
 
 typedef std::vector Line2DPointList;
 
-typedef struct Bubble2DPointList
+struct Bubble2DPointList
 {
 float x;
 float y;
 float xScale;
 float yScale;
-}Bubble2DPointList;
+};
 
 typedef std::vector Bubble2DCircle;
 
@@ -82,7 +82,7 @@ struct RectanglePointList
 float points[12];
 };
 
-typedef struct TextInfo
+struct TextInfo
 {
 GLuint texture;
 float x;
@@ -90,7 +90,7 @@ typedef struct TextInfo
 float z;
 double rotation;
 float vertex[12];
-}TextInfo;
+};
 
 typedef std::vector Area2DPointList;
 typedef std::vector PieSegment2DPointList;
commit a47351f84e9d9fe569700d79f14b239b6eff70a6
Author: Peilin 
Date:   Mon Feb 3 20:49:40 2014 +0100

replace malloc with std::vector

Change-Id: I3546d0d005d17286107ff2c70a29a4bceebd36a0

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 8ca8a58..f6a473a 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1074,18 +1074,18 @@ int OpenGLRender::CreateMultiSampleFrameBufObj()
 int OpenGLRender::Create2DCircle(int detail)
 {
 float angle;
-int idx = 2;
 if (detail <= 0)
 {
 return -1;
 }
-m_Bubble2DCircle.bufLen = 2 * (detail + 3)* sizeof(float);
-m_Bubble2DCircle.pointBuf = (float *)malloc(m_Bubble2DCircle.bufLen);
-memset(m_Bubble2DCircle.pointBuf, 0, m_Bubble2DCircle.bufLen);
+m_Bubble2DCircle.clear();
+m_Bubble2DCircle.reserve(2 * (detail + 3));
+m_Bubble2DCircle.push_back(0);
+m_Bubble2DCircle.push_back(0);
 for(angle = 2.0f * GL_PI; angle > -(2.0f * GL_PI / detail); angle -= (2.0f 
* GL_PI / detail))
 {
-m_Bubble2DCircle.pointBuf[idx++] = sin(angle);
-m_Bubble2DCircle.pointBuf[idx++] = cos(angle);
+m_Bubble2DCircle.push_back(sin(angle));
+m_Bubble2DCircle.push_back(cos(angle));
 }
 return 0;
 }
@@ -1093,7 +1093,7 @@ int OpenGLRender::Create2DCircle(int detail)
 int OpenGLRender::Bubble2DShapePoint(float x, float y, float directionX, float 
directionY)
 {
 //check whether to create the circle data
-if (!m_Bubble2DCircle.pointBuf)
+if (m_Bubble2DCircle.empty())
 {
 Create2DCircle(100);
 }
@@ -1126,11 +1126,11 @@ int OpenGLRender::RenderBubble2FBO(int)
 //render to fbo
 //fill vertex buffer
 glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
-if (!m_Bubble2DCircle.pointBuf)
+if (m_Bubble2DCircle.empty())
 {
 Create2DCircle(100);
 }
-glBufferData(GL_ARRAY_BUFFER, m_Bubble2DCircle.bufLen, 
m_Bubble2DCircle.pointBuf, GL_STATIC_DRAW);
+glBufferData(GL_ARRAY_BUFFER, m_Bubble2DCircle.size() * 
sizeof(GLfloat), &m_Bubble2DCircle[0], GL_STATIC_DRAW);
 
 glUseProgram(m_CommonProID);
 
@@ -1148,7 +1148,7 @@ int OpenGLRender::RenderBubble2FBO(int)
 0,  // stride
 (void*)0// array buffer offset
 );
-glDrawArrays(GL_TRIANGLE_FAN, 0, m_Bubble2DCircle.bufLen / 
sizeof(float) / 2);
+glDrawArrays(GL_TRIANGLE_FAN, 0, m_Bubble2DCircle.size() / 2);
 glDisableVertexAttribArray(m_2DVertexID);
 glUseProgram(0);
 m_Bubble2DShapePointList.pop_front();
diff --git a/chart2/source/view/main/OpenGLRender.hxx 
b/chart2/source/view/main/OpenGLRender.hxx
index 18176f6..864a58c 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -75,11 +75,7 @@ typedef struct Bubble2DPointList
 float yScale;
 }Bubble2DPointList;
 
-typedef struct Bubble2DCircle
-{
-float *pointBuf;
-int bufLen;
-}Bubble2DCircle;
+typedef std::vector Bubble2DCircle;
 
 struct RectanglePointList
 {
commit 89c6efe4ec986d6bc3c1147fea260f882f04c66b
Author: Markus Mohrhard 
Date:   Mon Feb 3 20:14:34 2014 +0100

add the remaining symbols

Change-Id: I81b63d9e0e164e07cee3e10072a565e669b98196

diff --git a/chart2/opengl/symbolFragmentShader.glsl 
b/chart2/opengl/symbolFragmentShader.glsl
index 2837f95..3ac6b03 100644
--- a

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Kohei Yoshida  changed:

   What|Removed |Added

 Depends on||72470

--- Comment #79 from Kohei Yoshida  ---
Added Bug 72470.  It hits pretty much every CJK user out there.

-- 
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: 2 commits - sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/document.hxx  |2 -
 sc/inc/mtvfunctions.hxx  |2 -
 sc/inc/table.hxx |2 -
 sc/qa/unit/ucalc_column.cxx  |   51 ++-
 sc/source/core/data/column.cxx   |8 +++---
 sc/source/core/data/document.cxx |6 ++--
 sc/source/core/data/table2.cxx   |   21 ++--
 7 files changed, 59 insertions(+), 33 deletions(-)

New commits:
commit 3e2ffb053f9749c6f6990c5ce8f47dc63ea7c148
Author: Kohei Yoshida 
Date:   Mon Feb 3 14:42:30 2014 -0500

fdo#72470: Correctly calculate the first edit cell row position.

Else it could go into an infinite loop.

Change-Id: I269cd118dcb3ab83ea8a2243576a360d3d4bc142

diff --git a/sc/inc/mtvfunctions.hxx b/sc/inc/mtvfunctions.hxx
index 3c2a940..6955d21 100644
--- a/sc/inc/mtvfunctions.hxx
+++ b/sc/inc/mtvfunctions.hxx
@@ -618,7 +618,7 @@ FindElement2(
 break;
 default:
 {
-ElseRetType aRet = rFuncElse(it->type, nTopRow, nDataSize);
+ElseRetType aRet = rFuncElse(*it, nOffset);
 if (aRet.second)
 return PositionType(it, aRet.first);
 }
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7771f0e..f65c3c7 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2956,16 +2956,16 @@ public:
 return const_cast(p)->IsMultilineResult();
 }
 
-std::pair operator() (mdds::mtv::element_t type, size_t 
nTopRow, size_t nDataSize)
+std::pair operator() (const sc::CellStoreType::value_type& 
node, size_t nOffset)
 {
 typedef std::pair RetType;
 
-if (type == sc::element_type_empty)
+if (node.type == sc::element_type_empty)
 return RetType(0, false);
 
-for (size_t i = 0; i < nDataSize; ++i)
+for (size_t i = nOffset; i < node.size; ++i)
 {
-SCROW nRow = nTopRow + i;
+SCROW nRow = node.position + i;
 sal_uInt8 nScriptType = mrColumn.GetRangeScriptType(miAttrPos, 
nRow, nRow, miCellPos);
 if (IsAmbiguousScriptNonZero(nScriptType))
 // Return the offset from the first row.
commit 99a262dc954c19ebd8d07fa8b0f9c9f9a45305a8
Author: Kohei Yoshida 
Date:   Mon Feb 3 14:39:51 2014 -0500

Finally found a way to get this test to fail.

Change-Id: I67cf68ee7e51794de374581016ffb13ebdff59d3

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6ffcc69..98b40b0 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -802,7 +802,7 @@ public:
 
 SC_DLLPUBLIC void SetEditText( const ScAddress& rPos, const OUString& rStr 
);
 
-SC_DLLPUBLIC bool HasEditText( const ScRange& rRange ) const;
+SC_DLLPUBLIC SCROW GetFirstEditTextRow( const ScRange& rRange ) const;
 
 /**
  * Call this if you are not sure whether to put this as an edit text or a
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 2b38473..52a6cf6 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -329,7 +329,7 @@ public:
 
 void SetEditText( SCCOL nCol, SCROW nRow, EditTextObject* pEditText );
 void SetEditText( SCCOL nCol, SCROW nRow, const EditTextObject& rEditText, 
const SfxItemPool* pEditPool );
-bool HasEditText( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) 
const;
+SCROW GetFirstEditTextRow( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2 ) const;
 
 void SetEmptyCell( SCCOL nCol, SCROW nRow );
 void SetFormula(
diff --git a/sc/qa/unit/ucalc_column.cxx b/sc/qa/unit/ucalc_column.cxx
index 0959ee1..0ed75b4 100644
--- a/sc/qa/unit/ucalc_column.cxx
+++ b/sc/qa/unit/ucalc_column.cxx
@@ -10,17 +10,20 @@
 #include 
 #include 
 #include 
+#include 
 
 void Test::testColumnFindEditCells()
 {
 m_pDoc->InsertTab(0, "Test");
 
-bool bRes = m_pDoc->HasEditText(ScRange(0,0,0,0,MAXROW,0));
-CPPUNIT_ASSERT_MESSAGE("There should be no edit cells.", !bRes);
-bRes = m_pDoc->HasEditText(ScRange(0,0,0,0,0,0));
-CPPUNIT_ASSERT_MESSAGE("There should be no edit cells.", !bRes);
-bRes = m_pDoc->HasEditText(ScRange(0,0,0,0,10,0));
-CPPUNIT_ASSERT_MESSAGE("There should be no edit cells.", !bRes);
+// Test the basics with real edit cells, using Column A.
+
+SCROW nResRow = m_pDoc->GetFirstEditTextRow(ScRange(0,0,0,0,MAXROW,0));
+CPPUNIT_ASSERT_MESSAGE("There should be no edit cells.", nResRow == -1);
+nResRow = m_pDoc->GetFirstEditTextRow(ScRange(0,0,0,0,0,0));
+CPPUNIT_ASSERT_MESSAGE("There should be no edit cells.", nResRow == -1);
+nResRow = m_pDoc->GetFirstEditTextRow(ScRange(0,0,0,0,10,0));
+CPPUNIT_ASSERT_MESSAGE("There should be no edit cells.", nResRow == -1);
 
 ScFieldEditEngine& rEE = m_pDoc->GetEditEngine();
 rEE.SetText("Test");
@@ -29,23 +32,23 @@ void Test::testColumnFindEditCells()
 CPPUNIT_ASSERT_MESSAGE("There should be an edit cell here.", pObj);
 
 ScRange aRange(0,

[Libreoffice-commits] core.git: icon-themes/tango

[Mirek Mazel]

 dev/null |binary
 1 file changed

New commits:
commit 6da6186fb2d34e26d1dca649eda80cbec374cb37
Author: Mirek Mazel 
Date:   Mon Feb 3 19:58:00 2014 +0100

Remove unnecessary icons.

Change-Id: I0fd129a0aa5a900bdb48c644ece3d823fde914b9
Reviewed-on: https://gerrit.libreoffice.org/7830
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/icon-themes/tango/lc10713.png b/icon-themes/tango/lc10713.png
deleted file mode 100644
index c18733c..000
Binary files a/icon-themes/tango/lc10713.png and /dev/null differ
diff --git a/icon-themes/tango/sc10713.png b/icon-themes/tango/sc10713.png
deleted file mode 100644
index 2650d6e..000
Binary files a/icon-themes/tango/sc10713.png and /dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 configmgr/source/winreg.cxx |2 +-
 vcl/source/filter/graphicfilter.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b95a9629703a772fa3e6a3e6e8da68d9ad07963b
Author: Andras Timar 
Date:   Mon Feb 3 19:26:30 2014 +0100

fix winreg example

Change-Id: I8115fb899e4248e6eab1aa9349456103353918e6

diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index 995169c..a47fe25 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -53,7 +53,7 @@ namespace {
 // 
 //
 // Another example:
-// 
[HKEY_LOCAL_MACHINE\Policies\LibreOffice\org.openoffice.Office.OptionsDialog\OptionsDialogGroups\ProductName/#fuse\Pages\Java/#fuse\Hide]
+// 
[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\LibreOffice\org.openoffice.Office.OptionsDialog\OptionsDialogGroups\ProductName/#fuse\Pages\Java/#fuse\Hide]
 // "Value"="true"
 // becomes the following in configuration:
 // 
commit 4926444bbbd2f4cad9c4681712164b615056e70a
Author: Andras Timar 
Date:   Mon Feb 3 17:24:53 2014 +0100

typo: howeve -> however

Change-Id: I12ca3f217eb1f3c77003014dc26ce4318d2b2857

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 6f647a1..67e1d2b 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -304,7 +304,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, 
OUString& rFormatExtension,
 bool bSomethingTested = false;
 
 // Now the different formats are checked. The order *does* matter. e.g. a 
MET file
-// could also go through the BMP test, howeve a BMP file can hardly go 
through the MET test.
+// could also go through the BMP test, however, a BMP file can hardly go 
through the MET test.
 // So MET should be tested prior to BMP. However, theoretically a BMP file 
could conceivably
 // go through the MET test. These problems are of course not only in MET 
and BMP.
 // Therefore, in the case of a format check (bTest == true)  we only test 
*exactly* this
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/inc/fesh.hxx   |3 +
 sw/source/core/frmedt/fews.cxx|   12 +-
 sw/source/ui/frmdlg/frmmgr.cxx|4 +-
 sw/source/ui/frmdlg/frmpage.cxx   |   23 +
 sw/source/ui/inc/frmpage.hxx  |1 
 sw/uiconfig/swriter/ui/frmtypepage.ui |   60 +++---
 6 files changed, 81 insertions(+), 22 deletions(-)

New commits:
commit 215e92735dd09954e105a09a5e349ff74009ef9f
Author: Miklos Vajna 
Date:   Mon Feb 3 19:38:01 2014 +0100

swpagerelsize ui: disable RelWidthRelation when RelWidthCB is not checked

Change-Id: I422f1f0d9b8436546ba355852fe6b3a21e2d1d23

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 6de7485..3942d5d 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -941,15 +941,18 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
 
 const SwFmtFrmSize& rFrmSize = (const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE);
 
+
m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::FRAME));
+
m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::REL_PG_FRAME));
 if (rFrmSize.GetWidthPercent() != 0xff && rFrmSize.GetWidthPercent() != 0)
 {
 //calculate the rerference value from the with and relative width 
values
 sal_Int32 nSpace = rFrmSize.GetWidth() * 100 / 
rFrmSize.GetWidthPercent();
 m_aWidthED.SetRefValue( nSpace );
 
-
m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::FRAME));
-
m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::REL_PG_FRAME));
+m_pRelWidthRelationLB->Enable();
 }
+else
+m_pRelWidthRelationLB->Disable();
 
 if (rFrmSize.GetHeightPercent() != 0xff && rFrmSize.GetHeightPercent() != 
0)
 {
@@ -1733,6 +1736,7 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn )
 if (pBtn == m_pRelWidthCB)
 {
 m_aWidthED.ShowPercent(pBtn->IsChecked());
+m_pRelWidthRelationLB->Enable(pBtn->IsChecked());
 if(pBtn->IsChecked())
 m_aWidthED.get()->SetMax(MAX_PERCENT_WIDTH);
 }
commit 5bb8a4b2e3137208d307cadf26df5a242b08e507
Author: Miklos Vajna 
Date:   Mon Feb 3 18:27:29 2014 +0100

swpagerelsize ui: write WidthPercentRelation to doc model

Change-Id: Ia446566e7757f06c1bac12ae1d7a2392f20003a6

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 0b5733a..6de7485 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1141,6 +1141,15 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
 const SwFmtFrmSize& rOldSize = (const SwFmtFrmSize& 
)rOldSet.Get(RES_FRM_SIZE);
 SwFmtFrmSize aSz( rOldSize );
 
+sal_uInt16 nRelWidthRelation = m_pRelWidthRelationLB->GetSelectEntryPos();
+if (nRelWidthRelation != LISTBOX_ENTRY_NOTFOUND)
+{
+if (nRelWidthRelation == 0)
+aSz.SetWidthPercentRelation(text::RelOrientation::FRAME);
+else if (nRelWidthRelation == 1)
+aSz.SetWidthPercentRelation(text::RelOrientation::PAGE_FRAME);
+}
+
 bool bValueModified = (m_aWidthED.IsValueModified() || 
m_aHeightED.IsValueModified());
 bool bCheckChanged = (m_pRelWidthCB->GetSavedValue() != 
m_pRelWidthCB->IsChecked()
 || m_pRelHeightCB->GetSavedValue() != 
m_pRelHeightCB->IsChecked());
commit 1188866c1f0eb087a7e9b09bd9628f9c916feb68
Author: Miklos Vajna 
Date:   Mon Feb 3 17:30:25 2014 +0100

swpagerelsize ui: fix width percent value

Change-Id: I6f5b937826ac37f5f8bdee26e139fd6ca1e9a925

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 7877ac99..57b58ba 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -300,7 +300,8 @@ public:
 const bool _bFollowTextFlow = false,
 bool _bMirror = false,
 Point* _opRef = NULL,
-Size* _opPercent = NULL ) const;
+Size* _opPercent = NULL,
+const SwFmtFrmSize* pFmtFrmSize = 0 ) const;
 
 /// Set size of draw objects.
 void SetObjRect( const SwRect& rRect );
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index a7f32a4..5853f41 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -709,7 +710,8 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
const bool _bFollowTextFlow,
bool _bMirror,
Point* _opRef,
-   Size* _opPercent ) const
+   Size* _opPercent,
+   const SwFmtFrmSize* pFmtFrmSize) const
 {
 const SwFrm* pFrm;
 const SwFlyFrm* pFly;
@@ -870,7 +872,13 @@ void SwFEShell::CalcBou

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

[Zolnai Tamás]

 include/sfx2/recentdocsview.hxx|2 ++
 include/sfx2/thumbnailview.hxx |2 +-
 sfx2/source/control/recentdocsview.cxx |   27 +++
 sfx2/source/dialog/backingcomp.cxx |   26 ++
 sfx2/source/dialog/backingwindow.cxx   |5 -
 5 files changed, 60 insertions(+), 2 deletions(-)

New commits:
commit ff86ddf59884ab3bd08e6bf33adabf8ca79967df
Author: Zolnai Tamás 
Date:   Thu Jan 23 13:34:48 2014 +0100

Related fdo#65826: Set StartCenter's min width to display one column of docs

If there is document to display. Otherwise set minimum to the width
of greating background text.

Updating minimum size is needed only when the list is cleared.

Change-Id: Ic089571fd21d5ab9ded0f4cde7e1aa72fd508d32

diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 63a067d..1706935 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -56,6 +56,8 @@ public:
 
 int mnFileTypes;
 
+virtual void Clear();
+
 DECL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile* );
 
 protected:
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index ccd25dc..e21b87b 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -192,7 +192,7 @@ public:
 
 void RemoveItem( sal_uInt16 nItemId );
 
-void Clear();
+virtual void Clear();
 
 // Change current thumbnail item list with new one (invalidates all 
pointers to a thumbnail item)
 void updateItems(const std::vector &items);
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index e815b97..12a9b7e 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -53,14 +53,6 @@ RecentDocsView::RecentDocsView( Window* pParent )
 SetStyle(GetStyle() | WB_VSCROLL);
 setItemMaxTextLength( mnItemMaxTextLength );
 setItemDimensions( mnItemMaxSize, mnItemMaxSize, mnTextHeight, 
mnItemPadding );
-
-// Set prefered width so text lines will not be cut off
-Font aOldFont(GetFont());
-Font aNewFont(aOldFont);
-aNewFont.SetHeight(20);
-SetFont(aNewFont);
-
set_width_request(std::max(GetTextWidth(maWelcomeLine1),GetTextWidth(maWelcomeLine2)));
-SetFont(aOldFont);
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRecentDocsView(Window 
*pParent, VclBuilder::stringmap &)
@@ -184,6 +176,21 @@ void RecentDocsView::loadRecentDocs()
 
 CalculateItemPositions();
 Invalidate();
+
+// Set prefered width
+if( mFilteredItemList.empty() )
+{
+Font aOldFont(GetFont());
+Font aNewFont(aOldFont);
+aNewFont.SetHeight(20);
+SetFont(aNewFont);
+
set_width_request(std::max(GetTextWidth(maWelcomeLine1),GetTextWidth(maWelcomeLine2)));
+SetFont(aOldFont);
+}
+else
+{
+set_width_request(mnItemMaxSize);
+}
 }
 
 void RecentDocsView::MouseButtonDown( const MouseEvent& rMEvt )
@@ -303,6 +310,18 @@ long RecentDocsView::GetThumbnailSize() const
 return mnItemMaxSize;
 }
 
+void RecentDocsView::Clear()
+{
+Font aOldFont(GetFont());
+Font aNewFont(aOldFont);
+aNewFont.SetHeight(20);
+SetFont(aNewFont);
+
set_width_request(std::max(GetTextWidth(maWelcomeLine1),GetTextWidth(maWelcomeLine2)));
+SetFont(aOldFont);
+
+ThumbnailView::Clear();
+}
+
 IMPL_STATIC_LINK_NOINSTANCE( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile*, 
pLoadRecentFile )
 {
 try
diff --git a/sfx2/source/dialog/backingcomp.cxx 
b/sfx2/source/dialog/backingcomp.cxx
index 023d426..f6dd7f0 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -850,7 +850,19 @@ void SAL_CALL BackingComp::dispatch( const css::util::URL& 
aURL, const css::uno:
 Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow);
 BackingWindow* pBack = dynamic_cast(pWindow );
 if( pBack )
+{
 pBack->clearRecentFileList();
+
+// Recalculate minimum width
+css::uno::Reference< css::awt::XWindow > xParentWindow = 
m_xFrame->getContainerWindow();
+WorkWindow* pParent = 
(WorkWindow*)VCLUnoHelper::GetWindow(xParentWindow);
+if( pParent )
+{
+pParent->SetMinOutputSizePixel( Size(
+pBack->get_width_request(),
+pParent->GetMinOutputSizePixel().Height()) );
+}
+}
 }
 }
 
diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index b02f3e3..a8114d6 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -550,5 +550,6 @@ Size BackingWindow::GetOptimalSize() const
 void BackingWindow::clearRecentFileList()
 {
 mpAllRecentThumbnails->Clear();
+set_width_request(mpAllRecentThumbnails->get_width_request() + 
m

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

[Michael Meeks]

 chart2/source/view/main/OpenGLRender.hxx |   21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 0b9207bf8cfc83e25189d3a0e8d3c82d8ce988c4
Author: Michael Meeks 
Date:   Mon Feb 3 19:28:59 2014 +0100

chart2: resolve merge conflict.

Change-Id: I5823d03af1eda3963c4ac52b60949402ca81f747

diff --git a/chart2/source/view/main/OpenGLRender.hxx 
b/chart2/source/view/main/OpenGLRender.hxx
index 3dc1077..18176f6 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -9,22 +9,21 @@
 
 #if defined( MACOSX )
 #elif defined( UNX )
-#if defined( UNX )
-#include 
-#include "GL/glxew.h"
-#include 
+#  include 
+#  include "GL/glxew.h"
+#  include 
 #elif defined( _WIN32 )
-#include "prewin.h"
-#include "windows.h"
-#include "postwin.h"
+#  include "prewin.h"
+#  include "windows.h"
+#  include "postwin.h"
 #endif
 
 #if defined( MACOSX )
-#include 
-#include 
+#  include 
+#  include 
 #else
-#include 
-#include 
+#  include 
+#  include 
 #endif
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/CppunitTest_sc_ucalc.mk sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/CppunitTest_sc_ucalc.mk   |1 
 sc/inc/document.hxx  |2 +
 sc/inc/table.hxx |1 
 sc/qa/unit/ucalc.hxx |4 ++
 sc/qa/unit/ucalc_column.cxx  |   70 +++
 sc/source/core/data/document.cxx |9 +
 sc/source/core/data/table2.cxx   |   19 ++
 7 files changed, 106 insertions(+)

New commits:
commit fc5eefc903529d1c3548c680b3077eee4e2c7a73
Author: Kohei Yoshida 
Date:   Mon Feb 3 11:47:10 2014 -0500

Add test code to exercise ScColumn::HasEditCells().

Change-Id: Ibacf3585a6d15d541a50cb7bb50905d34a7d598b

diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 20001e5..c4d48d8 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
 sc/qa/unit/ucalc \
+sc/qa/unit/ucalc_column \
 sc/qa/unit/ucalc_formula \
 sc/qa/unit/ucalc_pivottable \
 sc/qa/unit/ucalc_sharedformula \
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 972a96c..6ffcc69 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -802,6 +802,8 @@ public:
 
 SC_DLLPUBLIC void SetEditText( const ScAddress& rPos, const OUString& rStr 
);
 
+SC_DLLPUBLIC bool HasEditText( const ScRange& rRange ) const;
+
 /**
  * Call this if you are not sure whether to put this as an edit text or a
  * simple text.
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 22720e7..2b38473 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -329,6 +329,7 @@ public:
 
 void SetEditText( SCCOL nCol, SCROW nRow, EditTextObject* pEditText );
 void SetEditText( SCCOL nCol, SCROW nRow, const EditTextObject& rEditText, 
const SfxItemPool* pEditPool );
+bool HasEditText( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) 
const;
 
 void SetEmptyCell( SCCOL nCol, SCROW nRow );
 void SetFormula(
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 84f5470..48234e5 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -311,6 +311,8 @@ public:
 
 void testImportStream();
 
+void testColumnFindEditCells();
+
 CPPUNIT_TEST_SUITE(Test);
 #if CALC_TEST_PERF
 CPPUNIT_TEST(testPerf);
@@ -433,6 +435,7 @@ public:
 CPPUNIT_TEST(testCondFormatInsertCol);
 CPPUNIT_TEST(testCondCopyPaste);
 CPPUNIT_TEST(testImportStream);
+CPPUNIT_TEST(testColumnFindEditCells);
 CPPUNIT_TEST_SUITE_END();
 
 private:
diff --git a/sc/qa/unit/ucalc_column.cxx b/sc/qa/unit/ucalc_column.cxx
new file mode 100644
index 000..0959ee1
--- /dev/null
+++ b/sc/qa/unit/ucalc_column.cxx
@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+
+void Test::testColumnFindEditCells()
+{
+m_pDoc->InsertTab(0, "Test");
+
+bool bRes = m_pDoc->HasEditText(ScRange(0,0,0,0,MAXROW,0));
+CPPUNIT_ASSERT_MESSAGE("There should be no edit cells.", !bRes);
+bRes = m_pDoc->HasEditText(ScRange(0,0,0,0,0,0));
+CPPUNIT_ASSERT_MESSAGE("There should be no edit cells.", !bRes);
+bRes = m_pDoc->HasEditText(ScRange(0,0,0,0,10,0));
+CPPUNIT_ASSERT_MESSAGE("There should be no edit cells.", !bRes);
+
+ScFieldEditEngine& rEE = m_pDoc->GetEditEngine();
+rEE.SetText("Test");
+m_pDoc->SetEditText(ScAddress(0,0,0), rEE.CreateTextObject());
+const EditTextObject* pObj = m_pDoc->GetEditText(ScAddress(0,0,0));
+CPPUNIT_ASSERT_MESSAGE("There should be an edit cell here.", pObj);
+
+ScRange aRange(0,0,0,0,0,0);
+bRes = m_pDoc->HasEditText(aRange);
+CPPUNIT_ASSERT_MESSAGE("There is an edit cell here.", bRes);
+
+aRange.aStart.SetRow(1);
+aRange.aEnd.SetRow(1);
+bRes = m_pDoc->HasEditText(aRange);
+CPPUNIT_ASSERT_MESSAGE("There shouldn't be an edit cell in specified 
range.", !bRes);
+
+aRange.aStart.SetRow(2);
+aRange.aEnd.SetRow(4);
+bRes = m_pDoc->HasEditText(aRange);
+CPPUNIT_ASSERT_MESSAGE("There shouldn't be an edit cell in specified 
range.", !bRes);
+
+aRange.aStart.SetRow(0);
+aRange.aEnd.SetRow(MAXROW);
+bRes = m_pDoc->HasEditText(aRange);
+CPPUNIT_ASSERT_MESSAGE("There shouldn be an edit cell in specified 
range.", bRes);
+
+m_pDoc->SetString(ScAddress(0,0,0), "Test");
+m_pDoc->SetValue(ScAddress(0,2,0), 1.0);
+ScRefCellValue aCell;
+aCell.assign(*m_pDoc, ScAddress(0,0,0));
+CPPUNIT_ASSERT_MESSAGE("This should be a string cell.", aCell.meType == 
CELLTYPE_STRING);
+aCell.assign(*m_pDoc, ScAddress(0,1,0));
+CPPUNIT_ASSERT_MESSAGE("This should be an empty ce

Re: IRC going crazy ?

[Jonathan Aquilina]

Sophie I am on now no problem you have to keep trying until you connect to a 
server successfully.

On Monday, February 03, 2014 07:16:14 PM Sophie wrote:
> Le 03/02/2014 19:09, Jonathan Aquilina a écrit :
> > Freenode is being DoSed you are best using a european based server as US,
> > australian and asian servers are being attacked.
> 
> It seems European too, I've been unable to connect this afternoon...
> Cheers
> Sophie
> 
> ___
> 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

Re: IRC going crazy ?

[Sophie]

Le 03/02/2014 19:09, Jonathan Aquilina a écrit :
> Freenode is being DoSed you are best using a european based server as US, 
> australian and asian servers are being attacked.

It seems European too, I've been unable to connect this afternoon...
Cheers
Sophie

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

[Libreoffice-commits] dev-tools.git: gerritbot/send-daily-digest

[Mathias Michel]

 gerritbot/send-daily-digest |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 362e11ede8be6fd4b85eb6ed6bfdaf6b946f43b4
Author: Mathias Michel 
Date:   Thu Jan 30 22:57:21 2014 +0100

Finally fix the new commiters issue in mail digest

Change-Id: I0555dd87a166641e6f6cb75839274623533acfe1
Reviewed-on: https://gerrit.libreoffice.org/7752
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index 6786db3..79d86b8 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -74,7 +74,7 @@ def init_freshers():
 
subprocess.call(['git','clone','--bare','git://gerrit.libreoffice.org/core',repo_dir])
 else:
 subprocess.call(['git','fetch','origin'])
-return subprocess.check_output(['git','shortlog','-s'])
+return subprocess.check_output(['git','shortlog','-s','master'])
 
 
 def get_project_body(project):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: IRC going crazy ?

[Jonathan Aquilina]

Freenode is being DoSed you are best using a european based server as US, 
australian and asian servers are being attacked.

On Monday, February 03, 2014 12:34:46 PM Adam Fyne wrote:
> Hi,
> Any idea why IRC is going nuts and shows people keep getting disconnected?
> Best,
>Adam
> ___
> 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] libvisio.git: Branch 'libvisio-0.0' - src/lib

[Fridrich Štrba]

 src/lib/VSDXTheme.cpp |   59 ++
 src/lib/VSDXTheme.h   |2 +
 2 files changed, 61 insertions(+)

New commits:
commit 57210acffdc7953653f65be184897c0993555155
Author: Fridrich Å trba 
Date:   Mon Feb 3 12:03:00 2014 +0100

Little changes to theme parsing

(cherry picked from commit f20f0bed4e545355f37f008cf311833c7907506a)

Conflicts:
src/lib/VSDXTheme.h

Change-Id: Ie5e7b86799fda82611edf299952a8508efd7dc5f

diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp
index 8ea6cf6..f2f094d 100644
--- a/src/lib/VSDXTheme.cpp
+++ b/src/lib/VSDXTheme.cpp
@@ -55,6 +55,7 @@ libvisio::VSDXClrScheme::VSDXClrScheme()
   , m_accent6()
   , m_hlink()
   , m_folHlink()
+  , m_bkgnd()
   , m_variationClrSchemeLst()
 {
 }
@@ -205,6 +206,9 @@ void libvisio::VSDXTheme::readClrScheme(xmlTextReaderPtr 
reader)
 case XML_A_FOLHLINK:
   readThemeColour(reader, tokenId, m_clrScheme.m_folHlink);
   break;
+case XML_VT_BKGND:
+  readThemeColour(reader, tokenId, m_clrScheme.m_bkgnd);
+  break;
 case XML_VT_VARIATIONCLRSCHEMELST:
   readVariationClrSchemeLst(reader);
   break;
@@ -322,4 +326,59 @@ void 
libvisio::VSDXTheme::readVariationClrScheme(xmlTextReaderPtr reader, VSDXVa
   while ((XML_VT_VARIATIONSTYLESCHEME != tokenId || 
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret);
 }
 
+boost::optional libvisio::VSDXTheme::getThemeColour(unsigned 
value, unsigned variationIndex) const
+{
+  if (value < 100)
+  {
+switch (value)
+{
+case 0:
+  return m_clrScheme.m_dk1;
+case 1:
+  return m_clrScheme.m_lt1;
+case 2:
+  return m_clrScheme.m_accent1;
+case 3:
+  return m_clrScheme.m_accent2;
+case 4:
+  return m_clrScheme.m_accent3;
+case 5:
+  return m_clrScheme.m_accent4;
+case 6:
+  return m_clrScheme.m_accent5;
+case 7:
+  return m_clrScheme.m_accent6;
+case 8:
+  return m_clrScheme.m_bkgnd;
+default:
+  break;
+}
+  }
+  else if (!m_clrScheme.m_variationClrSchemeLst.empty())
+  {
+if (variationIndex >= m_clrScheme.m_variationClrSchemeLst.size())
+  variationIndex = 0;
+switch (value)
+{
+case 100:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor1;
+case 101:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor2;
+case 102:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor3;
+case 103:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor4;
+case 104:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor5;
+case 105:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor6;
+case 106:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor7;
+default:
+  break;
+}
+  }
+  return boost::optional();
+}
+
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VSDXTheme.h b/src/lib/VSDXTheme.h
index 15d152f..060a794 100644
--- a/src/lib/VSDXTheme.h
+++ b/src/lib/VSDXTheme.h
@@ -67,6 +67,7 @@ struct VSDXClrScheme
   Colour m_accent6;
   Colour m_hlink;
   Colour m_folHlink;
+  Colour m_bkgnd;
   std::vector m_variationClrSchemeLst;
 
   VSDXClrScheme();
@@ -78,6 +79,7 @@ public:
   VSDXTheme();
   ~VSDXTheme();
   bool parse(WPXInputStream *input);
+  boost::optional getThemeColour(unsigned value, unsigned 
variationIndex = 0) const;
 
 private:
   VSDXTheme(const VSDXTheme &);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - configure.ac icon-themes/galaxy icon-themes/hicontrast icon-themes/human include/sfx2 include/vcl sd/source sfx2/source sw/source vcl/source

[Jan Holesovsky]

 configure.ac   |   13 --
 dev/null   |binary
 include/sfx2/objsh.hxx |2 
 include/vcl/gdimtf.hxx |3 
 sd/source/ui/unoidl/unopage.cxx|3 
 sfx2/source/control/recentdocsview.cxx |5 -
 sfx2/source/doc/doc.hrc|1 
 sfx2/source/doc/docinf.cxx |4 
 sfx2/source/doc/graphhelp.cxx  |  153 -
 sfx2/source/doc/graphhelp.hxx  |   11 --
 sfx2/source/doc/graphhelp.src  |5 -
 sfx2/source/doc/objstor.cxx|   21 
 sw/source/ui/inc/wrtsh.hxx |4 
 vcl/source/gdi/gdimtf.cxx  |   70 ++-
 14 files changed, 32 insertions(+), 263 deletions(-)

New commits:
commit 6472e791484e492cb2adfa898c43fbdeee7475ca
Author: Jan Holesovsky 
Date:   Mon Feb 3 18:56:56 2014 +0100

fdo#72338: startcenter: Show busy mouse pointer when starting apps.

Change-Id: I8f254419ea7bb4e3e9835bd9fab8229ed89cd0e9

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 98e07d7..5f225bc 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -220,6 +220,9 @@ void RecentDocsView::OnItemDblClicked(ThumbnailViewItem 
*pItem)
 
 void RecentDocsView::OpenItem( const ThumbnailViewItem *pItem )
 {
+// show busy mouse pointer
+SetPointer(Pointer(POINTER_WAIT));
+
 const RecentDocsViewItem* pRecentItem = dynamic_cast(pItem);
 
 Reference< XDispatch >xDispatch;
commit 6141a2fda4e47582382d766c4077b1fd725e664a
Author: Jan Holesovsky 
Date:   Mon Feb 3 18:49:15 2014 +0100

startcenter: Don't cut off the thumbnails.

Change-Id: Ie5ad5f5be48aa873df94a31e980aaabc4ac24868

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 9ed9a96..98e07d7 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -190,7 +190,7 @@ void RecentDocsView::loadRecentDocs()
 }
 else
 {
-set_width_request(mnItemMaxSize);
+set_width_request(mnTextHeight + mnItemMaxSize + 2*mnItemPadding);
 }
 }
 
commit ea6c029dfcf7733bb1ce07bc04d9f221f34758db
Author: Jan Holesovsky 
Date:   Mon Feb 3 18:05:26 2014 +0100

startcenter: Kill the old branding images.

Change-Id: Idab983ac085efa755025fdef1caa2c0073dd1ba0

diff --git a/configure.ac b/configure.ac
index aa6bac5..2c8a33a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1912,11 +1912,8 @@ AC_ARG_WITH(branding,
 AS_HELP_STRING([--with-branding],
 [Use given path to retrieve branding images set.])
 [
-  Search for intro.png about.svg flat_logo.svg
-  backing_left.png backing_right.png
-  backing_rtl_left.png backing_rtl_right.png
-  backing_space.png. If any is missing, default
-  ones will be used instead.
+  Search for intro.png about.svg and flat_logo.svg.
+  If any is missing, default ones will be used instead.
 
   Search also progress.conf for progress
   settings on intro screen :
@@ -12304,11 +12301,7 @@ dnl branding
 dnl ===
 AC_MSG_CHECKING([for alternative branding images directory])
 # initialize mapped arrays
-BRAND_INTRO_IMAGES="flat_logo.svg intro.png"
-brand_files="$BRAND_INTRO_IMAGES about.svg \
-backing_left.png backing_right.png \
-backing_rtl_left.png backing_rtl_right.png \
-backing_space.png"
+BRAND_INTRO_IMAGES="flat_logo.svg intro.png about.svg"
 
 if test -z "$with_branding" -o "$with_branding" = "no"; then
 AC_MSG_RESULT([none])
diff --git a/icon-themes/galaxy/brand/shell/backing_left.png 
b/icon-themes/galaxy/brand/shell/backing_left.png
deleted file mode 100644
index 689f52e..000
Binary files a/icon-themes/galaxy/brand/shell/backing_left.png and /dev/null 
differ
diff --git a/icon-themes/galaxy/brand/shell/backing_right.png 
b/icon-themes/galaxy/brand/shell/backing_right.png
deleted file mode 100644
index 900501a..000
Binary files a/icon-themes/galaxy/brand/shell/backing_right.png and /dev/null 
differ
diff --git a/icon-themes/galaxy/brand/shell/backing_rtl_left.png 
b/icon-themes/galaxy/brand/shell/backing_rtl_left.png
deleted file mode 100644
index 689f52e..000
Binary files a/icon-themes/galaxy/brand/shell/backing_rtl_left.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/brand/shell/backing_rtl_right.png 
b/icon-themes/galaxy/brand/shell/backing_rtl_right.png
deleted file mode 100644
index 900501a..000
Binary files a/icon-themes/galaxy/brand/shell/backing_rtl_right.png and 
/dev/null differ
diff --git a/icon-themes/galaxy/brand/shell/backing_space.png 
b/icon-themes/galaxy/bran

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

[Markus Mohrhard]

 chart2/opengl/symbolFragmentShader.glsl  |   61 ++
 chart2/opengl/symbolVertexShader.glsl|3 
 chart2/source/view/main/OpenGLRender.cxx |  172 ---
 chart2/source/view/main/OpenGLRender.hxx |   24 +---
 4 files changed, 116 insertions(+), 144 deletions(-)

New commits:
commit cf728ae8f2d4978b83460aff5b4e595e748233b2
Author: Markus Mohrhard 
Date:   Mon Feb 3 18:10:12 2014 +0100

the msaa checks are only needed on windows

Change-Id: Ib5a4012b7365259e08e8d2fd0c1f3b239b46517c

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index d4349a6..8ca8a58 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -761,16 +761,17 @@ OpenGLRender::OpenGLRender(uno::Reference< 
drawing::XShape > xTarget):
 m_iHeight(0),
 mxRenderTarget(xTarget),
 mbArbMultisampleSupported(false),
+#if defined( _WIN32 )
+m_iArbMultisampleFormat(0),
+#endif
 m_2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0)),
 m_frameBufferMS(0),
 m_TextVertexID(0),
-m_TextTexCoordID(1),
+m_TextTexCoordID(1)
 {
 //TODO: moggi: use STL
 memset(&m_Bubble2DCircle, 0, sizeof(m_Bubble2DCircle));
 
-m_iArbMultisampleFormat = 0;
-
 //TODO: moggi: use STL
 for (size_t i = 0; i < sizeof(m_BackgroundColor) / sizeof(float); i++)
 {
@@ -950,7 +951,6 @@ bool OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR 
pfd)
 DestroyWindow(hWnd);
 return  mbArbMultisampleSupported;
 }
-#endif
 
 bool OpenGLRender::GetMSAASupport()
 {
@@ -962,7 +962,6 @@ int OpenGLRender::GetMSAAFormat()
 return m_iArbMultisampleFormat;
 }
 
-#if defined( _WIN32 )
 //TODO: moggi: why the hell do we need another implementation here?
 int OpenGLRender::InitTempWindow(HWND *hwnd, int width, int height, 
PIXELFORMATDESCRIPTOR inPfd)
 {
diff --git a/chart2/source/view/main/OpenGLRender.hxx 
b/chart2/source/view/main/OpenGLRender.hxx
index 03364e2..3dc1077 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -151,9 +151,9 @@ public:
 BitmapEx GetAsBitmap();
 #if defined( _WIN32 )
 bool InitMultisample(PIXELFORMATDESCRIPTOR pfd);
-#endif
 bool GetMSAASupport();
 int GetMSAAFormat();
+#endif
 void SetColor(sal_uInt32 color);
 int Bubble2DShapePoint(float x, float y, float directionX, float 
directionY);
 int RenderBubble2FBO(int wholeFlag);
@@ -204,7 +204,7 @@ private:
 glm::mat4 m_Projection;
 // Camera matrix
 glm::mat4 m_View;
-// Model matrix : an identity matrix (model will be at the origin#elif 
defined( UNX )
+// Model matrix : an identity matrix (model will be at the origin
 glm::mat4 m_Model;
 // Our ModelViewProjection : multiplication of our 3 matrices
 glm::mat4 m_MVP;
@@ -247,8 +247,11 @@ private:
 std::list  m_Line2DShapePointList;
 
 com::sun::star::uno::Reference< com::sun::star::drawing::XShape > 
mxRenderTarget;
+
 bool mbArbMultisampleSupported;
+#if defined( _WIN32 )
 int m_iArbMultisampleFormat;
+#endif
 
 glm::vec4 m_2DColor;
 GLuint m_frameBufferMS;
commit 27c1d4f2c4f55b67499d73fa7452a9a14a2aa948
Author: Markus Mohrhard 
Date:   Mon Feb 3 18:06:20 2014 +0100

working symbol rendering based on point sprites

This approach ahs several advantages compared to the old approach. There
is no UNO involved anymore and we have a perfect shape defined by a
mathematical formula. No need for anti-aliasing or complex calculations
on the CPU.

Change-Id: I5018eae516de3368037c4c293d937de66f38568d

diff --git a/chart2/opengl/symbolFragmentShader.glsl 
b/chart2/opengl/symbolFragmentShader.glsl
index a84d83c..2837f95 100644
--- a/chart2/opengl/symbolFragmentShader.glsl
+++ b/chart2/opengl/symbolFragmentShader.glsl
@@ -6,17 +6,70 @@
  * 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/.
  */
-#
+
 #version 120
 
 varying vec4 fragmentColor;
+uniform int shape;
 
 void main()
 {
 vec2 p = gl_PointCoord * 2.0 - vec2(1.0); // (0,0) in the center
-if (abs(p.x) < abs(p.y))
-discard;
-
+if(shape == 0)
+{
+}
+else if(shape == 1) //diamon
+{
+if (abs(p.x) + abs(p.y) > 1)
+discard;
+}
+else if(shape == 2) // arrow
+{
+if(p.y < 0 && (abs(p.x) + abs(p.y)) > 1)
+discard;
+else if(p.y > 0 && abs(p.x) > 0.5)
+discard;
+}
+else if(shape == 3) //arrow up
+{
+if(p.y > 0 && (abs(p.x) + abs(p.y)) > 1)
+discard;
+else if(p.y < 0 && abs(p.x) > 0.5)
+discard;
+}
+else if(shape == 4)
+{
+if(p.x > 0 && (abs(p.x) + abs(p.y)) > 1)
+discard;
+else if(p.x < 0 && abs(p.y) > 0.5)
+discard;
+}
+else if(shape == 5)
+{
+if(p.x < 0 && (abs(p.x) + abs(p.y)) >

[Libreoffice-commits] core.git: 3 commits - basctl/uiconfig chart2/uiconfig officecfg/registry sc/source sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig

[Michael Meeks]

 basctl/uiconfig/basicide/toolbar/standardbar.xml |5 -
 chart2/uiconfig/toolbar/standardbar.xml  |3 
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |   12 +--
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx   |   43 +--
 sc/uiconfig/scalc/toolbar/standardbar.xml|3 
 sc/uiconfig/scalc/toolbar/viewerbar.xml  |5 -
 sd/uiconfig/sdraw/toolbar/standardbar.xml|3 
 sd/uiconfig/sdraw/toolbar/viewerbar.xml  |5 -
 sd/uiconfig/simpress/toolbar/standardbar.xml |3 
 sd/uiconfig/simpress/toolbar/viewerbar.xml   |5 -
 starmath/uiconfig/smath/toolbar/standardbar.xml  |3 
 sw/uiconfig/sglobal/toolbar/standardbar.xml  |3 
 sw/uiconfig/sglobal/toolbar/viewerbar.xml|5 -
 sw/uiconfig/sweb/toolbar/standardbar.xml |3 
 sw/uiconfig/sweb/toolbar/viewerbar.xml   |5 -
 sw/uiconfig/swform/toolbar/standardbar.xml   |3 
 sw/uiconfig/swform/toolbar/viewerbar.xml |5 -
 sw/uiconfig/swreport/toolbar/standardbar.xml |3 
 sw/uiconfig/swreport/toolbar/viewerbar.xml   |5 -
 sw/uiconfig/swriter/toolbar/standardbar.xml  |3 
 sw/uiconfig/swriter/toolbar/viewerbar.xml|5 -
 sw/uiconfig/swxform/toolbar/standardbar.xml  |3 
 sw/uiconfig/swxform/toolbar/viewerbar.xml|5 -
 23 files changed, 62 insertions(+), 76 deletions(-)

New commits:
commit 0f7542a7a74a24b3cdb69f7e860caacbfcd2cc23
Author: Michael Meeks 
Date:   Mon Feb 3 17:46:05 2014 +0100

fdo#74455 - hide direct printing button and replace with new print dialog.

Change-Id: I7ae80079f4bd5fed1234753b521a680498ec43e1

diff --git a/basctl/uiconfig/basicide/toolbar/standardbar.xml 
b/basctl/uiconfig/basicide/toolbar/standardbar.xml
index 9dec388..f490c52 100644
--- a/basctl/uiconfig/basicide/toolbar/standardbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/standardbar.xml
@@ -24,7 +24,8 @@
  
  
  
- 
+ 
+ 
  
  
  
@@ -39,4 +40,4 @@
  
  
  
-
\ No newline at end of file
+
diff --git a/chart2/uiconfig/toolbar/standardbar.xml 
b/chart2/uiconfig/toolbar/standardbar.xml
index eef05bd..3b9ab0f 100644
--- a/chart2/uiconfig/toolbar/standardbar.xml
+++ b/chart2/uiconfig/toolbar/standardbar.xml
@@ -28,7 +28,8 @@
  
  
  
- 
+ 
+ 
  
  
  
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml 
b/sc/uiconfig/scalc/toolbar/standardbar.xml
index 7f91e05..5368218 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
  
  
  
- 
+ 
+ 
  
  
  
diff --git a/sc/uiconfig/scalc/toolbar/viewerbar.xml 
b/sc/uiconfig/scalc/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sc/uiconfig/scalc/toolbar/viewerbar.xml
+++ b/sc/uiconfig/scalc/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
  
  
  
- 
+ 
+ 
  
  
  
@@ -32,4 +33,4 @@
  
  
  
-
\ No newline at end of file
+
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml 
b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index e5b046f..7264492 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
  
  
  
- 
+ 
+ 
  
  
  
diff --git a/sd/uiconfig/sdraw/toolbar/viewerbar.xml 
b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sd/uiconfig/sdraw/toolbar/viewerbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
  
  
  
- 
+ 
+ 
  
  
  
@@ -32,4 +33,4 @@
  
  
  
-
\ No newline at end of file
+
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml 
b/sd/uiconfig/simpress/toolbar/standardbar.xml
index 901d895..87e81ff 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
  
  
  
- 
+ 
+ 
  
  
  
diff --git a/sd/uiconfig/simpress/toolbar/viewerbar.xml 
b/sd/uiconfig/simpress/toolbar/viewerbar.xml
index 7ad6a17..5fa4ee3 100644
--- a/sd/uiconfig/simpress/toolbar/viewerbar.xml
+++ b/sd/uiconfig/simpress/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
  
  
  
- 
+ 
+ 
  
  
  
@@ -34,4 +35,4 @@
  
  
  
-
\ No newline at end of file
+
diff --git a/starmath/uiconfig/smath/toolbar/standardbar.xml 
b/starmath/uiconfig/smath/toolbar/standardbar.xml
index 6d5e1f7..a941fe7 100644
--- a/starmath/uiconfig/smath/toolbar/standardbar.xml
+++ b/starmath/uiconfig/smath/toolbar/standardbar.xml
@@ -27,7 +27,8 @@
  
  
  
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/sglobal/toolbar/standardbar.xml 
b/sw/uiconfig/sglobal/toolbar/standardbar.xml
index 363f03b..cf5c96a 100644
--- a/sw/uiconfig/sglobal/toolbar/standardbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
  
  
  
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/sglobal/toolbar/viewerb

[Libreoffice-commits] core.git: 5 commits - include/svtools include/tools include/vcl svtools/source svx/source sw/source

[Michael Stahl]

 include/svtools/grfmgr.hxx|2 -
 include/tools/poly.hxx|   12 +
 include/vcl/region.hxx|   29 ++
 svtools/source/graphic/grfmgr.cxx |   42 -
 svx/source/svdraw/svdograf.cxx|   48 +-
 svx/source/svdraw/svdpagv.cxx |   11 +++-
 sw/source/core/graphic/ndgrf.cxx  |9 ---
 7 files changed, 106 insertions(+), 47 deletions(-)

New commits:
commit 66f8b54931f193bdc844c6bca388d9bde98779cd
Author: Michael Stahl 
Date:   Mon Feb 3 11:26:59 2014 +0100

fdo#74435: SdrPageView::DrawLayer(): hack to avoid spuriously visible images

In the TestBook2.odt of fdo#73300 it happens that at some particular
points when scrolling down, the
ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy()
will determine that > 200 images are visible; most likely this is due to
an empty ObjectContactOfPageView::maViewInformation2D::getViewport().

Loading this many images may need more RAM than is available on 32bit
platforms.

That appears to happen only (but not always) if somehow (not sure
how exactly) the rectangle passed to SdrPageView::DrawLayer() and the
existing GetRedrawRegion() do not overlap at all.

(regression from commit 8af09bf33291df2fb2bfbbd6e42f9bf074fcc4fc)

Change-Id: Iafc595241df05204bccec1f2336014fc471b6602

diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 4a58027..a247258 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -350,7 +350,16 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* 
pGivenTarget, sdr::con
 // Copy existing paint region to use the same as prepared 
in BeginDrawLayer
 SdrPaintWindow& rExistingPaintWindow = 
pPreparedTarget->GetPaintWindow();
 const Region& rExistingRegion = 
rExistingPaintWindow.GetRedrawRegion();
-if ( rRect.IsEmpty() )
+bool bUseRect(false);
+if (!rRect.IsEmpty())
+{
+Region r(rExistingRegion);
+r.Intersect(rRect);
+// fdo#74435: FIXME: visibility check broken if empty
+if (!r.IsEmpty())
+bUseRect = true;
+}
+if (!bUseRect)
 aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion);
 else
 aTemporaryPaintWindow.SetRedrawRegion(Region(rRect));
commit 6ef04640ab92ce69000dcff3071eaef4419a9af6
Author: Michael Stahl 
Date:   Mon Feb 3 00:12:23 2014 +0100

remove GraphicObject::SetSwapStreamHdl() timeout parameter

Every call to SetSwapStreamHdl uses the same timeout now so move the
function that determines that to svtools.

Change-Id: Ib7395d43dd132a9e14e7a7862ff2c2279f319536

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 9a9fdef..8e0a330 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -324,7 +324,7 @@ public:
 
 sal_BoolHasSwapStreamHdl() const { return( mpSwapStreamHdl 
!= NULL && mpSwapStreamHdl->IsSet() ); }
 voidSetSwapStreamHdl();
-voidSetSwapStreamHdl( const Link& rHdl, const 
sal_uLong nSwapOutTimeout = 0UL );
+voidSetSwapStreamHdl(const Link& rHdl);
 sal_uLong   GetSwapOutTimeout() const { return( mpSwapOutTimer 
? mpSwapOutTimer->GetTimeout() : 0 ); }
 
 voidFireSwapInRequest();
diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index e681176..41049c7 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -415,10 +415,50 @@ void GraphicObject::SetSwapStreamHdl()
 }
 }
 
-void GraphicObject::SetSwapStreamHdl( const Link& rHdl, const sal_uLong 
nSwapOutTimeout )
+#define SWAPGRAPHIC_TIMEOUT 5000
+
+// #i122985# it is not correct to set the swap-timeout to a hard-coded 5000ms
+// as it was before.  Added code and experimented what to do as a good
+// compromise, see description.
+static sal_uInt32 GetCacheTimeInMs()
+{
+static bool bSetAtAll(true);
+
+if (bSetAtAll)
+{
+static bool bSetToPreferenceTime(true);
+
+if (bSetToPreferenceTime)
+{
+const sal_uInt32 nSeconds =
+
officecfg::Office::Common::Cache::GraphicManager::ObjectReleaseTime::get(
+comphelper::getProcessComponentContext());
+
+
+// The default is 10 minutes. The minimum is one minute, thus 60
+// seconds. When the minimum should match to the former hard-coded
+// 5 seconds, we have a divisor of 12 to use. For the default of 10
+// minutes 

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 74325, which changed state.

Bug 74325 Summary: DATALOSS: Calc loses comments when (changed) file is saved
https://bugs.freedesktop.org/show_bug.cgi?id=74325

   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: cui/source

[Stephan Bergmann]

 cui/source/dialogs/hlmailtp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 196386efb6592c8ca43d40e27f7888d4809f500c
Author: Stephan Bergmann 
Date:   Mon Feb 3 16:24:30 2014 +0100

fdo#74366# Determining bMail was accidentally inverted

...in 64b720dce8d3087ed62da815ecae1375b45149be "Related: fdo#38838 remove
UniString::SearchAscii"

Change-Id: I814d832dc88704670a04fdc7f3edd1296dfda991

diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index cfc990a..10ecdb0 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -201,7 +201,7 @@ void SvxHyperlinkMailTp::SetScheme(const OUString& rScheme)
 //if rScheme is empty or unknown the default beaviour is like it where MAIL
 const sal_Char sNewsScheme[]   = INET_NEWS_SCHEME;
 
-bool bMail = rScheme.startsWith(sNewsScheme);
+bool bMail = !rScheme.startsWith(sNewsScheme);
 
 //update protocol button selection:
 maRbtMail.Check(bMail);
___
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

[Noel Power]

 sc/inc/cellsuno.hxx  |2 +-
 sc/source/ui/unoobj/cellsuno.cxx |   11 ---
 2 files changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 8eec79e595eb651cd41e2f6a1918af67c4d43cf7
Author: Noel Power 
Date:   Mon Feb 3 11:04:10 2014 +

Revert "fix Worksheet.Cells by now allowing TableSheet..." fdo#70079

This reverts commit 70aff4a7f7abe0c768238733ca8900b746e60189.

Change-Id: I8f8b423353ae1a825be91bd94308e87844948525
Signed-off-by: Noel Power 

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 2fd4c3e..9e42591 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1048,7 +1048,7 @@ protected:
 public:
 ScTableSheetObj(ScDocShell* pDocSh, SCTAB nTab);
 virtual ~ScTableSheetObj();
-virtual voidRefChanged();
+
 voidInitInsertSheet(ScDocShell* pDocSh, SCTAB nTab);
 
 virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 3bc0f8b..595b0f3 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -6885,17 +6885,6 @@ ScTableSheetObj::~ScTableSheetObj()
 {
 }
 
-void ScTableSheetObj::RefChanged()
-{
-// skip calling immediate base
-// class ScCellRangeObj::RefChanged as
-// it changes the Sheets range ( which shouldn't
-// happen ) - hmm maybe we don't even need to
-// call ScCellRangesBase::RefChanged() :/
-
-ScCellRangesBase::RefChanged();
-}
-
 void ScTableSheetObj::InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab)
 {
 InitInsertRange( pDocSh, ScRange(0,0,nTab, MAXCOL,MAXROW,nTab) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: animations/source basegfx/source cppuhelper/source cui/source embeddedobj/source forms/source package/source unotools/source

[Alexandre Vicenzi]

 animations/source/animcore/targetpropertiescreator.cxx |   20 --
 basegfx/source/tools/unopolypolygon.cxx|3 
 cppuhelper/source/factory.cxx  |3 
 cui/source/dialogs/colorpicker.cxx |  123 -
 embeddedobj/source/commonembedding/xfactory.cxx|   28 ---
 forms/source/component/FormattedFieldWrapper.cxx   |   24 ---
 package/source/zippackage/ZipPackage.cxx   |7 
 unotools/source/ucbhelper/xtempfile.cxx|9 -
 8 files changed, 21 insertions(+), 196 deletions(-)

New commits:
commit f9369d33a455b328f96fa554e3e942e64a40a4da
Author: Alexandre Vicenzi 
Date:   Sat Jan 25 16:24:52 2014 -0200

fdo#54938 Convert to cppu::supportsService

Change-Id: I512c525029ebd63d261560d27e9f38bbe94f7e10
Reviewed-on: https://gerrit.libreoffice.org/7649
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Marcos Souza 
Tested-by: Marcos Souza 

diff --git a/animations/source/animcore/targetpropertiescreator.cxx 
b/animations/source/animcore/targetpropertiescreator.cxx
index 6141f67..04cc32f 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -31,16 +31,16 @@
 #include 
 #include 
 #include 
+
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
-
-#include 
-
 #include 
-#include 
 
 
 using namespace ::com::sun::star;
@@ -88,8 +88,6 @@ namespace animcore
 TargetPropertiesCreator( const uno::Reference< uno::XComponentContext 
>& rxContext );
 };
 
-// 
-
 uno::Reference< uno::XInterface > SAL_CALL 
createInstance_TargetPropertiesCreator( const uno::Reference< 
uno::XComponentContext > & rSMgr ) throw (uno::Exception)
 {
 return TargetPropertiesCreator::createInstance( rSMgr );
@@ -107,8 +105,6 @@ namespace animcore
 return aRet;
 }
 
-// 
-
 namespace
 {
 // Vector containing all properties for a given shape
@@ -201,7 +197,6 @@ namespace animcore
 {
 // extract target shape from iterate node
 // (will override the target for all children)
-// --
 
 uno::Reference< animations::XIterateContainer > 
xIterNode( xNode,

uno::UNO_QUERY );
@@ -395,8 +390,6 @@ namespace animcore
 };
 }
 
-// 
-
 TargetPropertiesCreator::TargetPropertiesCreator( const uno::Reference< 
uno::XComponentContext >&  ) :
 TargetPropertiesCreator_Base( m_aMutex )
 {
@@ -433,10 +426,7 @@ namespace animcore
 // it actually does right now, for the slideshow implementation).
 aFunctor( xRootNode );
 
-
 // output to result sequence
-// 
--
-
 uno::Sequence< animations::TargetProperties > aRes( aShapeHash.size() 
);
 
 ::std::size_t   nCurrIndex(0);
@@ -474,7 +464,7 @@ namespace animcore
 
 sal_Bool SAL_CALL TargetPropertiesCreator::supportsService( const 
OUString& ServiceName ) throw( uno::RuntimeException )
 {
-return ServiceName.equalsIgnoreAsciiCase(SERVICE_NAME);
+return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL 
TargetPropertiesCreator::getSupportedServiceNames()  throw( 
uno::RuntimeException )
diff --git a/basegfx/source/tools/unopolypolygon.cxx 
b/basegfx/source/tools/unopolypolygon.cxx
index aa93b41..38535ab 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 using namespace ::com::sun::star;
@@ -443,7 +444,7 @@ namespace unotools
 
 sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const OUString& 
ServiceName ) throw( uno::RuntimeException )
 {
-return ServiceName == SERVICE_NAME;
+return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL 
UnoPolyPolygon::getSupportedServiceNames()  throw( uno::RuntimeException )
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index b9e85c1..b0b7e7b 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -954,8 +954,7 @@ OUString OFactoryProxyHelper::getImplementationName()
 sal_Bool OFactoryProxyHelper::supportsService(const OUString& ServiceName)
 throw(::com::sun::star::uno::RuntimeException)
 {
-Reference xInfo( xFactory, UNO_QUERY  );
-return xInfo.is() && xInfo->supportsServ

[Libreoffice-commits] core.git: 6 commits - chart2/Library_chartopengl.mk chart2/Module_chart2.mk chart2/source desktop/source editeng/source framework/source include/vcl postprocess/Rdb_services.mk R

[Tor Lillqvist]

 Repository.mk   |2 +-
 chart2/Library_chartopengl.mk   |4 
 chart2/Module_chart2.mk |2 +-
 chart2/source/view/inc/DummyXShape.hxx  |   14 ++
 chart2/source/view/main/DummyXShape.cxx |   16 +---
 chart2/source/view/main/OpenGLRender.cxx|8 
 chart2/source/view/main/OpenGLRender.hxx|   13 -
 desktop/source/app/app.cxx  |7 ---
 editeng/source/editeng/editdbg.cxx  |8 
 framework/source/fwe/helper/titlehelper.cxx |5 -
 include/vcl/apptypes.hxx|1 -
 postprocess/Rdb_services.mk |4 +++-
 vcl/source/app/svapp.cxx|3 ---
 vcl/source/gdi/virdev.cxx   |1 -
 vcl/source/window/window.cxx|1 -
 15 files changed, 52 insertions(+), 37 deletions(-)

New commits:
commit 26cb65db74d67fc2561a495018d0f580c31202bc
Author: Tor Lillqvist 
Date:   Mon Feb 3 17:06:55 2014 +0100

Make the OpenGL stuff in chart2 compile for OS X (but definitely won't work)

Change-Id: I487fcd12bf90e8ce2c05743244858f7b5145c355

diff --git a/Repository.mk b/Repository.mk
index e91efd6..2e820e7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -222,7 +222,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
canvastools \
chartcore \
chartcontroller \
-   $(if $(filter LINUX FREEBSD WNT,$(OS)),chartopengl) \
+   $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),chartopengl) \
$(if $(filter $(OS),WNT),,cmdmail) \
cppcanvas \
configmgr \
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index 8cf8385..0aa6340 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -62,6 +62,10 @@ $(eval $(call gb_Library_use_system_win32_libs,chartopengl,\
gdi32 \
glu32 \
 ))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\
+   OpenGL \
+))
 else ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,chartopengl,\
 -ldl \
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 9d6e019..611e699 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,chart2))
 $(eval $(call gb_Module_add_targets,chart2,\
 Library_chartcontroller \
 Library_chartcore \
-   $(if $(filter LINUX FREEBSD WNT,$(OS)), \
+   $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)), \
Library_chartopengl \
Package_opengl \
) \
diff --git a/chart2/source/view/inc/DummyXShape.hxx 
b/chart2/source/view/inc/DummyXShape.hxx
index df9a892..eae679b 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -61,8 +61,14 @@
 #include 
 #include 
 
+#if defined( MACOSX )
+#include 
+#include 
+#else
 #include 
 #include 
+#endif
+
 #include 
 #include 
 #include 
@@ -72,9 +78,6 @@
 #include 
 #include 
 #elif defined( MACOSX )
-#include "premac.h"
-#include 
-#include "postmac.h"
 #elif defined( UNX )
 #include 
 #include 
diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 636679e..003afd2 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -947,6 +947,13 @@ bool DummyChart::initWindow()
 return true;
 }
 
+#elif defined( MACOSX )
+
+bool DummyChart::initWindow()
+{
+return false;
+}
+
 #elif defined( UNX )
 
 namespace {
@@ -1085,6 +1092,8 @@ bool DummyChart::initOpengl()
 
 #if defined( WNT )
 GLWin.hDC = GetDC(GLWin.hWnd);
+#elif defined( MACOSX )
+
 #elif defined( UNX )
 GLWin.ctx = glXCreateContext(GLWin.dpy,
  GLWin.vi,
@@ -1135,6 +1144,8 @@ bool DummyChart::initOpengl()
 GLWin.hRC  = wglCreateContext(GLWin.hDC);
 wglMakeCurrent(GLWin.hDC,GLWin.hRC);
 
+#elif defined( MACOSX )
+
 #elif defined( UNX )
 if( !glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx ) )
 {
@@ -1195,6 +1206,8 @@ bool DummyChart::initOpengl()
 #if defined( WNT )
 SwapBuffers(GLWin.hDC);
 glFlush();
+#elif defined( MACOSX )
+
 #elif defined( UNX )
 glXSwapBuffers(GLWin.dpy, GLWin.win);
 #endif
diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 9cc75cb..1c3795a 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -424,6 +424,8 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
 
 #if defined( WNT )
 SwapBuffers(glWin.hDC);
+#elif defined( MACOSX )
+
 #elif defined( UNX )
 glXSwapBuffers(glWin.dpy, glWin.win);
 #endif
@@ -663,6 +665,8 @@ void OpenGLRender::renderToBitmap()
 glBindFramebuffer(GL_FRAMEBUFFER, 0);
 #if defined( WNT )
 SwapBuffers(glWin.hDC);
+#elif defined(

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

[Miklos Vajna]

 sw/source/filter/ww8/ww8par4.cxx |3 ++-
 sw/source/filter/ww8/ww8par6.cxx |2 +-
 sw/source/filter/ww8/ww8scan.cxx |2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ab207cc63d697426bb5c0e05bcde5c6a2785ad25
Author: Miklos Vajna 
Date:   Mon Feb 3 13:00:18 2014 +0100

sw: hardcoded NS_sprm::LN_CDttmRMarkDel

Change-Id: I56dc2661de5e421e979485f718b7b2a464a03866

diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 0532bd0..2573a8f 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -503,7 +504,7 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t 
eType,
 pPlcxMan->HasCharSprm( bIns ? 0x4804 : 0x4863, aResult);
 pSprmCIbstRMark = aResult.empty() ? 0 : aResult.back();
 aResult.clear();
-pPlcxMan->HasCharSprm( bIns ? 0x6805 : 0x6864, aResult);
+pPlcxMan->HasCharSprm( bIns ? 0x6805 : NS_sprm::LN_CDttmRMarkDel, 
aResult);
 pSprmCDttmRMark = aResult.empty() ? 0 : aResult.back();
 }
 }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 627a19b..b0ce585 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5853,7 +5853,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
 {0x4863, 0}, //"sprmCIbstRMarkDel"
  //chp.ibstRMarkDel;index 
into
  //sttbRMark;short;
-{0x6864, 0}, //"sprmCDttmRMarkDel"
+{NS_sprm::LN_CDttmRMarkDel, 0},
  
//chp.dttmRMarkDel;DTTM;long;
 {0x6865, &SwWW8ImplReader::Read_CharBorder}, //"sprmCBrc" 
chp.brc;BRC;long;
 {0x4866, &SwWW8ImplReader::Read_CharShadow}, //"sprmCShd" 
chp.shd;SHD;short;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 98a79a4..c5830fb 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -617,7 +617,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
 // chp.ibstDispFldRMark, chp.dttmDispFldRMark ;
 {0x4863, 2, L_FIX}, // "sprmCIbstRMarkDel" chp.ibstRMarkDel;index into
 // sttbRMark;short;
-{0x6864, 4, L_FIX}, // "sprmCDttmRMarkDel" chp.dttmRMarkDel;DTTM;long;
+{NS_sprm::LN_CDttmRMarkDel, 4, L_FIX}, // chp.dttmRMarkDel;DTTM;long;
 {0x6865, 4, L_FIX}, // "sprmCBrc" chp.brc;BRC;long;
 {0x4866, 2, L_FIX}, // "sprmCShd" chp.shd;SHD;short;
 {0x4867, 2, L_FIX}, // "sprmCIdslRMarkDel" chp.idslRMReasonDel;an index
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: Branch 'libvisio-0.0' - 2 commits - astyle.options

[Fridrich Štrba]

 astyle.options |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 34abd70d8da0d2f567978df3a770406c737c7928
Author: Fridrich Å trba 
Date:   Wed Dec 11 09:51:31 2013 +0100

Allow equal identing of functions

(cherry picked from commit f48d89167a57971fed2bbf55fecf06626ce8772d)

diff --git a/astyle.options b/astyle.options
index 9d46215..806e3e7 100644
--- a/astyle.options
+++ b/astyle.options
@@ -5,6 +5,7 @@ align-pointer=name
 break-closing-brackets
 pad-header
 unpad-paren
+max-instatement-indent=120
 
 # processing options
 recursive
commit 645244af97ef40cfbbd7840431efb9c80855fc3b
Author: David Tardon 
Date:   Thu Nov 28 19:00:30 2013 +0100

add options file for astyle

(cherry picked from commit dbbacaa9c7b7efb00ea9573e12dd189da3075fe6)

Conflicts:
HACKING

Change-Id: Ifa12207d6d3bde25af615b293ca1f18c839a3a2f

diff --git a/astyle.options b/astyle.options
new file mode 100644
index 000..9d46215
--- /dev/null
+++ b/astyle.options
@@ -0,0 +1,11 @@
+# formatting options
+style=allman
+indent=spaces=2
+align-pointer=name
+break-closing-brackets
+pad-header
+unpad-paren
+
+# processing options
+recursive
+suffix=none
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

IRC going crazy ?

[Adam Fyne]

Hi,
Any idea why IRC is going nuts and shows people keep getting disconnected?
Best,
   Adam
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Chris Sherlock]

 include/vcl/outdev.hxx |2 +-
 include/vcl/window.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0de3b50ff85f8a2ca1fed00c20a68cb51622dc71
Author: Chris Sherlock 
Date:   Mon Feb 3 09:42:56 2014 +1100

fdo#74424 OutputDevice no longer inherits Resource

OutputDevice does not need to inherit Resource. Window now inherits
OutputDevice and Resource. This decouples OutputDevice from Resource,
which was unnecessary.

Change-Id: I9bc0d7ce65c026a8e38110e17fafdde9d8744392
Reviewed-on: https://gerrit.libreoffice.org/7785
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index df78af3..4f22436 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -254,7 +254,7 @@ typedef ::std::vector< VCLXGraphics* > 
VCLXGraphicsList_impl;
 
 const char* ImplDbgCheckOutputDevice( const void* pObj );
 
-class VCL_DLLPUBLIC OutputDevice : public Resource
+class VCL_DLLPUBLIC OutputDevice
 {
 friend class Application;
 friend class Bitmap;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 0a3cf45..2adcc5d 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -325,7 +325,7 @@ struct WindowResHeader
 sal_uLong nRSStyle;
 };
 
-class VCL_DLLPUBLIC Window : public OutputDevice
+class VCL_DLLPUBLIC Window : public OutputDevice, public Resource
 {
 friend class Cursor;
 friend class OutputDevice;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: src/lib

[Fridrich Štrba]

 src/lib/VSDXTheme.cpp |   59 ++
 src/lib/VSDXTheme.h   |2 +
 2 files changed, 61 insertions(+)

New commits:
commit f20f0bed4e545355f37f008cf311833c7907506a
Author: Fridrich Å trba 
Date:   Mon Feb 3 12:03:00 2014 +0100

Little changes to theme parsing

Change-Id: Ie5e7b86799fda82611edf299952a8508efd7dc5f

diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp
index 92142cf..5550857 100644
--- a/src/lib/VSDXTheme.cpp
+++ b/src/lib/VSDXTheme.cpp
@@ -35,6 +35,7 @@ libvisio::VSDXClrScheme::VSDXClrScheme()
   , m_accent6()
   , m_hlink()
   , m_folHlink()
+  , m_bkgnd()
   , m_variationClrSchemeLst()
 {
 }
@@ -185,6 +186,9 @@ void libvisio::VSDXTheme::readClrScheme(xmlTextReaderPtr 
reader)
 case XML_A_FOLHLINK:
   readThemeColour(reader, tokenId, m_clrScheme.m_folHlink);
   break;
+case XML_VT_BKGND:
+  readThemeColour(reader, tokenId, m_clrScheme.m_bkgnd);
+  break;
 case XML_VT_VARIATIONCLRSCHEMELST:
   readVariationClrSchemeLst(reader);
   break;
@@ -302,4 +306,59 @@ void 
libvisio::VSDXTheme::readVariationClrScheme(xmlTextReaderPtr reader, VSDXVa
   while ((XML_VT_VARIATIONSTYLESCHEME != tokenId || 
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret);
 }
 
+boost::optional libvisio::VSDXTheme::getThemeColour(unsigned 
value, unsigned variationIndex) const
+{
+  if (value < 100)
+  {
+switch (value)
+{
+case 0:
+  return m_clrScheme.m_dk1;
+case 1:
+  return m_clrScheme.m_lt1;
+case 2:
+  return m_clrScheme.m_accent1;
+case 3:
+  return m_clrScheme.m_accent2;
+case 4:
+  return m_clrScheme.m_accent3;
+case 5:
+  return m_clrScheme.m_accent4;
+case 6:
+  return m_clrScheme.m_accent5;
+case 7:
+  return m_clrScheme.m_accent6;
+case 8:
+  return m_clrScheme.m_bkgnd;
+default:
+  break;
+}
+  }
+  else if (!m_clrScheme.m_variationClrSchemeLst.empty())
+  {
+if (variationIndex >= m_clrScheme.m_variationClrSchemeLst.size())
+  variationIndex = 0;
+switch (value)
+{
+case 100:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor1;
+case 101:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor2;
+case 102:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor3;
+case 103:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor4;
+case 104:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor5;
+case 105:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor6;
+case 106:
+  return m_clrScheme.m_variationClrSchemeLst[variationIndex].m_varColor7;
+default:
+  break;
+}
+  }
+  return boost::optional();
+}
+
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VSDXTheme.h b/src/lib/VSDXTheme.h
index a30a1c2..4f251cb 100644
--- a/src/lib/VSDXTheme.h
+++ b/src/lib/VSDXTheme.h
@@ -47,6 +47,7 @@ struct VSDXClrScheme
   Colour m_accent6;
   Colour m_hlink;
   Colour m_folHlink;
+  Colour m_bkgnd;
   std::vector m_variationClrSchemeLst;
 
   VSDXClrScheme();
@@ -58,6 +59,7 @@ public:
   VSDXTheme();
   ~VSDXTheme();
   bool parse(librevenge::RVNGInputStream *input);
+  boost::optional getThemeColour(unsigned value, unsigned 
variationIndex = 0) const;
 
 private:
   VSDXTheme(const VSDXTheme &);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 source/text/shared/optionen/01010400.xhp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 32e18e8bdd5e30942bd4c57d9aaa393e93bd564c
Author: László Németh 
Date:   Mon Feb 3 13:07:01 2014 +0100

desc. of non-standard hyphenation patterns in user-defined dict.

Change-Id: Ib202c5e1318b95b85f49b444ccfd511439a9c8c9
Reviewed-on: https://gerrit.libreoffice.org/7805
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/source/text/shared/optionen/01010400.xhp 
b/source/text/shared/optionen/01010400.xhp
index 1b8d145..18b9c9b 100644
--- a/source/text/shared/optionen/01010400.xhp
+++ b/source/text/shared/optionen/01010400.xhp
@@ -94,6 +94,7 @@
 
 Word
 You can type a new 
word for inclusion in the dictionary. In the list below you will see the 
contents of the current custom dictionary. If you select a word from 
this list it is displayed in the text field. If you type a word with a trailing 
= character, such as "AutoComplete=", the word is never automatically 
hyphenated and no hyphenation is suggested. Typing "Auto=Complete" results in 
the word being hyphenated, or a hyphenation suggested, where you insert the = 
sign.
+You can use a 
[] block instead of the = sign to specify character changes before the 
hyphenation break. Possible character changes: (1) Extra characters, for 
example tug[g]gumi results the correct hyphenation “tugg- 
gummi” of the Swedish word “tuggummi”. (2) Character removing specified 
by a digit, for example paral·[1]lel results correct hyphenation 
“paral- lel” of the Catalan word “paral·lel”, removing one character 
before the break point. (3) Both removed and extra characters, for example 
cafee[2é]tje results correct hyphenation “café- tje” of the 
Dutch word “cafeetje”, removing two characters before the break point, and 
adding an extra one.
 
 Suggestion
 This input field 
is only available if you are editing an exception dictionary. The field shows 
the alternative suggestion for the current word in the "Word" text 
box.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: src/lib

[Fridrich Štrba]

 src/lib/VSDXParser.cpp |   60 +
 src/lib/VSDXTheme.cpp  |8 +++---
 src/lib/tokens.txt |   10 
 3 files changed, 74 insertions(+), 4 deletions(-)

New commits:
commit 17843d542375641f707d9737fa77fff5180ec031
Author: Fridrich Å trba 
Date:   Mon Feb 3 13:32:52 2014 +0100

Parse the quick-style pointers

Change-Id: I2d6b5a72c6c2764793992d1ca6363c831fa425b0

diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index 7708558..21e2d2c 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -821,6 +821,37 @@ void 
libvisio::VSDXParser::readStyleProperties(xmlTextReaderPtr reader)
   if (XML_READER_TYPE_ELEMENT == tokenType)
 readCharacter(reader);
   break;
+case XML_QUICKSTYLELINECOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!strokeColour)
+  strokeColour = m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
+case XML_QUICKSTYLEFILLCOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!fillColourFG)
+  fillColourFG = m_currentTheme.getThemeColour((unsigned)tmpValue);
+if (!fillColourBG)
+  fillColourBG = m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
+case XML_QUICKSTYLESHADOWCOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!shadowColourFG)
+  shadowColourFG = m_currentTheme.getThemeColour((unsigned)tmpValue);
+if (!shadowColourBG)
+  shadowColourBG = m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
 default:
   break;
 }
@@ -1139,6 +1170,35 @@ void 
libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader)
   if (XML_READER_TYPE_ELEMENT == tokenType)
 ret = readBoolData(m_shape.m_misc.m_hideText, reader);
   break;
+case XML_QUICKSTYLELINECOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!m_shape.m_lineStyle.colour)
+  m_shape.m_lineStyle.colour = 
m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
+case XML_QUICKSTYLEFILLCOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!m_shape.m_fillStyle.fgColour)
+  m_shape.m_fillStyle.fgColour = 
m_currentTheme.getThemeColour((unsigned)tmpValue);
+if (!m_shape.m_fillStyle.bgColour)
+  m_shape.m_fillStyle.bgColour = 
m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
+case XML_QUICKSTYLESHADOWCOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!m_shape.m_fillStyle.shadowFgColour)
+  m_shape.m_fillStyle.shadowFgColour = 
m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
 default:
   if (XML_SECTION == tokenClass && XML_READER_TYPE_ELEMENT == tokenType)
 ret = skipSection(reader);
diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp
index 5550857..3def5fb 100644
--- a/src/lib/VSDXTheme.cpp
+++ b/src/lib/VSDXTheme.cpp
@@ -150,7 +150,7 @@ void libvisio::VSDXTheme::readClrScheme(xmlTextReaderPtr 
reader)
 tokenType = xmlTextReaderNodeType(reader);
 switch (tokenId)
 {
-case XML_A_SRGBCLR:
+case XML_A_DK1:
   readThemeColour(reader, tokenId, m_clrScheme.m_dk1);
   break;
 case XML_A_DK2:
@@ -248,7 +248,7 @@ void 
libvisio::VSDXTheme::readVariationClrSchemeLst(xmlTextReaderPtr reader)
 tokenType = xmlTextReaderNodeType(reader);
 switch (tokenId)
 {
-case XML_VT_VARIATIONSTYLESCHEME:
+case XML_VT_VARIATIONCLRSCHEME:
 {
   VSDXVariationClrScheme varClrSch;
   readVariationClrScheme(reader, varClrSch);
@@ -259,7 +259,7 @@ void 
libvisio::VSDXTheme::readVariationClrSchemeLst(xmlTextReaderPtr reader)
   break;
 }
   }
-  while ((XML_VT_VARIATIONSTYLESCHEMELST != tokenId || 
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret);
+  while ((XML_VT_VARIATIONCLRSCHEMELST != tokenId || 
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret);
 }
 
 void libvisio::VSDXTheme::readVariationClrScheme(xmlTextReaderPtr reader, 
VSDXVariationClrScheme &varClrSch)
@@ -303,7 +303,7 @@ void 
libvisio::VSDXTheme::readVariationClrScheme(xmlTextReaderPtr reader, VSDXVa
   break;
 }
   }
-  while ((XML_VT_VARIATIONSTYLESCHEME != tokenId || 
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret);
+  while ((XML_VT_VARIATIONCLRSCHEME != tokenId || XML_READER_TYPE_END_ELEMENT 
!= tokenType) && 1 == ret);
 }
 
 boost::o

[Libreoffice-commits] core.git: 6 commits - external/mysqlcppconn mysqlc/Library_mysqlc.mk mysqlc/source

[Stephan Bergmann]

 external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk |1 
 external/mysqlcppconn/patches/warnings.patch.0|   11 +++
 mysqlc/Library_mysqlc.mk  |2 -
 mysqlc/source/mysqlc_connection.cxx   |   18 ++--
 mysqlc/source/mysqlc_connection.hxx   |   12 +++-
 mysqlc/source/mysqlc_databasemetadata.cxx |   27 +-
 mysqlc/source/mysqlc_preparedstatement.cxx|   18 +++-
 mysqlc/source/mysqlc_preparedstatement.hxx|   12 +++-
 mysqlc/source/mysqlc_resultset.cxx|1 
 mysqlc/source/mysqlc_resultset.hxx|   11 ++-
 mysqlc/source/mysqlc_statement.cxx|   26 ++---
 mysqlc/source/mysqlc_statement.hxx|   12 +++-
 mysqlc/source/mysqlc_subcomponent.hxx |   23 ---
 13 files changed, 124 insertions(+), 50 deletions(-)

New commits:
commit 0b3aa592d1dcc870de8b7b30060b2dade4ac3b62
Author: Stephan Bergmann 
Date:   Mon Feb 3 10:43:07 2014 +0100

Do not disable -Werror for mysqlc

Change-Id: Ie65e31e138262475f41cd56d8da8c39cdd8836b9

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 00c35e3..151c493 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Library_Library,mysqlc))
 
-$(eval $(call gb_Library_set_warnings_not_errors,mysqlc))
-
 $(eval $(call gb_Library_add_cxxflags,mysqlc,-DRTL_DISABLE_FAST_STRING))
 
 $(eval $(call gb_Library_use_externals,mysqlc,\
commit 01b7bab7139b7f902e5570fc311d47f2ba5ef0e1
Author: Stephan Bergmann 
Date:   Mon Feb 3 10:42:24 2014 +0100

auto_ptr -> heap_ptr

Change-Id: I1b11593fc936c0a4b45c319fd73ef3b629950752

diff --git a/mysqlc/source/mysqlc_statement.cxx 
b/mysqlc/source/mysqlc_statement.cxx
index a952559..0d5de2b 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -201,7 +202,7 @@ Reference< XResultSet > SAL_CALL 
OCommonStatement::executeQuery(const OUString&
 
 Reference< XResultSet > xResultSet;
 try {
-std::auto_ptr< sql::ResultSet > 
rset(cppStatement->executeQuery(OUStringToOString(sSqlStatement, 
m_pConnection->getConnectionEncoding()).getStr()));
+o3tl::heap_ptr< sql::ResultSet > 
rset(cppStatement->executeQuery(OUStringToOString(sSqlStatement, 
m_pConnection->getConnectionEncoding()).getStr()));
 xResultSet = new OResultSet(this, rset.get(), 
m_pConnection->getConnectionEncoding());
 rset.release();
 } catch (const sql::SQLException &e) {
@@ -307,7 +308,7 @@ Reference< XResultSet > SAL_CALL 
OCommonStatement::getResultSet()
 
 Reference< XResultSet > xResultSet;
 try {
-std::auto_ptr< sql::ResultSet > rset(cppStatement->getResultSet());
+o3tl::heap_ptr< sql::ResultSet > rset(cppStatement->getResultSet());
 xResultSet = new OResultSet(this, rset.get(), 
m_pConnection->getConnectionEncoding());
 rset.release();
 } catch (const sql::SQLException &e) {
commit 9072e25992c43b8d79c44cdf025f8d97f3342a70
Author: Stephan Bergmann 
Date:   Mon Feb 3 10:34:11 2014 +0100

auto_ptr -> scoped_ptr

Change-Id: I878aae330a3b1658c8bca83bd8a1126d2a8d26b6

diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx 
b/mysqlc/source/mysqlc_databasemetadata.cxx
index 99d2f4c..bf086af 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "mysqlc_databasemetadata.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -1566,7 +1567,7 @@ Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getCatalogs()
 
 try {
 rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
-std::auto_ptr< sql::ResultSet> rset( meta->getCatalogs());
+boost::scoped_ptr< sql::ResultSet> rset( meta->getCatalogs());
 sql::ResultSetMetaData * rs_meta = rset->getMetaData();
 sal_uInt32 columns = rs_meta->getColumnCount();
 while (rset->next()) {
@@ -1601,7 +1602,7 @@ Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getSchemas()
 
 try {
 rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
-std::auto_ptr< sql::ResultSet> rset( meta->getSchemas());
+boost::scoped_ptr< sql::ResultSet> rset( meta->getSchemas());
 sql::ResultSetMetaData * rs_meta = rset->getMetaData();
 sal_uInt32 columns = rs_meta->getColumnCount();
 while (rset->next()) {
@@ -1650,7 +1651,7 @@ Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getColumnPrivileges(
 cNamePattern(OUStringToOString(columnNamePattern, 
m_rConnection.getConnectionEncoding()).getStr());
 try {
 rtl_TextEncod

[Libreoffice-commits] core.git: basic/source filter/source include/unotools sc/source sd/source sw/qa sw/source vcl/source writerfilter/source

[Thomas Arnhold]

 basic/source/runtime/runtime.cxx  |2 +-
 basic/source/sbx/sbxscan.cxx  |2 +-
 filter/source/xslt/export/wordml/ooo2wordml_field.xsl |2 +-
 include/unotools/fontcvt.hxx  |4 ++--
 sc/source/ui/view/printfun.cxx|2 +-
 sd/source/filter/eppt/eppt.cxx|2 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |4 ++--
 sw/qa/extras/rtfimport/rtfimport.cxx  |2 +-
 sw/source/filter/ww8/wrtw8sty.cxx |2 +-
 sw/source/filter/ww8/ww8par.cxx   |2 +-
 sw/source/filter/ww8/ww8par3.cxx  |4 ++--
 vcl/source/window/split.cxx   |6 +++---
 writerfilter/source/dmapper/DomainMapper.cxx  |2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx|2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 326bec33e0a08123d716b9d2a06884368a8f07eb
Author: Thomas Arnhold 
Date:   Mon Feb 3 14:01:31 2014 +0100

some more continuous corrections

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 8e51eb0..83e81e6 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -983,7 +983,7 @@ SbMethod* SbiRuntime::GetCaller()
 
 //  Stacks
 
-// The expression-stack is available for the continous evaluation
+// The expression-stack is available for the continuous evaluation
 // of expressions.
 
 void SbiRuntime::PushVar( SbxVariable* pVar )
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 6d39ba7..43620d3 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -916,7 +916,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt 
) const
 // Remark: For performance reasons there's only ONE BasicFormater-
 //object created and 'stored', so that the expensive resource-
 //loading is saved (for country-specific predefined outputs,
-//e. g. "On/Off") and the continous string-creation
+//e. g. "On/Off") and the continuous string-creation
 //operations, too.
 // BUT: therefore this code is NOT multithreading capable!
 
diff --git a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl 
b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl
index eb1eb69..9ea6418 100644
--- a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl
+++ b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl
@@ -354,7 +354,7 @@ $field_number_format_style ='壹, 贰, 叁, ...' ">
 
 
 
-
+
 
 
 
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index 2beda5d..2a23107 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -54,9 +54,9 @@ public:
 //Starts converting the string at position rIndex. It converts as much of
 //the string that can be converted to the same symbol font and returns the
 //name of that font. rIndex is modified to the last index that was
-//converted. Typically you call if continously until rIndex ==
+//converted. Typically you call if continuously until rIndex ==
 //rString.Len() and handle each section as separate 8bit strings using
-//separate fonts. Will return an empty string for a continous section
+//separate fonts. Will return an empty string for a continuous section
 //that has no possible mapping.
 virtual OUString ConvertString(OUString &rString, sal_Int32 &rIndex) = 0;
 virtual ~StarSymbolToMSMultiFont() {}
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index b509e2b..9406a90 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2598,7 +2598,7 @@ void ScPrintFunc::ApplyPrintSettings()
 //
 //  rPageRanges   = range for all tables
 //  nStartPage= rPageRanges starts at nStartPage
-//  nDisplayStart = continious number for displaying the page number
+//  nDisplayStart = continuous number for displaying the page number
 
 long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
 long nStartPage, long nDisplayStart, bool 
bDoPrint,
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 34abbd6..99ec203 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -783,7 +783,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
 // Bit 3Use named show
 // Bit 4Browse mode on
 // Bit 5Kiosk mode on
-// Bit 7loop 
continously
+  

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

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d271e5fd87dc11512f4be244bf6e7eea1769c62e
Author: Miklos Vajna 
Date:   Mon Feb 3 13:16:24 2014 +0100

writerfilter: continous -> continuous

Change-Id: Ie36ac366af0563485b2d937903a63a9b3aca8931

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e42f9d0..4ba2ea3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2004,7 +2004,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 break;
 case RTF_PAGE:
 {
-// If we're inside a continous section, we should send a 
section break, not a page one.
+// If we're inside a continuous section, we should send a 
section break, not a page one.
 RTFValue::Pointer_t pBreak = 
m_aStates.top().aSectionSprms.find(NS_sprm::LN_SBkc);
 // Unless we're on a title page.
 RTFValue::Pointer_t pTitlePg = 
m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_titlePg);
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index c7e5a21..2c213d4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -384,7 +384,7 @@ namespace writerfilter {
 bool m_bSkipUnknown;
 /// Font index <-> encoding map, *not* part of the parser state
 std::map m_aFontEncodings;
-/// Maps the non-continious font indexes to the continous 
dmapper indexes.
+/// Maps the non-continious font indexes to the continuous 
dmapper indexes.
 std::vector m_aFontIndexes;
 /// Maps style indexes to style names.
 std::map m_aStyleNames;
@@ -464,7 +464,7 @@ namespace writerfilter {
 oox::formulaimport::XmlStreamBuilder m_aMathBuffer;
 /// Normal text property, that is math italic and math spacing 
are not applied to the current run.
 bool m_bMathNor;
-/// If the next continous section break should be ignored.
+/// If the next continuous section break should be ignored.
 bool m_bIgnoreNextContSectBreak;
 /// If a section break is needed before the end of the doc 
(false right after a section break).
 bool m_bNeedSect;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/line-rotation.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   10 +-
 writerfilter/source/dmapper/GraphicImport.cxx|   13 +
 3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit e034fa4607dfc732eaa82261755193fd781a2aad
Author: Miklos Vajna 
Date:   Mon Feb 3 11:44:21 2014 +0100

DOCX import: make sure rotation is not changed when we alter size

Change-Id: I5dd344fe06a0b700cebccfece44b622d00adfb5f

diff --git a/sw/qa/extras/ooxmlimport/data/line-rotation.docx 
b/sw/qa/extras/ooxmlimport/data/line-rotation.docx
new file mode 100644
index 000..a2450c0
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/line-rotation.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 8af52d6..6bfe06a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1567,7 +1567,15 @@ DECLARE_OOXMLIMPORT_TEST(lineWpsOnly, 
"line-wps-only.docx")
 {
 uno::Reference xShape = getShape(1);
 // Check position, it was -7223 as it was set after the 
CustomShapeGeometry property.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(210), xShape->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(208), xShape->getPosition().X);
+}
+
+DECLARE_OOXMLIMPORT_TEST(lineRotation, "line-rotation.docx")
+{
+uno::Reference xShape = getShape(3);
+// This was 5096: the line was shifted towards the bottom, so the end of
+// the 3 different lines wasn't at the same point.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4808), xShape->getPosition().Y);
 }
 
 DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly, "textbox-wps-only.docx")
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index e615ddf..41d9c7b 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -671,11 +671,19 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
  (text::TextContentAnchorType_AS_CHARACTER));
 
 uno::Reference 
xServiceInfo(m_xShape, uno::UNO_QUERY_THROW);
+
+// TextFrames can't be rotated. But for anything else,
+// make sure that setting size doesn't affect rotation,
+// that would not match Word's definition of rotation.
+bool bKeepRotation = false;
 if 
(!xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
+{
+bKeepRotation = true;
 xShapeProps->setPropertyValue
 (rPropNameSupplier.GetName(PROP_TEXT_RANGE),
  uno::makeAny
  
(m_pImpl->rDomainMapper.GetCurrentTextRange()));
+}
 
 awt::Size aSize(m_xShape->getSize());
 
@@ -684,7 +692,12 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
 if (m_pImpl->isYSizeValis())
 aSize.Height = m_pImpl->getYSize();
 
+uno::Any aRotation;
+if (bKeepRotation)
+aRotation = 
xShapeProps->getPropertyValue("RotateAngle");
 m_xShape->setSize(aSize);
+if (bKeepRotation)
+xShapeProps->setPropertyValue("RotateAngle", 
aRotation);
 
 m_pImpl->bIsGraphic = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[László Németh]

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

New commits:
commit 70ba89711bebcbf53eec374829b090041f30c2cc
Author: László Németh 
Date:   Mon Feb 3 13:07:01 2014 +0100

Updated core
Project: help  32e18e8bdd5e30942bd4c57d9aaa393e93bd564c

desc. of non-standard hyphenation patterns in user-defined dict.

Change-Id: Ib202c5e1318b95b85f49b444ccfd511439a9c8c9
Reviewed-on: https://gerrit.libreoffice.org/7805
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/helpcontent2 b/helpcontent2
index 2328f3f..32e18e8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2328f3f8efa6622c742b6e5b826376b08cd22d46
+Subproject commit 32e18e8bdd5e30942bd4c57d9aaa393e93bd564c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39944] ACCESSIBILITY: Implement new ATK Roles

[bugzilla-daemon]

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

Jacobo Aragunde Pérez  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |jaragu...@igalia.com
   |desktop.org |

--- Comment #13 from Jacobo Aragunde Pérez  ---
With some changes to atkwrapper.cxx, we would adopt some new roles:

* UNO role GROUP_BOX was not mapped to any ATK role, we could use
ATK_ROLE_GROUPING.

* UNO role COMMENT was mapped to ATK_ROLE_SCROLL_PANE, we could replace it with
ATK_ROLE_COMMENT.

For the ATK_ROLE_DOCUMENT_* roles, we would have to create new UNO roles
because it only has the DOCUMENT role.

-- 
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: fdo#70798 Add new Excel functions, move from add-in module?

[Eike Rathke]

Hi Winfried,

On Monday, 2014-02-03 09:47:51 +0100, Winfried Donkers wrote:

> In Excel 2010 Microsoft introduced new functions ERF.PRECISE, ERFC.PRECISE, 
> NETWORKDAYS.INTL and WORKDAY.INTL.
> These functions are defined in ODF1.2 as ERF, ERFC, NETWORKDAYS and WORKDAY 
> (some with small differences).
> The functions ERF, ERFC, NETWORKDAYS and WORKDAY are currently in the add-in 
> module.
> 
> I propose to make the functions fully ODF1.2 compliant (if they are not yet) 
> and move them to the sc module as standard functions.
> And use this code to implement the Excel 2010 functions.
> 
> IMHO the add-in module is (slowly) becoming something from the past and 
> maintaining the function in the sc module is more straightforward.
> 
> Any objections to this?

Moving functions out from the scaddin module might a bit problematic.
Most functions exist there because they originated from / have
a counterpart in the MS-Excel Analysis-AddIn. The export to BIFF .xls
for those AddIn functions automatically adds the necessary things so
Excel can actually read them and map it to their AddIn. Moving
a function from scaddins to sc core would need to take care of that.

See current handling in sc/source/filter/excel/xeformula.cxx
XclExpFmlaCompImpl::AppendAddInCallToken()

It seems we'll need a genereal plan how to handle the functions that
Excel newly introduces but are in fact implementations of ODFF under
a new name. Also various of the statistic functions you implemented
match that criteria..

As I wanted to come up with a renaming plan for the FLOOR/CEILING
problem anyway I may as well think about this.. seems related.

  Eike

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


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

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

[Tor Lillqvist]

 vcl/osx/salobj.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit dd6bb0aba7c3dbe5d7d337cbcca2fd343e04402f
Author: Tor Lillqvist 
Date:   Mon Feb 3 11:56:07 2014 +0100

Add comment

Change-Id: I2e5633040d40620b3d0f01c584eb1f9790acb22d

diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 16a56b5..b0633c3 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -73,6 +73,12 @@ AquaSalObject::~AquaSalObject()
 }
 }
 
+// Please note that the talk about QTMovieView below presumably refers
+// to stuff in the QuickTime avmedia thingie, and that QuickTime is
+// deprecated, not available for 64-bit code, and won't thus be used
+// in a "modern" build of LO anyway. So the relevance of the comment
+// is unclear.
+
 /*
sadly there seems to be no way to impose clipping on a child view,
especially a QTMovieView which seems to ignore the current context
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Module_avmedia.mk

[Tor Lillqvist]

 avmedia/Module_avmedia.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5fc9a33b9a684eff92bdf1bad705dbc5986098ce
Author: Tor Lillqvist 
Date:   Mon Feb 3 11:40:20 2014 +0100

Drop the deprecated QuickTime stuff when building a sandboxed LO

A sandboxed build is presumably intended for the Mac App Store and we
don't want to be using deprecated crap there.

Change-Id: I0b0098f7002643b1ed53a5caaee9ffee3c9fc970

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 8f6270e..88ee2aa 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -37,11 +37,13 @@ endif
 
 ifeq ($(OS),MACOSX)
 ifneq ($(CPUNAME),X86_64)
+ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
 $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaQuickTime \
 ))
 endif
 endif
+endif
 
 ifneq ($(ENABLE_DIRECTX),)
 $(eval $(call gb_Module_add_targets,avmedia,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: Branch 'libvisio-0.0' - src/lib

[Fridrich Štrba]

 src/lib/VSDXParser.cpp |   60 +
 src/lib/VSDXTheme.cpp  |8 +++---
 src/lib/tokens.txt |   10 
 3 files changed, 74 insertions(+), 4 deletions(-)

New commits:
commit 271be232a69d19628a3fd7782176a140d1e92e40
Author: Fridrich Å trba 
Date:   Mon Feb 3 13:32:52 2014 +0100

Parse the quick-style pointers

Change-Id: I2d6b5a72c6c2764793992d1ca6363c831fa425b0
(cherry picked from commit 17843d542375641f707d9737fa77fff5180ec031)

diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index 730a353..e4dc1b1 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -852,6 +852,37 @@ void 
libvisio::VSDXParser::readStyleProperties(xmlTextReaderPtr reader)
   if (XML_READER_TYPE_ELEMENT == tokenType)
 readCharacter(reader);
   break;
+case XML_QUICKSTYLELINECOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!strokeColour)
+  strokeColour = m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
+case XML_QUICKSTYLEFILLCOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!fillColourFG)
+  fillColourFG = m_currentTheme.getThemeColour((unsigned)tmpValue);
+if (!fillColourBG)
+  fillColourBG = m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
+case XML_QUICKSTYLESHADOWCOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!shadowColourFG)
+  shadowColourFG = m_currentTheme.getThemeColour((unsigned)tmpValue);
+if (!shadowColourBG)
+  shadowColourBG = m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
 default:
   break;
 }
@@ -1170,6 +1201,35 @@ void 
libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader)
   if (XML_READER_TYPE_ELEMENT == tokenType)
 ret = readBoolData(m_shape.m_misc.m_hideText, reader);
   break;
+case XML_QUICKSTYLELINECOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!m_shape.m_lineStyle.colour)
+  m_shape.m_lineStyle.colour = 
m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
+case XML_QUICKSTYLEFILLCOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!m_shape.m_fillStyle.fgColour)
+  m_shape.m_fillStyle.fgColour = 
m_currentTheme.getThemeColour((unsigned)tmpValue);
+if (!m_shape.m_fillStyle.bgColour)
+  m_shape.m_fillStyle.bgColour = 
m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
+case XML_QUICKSTYLESHADOWCOLOR:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+  {
+long tmpValue;
+ret = readLongData(tmpValue, reader);
+if (!m_shape.m_fillStyle.shadowFgColour)
+  m_shape.m_fillStyle.shadowFgColour = 
m_currentTheme.getThemeColour((unsigned)tmpValue);
+  }
+  break;
 default:
   if (XML_SECTION == tokenClass && XML_READER_TYPE_ELEMENT == tokenType)
 ret = skipSection(reader);
diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp
index f2f094d..b67330a 100644
--- a/src/lib/VSDXTheme.cpp
+++ b/src/lib/VSDXTheme.cpp
@@ -170,7 +170,7 @@ void libvisio::VSDXTheme::readClrScheme(xmlTextReaderPtr 
reader)
 tokenType = xmlTextReaderNodeType(reader);
 switch (tokenId)
 {
-case XML_A_SRGBCLR:
+case XML_A_DK1:
   readThemeColour(reader, tokenId, m_clrScheme.m_dk1);
   break;
 case XML_A_DK2:
@@ -268,7 +268,7 @@ void 
libvisio::VSDXTheme::readVariationClrSchemeLst(xmlTextReaderPtr reader)
 tokenType = xmlTextReaderNodeType(reader);
 switch (tokenId)
 {
-case XML_VT_VARIATIONSTYLESCHEME:
+case XML_VT_VARIATIONCLRSCHEME:
 {
   VSDXVariationClrScheme varClrSch;
   readVariationClrScheme(reader, varClrSch);
@@ -279,7 +279,7 @@ void 
libvisio::VSDXTheme::readVariationClrSchemeLst(xmlTextReaderPtr reader)
   break;
 }
   }
-  while ((XML_VT_VARIATIONSTYLESCHEMELST != tokenId || 
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret);
+  while ((XML_VT_VARIATIONCLRSCHEMELST != tokenId || 
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret);
 }
 
 void libvisio::VSDXTheme::readVariationClrScheme(xmlTextReaderPtr reader, 
VSDXVariationClrScheme &varClrSch)
@@ -323,7 +323,7 @@ void 
libvisio::VSDXTheme::readVariationClrScheme(xmlTextReaderPtr reader, VSDXVa
   break;
 }
   }
-  while ((XML_VT_VARIATIONSTYLESCHEME != tokenId || 
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret);
+  while ((XML_VT_VARIATIONCLRSCHEME != tokenId |

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #40 from Commit Notification 
 ---
Alexandre Vicenzi committed a patch related to this issue.
It has been pushed to "master":

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

fdo#54938 Convert to cppu::supportsService



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/column.hxx|1 +
 sc/inc/document.hxx  |6 ++
 sc/inc/mtvcellfunc.hxx   |7 +++
 sc/inc/table.hxx |1 +
 sc/source/core/data/column2.cxx  |   23 +++
 sc/source/core/data/document.cxx |   11 +++
 sc/source/core/data/table2.cxx   |6 ++
 sc/source/filter/xml/xmlwrap.cxx |2 ++
 8 files changed, 57 insertions(+)

New commits:
commit 17593b3e00c4d73a1985dfc1fae976d211aee007
Author: Kohei Yoshida 
Date:   Sun Feb 2 13:21:35 2014 -0500

fdo#74325: Ensure that all note objects have an sdr object before exporting.

Otherwise, if a note hasn't been displayed at least once before saving
that note would not get saved.  In the future, we should modify the export
code to not rely on SdrObject to check the presence of note.

Change-Id: Ib7ca3ac00a0c9cdd3a01facda7af479ef172afbe
(cherry picked from commit 018500a73f3b1082b6662b7c123dfe5158ae5752)
Reviewed-on: https://gerrit.libreoffice.org/7782
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 67d7572..414f40d 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -502,6 +502,7 @@ public:
 bool IsNotesEmptyBlock(SCROW nStartRow, SCROW nEndRow) const;
 
 size_t GetNoteCount() const;
+void CreateAllNoteCaptions();
 SCROW GetNotePosition( size_t nIndex ) const;
 void GetAllNoteEntries( std::vector& rNotes ) const;
 void GetNotesInRange( SCROW nStartRow, SCROW nEndRow, 
std::vector& rNotes ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 1f8ced4..4a96709 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -912,6 +912,12 @@ public:
 size_t CountNotes() const;
 size_t GetNoteCount( SCTAB nTab, SCCOL nCol ) const;
 
+/**
+ * Ensure that all note objects have an associated sdr object.  The export
+ * code uses sdr objects to export note data.
+ */
+void CreateAllNoteCaptions();
+
 ScAddress GetNotePosition( size_t nIndex ) const;
 SCROW GetNotePosition( SCTAB nTab, SCCOL nCol, size_t nIndex ) const;
 
diff --git a/sc/inc/mtvcellfunc.hxx b/sc/inc/mtvcellfunc.hxx
index c54d02e..793f2db 100644
--- a/sc/inc/mtvcellfunc.hxx
+++ b/sc/inc/mtvcellfunc.hxx
@@ -159,6 +159,13 @@ FindFormulaEditText(const CellStoreType& rStore, SCROW 
nRow1, SCROW nRow2, _Func
 return FindElement2(rStore, nRow1, nRow2, rFunc, rFunc);
 }
 
+template
+void ProcessNote(CellNoteStoreType& rStore, _Func& rFunc)
+{
+FuncElseNoOp aElse;
+ProcessElements1 >(rStore, rFunc, aElse);
+}
+
 }
 
 #endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 2e1cfd5..f067658 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -382,6 +382,7 @@ public:
 
 size_t GetNoteCount( SCCOL nCol ) const;
 SCROW GetNotePosition( SCCOL nCol, size_t nIndex ) const;
+void CreateAllNoteCaptions();
 
 void GetAllNoteEntries( std::vector& rNotes ) const;
 void GetNotesInRange( const ScRange& rRange, std::vector& 
rNotes ) const;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 20d3ee7..6aef111 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1229,6 +1229,29 @@ size_t ScColumn::GetNoteCount() const
 return nCount;
 }
 
+namespace {
+
+class NoteCaptionCreator
+{
+ScAddress maPos;
+public:
+NoteCaptionCreator( SCTAB nTab, SCCOL nCol ) : maPos(nCol,0,nTab) {}
+
+void operator() ( size_t nRow, ScPostIt* p )
+{
+maPos.SetRow(nRow);
+p->GetOrCreateCaption(maPos);
+}
+};
+
+}
+
+void ScColumn::CreateAllNoteCaptions()
+{
+NoteCaptionCreator aFunc(nTab, nCol);
+sc::ProcessNote(maCellNotes, aFunc);
+}
+
 SCROW ScColumn::GetNotePosition( size_t nIndex ) const
 {
 // Return the row position of the nth note in the column.
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 11b6507..6bbe835 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6188,6 +6188,17 @@ size_t ScDocument::GetNoteCount( SCTAB nTab, SCCOL nCol 
) const
 return pTab->GetNoteCount(nCol);
 }
 
+void ScDocument::CreateAllNoteCaptions()
+{
+TableContainer::iterator it = maTabs.begin(), itEnd = maTabs.end();
+for (; it != itEnd; ++it)
+{
+ScTable* p = *it;
+if (p)
+p->CreateAllNoteCaptions();
+}
+}
+
 ScAddress ScDocument::GetNotePosition( size_t nIndex ) const
 {
 for (size_t nTab = 0; nTab < maTabs.size(); ++nTab)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index ce4871a..e81a5e2 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1510,6 +1510,12 @@ SCROW ScTable::GetNotePosition( SCCOL nCol, size_t 
nIndex ) const
 return aCol[nCol].GetNotePosition(nIndex);
 }
 
+void ScTable::CreateAllNoteCaptions()
+{
+for (SCCOL i 

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

[Norbert Thiebaud]

 sc/source/filter/xml/xmlexprt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e9b5a6849afe09f5152e9e989fe50c3e208db73
Author: Norbert Thiebaud 
Date:   Mon Feb 3 02:59:10 2014 -0600

WaE signed/unsigned

Change-Id: Ie667f2d4860cf6427e93b6cf925e4bc70929e3d3

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 0936c63..fc31813 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3308,7 +3308,7 @@ void ScXMLExport::WriteEditCell(const EditTextObject* 
pText)
 pText->GetAllSections(aAttrs);
 std::vector::const_iterator itSec = aAttrs.begin(), 
itSecEnd = aAttrs.end();
 std::vector::const_iterator itPara = itSec;
-size_t nCurPara = 0; // current paragraph
+sal_Int32 nCurPara = 0; // current paragraph
 for (; itSec != itSecEnd; ++itSec)
 {
 const editeng::Section& rSec = *itSec;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 mysqlc/source/mysqlc_subcomponent.hxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 22c6d5739ece983aacbb2f86a0a25e2e5c7249fe
Author: Stephan Bergmann 
Date:   Mon Feb 3 09:47:44 2014 +0100

Fix typos

Change-Id: I0314d439412e9fcc0fbc6a7702e5ec3cddafc0c5

diff --git a/mysqlc/source/mysqlc_subcomponent.hxx 
b/mysqlc/source/mysqlc_subcomponent.hxx
index 0647501..5aaf5e9 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -193,11 +193,12 @@ namespace connectivity
 
 return aReturn;
 }
+}
 
 #define DECLARE_SERVICE_INFO() 
  \
 virtual OUString SAL_CALL getImplementationName() throw 
(::com::sun::star::uno::RuntimeException);  
 \
 virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 
throw(::com::sun::star::uno::RuntimeException);   \
-virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL 
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)   \
+virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL 
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
 
 #define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) 
  \
 OUString SAL_CALL classname::getImplementationName() throw 
(::com::sun::star::uno::RuntimeException) \
@@ -212,9 +213,9 @@ namespace connectivity
 }  
  \
 sal_Bool SAL_CALL classname::supportsService(const OUString& 
_rServiceName) throw(::com::sun::star::uno::RuntimeException)   \
 {  
  \
-return cppu::supportsService(this, ServiceName);   
  \
-}  
  \
+return cppu::supportsService(this, _rServiceName); 
  \
 }
+
 }
 #endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

fdo#70798 Add new Excel functions, move from add-in module?

[Winfried Donkers]

Hi,

In Excel 2010 Microsoft introduced new functions ERF.PRECISE, ERFC.PRECISE, 
NETWORKDAYS.INTL and WORKDAY.INTL.
These functions are defined in ODF1.2 as ERF, ERFC, NETWORKDAYS and WORKDAY 
(some with small differences).
The functions ERF, ERFC, NETWORKDAYS and WORKDAY are currently in the add-in 
module.

I propose to make the functions fully ODF1.2 compliant (if they are not yet) 
and move them to the sc module as standard functions.
And use this code to implement the Excel 2010 functions.

IMHO the add-in module is (slowly) becoming something from the past and 
maintaining the function in the sc module is more straightforward.

Any objections to this?


Winfried

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