date:20141203

 include/svx/svdmodel.hxx|2 ++
 svx/source/svdraw/svdmodel.cxx  |   16 
 sw/source/core/docnode/nodedump.cxx |   15 ++-
 3 files changed, 20 insertions(+), 13 deletions(-)

New commits:
commit 1801b559e1234cf1f43a414df38bb47fe81f087a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Dec 3 09:07:41 2014 +0100

Factor out SdrModel::dumpAsXml() from SwDoc::dumpAsXml()

Change-Id: Ic2cc6507390edfd0bc5a38b655a3b652fd5ec33e

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 3e4b31e..037cf60 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -666,6 +666,8 @@ public:
 This returns false if undo was disabled using EnableUndo( false ) and
 also during the runtime of the Undo() and Redo() methods. */
 bool IsUndoEnabled() const;
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 typedef tools::WeakReference SdrModel  SdrModelWeakRef;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index fe81f4f..f2c0f9e 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -87,6 +87,7 @@
 #include vcl/settings.hxx
 #include vcl/svapp.hxx
 #include boost/scoped_array.hpp
+#include libxml/xmlwriter.h
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -2014,6 +2015,21 @@ void SdrModel::SetSdrUndoFactory( SdrUndoFactory* 
pUndoFactory )
 }
 }
 
+void SdrModel::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST(sdrModel));
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST(ptr), %p, this);
+
+sal_uInt16 nPageCount = GetPageCount();
+for (sal_uInt16 i = 0; i  nPageCount; ++i)
+{
+if (const SdrPage* pPage = GetPage(i))
+pPage-dumpAsXml(pWriter);
+}
+
+xmlTextWriterEndElement(pWriter);
+}
+
 namespace
 {
 class theSdrModelUnoTunnelImplementationId : public rtl::Static 
UnoTunnelIdInit, theSdrModelUnoTunnelImplementationId  {};
diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index 97352e9..190f753 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -133,18 +133,6 @@ static const char* TMP_FORMAT_I32 = % SAL_PRIdINT32;
 
 void lcl_dumpSfxItemSet(WriterHelper writer, const SfxItemSet* pSet);
 
-void lcl_dumpSdrModel(WriterHelper writer, const SdrModel* pModel)
-{
-writer.startElement(sdrModel);
-writer.writeFormatAttribute(ptr, %p, pModel);
-if (pModel)
-{
-if (const SdrPage* pPage = pModel-GetPage(0))
-pPage-dumpAsXml(writer);
-}
-writer.endElement();
-}
-
 void SwDoc::dumpAsXml( xmlTextWriterPtr w ) const
 {
 WriterHelper writer( w );
@@ -162,7 +150,8 @@ void SwDoc::dumpAsXml( xmlTextWriterPtr w ) const
 mpNumRuleTbl-dumpAsXml( writer );
 getIDocumentRedlineAccess().GetRedlineTbl().dumpAsXml( writer );
 getIDocumentRedlineAccess().GetExtraRedlineTbl().dumpAsXml( writer );
-lcl_dumpSdrModel( writer, getIDocumentDrawModelAccess().GetDrawModel() );
+if (const SdrModel* pModel = getIDocumentDrawModelAccess().GetDrawModel())
+pModel-dumpAsXml(writer);
 
 writer.startElement(mbModified);
 writer.writeFormatAttribute(value, TMP_FORMAT, 
static_castint(getIDocumentState().IsModified()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: Makefile.am

 Makefile.am |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 186a8b8ebce53dcdc1a192f55ca12d8b50d8c725
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Dec 3 09:14:53 2014 +0100

Add a 'tags' target to please ctags users

Change-Id: I190cc2b7bff165fbf0f9bbd21bb59c85bd7c245a

diff --git a/Makefile.am b/Makefile.am
index 0c4281d..3b52e8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,6 @@ distclean-local:
 dist-hook:
git log --date=short --pretty=format:@%cd  %an  %ae  
[%H]%n%n%s%n%n%e%b | sed -e s|^\([^@]\)|\t\1| -e s|^@|| 
$(distdir)/ChangeLog
 
+tags:
+   ctags --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes *
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-03 Thread Bjoern Michaelsen

 sw/inc/edimp.hxx |2 
 sw/inc/ring.hxx  |   98 +--
 sw/qa/core/uwriter.cxx   |   16 +++---
 sw/source/core/doc/doccorr.cxx   |6 +-
 sw/source/core/edit/autofmt.cxx  |2 
 sw/source/core/frmedt/fecopy.cxx |2 
 sw/source/core/frmedt/fews.cxx   |9 +--
 7 files changed, 72 insertions(+), 63 deletions(-)

New commits:
commit 02ef3abd83f2d5f702349a8cd47928621ee5c620
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 3 09:22:54 2014 +0100

fdo#86929: Kill FOREACHPAM_START for good

Change-Id: Ibaff13e84f186616259ba9bbf9224bbe2d30c5d6

diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 16aa9bd..8b0aa53 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -507,9 +507,9 @@ bool SwFEShell::Sort(const SwSortOptions rOpt)
 else
 {
 // Sort text nothing else
-FOREACHPAM_START(GetCrsr())
-
-SwPaM* pPam = PCURCRSR;
+for(SwPaM rPaM : GetCrsr()-GetRingContainer())
+{
+SwPaM* pPam = rPaM;
 
 SwPosition* pStart = pPam-Start();
 SwPosition* pEnd   = pPam-End();
@@ -534,8 +534,7 @@ bool SwFEShell::Sort(const SwSortOptions rOpt)
 pPam-GetPoint()-nNode += nOffset;
 pCNd = pPam-GetCntntNode();
 pPam-GetPoint()-nContent.Assign( pCNd, pCNd-Len() );
-
-FOREACHPAM_END()
+}
 }
 
 EndAllAction();
commit 881458eb2970d6be0ac0648159efcd37fa1623e2
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 3 09:09:58 2014 +0100

move size() into the container too

Change-Id: I22ee641e7d07fa7c0cae7a4b36ce61dbed62b31f

diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 61181eb..174a5bb 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -22,6 +22,7 @@
 #include swdllapi.h
 #include swtypes.hxx
 #include utility
+#include iterator
 #include boost/iterator/iterator_facade.hpp
 #include boost/intrusive/circular_list_algorithms.hpp
 
@@ -94,9 +95,6 @@ namespace sw
 /** @return the previous item in the ring container */
 T* GetPrev() const
 { return pPrev; }
-/** @return the number of elements in the container */
-size_t size() const
-{ return algo::count(static_cast const T* (this)); }
 /** @return a stl-like container with begin()/end() for iteration */
 ring_container GetRingContainer();
 /** @return a stl-like container with begin()/end() for const 
iteration */
@@ -161,9 +159,9 @@ namespace sw
 iterator end();
 const_iterator begin() const;
 const_iterator end() const;
-///** @return the number of elements in the container */
-//size_t size() const
-//{ return algo::count(static_cast const T* (this)); }
+/** @return the number of elements in the container */
+size_t size() const
+{ return std::distance(begin(), end()); }
 };
 template class T
 class RingIterator SAL_FINAL : public boost::iterator_facade
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 584f398..bad84c9 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1296,18 +1296,18 @@ void SwDocTest::testIntrusiveRing()
 vRings.push_back(aRing3);
 vRings.push_back(aRing4);
 vRings.push_back(aRing5);
-CPPUNIT_ASSERT_EQUAL(aRing1.size(), static_castsize_t(1));
+CPPUNIT_ASSERT_EQUAL(aRing1.GetRingContainer().size(), 
static_castsize_t(1));
 aRing2.MoveTo(aRing1);
 aRing3.MoveTo(aRing1);
-CPPUNIT_ASSERT_EQUAL(aRing1.size(), static_castsize_t(3));
-CPPUNIT_ASSERT_EQUAL(aRing2.size(), static_castsize_t(3));
-CPPUNIT_ASSERT_EQUAL(aRing3.size(), static_castsize_t(3));
+CPPUNIT_ASSERT_EQUAL(aRing1.GetRingContainer().size(), 
static_castsize_t(3));
+CPPUNIT_ASSERT_EQUAL(aRing2.GetRingContainer().size(), 
static_castsize_t(3));
+CPPUNIT_ASSERT_EQUAL(aRing3.GetRingContainer().size(), 
static_castsize_t(3));
 aRing5.MoveTo(aRing4);
-CPPUNIT_ASSERT_EQUAL(aRing4.size(), static_castsize_t(2));
+CPPUNIT_ASSERT_EQUAL(aRing4.GetRingContainer().size(), 
static_castsize_t(2));
 aRing4.MoveRingTo(aRing1);
 BOOST_FOREACH(TestRing* pRing, vRings)
 {
-CPPUNIT_ASSERT_EQUAL(pRing-size(), static_castsize_t(5));
+CPPUNIT_ASSERT_EQUAL(pRing-GetRingContainer().size(), 
static_castsize_t(5));
 }
 for(std::vectorTestRing*::iterator ppRing = vRings.begin(); ppRing != 
vRings.end(); ++ppRing)
 {
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 95a5033..c10c8d9 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -719,7 +719,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool 
bIncludingPageFrames )
 SwNodeIndex aClpIdx( aIdx );
 SwPaM* pStartCursor = GetCrsr();

[Bug 86929] Kill FOREACHPAM_START for good

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

Commit Notification libreoffice-comm...@lists.freedesktop.org changed:

   What|Removed |Added

 Whiteboard|EasyHack SkillCpp   |EasyHack SkillCpp
   |DifficultyBeginner  |DifficultyBeginner
   |TopicCleanup|TopicCleanup target:4.5.0

-- 
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 86929] Kill FOREACHPAM_START for good

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

--- Comment #4 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Bjoern Michaelsen committed a patch related to this issue.
It has been pushed to master:

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

fdo#86929: Kill FOREACHPAM_START for good

It will be available in 4.5.0.

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: basic/source include/basic

2014-12-03 Thread Tobias Madl

 basic/source/basmgr/basmgr.cxx |   20 ++--
 include/basic/basmgr.hxx   |   34 ++
 2 files changed, 28 insertions(+), 26 deletions(-)

New commits:
commit 57fe57677887dd951000d3317690f8c628a58e02
Author: Tobias Madl tobias.madl@gmail.com
Date:   Tue Dec 2 12:19:32 2014 +

fdo#84938 replace BASERR_REASON_ constants - enum

Change-Id: I80fe0108c2d27b72d2fadc23032cf2b52c3193a6
Reviewed-on: https://gerrit.libreoffice.org/13268
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index b0f0521..8029d18 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -358,7 +358,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( 
const container::Cont
 }
 }
 
-BasicError::BasicError( sal_uInt64 nId, sal_uInt16 nR, const OUString rErrStr 
) :
+BasicError::BasicError( sal_uInt64 nId, BasicErrorReason nR, const OUString 
rErrStr ) :
 aErrStr( rErrStr )
 {
 nErrorId= nId;
@@ -796,7 +796,7 @@ void BasicManager::ImpMgrNotLoaded( const OUString 
rStorageName )
 // pErrInf is only destroyed if the error os processed by an
 // ErrorHandler
 StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, 
rStorageName, ERRCODE_BUTTON_OK );
-aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_OPENMGRSTREAM, 
rStorageName));
+aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENMGRSTREAM, 
rStorageName));
 
 // Create a stdlib otherwise we crash!
 BasicLibInfo* pStdLibInfo = CreateLibInfo();
@@ -936,7 +936,7 @@ void BasicManager::LoadOldBasicManager( SotStorage 
rStorage )
 if( !ImplLoadBasic( *xManagerStream, pLibs-GetObject(0)-GetLibRef() ) )
 {
 StringErrorInfo* pErrInf = new StringErrorInfo( 
ERRCODE_BASMGR_MGROPEN, aStorName, ERRCODE_BUTTON_OK );
-aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_OPENMGRSTREAM, 
aStorName));
+aErrors.push_back(BasicError(*pErrInf, 
BasicErrorReason::OPENMGRSTREAM, aStorName));
 // and it proceeds ...
 }
 xManagerStream-Seek( nBasicEndOff+1 ); // +1: 0x00 as separator
@@ -985,7 +985,7 @@ void BasicManager::LoadOldBasicManager( SotStorage 
rStorage )
 else
 {
 StringErrorInfo* pErrInf = new StringErrorInfo( 
ERRCODE_BASMGR_LIBLOAD, aStorName, ERRCODE_BUTTON_OK );
-aErrors.push_back(BasicError(*pErrInf, 
BASERR_REASON_STORAGENOTFOUND, aStorName));
+aErrors.push_back(BasicError(*pErrInf, 
BasicErrorReason::STORAGENOTFOUND, aStorName));
 }
 }
 }
@@ -1078,7 +1078,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* 
pLibInfo, SotStorage* pCurStora
 if ( !xBasicStorage.Is() || xBasicStorage-GetError() )
 {
 StringErrorInfo* pErrInf = new StringErrorInfo( 
ERRCODE_BASMGR_MGROPEN, xStorage-GetName(), ERRCODE_BUTTON_OK );
-aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_OPENLIBSTORAGE, 
pLibInfo-GetLibName()));
+aErrors.push_back(BasicError(*pErrInf, 
BasicErrorReason::OPENLIBSTORAGE, pLibInfo-GetLibName()));
 }
 else
 {
@@ -1087,7 +1087,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* 
pLibInfo, SotStorage* pCurStora
 if ( !xBasicStream.Is() || xBasicStream-GetError() )
 {
 StringErrorInfo* pErrInf = new StringErrorInfo( 
ERRCODE_BASMGR_LIBLOAD , pLibInfo-GetLibName(), ERRCODE_BUTTON_OK );
-aErrors.push_back(BasicError(*pErrInf, 
BASERR_REASON_OPENLIBSTREAM, pLibInfo-GetLibName()));
+aErrors.push_back(BasicError(*pErrInf, 
BasicErrorReason::OPENLIBSTREAM, pLibInfo-GetLibName()));
 }
 else
 {
@@ -1121,7 +1121,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* 
pLibInfo, SotStorage* pCurStora
 if ( !bLoaded )
 {
 StringErrorInfo* pErrInf = new StringErrorInfo( 
ERRCODE_BASMGR_LIBLOAD, pLibInfo-GetLibName(), ERRCODE_BUTTON_OK );
-aErrors.push_back(BasicError(*pErrInf, 
BASERR_REASON_BASICLOADERROR, pLibInfo-GetLibName()));
+aErrors.push_back(BasicError(*pErrInf, 
BasicErrorReason::BASICLOADERROR, pLibInfo-GetLibName()));
 }
 else
 {
@@ -1309,7 +1309,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool 
bDelBasicFromStorage )
 if ( !pLibInfo || !nLib )
 {
 StringErrorInfo* pErrInf = new StringErrorInfo( 
ERRCODE_BASMGR_REMOVELIB, OUString(), ERRCODE_BUTTON_OK );
-aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_STDLIB, 
pLibInfo-GetLibName()));
+aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::STDLIB, 
pLibInfo-GetLibName()));
 return false;
 }
 
@@ -1343,7 +1343,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool 
bDelBasicFromStorage )
 if (

[Bug 84938] replace #defined constants with ‘enum class’

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

--- Comment #9 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Tobias Madl committed a patch related to this issue.
It has been pushed to master:

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

fdo#84938 replace BASERR_REASON_ constants - enum

It will be available in 4.5.0.

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

[Bug 86929] Kill FOREACHPAM_START for good

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

Björn Michaelsen bjoern.michael...@canonical.com changed:

   What|Removed |Added

 Depends on|75757   |

--- Comment #5 from Björn Michaelsen bjoern.michael...@canonical.com ---
With some additional thinking, I found a way to get C++11 for(:) iteration
right away, without using the BOOST_FOREACH hack as an intermediate solution.
See:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=02ef3abd83f2d5f702349a8cd47928621ee5c620
for an example change. Thus also not depending on fdo#75757 anymore. This
should make this Easy Hack even simpler.

-- 
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 75757] remove inheritance to std::map and std::vector

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

Björn Michaelsen bjoern.michael...@canonical.com changed:

   What|Removed |Added

 Blocks|86929   |

-- 
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: C++11 on master (towards LO 4.5)


On 12/03/2014 07:39 AM, julien2412 wrote:

Will we be able to consider that erase method of every container (not just
some of them) will return an iterator so we won't need a temporary iterator
when using erase in a loop block?
(eg: http://www.cplusplus.com/reference/map/map/erase/)


The only answer to questions like this is---try it out.  There's no good 
reference that I know of that would provide a sufficiently detailed 
matrix of what's available in which compiler's standard library to be 
able to answer it theoretically.

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

Re: [Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/sifr

On Mon, Dec 01, 2014 at 11:15:50PM +0400, Jay Philips philip...@hotmail.com 
wrote:
 Sorry for the delay. I've pushed a patch that should fix the issue with
 sifr/links.txt.

Thanks, that helped. :)


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

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

2014-12-03 Thread Noel Grandin

 starmath/inc/caret.hxx|2 -
 starmath/inc/cursor.hxx   |2 -
 starmath/inc/view.hxx |5 +--
 starmath/source/ElementsDockingWindow.cxx |2 -
 starmath/source/config.cxx|   16 +-
 starmath/source/cursor.cxx|   40 +-
 starmath/source/dialog.cxx|   18 +--
 starmath/source/document.cxx  |8 ++---
 starmath/source/edit.cxx  |4 +-
 starmath/source/mathmlimport.cxx  |6 +--
 starmath/source/mathtype.cxx  |   10 +++---
 starmath/source/node.cxx  |   10 +++---
 starmath/source/ooxmlexport.cxx   |2 -
 starmath/source/parse.cxx |2 -
 starmath/source/rtfexport.cxx |2 -
 starmath/source/smmod.cxx |2 -
 starmath/source/tmpdevice.cxx |2 -
 starmath/source/toolbox.cxx   |2 -
 starmath/source/view.cxx  |   20 ++---
 starmath/source/visitors.cxx  |4 +-
 sw/source/ui/dbui/createaddresslistdialog.cxx |4 +-
 sw/source/ui/dbui/mmaddressblockpage.cxx  |   20 ++---
 sw/source/ui/dbui/selectdbtabledialog.cxx |2 -
 sw/source/ui/misc/glosbib.cxx |8 ++---
 sw/source/ui/misc/pgfnote.cxx |   18 +--
 25 files changed, 106 insertions(+), 105 deletions(-)

New commits:
commit 0e2927ed2cffdc718085cadce3cc41e34cd6a04f
Author: Noel Grandin n...@peralex.com
Date:   Wed Dec 3 10:43:11 2014 +0200

loplugin: cstylecast

Change-Id: Ic48a59c209e77382a0e431a5502c24a62407334b

diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx 
b/sw/source/ui/dbui/createaddresslistdialog.cxx
index b398105..b331a8e 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -179,7 +179,7 @@ void SwAddressControl_Impl::SetData(SwCSVData rDBData)
 FixedText* pNewFT = new FixedText(m_pWindow, WB_RIGHT);
 Edit* pNewED = new Edit(m_pWindow, WB_BORDER);
 //set nLines a position identifier - used in the ModifyHdl
-pNewED-SetData((void*)nLines);
+pNewED-SetData(reinterpret_castvoid*(nLines));
 pNewED-SetGetFocusHdl(aFocusLink);
 pNewED-SetModifyHdl(aEditModifyLink);
 
@@ -299,7 +299,7 @@ void SwAddressControl_Impl::MakeVisible(const Rectangle  
rRect)
 IMPL_LINK(SwAddressControl_Impl, EditModifyHdl_Impl, Edit*, pEdit)
 {
 //get the data element number of the current set
-sal_Int32 nIndex = (sal_Int32)(sal_IntPtr)pEdit-GetData();
+sal_Int32 nIndex = 
(sal_Int32)reinterpret_castsal_IntPtr(pEdit-GetData());
 //get the index of the set
 OSL_ENSURE(m_pData-aDBData.size()  m_nCurrentDataSet, wrong data set 
index );
 if(m_pData-aDBData.size()  m_nCurrentDataSet)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 675b1e8..f0868a7 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -483,11 +483,11 @@ 
SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
 m_pFieldFT-Show();
 m_pFieldCB-Show();
 SvTreeListEntry* pEntry = 
m_pAddressElementsLB-InsertEntry(SW_RESSTR(ST_SALUTATION));
-pEntry-SetUserData((void*)(sal_Int32)USER_DATA_SALUTATION );
+
pEntry-SetUserData(reinterpret_castvoid*((sal_Int32)USER_DATA_SALUTATION) );
 pEntry = m_pAddressElementsLB-InsertEntry(SW_RESSTR(ST_PUNCTUATION));
-pEntry-SetUserData((void*)(sal_Int32)USER_DATA_PUNCTUATION );
+
pEntry-SetUserData(reinterpret_castvoid*((sal_Int32)USER_DATA_PUNCTUATION) );
 pEntry = m_pAddressElementsLB-InsertEntry(SW_RESSTR(ST_TEXT));
-pEntry-SetUserData((void*)(sal_Int32)USER_DATA_TEXT   );
+pEntry-SetUserData(reinterpret_castvoid*((sal_Int32)USER_DATA_TEXT) 
  );
 ResStringArray aSalutArr(SW_RES(RA_SALUTATION));
 for(sal_uInt32 i = 0; i  aSalutArr.Count(); ++i)
 m_aSalutations.push_back(aSalutArr.GetString(i));
@@ -512,7 +512,7 @@ 
SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
 for(sal_uInt32 i = 0; i  rHeaders.Count(); ++i)
 {
 SvTreeListEntry* pEntry = 
m_pAddressElementsLB-InsertEntry(rHeaders.GetString( i ));
-pEntry-SetUserData((void*)(sal_IntPtr)i);
+pEntry-SetUserData(reinterpret_castvoid*((sal_IntPtr)i));
 }
 m_pOK-SetClickHdl(LINK(this, SwCustomizeAddressBlockDialog, OKHdl_Impl));
 m_pAddressElementsLB-SetSelectHdl(LINK(this, 
SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl ));
@@ -543,7 +543,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, OKHdl_Impl)
 
 IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, DDListBox*, 
pBox)
 {
-sal_Int32

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

2014-12-03 Thread Bjoern Michaelsen

 sw/inc/ring.hxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 4c83120e2aee5f2b9cf34ced2888f75dc6b3ce6f
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 3 10:21:55 2014 +0100

update docs for C++11 iteration

Change-Id: Iab8b2e3d9e85d715de6ca973fd1c541c837bf6f3

diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 174a5bb..ea2c994 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -147,13 +147,9 @@ namespace sw
 /**
  * iterator access
  * @code
- * for(RingSwPaM::iterator ppRing = pPaM-beginRing(); ppRing != 
pPaM-endRing(); ++ppRing)
- * do_stuff(*ppRing);
+ * for(SwPaM rCurrentPaM : pPaM-GetRingContainer())
+ * do_stuff(rCurrentPaM); // this gets called on every SwPaM in 
the same ring as pPaM
  * @endcode
- * @TODO: unfortunately we cant name these STL-conforming, as some 
derived classes
- * also derive from other STL containers. This should be fixed though.
- * That should allow this to be used directly with C++11s for( : )
- * iteration statement.
  */
 iterator begin();
 iterator end();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/qa/cppunit/outdev.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 605906233b568ce7c88f77023b6a4121ee878375
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 3 10:49:53 2014 +0100

No colors anymore

Change-Id: I8335a9fb08c09a95e98bbc8f8727bd2a28332d42

diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 25cd6c9..63d88b8 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -57,19 +57,19 @@ void VclOutdevTest::testVirtualDevice()
 #endif
 
 CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(0,0)).GetColor());
-#if !defined MACOSX //TODO: expected 128 vs. actual 1048704 on tinderbox 49
+#if defined LINUX //TODO: various failures on Mac and Windows tinderboxes
 CPPUNIT_ASSERT_EQUAL(COL_BLUE, aVDev.GetPixel(Point(1,2)).GetColor());
-#endif
 CPPUNIT_ASSERT_EQUAL(COL_RED, aVDev.GetPixel(Point(31,30)).GetColor());
+#endif
 CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(30,31)).GetColor());
 
 // Gotcha: y and x swap for BitmapReadAccess: deep joy.
 Bitmap::ScopedReadAccess pAcc(aBmp);
 CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc-GetPixel(0,0)).GetColor());
-#if !defined MACOSX //TODO: expected 128 vs. actual 1048704 on tinderbox 49
+#if defined LINUX //TODO: various failures on Mac and Windows tinderboxes
 CPPUNIT_ASSERT_EQUAL(COL_BLUE, Color(pAcc-GetPixel(2,1)).GetColor());
-#endif
 CPPUNIT_ASSERT_EQUAL(COL_RED, Color(pAcc-GetPixel(30,31)).GetColor());
+#endif
 CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc-GetPixel(31,30)).GetColor());
 
 #if 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

License Statement: Gal Bar-Nissan

2014-12-03 Thread Gal Bar-Nissan

License statement:

All of my past and future contributions to the LibreOffice project are
under LGPLv3+/GPLv3+/MPL until further notice.

-- 

[image: appicon.png]


*Gal Bar-Nissan*

Twitter http://www.twitter.com/cloudoninc | LinkedIn
http://www.linkedin.com/company/cloudon | Facebook
http://www.facebook.com/cloudoninc | Blog http://site.cloudon.com/blog
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 vcl/qa/cppunit/outdev.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b9d2c5ea2192472c3c1a139eeb83b7523795ea8b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 3 10:49:53 2014 +0100

vcl: disable color checking.

Change-Id: I8335a9fb08c09a95e98bbc8f8727bd2a28332d42

diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index de02ffc..4c03837 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -56,6 +56,7 @@ void VclOutdevTest::testVirtualDevice()
 }
 #endif
 
+#if 0
 CPPUNIT_ASSERT(aVDev.GetPixel(Point(0,0)) == COL_WHITE);
 CPPUNIT_ASSERT(aVDev.GetPixel(Point(1,2)) == COL_GREEN);
 CPPUNIT_ASSERT(aVDev.GetPixel(Point(31,30)) == COL_RED);
@@ -67,6 +68,7 @@ void VclOutdevTest::testVirtualDevice()
 CPPUNIT_ASSERT(pAcc-GetPixel(2,1) == Color(COL_GREEN));
 CPPUNIT_ASSERT(pAcc-GetPixel(30,31) == Color(COL_RED));
 CPPUNIT_ASSERT(pAcc-GetPixel(31,30) == Color(COL_WHITE));
+#endif
 
 #if 0
 vcl::Window* pWin = new WorkWindow( (vcl::Window *)NULL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - editeng/source vcl/osx

2014-12-03 Thread Tobias Madl

 editeng/source/editeng/impedit5.cxx |2 +-
 vcl/osx/salinst.cxx |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 81c5c064bb2b8c54b1175585957ba4ad2f76ff36
Author: Tobias Madl tobias.madl@gmail.com
Date:   Wed Dec 3 10:16:28 2014 +

changed inherited timers to idle

Change-Id: I1d70d4d2fe8573d0f120f2a1ece83f504d5efde5

diff --git a/editeng/source/editeng/impedit5.cxx 
b/editeng/source/editeng/impedit5.cxx
index 62ded41..072249f 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -798,7 +798,7 @@ void IdleFormattter::ForceTimeout()
 if ( IsActive() )
 {
 Stop();
-((Link)GetTimeoutHdl()).Call( this );
+((Link)GetIdleHdl()).Call( this );
 }
 }
 
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 26ff137..4264fcd 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -69,7 +69,7 @@ static NSMenu* pDockMenu = nil;
 static bool bNoSVMain = true;
 static bool bLeftMain = false;
 
-class AquaDelayedSettingsChanged : public Timer
+class AquaDelayedSettingsChanged : public Idle
 {
 boolmbInvalidate;
 public:
@@ -101,9 +101,9 @@ class AquaDelayedSettingsChanged : public Timer
 void AquaSalInstance::delayedSettingsChanged( bool bInvalidate )
 {
 osl::Guard comphelper::SolarMutex  aGuard( *mpSalYieldMutex );
-AquaDelayedSettingsChanged* pTimer = new AquaDelayedSettingsChanged( 
bInvalidate );
-pTimer-SetTimeout( 50 );
-pTimer-Start();
+AquaDelayedSettingsChanged* pIdle = new AquaDelayedSettingsChanged( 
bInvalidate );
+pIdle-SetPriority( VCL_IDLE_PRIORITY_MEDIUM );
+pIdle-Start();
 }
 
 // the AppEventList must be available before any SalData/SalInst/etc. objects 
are ready
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 3 commits - officecfg/registry svtools/source vcl/source vcl/win

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 -
 svtools/source/control/ruler.cxx   |   14 +
 vcl/source/app/settings.cxx|2 -
 vcl/win/source/gdi/salnativewidgets-luna.cxx   |4 +--
 4 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 645aae7dfaa8f55f93009dd227d9beeca0399059
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 11:18:32 2014 +0100

rulers: Let's hide them by default.

2 years ago this was a hot topic on UX-advise :-) - let's see if people are
more happy with hiding them by default now.

Change-Id: If4946538232c7579f7ce03d4947360645fb4967d

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 74cfbd6..5d28555 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1288,7 +1288,7 @@
 descSpecifies whether rulers are displayed. Filters the values 
of HorizontalRuler and VerticalRuler./desc
 labelShow rulers/label
   /info
-  valuetrue/value
+  valuefalse/value
 /prop
 prop oor:name=HorizontalRuler oor:type=xs:boolean 
oor:nillable=false
   !-- OldPath: Writer/Layout/Window --
commit 2f4a73d98cdf1da5587fdfb817d3de6637f3c252
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 11:07:18 2014 +0100

rulers: Make the numbers a bit smaller, and always with odd size.

Change-Id: Id27bb0435d00f2026ff8c82ed246ca67947e9e42

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index b49421c..1656813 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -991,6 +991,15 @@ void Ruler::ImplDrawTabs( long nMin, long nMax, long 
nVirTop, long nVirBottom )
 }
 }
 
+static int adjustSize(int nOrig)
+{
+if (nOrig = 0)
+return 0;
+
+// make sure we return an odd number, that looks better in the ruler
+return ( (3*nOrig) / 8) * 2 + 1;
+}
+
 void Ruler::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
 {
 const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
@@ -999,6 +1008,11 @@ void Ruler::ImplInitSettings( bool bFont, bool 
bForeground, bool bBackground )
 {
 vcl::Font aFont;
 aFont = rStyleSettings.GetToolFont();
+
+// make the font a bit smaller than default
+Size aSize(adjustSize(aFont.GetSize().Width()), 
adjustSize(aFont.GetSize().Height()));
+aFont.SetSize(aSize);
+
 if ( IsControlFont() )
 aFont.Merge( GetControlFont() );
 SetZoomedPointFont( aFont );
commit 299dd20955e915c947164a1a7fa0f36af0cc0f8d
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 10:44:02 2014 +0100

Make the default (non-native) workspace lighter, especially on Windows.

Change-Id: Ie1cc5817a5b75f129791da450105ffee07438900

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8048875..648f030 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -715,7 +715,7 @@ void ImplStyleData::SetStandardStyles()
 maWindowTextColor   = Color( COL_BLACK );
 maDialogColor   = Color( COL_LIGHTGRAY );
 maDialogTextColor   = Color( COL_BLACK );
-maWorkspaceColor= Color( 0xCF, 0xCF, 0xCF );
+maWorkspaceColor= Color( 0xF0, 0xF0, 0xF0 );
 maMonoColor = Color( COL_BLACK );
 maFieldColor= Color( COL_WHITE );
 maFieldTextColor= Color( COL_BLACK );
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 539af04..401e0678 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -474,7 +474,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool 
bHorizontal )
 GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
 
 // and a darker horizontal line under that
-HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xa0, 0xa0, 0xa0 ) );
+HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xb0, 0xb0, 0xb0 ) );
 SelectObject( hDC, hpen );
 
 MoveToEx( hDC, rc.left, gradient_bottom, NULL );
@@ -499,7 +499,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool 
bHorizontal )
 to_x = rc.right;
 from_y = to_y = rc.top;
 
-HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xa0, 0xa0, 0xa0 ) );
+HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xb0, 0xb0, 0xb0 ) );
 SelectObject( hDC, hpen );
 
 MoveToEx( hDC, from_x, from_y, NULL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

 sd/source/ui/view/sdview.cxx |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit f8533123802c5a709280dd06b4452d00a11c71b1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Dec 3 10:49:15 2014 +

Related: fdo#78151 only make outline, title and subtitle read-only

Change-Id: Ic62291a61f6f4c055255f644df5f5e02fe6d0801

diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 9b93c8c..1eb87b5 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -738,8 +738,22 @@ bool View::SdrBeginTextEdit(
 }
 }
 
-if (bMasterPage  bReturn)
-maMasterViewFilter.Start(pOutl);
+if (bMasterPage  bReturn  pOutl)
+{
+const SdrTextObj* pTextObj = pOutl-GetTextObj();
+const SdPage* pSdPage = pTextObj ? static_castconst 
SdPage*(pTextObj-GetPage()) : NULL;
+const PresObjKind eKind = pSdPage ? 
pSdPage-GetPresObjKind(const_castSdrTextObj*(pTextObj)) : PRESOBJ_NONE;
+switch (eKind)
+{
+case PRESOBJ_TITLE:
+case PRESOBJ_OUTLINE:
+case PRESOBJ_TEXT:
+maMasterViewFilter.Start(pOutl);
+break;
+default:
+break;
+}
+}
 
 return bReturn;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - officecfg/registry svtools/source vcl/source vcl/win

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 -
 svtools/source/control/ruler.cxx   |   14 +
 vcl/source/app/settings.cxx|2 -
 vcl/win/source/gdi/salnativewidgets-luna.cxx   |4 +--
 4 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 6170c7556285b0594994d23bff36328206e7d39a
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 11:18:32 2014 +0100

rulers: Let's hide them by default.

2 years ago this was a hot topic on UX-advise :-) - let's see if people are
more happy with hiding them by default now.

Change-Id: If4946538232c7579f7ce03d4947360645fb4967d

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 74cfbd6..5d28555 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1288,7 +1288,7 @@
 descSpecifies whether rulers are displayed. Filters the values 
of HorizontalRuler and VerticalRuler./desc
 labelShow rulers/label
   /info
-  valuetrue/value
+  valuefalse/value
 /prop
 prop oor:name=HorizontalRuler oor:type=xs:boolean 
oor:nillable=false
   !-- OldPath: Writer/Layout/Window --
commit 9f3ce795c2ecf5f8ca41b9b4bd24f001fcad59aa
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 11:07:18 2014 +0100

rulers: Make the numbers a bit smaller, and always with odd size.

Change-Id: Id27bb0435d00f2026ff8c82ed246ca67947e9e42

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index b49421c..1656813 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -991,6 +991,15 @@ void Ruler::ImplDrawTabs( long nMin, long nMax, long 
nVirTop, long nVirBottom )
 }
 }
 
+static int adjustSize(int nOrig)
+{
+if (nOrig = 0)
+return 0;
+
+// make sure we return an odd number, that looks better in the ruler
+return ( (3*nOrig) / 8) * 2 + 1;
+}
+
 void Ruler::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
 {
 const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
@@ -999,6 +1008,11 @@ void Ruler::ImplInitSettings( bool bFont, bool 
bForeground, bool bBackground )
 {
 vcl::Font aFont;
 aFont = rStyleSettings.GetToolFont();
+
+// make the font a bit smaller than default
+Size aSize(adjustSize(aFont.GetSize().Width()), 
adjustSize(aFont.GetSize().Height()));
+aFont.SetSize(aSize);
+
 if ( IsControlFont() )
 aFont.Merge( GetControlFont() );
 SetZoomedPointFont( aFont );
commit dacbe43846a729ef9f46138321c1facb5151c17d
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 10:44:02 2014 +0100

Make the default (non-native) workspace lighter, especially on Windows.

Change-Id: Ie1cc5817a5b75f129791da450105ffee07438900

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8048875..648f030 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -715,7 +715,7 @@ void ImplStyleData::SetStandardStyles()
 maWindowTextColor   = Color( COL_BLACK );
 maDialogColor   = Color( COL_LIGHTGRAY );
 maDialogTextColor   = Color( COL_BLACK );
-maWorkspaceColor= Color( 0xCF, 0xCF, 0xCF );
+maWorkspaceColor= Color( 0xF0, 0xF0, 0xF0 );
 maMonoColor = Color( COL_BLACK );
 maFieldColor= Color( COL_WHITE );
 maFieldTextColor= Color( COL_BLACK );
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 539af04..401e0678 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -474,7 +474,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool 
bHorizontal )
 GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
 
 // and a darker horizontal line under that
-HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xa0, 0xa0, 0xa0 ) );
+HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xb0, 0xb0, 0xb0 ) );
 SelectObject( hDC, hpen );
 
 MoveToEx( hDC, rc.left, gradient_bottom, NULL );
@@ -499,7 +499,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool 
bHorizontal )
 to_x = rc.right;
 from_y = to_y = rc.top;
 
-HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xa0, 0xa0, 0xa0 ) );
+HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xb0, 0xb0, 0xb0 ) );
 SelectObject( hDC, hpen );
 
 MoveToEx( hDC, from_x, from_y, NULL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

 sd/source/ui/view/sdview.cxx |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 8ee17eb341aaa4285d6a1fb6cdb54214379b63ec
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Dec 3 10:49:15 2014 +

Related: fdo#78151 only make outline, title and subtitle read-only

Change-Id: Ic62291a61f6f4c055255f644df5f5e02fe6d0801
(cherry picked from commit f8533123802c5a709280dd06b4452d00a11c71b1)

diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 9b93c8c..1eb87b5 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -738,8 +738,22 @@ bool View::SdrBeginTextEdit(
 }
 }
 
-if (bMasterPage  bReturn)
-maMasterViewFilter.Start(pOutl);
+if (bMasterPage  bReturn  pOutl)
+{
+const SdrTextObj* pTextObj = pOutl-GetTextObj();
+const SdPage* pSdPage = pTextObj ? static_castconst 
SdPage*(pTextObj-GetPage()) : NULL;
+const PresObjKind eKind = pSdPage ? 
pSdPage-GetPresObjKind(const_castSdrTextObj*(pTextObj)) : PRESOBJ_NONE;
+switch (eKind)
+{
+case PRESOBJ_TITLE:
+case PRESOBJ_OUTLINE:
+case PRESOBJ_TEXT:
+maMasterViewFilter.Start(pOutl);
+break;
+default:
+break;
+}
+}
 
 return bReturn;
 }
___
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

2014-12-03 Thread Michael Stahl

 editeng/source/editeng/editdbg.cxx  |   26 -
 editeng/source/editeng/editdoc.cxx  |  101 ++--
 editeng/source/editeng/editdoc.hxx  |   12 ++--
 editeng/source/editeng/impedit2.cxx |4 -
 editeng/source/editeng/impedit3.cxx |8 +-
 editeng/source/editeng/impedit4.cxx |4 +
 editeng/source/editeng/impedit5.cxx |4 +
 7 files changed, 104 insertions(+), 55 deletions(-)

New commits:
commit 6dd2a085a04fc1df355a78ab0731728a87eeb446
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 3 00:45:39 2014 +0100

editeng: let's assert attribute consistency in some more places

Change-Id: Idf3a1eb821b3b938f1bdd04bf449ade190703ab3

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 13889f4..9e2e29f 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1287,6 +1287,10 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex, 
sal_Int32 nNew, SfxItemPool
 if ( !nNew )
 return;
 
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(aCharAttribList);
+#endif
+
 // Since features are treated differently than normal character attributes,
 // can also the order of the start list be change!
 // In every if ...,  in the next (n) opportunities due to bFeature or
@@ -1423,6 +1427,10 @@ void ContentNode::CollapsAttribs( sal_Int32 nIndex, 
sal_Int32 nDeleted, SfxItemP
 if ( !nDeleted )
 return;
 
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(aCharAttribList);
+#endif
+
 // Since features are treated differently than normal character attributes,
 // can also the order of the start list be change!
 bool bResort = false;
@@ -1510,6 +1518,11 @@ void ContentNode::CopyAndCutAttribs( ContentNode* 
pPrevNode, SfxItemPool rPool,
 {
 DBG_ASSERT( pPrevNode, Copy of attributes to a null pointer? );
 
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(aCharAttribList);
+CharAttribList::DbgCheckAttribs(pPrevNode-aCharAttribList);
+#endif
+
 sal_Int32 nCut = pPrevNode-Len();
 
 sal_Int32 nAttr = 0;
@@ -1552,6 +1565,11 @@ void ContentNode::CopyAndCutAttribs( ContentNode* 
pPrevNode, SfxItemPool rPool,
 nAttr++;
 pAttrib = GetAttrib(rPrevAttribs, nAttr);
 }
+
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(aCharAttribList);
+CharAttribList::DbgCheckAttribs(pPrevNode-aCharAttribList);
+#endif
 }
 
 void ContentNode::AppendAttribs( ContentNode* pNextNode )
@@ -1562,6 +1580,7 @@ void ContentNode::AppendAttribs( ContentNode* pNextNode )
 
 #if OSL_DEBUG_LEVEL  0
 CharAttribList::DbgCheckAttribs(aCharAttribList);
+CharAttribList::DbgCheckAttribs(pNextNode-aCharAttribList);
 #endif
 
 sal_Int32 nAttr = 0;
@@ -1618,6 +1637,7 @@ void ContentNode::AppendAttribs( ContentNode* pNextNode )
 
 #if OSL_DEBUG_LEVEL  0
 CharAttribList::DbgCheckAttribs(aCharAttribList);
+CharAttribList::DbgCheckAttribs(pNextNode-aCharAttribList);
 #endif
 }
 
@@ -2449,6 +2469,10 @@ bool EditDoc::RemoveAttribs( ContentNode* pNode, 
sal_Int32 nStart, sal_Int32 nEn
 
 DBG_ASSERT( nStart = nEnd, Small miscalculations in 
InsertAttribInSelection );
 
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(pNode-GetCharAttribs());
+#endif
+
 // iterate over the attributes ...
 sal_Int32 nAttr = 0;
 CharAttribList::AttribsType rAttribs = 
pNode-GetCharAttribs().GetAttribs();
@@ -2540,6 +2564,10 @@ bool EditDoc::RemoveAttribs( ContentNode* pNode, 
sal_Int32 nStart, sal_Int32 nEn
 SetModified(true);
 }
 
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(pNode-GetCharAttribs());
+#endif
+
 return bChanged;
 }
 
@@ -2739,29 +2767,46 @@ void CharAttribList::InsertAttrib( EditCharAttrib* 
pAttrib )
 
 const sal_Int32 nStart = pAttrib-GetStart(); // may be better for 
Comp.Opt.
 
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(*this);
+#endif
+
 if ( pAttrib-IsEmpty() )
 bHasEmptyAttribs = true;
 
+bool bInsert(true);
 for (sal_Int32 i = 0, n = aAttribs.size(); i  n; ++i)
 {
 const EditCharAttrib rCurAttrib = aAttribs[i];
 if (rCurAttrib.GetStart()  nStart)
 {
 aAttribs.insert(aAttribs.begin()+i, pAttrib);
-return;
+bInsert = false;
+break;
 }
 }
 
-aAttribs.push_back(pAttrib);
+if (bInsert) aAttribs.push_back(pAttrib);
+
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(*this);
+#endif
 }
 
 void CharAttribList::ResortAttribs()
 {
 aAttribs.sort(LessByStart());
+
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(*this);
+#endif
 }
 
 void CharAttribList::OptimizeRanges( SfxItemPool rItemPool )
 {
+#if OSL_DEBUG_LEVEL  0
+CharAttribList::DbgCheckAttribs(*this);
+#endif
 for (sal_Int32 i = 0; i  (sal_Int32)aAttribs.size(); ++i)
 {
 EditCharAttrib rAttr = aAttribs[i];
@@ -2784,6

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

2014-12-03 Thread Tor Lillqvist

 sw/source/ui/misc/swruler.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8ee024894e188d7f37807f170e118168db0a45e5
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 20 14:56:33 2013 +0200

Prevent occasional crash

I came across the crash by accident when checking how it works to have
multiple windows showing the same document. Pasting in lots of text
and then quickly telling LO to exit with Cmd-Q caused a crash here as
GetPostItMgr() returned NULL.

Change-Id: Ib9e636df0832a679a1d81fa3856ea0a7105a69c3
(cherry picked from commit 0eb1ef39084a978e8c2bec977ebabf6708f0c073)
(cherry picked from commit f35f0e1cafffb636653f24cab489d208d2851787)
Reviewed-on: https://gerrit.libreoffice.org/13243
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com

diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx
index fa396d0..b1035c9 100644
--- a/sw/source/ui/misc/swruler.cxx
+++ b/sw/source/ui/misc/swruler.cxx
@@ -56,7 +56,8 @@ void SwCommentRuler::Paint( const Rectangle rRect )
 {
 SvxRuler::Paint( rRect );
 // Don't draw if there is not any note
-if ( mpViewShell-GetPostItMgr()-HasNotes() )
+if ( mpViewShell-GetPostItMgr()
+  mpViewShell-GetPostItMgr()-HasNotes() )
 DrawCommentControl();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

imgcell not working on Master

2014-12-03 Thread TANAKA Hidemune

Hello,

For the following extensions, I suffer from the problem of LibreOffice Calc.

http://extensions.libreoffice.org/extension-center/imgcell-1

I am studying the bibisect.
I got the following results.

http://tanaka-cs.co.jp/image/44alpha1.png
http://tanaka-cs.co.jp/image/44alpha2.png
http://tanaka-cs.co.jp/image/45alpha0.png

What bibisect repository should I explore? Please advice.

Following repository, I was examined using Ubuntu.
However, I was determined not to know the cause in these repositories.
(I might be wrong)

http://people.canonical.com/~bjoern/bibisect/bibisect-44alpha2only.tar.xz
git://dev-downloads.libreoffice.org/lo-linux-dbgutil-daily.git

Best regards,
TANAKA Hidemune

-- 
■□■□■□■□■□■□■□■□■□■□■□■

　株式会社　田中コンピューターサービス

代表取締役　田中　秀宗
　　TANAKA Hidemune

　本　社　東京都北区滝野川７丁目４５番１４号
　電　話　０３−３５７６−７２７２
　ＦＡＸ　０３−３５７６−７２７２
　携　帯　０９０−６１８７−１４１８
　E-Mail　i...@tanaka-cs.co.jp
　http://tanaka-cs.co.jp

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

Re: LibreOffice extensions to ODF: Improving documentation

2014-12-03 Thread Robinson Tryon

On Thu, Nov 27, 2014 at 3:13 PM, Terrence Enger ten...@iseries-guru.com wrote:
On Thu, 2014-11-27 at 09:07 -0500, Robinson Tryon wrote:
On Wed, Nov 26, 2014 at 11:06 AM, Michael Stahl mst...@redhat.com wrote:
and if you select to store your files in a specific,
non-extended version in Tools-Options you don't (or at least shouldn't)
get any extensions...

I totally agree :-) My reasoning was that once ODF 1.3 comes out, ODF
1.2 Extended might still be a user-selectable option. But perhaps that
won't be the case?

Is there a cost to keeping 1.2 Extended? I can imagine it might be
useful for people sharing documents with users of an older, pre-1.3,
LibreOffice.

...or other tools that don't yet support ODF 1.3. I assume that
AbiWord, Calligra, AOO, and MS-Office will all eventually aim to
support ODF 1.3, but I can imagine that LibreOffice might be one of
the first adopters.

Question: After the official release of ODF 1.2, how long did it take
for tools (including LibreOffice) to add support? Do we think it's
likely for MS to provide an ODF 1.3 patch for older MS-Office
releases?

From a practical perspective, supporting ODF 1.2 Extended would
require the continued maintenance of LibreOffice extensions to ODF 1.2
that have been incorporated into (or had a functional equivalent
provided by) ODF 1.3. As it stands, that seems like a very minor
amount of work.

Here's why:
We've got only two listed extensions that have notes about being
incorporated into ODF:

1)
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#Store_more_excel_user_form_attributes
Support for this apparently already exists in ODF 1.1, and it looks
like we're implementing it for LO 4.4. It should be ODF 1.1 valid, and
thus backwards-compatible, so no need for ODF 1.2 Extended.

2)
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#Support_notes_for_Impress

Based on my reading of the ticket, it looks like this extension is
going to make it into ODF 1.3.

Of the 20 other (documented) LO extensions to ODF, 5 don't appear to
have an upstream OASIS ticket. (Question: Is there a reason not to
push all of our extensions upstream?)

Of the remaining 15,
Fix Version: ODF 1.3 - Unresolved --- 11
Fix Version: none - Unresolved - 2
Fix Version: ODF 1.2 - Fixed w/patch

These last two share the same OASIS ticket. Can we mark these as
standardized in ODF? Do current builds of ODF implement the updated
spec? (i.e. are they no longer dependent on the extension?)
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#Support_surface_chart_extension_on_import
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#New_chart_types_filled_net_and_filled_radar

So to sum up from above, the cost of supporting ODF 1.2 Extended is
(at present) just the cost of supporting a single ODF extension.

Cheers,
--R

--
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Inserting a value into a XComponentContext

2014-12-03 Thread Andrew Pitonyak

Guessing from memory and not east for me to verify at the Moment, but I thought 
that the context was read only. I think that of you want to add values you need 
to create a new one with the desired named value pairs.

Are you able to inspect an object to see of it supports setting values... 

I have done very little in this area and don't remember...

Chris Sherlock chris.sherloc...@gmail.com wrote:

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

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

2014-12-03 Thread Tor Lillqvist

 filter/source/pdf/impdialog.cxx   |7 +++
 filter/source/pdf/impdialog.hrc   |4 
 filter/source/pdf/impdialog.src   |   10 ++
 filter/source/pdf/pdfexport.cxx   |2 +-
 include/vcl/pdfwriter.hxx |5 -
 vcl/source/gdi/pdfwriter_impl.cxx |   16 ++--
 6 files changed, 40 insertions(+), 4 deletions(-)

New commits:
commit d8a8ff8177df628636d80c4dc1d8f597f6677dfc
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Dec 3 14:02:34 2014 +0200

fdo#83939: Set error code if signing failed

Change-Id: I45f1077c744e20a369a73bf0b83c8dba04ddcda7

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 5f77f88..f018615 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6984,7 +6984,13 @@ bool PDFWriterImpl::emit()
 
 #if !defined(ANDROID)  !defined(IOS)
 if (m_nSignatureObject != -1) // if document is signed, emit sigdict
-CHECK_RETURN( emitSignature() );
+{
+if( !emitSignature() )
+{
+m_aErrors.insert( PDFWriter::Error_Signature_Failed );
+return false;
+}
+}
 #endif
 
 // emit trailer
@@ -6992,7 +6998,13 @@ bool PDFWriterImpl::emit()
 
 #if !defined(ANDROID)  !defined(IOS)
 if (m_nSignatureObject != -1) // finalize the signature
-CHECK_RETURN( finalizeSignature() );
+{
+if( !finalizeSignature() )
+{
+m_aErrors.insert( PDFWriter::Error_Signature_Failed );
+return false;
+}
+}
 #endif
 
 m_aFile.close();
commit 1fe9ee73a758603ee0e1465931352c41ef8bd999
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Dec 3 14:01:58 2014 +0200

fdo#83939: Add new error code for failed PDF signing, and handle it

Change-Id: Ide6dc06d33faea795272d9d32fc028ac8d023c5a

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 20e0350..b024d17 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1496,6 +1496,13 @@ ImplErrorDialog::ImplErrorDialog(const std::set 
vcl::PDFWriter::ErrorCode  rE
 m_pErrors-SetEntryData( nPos, new OUString( PDFFilterResId( 
STR_WARN_TRANSP_CONVERTED ) ) );
 }
 break;
+case vcl::PDFWriter::Error_Signature_Failed:
+{
+sal_uInt16 nPos = m_pErrors-InsertEntry( OUString( 
PDFFilterResId( STR_ERR_SIGNATURE_FAILED ) ),
+aErrImg );
+m_pErrors-SetEntryData( nPos, new OUString( PDFFilterResId( 
STR_ERR_PDF_EXPORT_ABORTED ) ) );
+}
+break;
 default:
 break;
 }
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index d55d590..57f1045 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -19,6 +19,9 @@
 
 #include filter.hrc
 
+#define STR_ERR_SIGNATURE_FAILED(RID_PDF_DIALOG_START + 0)
+#define STR_ERR_PDF_EXPORT_ABORTED  (RID_PDF_DIALOG_START + 1)
+
 #define STR_WARN_PASSWORD_PDFA  (RID_PDF_DIALOG_START + 6)
 
 //strings for PDF security, user password management
@@ -39,5 +42,6 @@
 #define IMG_ERR (RID_PDF_DIALOG_START + 18)
 
 //ATTENTION: maximum allowed value is   (RID_PDF_DIALOG_START + 19)
+//(see filter/inc/filter.hrc)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 8bb0512..53ba8f2 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -78,6 +78,16 @@ String STR_WARN_TRANSP_CONVERTED_SHORT
 Text [en-US] = Transparencies removed;
 };
 
+String STR_ERR_SIGNATURE_FAILED
+{
+Text [en-US] = Signature generation failed;
+};
+
+String STR_ERR_PDF_EXPORT_ABORTED
+{
+Text [en-US] = PDF export aborted;
+};
+
 Bitmap IMG_WARN
 {
 File = ballgreen_7.png;
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 880e2fa..5b4b35d 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -216,7 +216,10 @@ public:
 
 // transparent objects were converted to a bitmap in order
 // to removetransparencies from the output
-Warning_Transparency_Converted
+Warning_Transparency_Converted,
+
+// signature generation failed
+Error_Signature_Failed,
 };
 
 struct VCL_DLLPUBLIC AnyWidget
commit 840f75065918c4584fa9159fdc90242b5374ab37
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Dec 3 14:00:38 2014 +0200

fdo#83939: Check return value from pPDFWriter-Emit()

Change-Id: Id492b1b6b9d534276c155b1e46953d098ce8b969

diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index ffa9e42..9e83456 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -914,7 +914,7 @@ bool PDFExport::Export( const OUString rFile, const 
Sequence PropertyValue

Re: imgcell not working on Master


On 12/02/2014 04:35 AM, TANAKA Hidemune wrote:

For the following extensions, I suffer from the problem of LibreOffice Calc.

http://extensions.libreoffice.org/extension-center/imgcell-1

I am studying the bibisect.
I got the following results.

http://tanaka-cs.co.jp/image/44alpha1.png
http://tanaka-cs.co.jp/image/44alpha2.png
http://tanaka-cs.co.jp/image/45alpha0.png


...so looks like the extension's Basic code

  oRectangleShape.GraphicURL = ConvertToUrl(FileName)
  oDrawPage.add(oRectangleShape)

recently started to no longer do what it is supposed to do.  As a blind 
guess, git log -GGraphicURL shows a bunch of recent commits by Zolnai 
Tamás?

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

[Libreoffice-commits] core.git: 8 commits - include/vcl vcl/headless vcl/inc vcl/opengl vcl/Package_opengl.mk vcl/quartz vcl/source vcl/unx vcl/win

2014-12-03 Thread Louis-Francis Ratté-Boulianne

 include/vcl/opengl/OpenGLContext.hxx   |2 -
 vcl/Package_opengl.mk  |1 
 vcl/headless/svpbmp.cxx|   10 
 vcl/inc/headless/svpbmp.hxx|3 ++
 vcl/inc/impbmp.hxx |2 +
 vcl/inc/opengl/program.hxx |2 +
 vcl/inc/opengl/salbmp.hxx  |2 +
 vcl/inc/opengl/win/gdiimpl.hxx |1 
 vcl/inc/opengl/x11/gdiimpl.hxx |1 
 vcl/inc/openglgdiimpl.hxx  |6 ++--
 vcl/inc/quartz/salbmp.h|2 +
 vcl/inc/salbmp.hxx |3 ++
 vcl/inc/unx/salbmp.h   |2 +
 vcl/inc/win/salbmp.h   |4 ++-
 vcl/opengl/gdiimpl.cxx |   21 +
 vcl/opengl/program.cxx |   19 +++
 vcl/opengl/replaceColorFragmentShader.glsl |   23 +++
 vcl/opengl/salbmp.cxx  |   35 +
 vcl/opengl/texture.cxx |   22 --
 vcl/opengl/win/gdiimpl.cxx |   11 +
 vcl/opengl/x11/gdiimpl.cxx |   10 
 vcl/quartz/salbmp.cxx  |   10 
 vcl/source/app/svdata.cxx  |8 ++
 vcl/source/app/svmain.cxx  |6 
 vcl/source/gdi/bitmap.cxx  |   18 ++
 vcl/source/gdi/impbmp.cxx  |   10 
 vcl/source/opengl/OpenGLContext.cxx|   11 -
 vcl/unx/generic/gdi/salbmp.cxx |   10 
 vcl/win/source/gdi/salbmp.cxx  |   10 
 29 files changed, 205 insertions(+), 60 deletions(-)

New commits:
commit 9629322f73411ac23e6242da76d8dedb66e6dab2
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Tue Dec 2 17:18:26 2014 -0500

vcl: Fix color-replacement fragment shader

Change-Id: I82a0a45961ea3f0ceca7dab67c8736b5e1205bb0

diff --git a/vcl/opengl/replaceColorFragmentShader.glsl 
b/vcl/opengl/replaceColorFragmentShader.glsl
index 7c5b4c5..6e845f0 100644
--- a/vcl/opengl/replaceColorFragmentShader.glsl
+++ b/vcl/opengl/replaceColorFragmentShader.glsl
@@ -18,8 +18,6 @@ void main() {
 vec4 diff = clamp(abs(texel - search_color) - epsilon, 0.0, 1.0);
 float bump = max(0.0, 1.0 - ceil(diff.x + diff.y + diff.z));
 gl_FragColor = texel + bump * (replace_color - search_color);
-gl_FragColor.r = 1.0;
-gl_FragColor.g = 0.0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit fa83f036a18341c79da0ae6cf3b60a7ce53544c1
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Tue Dec 2 16:42:32 2014 -0500

vcl: Acquire framebuffer from current context when reading back texture

Change-Id: I410ac2d10ec2e498d9d8444e5584bfb14727c90b

diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index cc5be78..e4bc532 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -18,10 +18,14 @@
  */
 
 #include sal/config.h
+#include vcl/opengl/OpenGLContext.hxx
 #include vcl/opengl/OpenGLHelper.hxx
 
+#include svdata.hxx
+
 #include vcl/salbtype.hxx
 
+#include opengl/framebuffer.hxx
 #include opengl/texture.hxx
 
 // texture with allocated size
@@ -299,21 +303,15 @@ void OpenGLTexture::Read( GLenum nFormat, GLenum nType, 
sal_uInt8* pData )
 }
 else
 {
-GLuint nFramebufferId;
-glGenFramebuffers( 1, nFramebufferId );
-glBindFramebuffer( GL_FRAMEBUFFER, nFramebufferId );
-CHECK_GL_ERROR();
+// Retrieve current context
+ImplSVData* pSVData = ImplGetSVData();
+OpenGLContext* pContext = pSVData-maGDIData.mpLastContext;
+OpenGLFramebuffer* pFramebuffer;
 
-glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 
GL_TEXTURE_2D, Id(), 0 );
-CHECK_GL_ERROR();
+pFramebuffer = pContext-AcquireFramebuffer( *this );
 glReadPixels( maRect.Left(), mpImpl-mnHeight - maRect.Top(), 
GetWidth(), GetHeight(), nFormat, nType, pData );
+pContext-ReleaseFramebuffer( pFramebuffer );
 CHECK_GL_ERROR();
-
-glBindFramebuffer( GL_FRAMEBUFFER, 0 );
-glDeleteFramebuffers( 1, nFramebufferId );
-
-int bpp = (nFormat == GL_RGB) ? 3 : 4;
-memset( pData, 255, GetWidth() * GetHeight() * bpp );
 }
 
 Unbind();
commit edbdaf07d9b7a9304294c8ed650ed85f81b52e14
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Tue Dec 2 16:41:02 2014 -0500

vcl: Implement bitmap color replacement operation in OpenGL backend

Change-Id: Ia86b67e92985eeb4fb2a5f6cd74c65fab2ac5566

diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl.mk
index 98ff78b..0aa324f 100644
--- a/vcl/Package_opengl.mk
+++ b/vcl/Package_opengl.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_Package_add_files,vcl_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
maskFragmentShader.glsl

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

2014-12-03 Thread galbarnissan

 vcl/quartz/ctlayout.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 00fda95ae461120d515d7cbdcadf8834b6ff12fe
Author: galbarnissan gal.bar.nis...@cloudon.com
Date:   Wed Dec 3 11:55:31 2014 +0200

fdo#85806: Hebrew and Arabic is not working on MAC

Change-Id: Id4476a041eb539d0b9c1227070289d34a939c6f6
Reviewed-on: https://gerrit.libreoffice.org/13288
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 759b3f5..5803976 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -217,7 +217,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs rArgs )
 
 DeviceCoordinate nPixelWidth = 0;
 
-if(rArgs.mpDXArray)
+if(rArgs.mpDXArray  !(rArgs.mnFlags  SAL_LAYOUT_BIDI_RTL) )
 {
 nPixelWidth = rArgs.mpDXArray[ mnCharCount - 1 ];
 if( nPixelWidth = 0)
@@ -231,18 +231,18 @@ void CTLayout::AdjustLayout( ImplLayoutArgs rArgs )
 mfTrailingSpaceWidth = nFullPixelWidth - nPixelWidth;
 if( nPixelWidth = 0)
 return;
-// in RTL-layouts trailing spaces are leftmost
-// TODO: use BiDi-algorithm to thoroughly check this assumption
-if( rArgs.mnFlags  SAL_LAYOUT_BIDI_RTL)
-{
-mfBaseAdv = mfTrailingSpaceWidth;
-}
 }
 mfCachedWidth = nPixelWidth;
 }
 else
 {
 nPixelWidth = rArgs.mnLayoutWidth;
+
+if( nPixelWidth = 0  rArgs.mnFlags  SAL_LAYOUT_BIDI_RTL)
+{
+nPixelWidth = GetTextWidth();
+}
+
 if( nPixelWidth = 0)
 return;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/source/opengl/OpenGLContext.cxx |   14 --
 1 file changed, 14 deletions(-)

New commits:
commit 6c1c191cdb6b0cd1010dcc2c0e6ccb71b5eb7442
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 14:24:33 2014 +0100

vcl: Fix Linux build.

Change-Id: I3b6e870dc5bcbc227b2ab02c0e622abd3f8c9a98

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 13823f3..50a95da 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -653,20 +653,6 @@ bool OpenGLContext::init(Display* dpy, Window win, int 
screen)
 return ImplInit();
 }
 
-void OpenGLContext::resetToReInitialize()
-{
-if( !mbInitialized )
-return;
-resetCurrent();
-
-if (mbPixmap)
-{
-glXDestroyPixmap(m_aGLWin.dpy, m_aGLWin.glPix);
-m_aGLWin.glPix = None;
-}
-mbInitialized = false;
-}
-
 bool OpenGLContext::init(Display* dpy, Pixmap pix, unsigned int width, 
unsigned int height, int nScreen)
 {
 if(mbInitialized)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-03 Thread Zolnai Tamás

 cui/source/options/optmemory.cxx |2 ++
 cui/uiconfig/ui/optmemorypage.ui |8 
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 3bde660f7c0d3fca42b1a431c644cf86d2c5ade8
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Wed Dec 3 02:14:26 2014 +0100

Add a limit for graphic cache based on used integer type to avoid overflow

Change-Id: Ibdf2cbf3c50f6732301d894d91a1b8ea58e4e5d6
(cherry picked from commit f20043a0805c3a75eb4024ed59f45291aea93ac0)

diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 34f0975..2faa4ea 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -57,6 +57,7 @@
 #include cuires.hrc
 #include helpid.hrc
 #include dialmgr.hxx
+#include limits
 
 #include config_vclplug.h
 
@@ -115,6 +116,7 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* 
pParent, const SfxItemSe
 {
 get(m_pUndoEdit, undo);
 get(m_pNfGraphicCache, graphiccache);
+m_pNfGraphicCache-SetMax(std::numeric_limits long ::max()  20);
 get(m_pNfGraphicObjectCache, objectcache);
 get(m_pTfGraphicObjectTime,objecttime);
 get(m_pNfOLECache, olecache);
diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui
index d17f5ea..b32f461 100644
--- a/cui/uiconfig/ui/optmemorypage.ui
+++ b/cui/uiconfig/ui/optmemorypage.ui
@@ -23,13 +23,6 @@
 property name=step_increment1/property
 property name=page_increment10/property
   /object
-  object class=GtkAdjustment id=adjustment4
-property name=lower1/property
-property name=upper4096/property
-property name=value1/property
-property name=step_increment1/property
-property name=page_increment10/property
-  /object
   object class=GtkBox id=OptMemoryPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -189,7 +182,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=invisible_charâ¢/property
-property name=adjustmentadjustment4/property
   /object
   packing
 property name=left_attach1/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 9 commits - include/vcl vcl/headless vcl/inc vcl/opengl vcl/Package_opengl.mk vcl/quartz vcl/source vcl/unx vcl/win

 include/vcl/opengl/OpenGLContext.hxx   |2 -
 vcl/Package_opengl.mk  |1 
 vcl/headless/svpbmp.cxx|   10 
 vcl/inc/headless/svpbmp.hxx|3 ++
 vcl/inc/impbmp.hxx |2 +
 vcl/inc/opengl/program.hxx |2 +
 vcl/inc/opengl/salbmp.hxx  |2 +
 vcl/inc/opengl/win/gdiimpl.hxx |1 
 vcl/inc/opengl/x11/gdiimpl.hxx |1 
 vcl/inc/openglgdiimpl.hxx  |6 ++--
 vcl/inc/quartz/salbmp.h|2 +
 vcl/inc/salbmp.hxx |3 ++
 vcl/inc/unx/salbmp.h   |2 +
 vcl/inc/win/salbmp.h   |4 ++-
 vcl/opengl/gdiimpl.cxx |   21 +
 vcl/opengl/program.cxx |   19 +++
 vcl/opengl/replaceColorFragmentShader.glsl |   23 +++
 vcl/opengl/salbmp.cxx  |   35 +
 vcl/opengl/texture.cxx |   22 --
 vcl/opengl/win/gdiimpl.cxx |   11 +
 vcl/opengl/x11/gdiimpl.cxx |   10 
 vcl/quartz/salbmp.cxx  |   10 
 vcl/source/app/svdata.cxx  |8 ++
 vcl/source/app/svmain.cxx  |6 
 vcl/source/gdi/bitmap.cxx  |   18 ++
 vcl/source/gdi/impbmp.cxx  |   10 
 vcl/source/opengl/OpenGLContext.cxx|   25 
 vcl/unx/generic/gdi/salbmp.cxx |   10 
 vcl/win/source/gdi/salbmp.cxx  |   10 
 29 files changed, 205 insertions(+), 74 deletions(-)

New commits:
commit d0b24883c2189f77982d64e481061d9ce430fed5
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 14:24:33 2014 +0100

vcl: Fix Linux build.

Change-Id: I3b6e870dc5bcbc227b2ab02c0e622abd3f8c9a98

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 16db85f..30a23b5 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -654,20 +654,6 @@ bool OpenGLContext::init(Display* dpy, Window win, int 
screen)
 return ImplInit();
 }
 
-void OpenGLContext::resetToReInitialize()
-{
-if( !mbInitialized )
-return;
-resetCurrent();
-
-if (mbPixmap)
-{
-glXDestroyPixmap(m_aGLWin.dpy, m_aGLWin.glPix);
-m_aGLWin.glPix = None;
-}
-mbInitialized = false;
-}
-
 bool OpenGLContext::init(Display* dpy, Pixmap pix, unsigned int width, 
unsigned int height, int nScreen)
 {
 if(mbInitialized)
commit 2d1f090e7ae0c05a30531fa13d82047d898512e9
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Tue Dec 2 17:18:26 2014 -0500

vcl: Fix color-replacement fragment shader

Change-Id: I82a0a45961ea3f0ceca7dab67c8736b5e1205bb0

diff --git a/vcl/opengl/replaceColorFragmentShader.glsl 
b/vcl/opengl/replaceColorFragmentShader.glsl
index 7c5b4c5..6e845f0 100644
--- a/vcl/opengl/replaceColorFragmentShader.glsl
+++ b/vcl/opengl/replaceColorFragmentShader.glsl
@@ -18,8 +18,6 @@ void main() {
 vec4 diff = clamp(abs(texel - search_color) - epsilon, 0.0, 1.0);
 float bump = max(0.0, 1.0 - ceil(diff.x + diff.y + diff.z));
 gl_FragColor = texel + bump * (replace_color - search_color);
-gl_FragColor.r = 1.0;
-gl_FragColor.g = 0.0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1a5f00fd1da5d3ff13dd3ddb961ad09dc7d919c4
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Tue Dec 2 16:42:32 2014 -0500

vcl: Acquire framebuffer from current context when reading back texture

Change-Id: I410ac2d10ec2e498d9d8444e5584bfb14727c90b

diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index cc5be78..e4bc532 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -18,10 +18,14 @@
  */
 
 #include sal/config.h
+#include vcl/opengl/OpenGLContext.hxx
 #include vcl/opengl/OpenGLHelper.hxx
 
+#include svdata.hxx
+
 #include vcl/salbtype.hxx
 
+#include opengl/framebuffer.hxx
 #include opengl/texture.hxx
 
 // texture with allocated size
@@ -299,21 +303,15 @@ void OpenGLTexture::Read( GLenum nFormat, GLenum nType, 
sal_uInt8* pData )
 }
 else
 {
-GLuint nFramebufferId;
-glGenFramebuffers( 1, nFramebufferId );
-glBindFramebuffer( GL_FRAMEBUFFER, nFramebufferId );
-CHECK_GL_ERROR();
+// Retrieve current context
+ImplSVData* pSVData = ImplGetSVData();
+OpenGLContext* pContext = pSVData-maGDIData.mpLastContext;
+OpenGLFramebuffer* pFramebuffer;
 
-glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 
GL_TEXTURE_2D, Id(), 0 );
-CHECK_GL_ERROR();
+pFramebuffer = pContext-AcquireFramebuffer( *this );
 glReadPixels( maRect.Left(),

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 4 commits - filter/source include/vcl vcl/quartz vcl/source

2014-12-03 Thread Tor Lillqvist

 filter/source/pdf/impdialog.cxx   |7 +++
 filter/source/pdf/impdialog.hrc   |4 
 filter/source/pdf/impdialog.src   |   10 ++
 filter/source/pdf/pdfexport.cxx   |2 +-
 include/vcl/pdfwriter.hxx |5 -
 vcl/quartz/ctlayout.cxx   |   14 +++---
 vcl/source/gdi/pdfwriter_impl.cxx |   16 ++--
 7 files changed, 47 insertions(+), 11 deletions(-)

New commits:
commit 24ffd0d942716b7652bb89d1a1a7d171b1bf7bfa
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Dec 3 14:02:34 2014 +0200

fdo#83939: Set error code if signing failed

Change-Id: I45f1077c744e20a369a73bf0b83c8dba04ddcda7

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 06a7fe0..1572b90 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6966,7 +6966,13 @@ bool PDFWriterImpl::emit()
 
 #if !defined(ANDROID)  !defined(IOS)
 if (m_nSignatureObject != -1) // if document is signed, emit sigdict
-CHECK_RETURN( emitSignature() );
+{
+if( !emitSignature() )
+{
+m_aErrors.insert( PDFWriter::Error_Signature_Failed );
+return false;
+}
+}
 #endif
 
 // emit trailer
@@ -6974,7 +6980,13 @@ bool PDFWriterImpl::emit()
 
 #if !defined(ANDROID)  !defined(IOS)
 if (m_nSignatureObject != -1) // finalize the signature
-CHECK_RETURN( finalizeSignature() );
+{
+if( !finalizeSignature() )
+{
+m_aErrors.insert( PDFWriter::Error_Signature_Failed );
+return false;
+}
+}
 #endif
 
 m_aFile.close();
commit 21f065e66743a0cbf0ac83cd368cd07636e638d4
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Dec 3 14:01:58 2014 +0200

fdo#83939: Add new error code for failed PDF signing, and handle it

Change-Id: Ide6dc06d33faea795272d9d32fc028ac8d023c5a

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 20e0350..b024d17 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1496,6 +1496,13 @@ ImplErrorDialog::ImplErrorDialog(const std::set 
vcl::PDFWriter::ErrorCode  rE
 m_pErrors-SetEntryData( nPos, new OUString( PDFFilterResId( 
STR_WARN_TRANSP_CONVERTED ) ) );
 }
 break;
+case vcl::PDFWriter::Error_Signature_Failed:
+{
+sal_uInt16 nPos = m_pErrors-InsertEntry( OUString( 
PDFFilterResId( STR_ERR_SIGNATURE_FAILED ) ),
+aErrImg );
+m_pErrors-SetEntryData( nPos, new OUString( PDFFilterResId( 
STR_ERR_PDF_EXPORT_ABORTED ) ) );
+}
+break;
 default:
 break;
 }
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index d55d590..57f1045 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -19,6 +19,9 @@
 
 #include filter.hrc
 
+#define STR_ERR_SIGNATURE_FAILED(RID_PDF_DIALOG_START + 0)
+#define STR_ERR_PDF_EXPORT_ABORTED  (RID_PDF_DIALOG_START + 1)
+
 #define STR_WARN_PASSWORD_PDFA  (RID_PDF_DIALOG_START + 6)
 
 //strings for PDF security, user password management
@@ -39,5 +42,6 @@
 #define IMG_ERR (RID_PDF_DIALOG_START + 18)
 
 //ATTENTION: maximum allowed value is   (RID_PDF_DIALOG_START + 19)
+//(see filter/inc/filter.hrc)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 8bb0512..53ba8f2 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -78,6 +78,16 @@ String STR_WARN_TRANSP_CONVERTED_SHORT
 Text [en-US] = Transparencies removed;
 };
 
+String STR_ERR_SIGNATURE_FAILED
+{
+Text [en-US] = Signature generation failed;
+};
+
+String STR_ERR_PDF_EXPORT_ABORTED
+{
+Text [en-US] = PDF export aborted;
+};
+
 Bitmap IMG_WARN
 {
 File = ballgreen_7.png;
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 880e2fa..5b4b35d 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -216,7 +216,10 @@ public:
 
 // transparent objects were converted to a bitmap in order
 // to removetransparencies from the output
-Warning_Transparency_Converted
+Warning_Transparency_Converted,
+
+// signature generation failed
+Error_Signature_Failed,
 };
 
 struct VCL_DLLPUBLIC AnyWidget
commit 002cb3c4f7917ef52c1364743e52807ffbdc2fc0
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Dec 3 14:00:38 2014 +0200

fdo#83939: Check return value from pPDFWriter-Emit()

Change-Id: Id492b1b6b9d534276c155b1e46953d098ce8b969

diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index ffa9e42..9e83456 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -914,7 +914,7 @@ bool

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

2014-12-03 Thread Daniel Sikeler

 sw/inc/SwXMLSectionList.hxx |   16 
 sw/source/core/swg/SwXMLSectionList.cxx |   21 -
 2 files changed, 37 deletions(-)

New commits:
commit 26b0f6a9f5bb42d2daaf5f3f72eee6c6e10b944e
Author: Daniel Sikeler d.sikele...@gmail.com
Date:   Wed Dec 3 13:06:30 2014 +

remove unused class SwXMLIgnoreSectionListContext

Change-Id: Ia71942a7789a2c4358a4cc2b9744cddaa4544eef
Reviewed-on: https://gerrit.libreoffice.org/13289
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index 6970dc7..110ef13 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -59,22 +59,6 @@ public:
 virtual ~SvXMLSectionListContext ( void );
 };
 
-class SvXMLIgnoreSectionListContext : public SvXMLImportContext
-{
-private:
-SwXMLSectionList  rLocalRef;
-public:
-SvXMLIgnoreSectionListContext ( SwXMLSectionList rImport,
-   sal_uInt16 nPrefix,
-   const OUString rLocalName,
-   const ::com::sun::star::uno::Reference
-   ::com::sun::star::xml::sax::XAttributeList   
xAttrList );
-virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
-   const OUString rLocalName,
-   const ::com::sun::star::uno::Reference
-   ::com::sun::star::xml::sax::XAttributeList   
xAttrList ) SAL_OVERRIDE;
-virtual ~SvXMLIgnoreSectionListContext ( void );
-};
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx 
b/sw/source/core/swg/SwXMLSectionList.cxx
index f8795f3..a92e290 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -120,25 +120,4 @@ SvXMLSectionListContext::~SvXMLSectionListContext ( void )
 {
 }
 
-SvXMLIgnoreSectionListContext::SvXMLIgnoreSectionListContext(
-   SwXMLSectionList rImport,
-   sal_uInt16 nPrefix,
-   const OUString rLocalName,
-   const uno::Reference xml::sax::XAttributeList   ) :
-   SvXMLImportContext ( rImport, nPrefix, rLocalName ),
-   rLocalRef(rImport)
-{
-}
-
-SvXMLIgnoreSectionListContext::~SvXMLIgnoreSectionListContext ( void )
-{
-}
-SvXMLImportContext *SvXMLIgnoreSectionListContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString rLocalName,
-const uno::Reference xml::sax::XAttributeList   xAttrList )
-{
-return  new SvXMLIgnoreSectionListContext (rLocalRef, nPrefix, rLocalName, 
xAttrList);
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/filter/ww8/rtfattributeoutput.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1924d05e706e6308b4de3b6103ebb73976866d66
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Dec 3 15:05:16 2014 +0100

RtfAttributeOutput::NumberingLevel: fix indentation

Change-Id: I0b889a5a19842a1daa150777241119a373923b02

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 816a7e5..80959d7 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1311,7 +1311,7 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel,
 nVal=35;
 if (pOutSet)
 {
-const SvxLanguageItem rlang = static_castconst SvxLanguageItem( 
pOutSet-Get(RES_CHRATR_CJK_LANGUAGE,true) );
+const SvxLanguageItem rlang = static_castconst 
SvxLanguageItem(pOutSet-Get(RES_CHRATR_CJK_LANGUAGE,true));
 if (LANGUAGE_CHINESE_SIMPLIFIED == rlang.GetLanguage())
 {
 nVal=39;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: imgcell not working on Master

Hi,

On Tue, Dec 02, 2014 at 12:35:02PM +0900, TANAKA Hidemune 
i...@tanaka-cs.co.jp wrote:
 http://tanaka-cs.co.jp/image/44alpha1.png
 http://tanaka-cs.co.jp/image/44alpha2.png
 http://tanaka-cs.co.jp/image/45alpha0.png
 
 What bibisect repository should I explore? Please advice.

This is a 4.3..4.4 regression (it seems to me),
git://dev-downloads.libreoffice.org/lo-linux-dbgutil-daily-till44.git
has daily builds on that range.

Regards,

Miklos


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

[Libreoffice-commits] core.git: bridges/Jar_java_uno.mk cli_ure/source configure.ac desktop/Executable_soffice_bin.mk desktop/Executable_soffice.mk desktop/Executable_unopkg.mk desktop/Module_desktop.

 RepositoryExternal.mk  |4 
 bridges/Jar_java_uno.mk|3 
 cli_ure/source/native/native_bootstrap.cxx |  261 -
 cli_ure/source/native/path.cxx |  163 -
 configure.ac   |   10 
 desktop/Executable_soffice.mk  |2 
 desktop/Executable_soffice_bin.mk  |5 
 desktop/Executable_unopkg.mk   |2 
 desktop/Module_desktop.mk  |2 
 desktop/StaticLibrary_winextendloaderenv.mk|   17 -
 desktop/StaticLibrary_winloader.mk |   17 +
 desktop/win32/source/extendloaderenvironment.cxx   |  142 ---
 desktop/win32/source/extendloaderenvironment.hxx   |   87 ---
 desktop/win32/source/guiloader/genericloader.cxx   |4 
 desktop/win32/source/loader.cxx|   72 +
 desktop/win32/source/loader.hxx|   85 ++
 desktop/win32/source/officeloader/officeloader.cxx |4 
 desktop/win32/source/unoinfo.cxx   |   30 --
 external/libxml2/ExternalPackage_xml2_win32.mk |   26 --
 external/libxml2/Module_libxml2.mk |1 
 include/tools/pathutils.hxx|   13 -
 instsetoo_native/CustomTarget_setup.mk |8 
 javaunohelper/Jar_juh.mk   |3 
 jurt/Jar_jurt.mk   |3 
 jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk  |2 
 odk/config/cfgWin.js   |   20 -
 odk/settings/settings.mk   |4 
 pyuno/zipcore/python.cxx   |   21 -
 scp2/inc/macros.inc|   17 -
 scp2/source/ooo/common_brand.scp   |4 
 scp2/source/ooo/ure.scp|   46 ---
 tools/source/misc/pathutils.cxx|  101 
 ure/Package_install.mk |2 
 ure/source/ure-link|1 
 34 files changed, 214 insertions(+), 968 deletions(-)

New commits:
commit 827430c8c0417396b3c1d2a049ccddb818c89646
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 18:12:54 2014 +0100

Fold URE: Windows

...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx 
is
no longer necessary and loading of cppuhelper from the program dir cannot 
fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.

Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3ae0eb6..c8f093e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -932,10 +932,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
xml2 \
 ))
 
-$(eval $(call gb_Helper_register_packages_for_install,ooo,\
-   xml2_win32 \
-))
-
 define gb_LinkTarget__use_libxml2
 $(call gb_LinkTarget_use_package,$(1),xml2)
 $(call gb_LinkTarget_set_include,$(1),\
diff --git a/bridges/Jar_java_uno.mk b/bridges/Jar_java_uno.mk
index da80f84..ecaad3c 100644
--- a/bridges/Jar_java_uno.mk
+++ b/bridges/Jar_java_uno.mk
@@ -21,8 +21,7 @@ $(eval $(call gb_Jar_set_packageroot,java_uno,com))
 $(eval $(call gb_Jar_add_manifest_classpath,java_uno,\
ridl.jar \
jurt.jar \
-   $(if $(filter MACOSX,$(OS)),../../Frameworks/, \
-   $(if $(filter WNT,$(OS)),../bin/,../)) \
+   $(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \
 ))
 
 $(eval $(call gb_Jar_add_sourcefiles,java_uno,\
diff --git a/cli_ure/source/native/native_bootstrap.cxx 
b/cli_ure/source/native/native_bootstrap.cxx
index 1e21402..2ff980f 100644
--- a/cli_ure/source/native/native_bootstrap.cxx
+++ b/cli_ure/source/native/native_bootstrap.cxx
@@ -25,7 +25,6 @@
 #pragma warning(push, 1)
 #endif
 #include windows.h
-#include uno/environment.hxx
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
@@ -37,271 +36,11 @@
 #include rtl/bootstrap.hxx
 #include com/sun/star/uno/XComponentContext.hpp
 #include cppuhelper/bootstrap.hxx
-#include delayimp.h
 #include stdio.h
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace cli_ure {
-WCHAR * resolveLink(WCHAR * path);
-}
-
-#define INSTALL_PATH LSoftware\\LibreOffice\\UNO\\InstallPath
-#define URE_LINK L\\ure-link
-#define URE_BIN L\\bin
-#define UNO_PATH LUNO_PATH
-
-namespace
-{
-
- /*
- * Gets the installation path from the Windows Registry for the specified
- * registry key.
- *
- * @param hroot   open handle to predefined root registry key
- * @param subKeyName  name of the subkey to open
- *
- * @return the installation path or NULL, if no installation was found or
- * if an error occurred
- */
-WCHAR* getPathFromRegistryKey( HKEY hroot, LPCWSTR subKeyName )
-{
-HKEY hkey;
-DWORD type;
-TCHAR* data = NULL;
-DWORD

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

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

New commits:
commit 6c3ff6323e1bfd7f9ca676b2edb2647699ed405f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 3 15:30:34 2014 +0100

Master requires MSVC 2013 now

Change-Id: I36c8a01bcfe15978882ca6306b4cca291357bc8f

diff --git a/configure.ac b/configure.ac
index e2b7e4b..17d0de4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1998,13 +1998,13 @@ AC_ARG_WITH(
 [with_doxygen=yes])
 
 AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=2013/2012],
+AS_HELP_STRING([--with-visual-studio=2013],
 [Specify which Visual Studio version to use in case several are
- are installed. If not specified, the order of preference is
- 2013, 2012 (including Express editions). Note that it is
- unclear whether using 2013 actually works as intended.])
+ installed. If not specified, the order of preference is 2013 
(including
+ Express editions). Not very useful at the moment, as currently only
+ 2013 is supported, anyway.])
 [
-  Usage: --with-visual-studio=2013/2012
+  Usage: --with-visual-studio=2013
 ],
 ,)
 
@@ -3315,8 +3315,6 @@ map_vs_year_to_version()
 unset vsversion
 
 case $1 in
-2012)
-vsversion=11.0;;
 2013)
 vsversion=12.0;;
 *)
@@ -3335,14 +,14 @@ vs_versions_to_check()
 map_vs_year_to_version $1
 vsversions=$vsversion
 else
-# By default we prefer 2013, then 2012
-vsversions=12.0 11.0
+# By default we prefer 2013
+vsversions=12.0
 fi
 }
 
 find_msvs()
 {
-# Find Visual Studio 2013/2012
+# Find Visual Studio 2013
 # Args: $1 (optional) : versions to check, in the order of preference
 # Return value: $vstest
 
@@ -3366,7 +3364,7 @@ find_msvs()
 
 find_msvc()
 {
-# Find Visual C++ 2013/2012
+# Find Visual C++ 2013
 # Args: $1 (optional) : The VS version year
 # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
 
@@ -3389,10 +3387,6 @@ find_msvc()
 if test -n $vctest; then
 vcnumwithdot=$ver
 case $vcnumwithdot in
-11.0)
-vcyear=2012
-vcnum=110
-;;
 12.0)
 vcyear=2013
 vcnum=120
@@ -3417,7 +3411,7 @@ if test $_os = WINNT; then
 if test -n $with_visual_studio; then
 AC_MSG_ERROR([No Visual Studio $with_visual_studio 
installation found])
 else
-AC_MSG_ERROR([No Visual Studio 2012 or 2013 installation 
found])
+AC_MSG_ERROR([No Visual Studio 2013 installation found])
 fi
 fi
 
@@ -3513,7 +3507,8 @@ if test $_os = WINNT; then
 fi
 fi
 if test $BITNESS_OVERRIDE = ; then
-CC=$CC -arch:SSE # MSVC 2012 default for x86 is -arch:SSE2
+dnl since MSVC 2012, default for x86 is -arch:SSE2:
+CC=$CC -arch:SSE
 fi
 export INCLUDE=`cygpath -d $COMPATH/Include`
 
@@ -5100,7 +5095,7 @@ find_msms()
 my_msm_file=Microsoft_VC${VCVER}_CRT_x86.msm
 AC_MSG_CHECKING([for $my_msm_file])
 msmdir=
-for ver in 10.0 11.0 12.0; do
+for ver in 12.0; do
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
 if test -n $regvalue; then
 if test -e $regvalue/$my_msm_file; then
@@ -9520,11 +9515,11 @@ the  Windows SDK are installed.])
 elif echo $WINDOWS_SDK_HOME | grep 8.0 /dev/null 2/dev/null; then
 WINDOWS_SDK_VERSION=80
 AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)])
-# compatibility warning if usind VS 2012 and not explicitly choosing 
the 80 SDK
-if test $VCVER = 110 -a -z $with_windows_sdk; then
-AC_MSG_WARN([If a build created with VS 2012 should run on Windows 
XP,])
+dnl compatibility warning if not explicitly choosing the 80 SDK:
+if test -z $with_windows_sdk; then
+AC_MSG_WARN([If a build should run on Windows XP,])
 AC_MSG_WARN([use --with-windows-sdk=7.1A (requires VS 2012 Update 
1 or newer)])
-add_warning If a build created with VS 2012 should run on Windows 
XP,
+add_warning If a build should run on Windows XP,
 add_warning use --with-windows-sdk=7.1A (requires VS 2012 Update 
1 or newer)
 fi
 elif echo $WINDOWS_SDK_HOME | grep 8.1 /dev/null 2/dev/null; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: C++11 on master (towards LO 4.5)


On 11/28/2014 09:22 AM, Stephan Bergmann wrote:

Maintainers of active Windows tinderboxes (on cc, as of
https://wiki.documentfoundation.org/Development/Tinderbox#List_of_registered_Tinderboxes),
please make sure until, say, mid of next week (Dec 3) that they are
using MSVC 2013 for master builds.  I'll then make configure fail on
anything less.


In place now with 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=6c3ff6323e1bfd7f9ca676b2edb2647699ed405f 
Master requires MSVC 2013 now.


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

[Libreoffice-commits] core.git: Changes to 'feature/droid_calcimpress3_rebased'

2014-12-03 Thread Tomaž Vajngerl

New branch 'feature/droid_calcimpress3_rebased' available with the following 
commits:
commit b424cd46bdb30f7c55b2a55a44a8f9d8ab8e19bf
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Sun Nov 30 18:07:19 2014 +0100

android: extract JavaPanZoomController (PZC becomes an interface)

Change-Id: I87e63008fe7c6db62c18bf461dc4dcda733393ac

commit 3205e4a465ed82f8d0aca903b6e0ee0df685e633
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Sun Nov 30 17:26:50 2014 +0100

android: Fennec change - move classes from gecko.ui to gecko.gfx

Change-Id: I510e0d601e293ed8e013a0273d5ae0f9be078d8a

commit a25dc44a9bb4e6818557db99a5f1d0c848136a97
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Sun Nov 30 17:21:10 2014 +0100

android: change LOKitThread.draw to return void

Change-Id: I00f3ed059bd633e662e5bee09703ca505bf3b9a5

commit 1f04e956d5d995334bf05043e19919855c234fcc
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Sun Nov 30 17:18:56 2014 +0100

android: Fennec PanZoomControler updates..

Change-Id: I277fbf522b16d9b479260df8372a5ee160adcc37

commit 420059f3fc6d904d9e736ef24ec7d4d1e77519f2
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Sun Nov 30 10:36:42 2014 +0100

fdo#85845 android: draw tiles immediately when they are ready

Change-Id: I924a212210703b0f6136ddefacd77d98dc89f42d

commit d43a6161e3da00186d2e05f66a34c4d25de135f7
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Fri Nov 28 15:21:52 2014 +0100

android: rearange anc clean-up GeckoLayerClient

Change-Id: I6b4a7f8053adea6d86ee625201eeead188bbadcc

commit 56ba1e7cc49fbff5957986eaac94035848bb0e6b
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Thu Nov 27 22:47:42 2014 +0100

android: Fold LayerController into GeckoLayerClient

Change-Id: I6a6e702e243b389f1c487b6b5390f28a4292cc74

commit 3562526f48a9cd987d83eed75db76a4e215db465
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Thu Nov 27 21:46:22 2014 +0100

android: introduce getDisplayMetrics - reduce code duplication

Change-Id: Ic020d9604814213e13c339b07b6e74de77a9f400

commit 5ee5dfe67543fbe2c164a615a971353df61347f9
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Thu Nov 27 10:39:40 2014 +0100

android: reset document dimensions when changing document part

Change-Id: I2f7967ee20ad71b58e2b0dc7f182769499910373

commit 362c1a5b7415b72c8c526c58c1605905e55fb0df
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 17 13:42:41 2014 +0100

android: Change the handle type (long too ByteBuffer)

Change-Id: Ia2ed94dbbb43d2e768da5af5ca7a51f5cda5bae0

commit 04e016151d969d8f69acdf4f7f21e43ef1f3d5f7
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 17 10:47:02 2014 +0100

android: use ByteBuffer to send or store pointers in JNI bindings

Using direct ByteBuffer is much nicer option to store or send
pointers between C(++) code and Java via JNI as it handles endiness
and pointer size for us. Using long type can have unexpected
results in 32-bit architectures (mostly Android). This was causing
grief especially when Android introduced support for 64-bit
architectures starting with SDK 19.

Change-Id: Ie92d0f913b668e1724e846d70d1820445d9cb086

commit 423b5af4eb04112afe298550f55dbe006d1c5adb
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 17 10:44:04 2014 +0100

android: cleanup LibreOfficeKit initialization in Java

Change-Id: I7688968e92ae4b3d6fef19c4544ae91bdcd8b1b9

commit 2c4199da8e51b7e263a625b2278c68c24b323c55
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 17 10:38:54 2014 +0100

android: use different function to prevent stripping JNI symbols

Change-Id: Ib003da5c7fec7fc3783f01a33a63deb384c7e770

commit 8e976b2113992ae72e69542323d6563d6894691f
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 17 10:36:53 2014 +0100

lok: improve error reporting in lok implementation

Change-Id: Ifc7b18e173b0c91c24a53fad9c35ac3a34a4b33e

commit 8baefb818172d69c7474cbd6740765f63e62a057
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 17 10:34:20 2014 +0100

android: extract gathering document info into postLoad method

Change-Id: Id90680d3b207973b55927add1c9268bb2a48

commit 6d4dfbc079c90dbf6593a4783dba8cd5102f099a
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 17 10:32:26 2014 +0100

android: improve error messages in DirectBufferAllocator

Change-Id: Iefab77e543606cfad937a79743fb3b9a68a0f2a2

commit d490237af969f825811b55d340154566649c0bf9
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 10 13:10:03 2014 +0100

android: add destroy and exit as a separate JNI call

Change-Id: Ia8516da556b3736f34b366e2eb89ad8bbd7bafc1

commit

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

 basctl/source/basicide/bastype2.cxx |   20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 2dfcbfbdde1ab25bf395bf8f4533965f7d99d9e3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 9 12:32:14 2014 +0200

Use std::initializer_list

Change-Id: I726fc6429a2eb7827d09d04584fd0b725e78f650

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 05894ad..9a4d75e 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -41,6 +41,7 @@
 #include sfx2/dispatch.hxx
 
 #include cassert
+#include initializer_list
 #include memory
 
 #include com/sun/star/script/ModuleType.hpp
@@ -424,18 +425,15 @@ void TreeListBox::ImpCreateLibSubEntries( 
SvTreeListEntry* pLibRootEntry, const
 
 void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* 
pLibRootEntry, const ScriptDocument rDocument, const OUString rLibName )
 {
-
-std::vectorstd::pairEntryType, OUString  aEntries;
-aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, 
IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) );
-aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, 
IDE_RESSTR(RID_STR_USERFORMS) ) );
-aEntries.push_back( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES, 
IDE_RESSTR(RID_STR_NORMAL_MODULES) ) );
-aEntries.push_back( ::std::make_pair( OBJ_TYPE_CLASS_MODULES, 
IDE_RESSTR(RID_STR_CLASS_MODULES) ) );
-
-std::vectorstd::pairEntryType, OUString ::iterator iter;
-for( iter = aEntries.begin(); iter != aEntries.end(); ++iter )
+auto const aEntries = {
+std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, 
IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ),
+std::make_pair( OBJ_TYPE_USERFORMS, IDE_RESSTR(RID_STR_USERFORMS) ),
+std::make_pair( OBJ_TYPE_NORMAL_MODULES, 
IDE_RESSTR(RID_STR_NORMAL_MODULES) ),
+std::make_pair( OBJ_TYPE_CLASS_MODULES, 
IDE_RESSTR(RID_STR_CLASS_MODULES) ) };
+for( auto const  iter: aEntries )
 {
-EntryType eType = iter-first;
-OUString aEntryName = iter-second;
+EntryType eType = iter.first;
+OUString const  aEntryName = iter.second;
 SvTreeListEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, 
aEntryName, eType );
 if( pLibSubRootEntry )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sfx2/source/dialog/backingwindow.cxx |   14 +-
 sfx2/source/dialog/backingwindow.hxx |1 -
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 6abdd2d963740afaac0b744f7b96d75ce375bd49
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 3 16:02:43 2014 +0100

Redundant mpCurrentView (always = mpLocalView)

Change-Id: Ida05d4cb97ace166472ee9f256065e4c420c3a7a

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 95084be..f121c21 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -146,7 +146,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 
 get(mpAllRecentThumbnails, all_recent);
 get(mpLocalView, local_view);
-mpCurrentView = mpLocalView;
 
 maDndWindows.push_back(mpAllRecentThumbnails);
 
@@ -265,9 +264,6 @@ void BackingWindow::initControls()
 mpLocalView-Hide();
 mpLocalView-filterItems(ViewFilter_Application(FILTER_APP_NONE));
 
-
-mpCurrentView = mpLocalView;
-
 mpTemplateButton-SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
 
 //set handlers
@@ -556,7 +552,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 else if( pButton == mpTemplateButton )
 {
 mpAllRecentThumbnails-Hide();
-mpCurrentView-filterItems(ViewFilter_Application(FILTER_APP_NONE));
+mpLocalView-filterItems(ViewFilter_Application(FILTER_APP_NONE));
 mpLocalView-Show();
 mpLocalView-reload();
 mpLocalView-GrabFocus();
@@ -570,19 +566,19 @@ IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, 
pButton )
 
 if( sId == filter_writer )
 {
-mpCurrentView-filterItems(ViewFilter_Application(FILTER_APP_WRITER));
+mpLocalView-filterItems(ViewFilter_Application(FILTER_APP_WRITER));
 }
 else if( sId == filter_calc )
 {
-mpCurrentView-filterItems(ViewFilter_Application(FILTER_APP_CALC));
+mpLocalView-filterItems(ViewFilter_Application(FILTER_APP_CALC));
 }
 else if( sId == filter_impress )
 {
-mpCurrentView-filterItems(ViewFilter_Application(FILTER_APP_IMPRESS));
+mpLocalView-filterItems(ViewFilter_Application(FILTER_APP_IMPRESS));
 }
 else if( sId == filter_draw )
 {
-mpCurrentView-filterItems(ViewFilter_Application(FILTER_APP_DRAW));
+mpLocalView-filterItems(ViewFilter_Application(FILTER_APP_DRAW));
 }
 else if( sId == edit )
 {
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index cc1e9e5..3c96626 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -87,7 +87,6 @@ class BackingWindow
 
 RecentDocsView* mpAllRecentThumbnails;
 TemplateDefaultView*  mpLocalView;
-TemplateAbstractView*   mpCurrentView;
 
 std::vectorvcl::Window*maDndWindows;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/Library_comphelper.mk comphelper/source include/comphelper sd/inc sd/source

 comphelper/Library_comphelper.mk  |2 -
 comphelper/source/misc/expandmacro.cxx|   41 --
 comphelper/source/misc/getexpandeduri.cxx |   32 +++
 include/comphelper/expandmacro.hxx|   36 --
 include/comphelper/getexpandeduri.hxx |   41 ++
 sd/inc/pch/precompiled_sd.hxx |1 
 sd/source/core/CustomAnimationPreset.cxx  |4 +-
 sd/source/core/TransitionPreset.cxx   |4 +-
 sd/source/core/drawdoc.cxx|6 ++--
 9 files changed, 81 insertions(+), 86 deletions(-)

New commits:
commit b9ca4de9852d44382f499e078d887421ec8ee46b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 3 16:14:48 2014 +0100

From ill-named comphelper::getExpandedFilePath to comphelper::getExpanedUri

Change-Id: I749d78d115f641b2ac18cd6eb483c69a22ee210c

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 271a95b..7a263c9 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -88,7 +88,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
 comphelper/source/misc/documentiologring \
 comphelper/source/misc/evtlistenerhlp \
 comphelper/source/misc/evtmethodhelper \
-comphelper/source/misc/expandmacro \
+comphelper/source/misc/getexpandeduri \
 comphelper/source/misc/instancelocker \
 comphelper/source/misc/interaction \
 comphelper/source/misc/listenernotification \
diff --git a/comphelper/source/misc/expandmacro.cxx 
b/comphelper/source/misc/expandmacro.cxx
deleted file mode 100644
index 86eb7c2..000
--- a/comphelper/source/misc/expandmacro.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include comphelper/expandmacro.hxx
-
-#include com/sun/star/uno/Reference.hxx
-#include rtl/ustring.hxx
-#include rtl/uri.hxx
-#include rtl/bootstrap.hxx
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-namespace comphelper
-{
-rtl::OUString getExpandedFilePath(const rtl::OUString filepath)
-{
-rtl::OUString aFilename = filepath;
-
-if( aFilename.startsWith( vnd.sun.star.expand: ) )
-{
-// cut protocol
-rtl::OUString aMacro( aFilename.copy( sizeof ( 
vnd.sun.star.expand: ) -1 ) );
-
-// decode uric class chars
-aMacro = rtl::Uri::decode( aMacro, rtl_UriDecodeWithCharset, 
RTL_TEXTENCODING_UTF8 );
-
-// expand macro string
-rtl::Bootstrap::expandMacros( aMacro);
-
-aFilename = aMacro;
-}
-return aFilename;
-}
-}
diff --git a/comphelper/source/misc/getexpandeduri.cxx 
b/comphelper/source/misc/getexpandeduri.cxx
new file mode 100644
index 000..796400f
--- /dev/null
+++ b/comphelper/source/misc/getexpandeduri.cxx
@@ -0,0 +1,32 @@
+/* -*- 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 sal/config.h
+
+#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/uno/XComponentContext.hpp
+#include com/sun/star/uri/UriReferenceFactory.hpp
+#include com/sun/star/uri/XVndSunStarExpandUrlReference.hpp
+#include com/sun/star/util/theMacroExpander.hpp
+#include comphelper/getexpandeduri.hxx
+#include rtl/ustring.hxx
+#include sal/types.h
+
+OUString comphelper::getExpandedUri(
+css::uno::Referencecss::uno::XComponentContext const  context,
+OUString const  uri)
+{
+css::uno::Referencecss::uri::XVndSunStarExpandUrlReference ref(
+css::uri::UriReferenceFactory::create(context)-parse(uri),
+css::uno::UNO_QUERY);
+return ref.is()
+? ref-expand(css::util::theMacroExpander::get(context)) : uri;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/expandmacro.hxx 
b/include/comphelper/expandmacro.hxx
deleted file mode 100644
index e85c55b..000
--- a/include/comphelper/expandmacro.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef

Crash test update

2014-12-03 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/29daf8efdf1beb5972a8cd3d2572c374e831b136/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 external/icu/UnpackedTarball_icu.mk |1 
 external/icu/icu4c-scriptrun.patch  |   58 
 2 files changed, 59 insertions(+)

New commits:
commit 8594604107f1727303f57294c4c8c8a8dc5d2265
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sun Nov 30 20:38:42 2014 +

mirror fixes for fdo#78906 and deb#766788 into icu

(cherry picked from commit a66451887425ddd9387e2b25d5125916f4a35f83)
(cherry picked from commit bff0fe902686d8c126a73e1d2c914f5d65c6ffaf)

Conflicts:
external/icu/UnpackedTarball_icu.mk

Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9
(cherry picked from commit c0d9f573b1200f8860f1c1c89107d54226869f56)
Reviewed-on: https://gerrit.libreoffice.org/13242
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 77cd38a..8c73b48 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-mkdir.patch \
external/icu/icu4c-buffer-overflow.patch \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
+   external/icu/icu4c-scriptrun.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-scriptrun.patch 
b/external/icu/icu4c-scriptrun.patch
new file mode 100644
index 000..e307811
--- /dev/null
+++ b/external/icu/icu4c-scriptrun.patch
@@ -0,0 +1,58 @@
+--- misc/icu/source/extra/scrptrun/scrptrun.cpp
 misc/build/icu/source/extra/scrptrun/scrptrun.cpp
+@@ -150,7 +150,11 @@
+ // characters above it on the stack will be poped.
+ if (pairIndex = 0) {
+ if ((pairIndex  1) == 0) {
+-parenStack[++parenSP].pairIndex = pairIndex;
++++parenSP;
++int32_t nVecSize = parenStack.size();
++if (parenSP == nVecSize)
++parenStack.resize(nVecSize + 128);
++parenStack[parenSP].pairIndex = pairIndex;
+ parenStack[parenSP].scriptCode  = scriptCode;
+ } else if (parenSP = 0) {
+ int32_t pi = pairIndex  ~1;
+@@ -184,7 +188,14 @@
+ // pop it from the stack
+ if (pairIndex = 0  (pairIndex  1) != 0  parenSP = 0) {
+ parenSP -= 1;
+-startSP -= 1;
++/* decrement startSP only if it is = 0,
++   decrementing it unnecessarily will lead to memory 
corruption
++   while processing the above while block.
++   e.g. startSP = -4 , parenSP = -1
++*/
++if (startSP = 0) {
++startSP -= 1;
++}
+ }
+ } else {
+ // if the run broke on a surrogate pair,
+--- misc/icu/source/extra/scrptrun/scrptrun.h
 misc/build/icu/source/extra/scrptrun/scrptrun.h
+@@ -17,6 +17,7 @@
+ #include unicode/utypes.h
+ #include unicode/uobject.h
+ #include unicode/uscript.h
++#include vector
+ 
+ struct ScriptRecord
+ {
+@@ -79,7 +80,7 @@
+ int32_t scriptEnd;
+ UScriptCode scriptCode;
+ 
+-ParenStackEntry parenStack[128];
++std::vectorParenStackEntry parenStack;
+ int32_t parenSP;
+ 
+ static int8_t highBit(int32_t value);
+@@ -133,6 +134,7 @@
+ scriptEnd   = charStart;
+ scriptCode  = USCRIPT_INVALID_CODE;
+ parenSP = -1;
++parenStack.resize(128);
+ }
+ 
+ inline void ScriptRun::reset(int32_t start, int32_t length)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/inc/column.hxx  |2 +-
 sc/inc/table.hxx   |2 +-
 sc/source/core/data/table4.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ad4b7986c5ca6a5b97d09a7413adf39440eefb93
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 3 16:34:35 2014 +0100

remove boolean parameter default from ScTable::SetDirty()

Change-Id: I37761c07dd72bfa25cc499c8ed41241f1ba56469

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 78ca0d8..c7898f1 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -532,7 +532,7 @@ public:
 voidResetChanged( const ScRange rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-voidSetDirty( const ScRange, bool bIncludeEmptyCells = false );
+voidSetDirty( const ScRange, bool bIncludeEmptyCells );
 voidSetDirtyAfterLoad();
 voidSetDirtyVar();
 voidSetTableOpDirty( const ScRange );
commit a1a1c4600e6c7ee457b62098128b27471c077908
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 3 16:13:46 2014 +0100

get rid of defaulted boolean parameters in ScColumn::SetDirty()

Change-Id: Iba030c1a4fd3dad34bdd61377b73fa76a062b5f8

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index bfe3fb8..7d7e39b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -361,7 +361,7 @@ public:
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
 void SetDirtyFromClip( SCROW nRow1, SCROW nRow2, sc::ColumnSpanSet 
rBroadcastSpans );
-void SetDirty( SCROW nRow1, SCROW nRow2, bool bBroadcast = true, bool 
bIncludeEmptyCells = false );
+void SetDirty( SCROW nRow1, SCROW nRow2, bool bBroadcast, bool 
bIncludeEmptyCells );
 voidSetDirtyVar();
 voidSetDirtyAfterLoad();
 voidSetTableOpDirty( const ScRange );
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 13a7baf..84bafad 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1184,7 +1184,7 @@ void ScTable::FillFormulaVertical(
 
 std::vectorsc::RowSpan::const_iterator it = aSpans.begin(), itEnd = 
aSpans.end();
 for (; it != itEnd; ++it)
-aCol[nCol].SetDirty(it-mnRow1, it-mnRow2, false);
+aCol[nCol].SetDirty(it-mnRow1, it-mnRow2, false, false);
 
 rProgress += nRow2 - nRow1 + 1;
 if (pProgress)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/filter/ww8/ww8par2.cxx |   22 ++
 vcl/workben/vcldemo.cxx  |5 +++--
 2 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 9ddadaa5c0e2429c2d6d6a5661e945fd03012518
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Dec 3 14:30:01 2014 +

when parking pams, park into nearest txtnode

i.e. avoid assert of ooo67620-2.doc

Change-Id: Idea4ca1cef764608c55bba6a540bde57b7b19d08

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 8fe310b..bbea4c0 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2635,9 +2635,17 @@ void WW8TabDesc::ParkPaM()
 return;
 }
 
-if (pIo-pPaM-GetPoint()-nNode != pTabBox2-GetSttIdx() + 1)
+sal_uLong nSttNd = pTabBox2-GetSttIdx() + 1,
+  nEndNd = pTabBox2-GetSttNd()-EndOfSectionIndex();
+
+if (pIo-pPaM-GetPoint()-nNode != nSttNd)
 {
-pIo-pPaM-GetPoint()-nNode = pTabBox2-GetSttIdx() + 1;
+do
+{
+pIo-pPaM-GetPoint()-nNode = nSttNd;
+}
+while (pIo-pPaM-GetNode().GetNodeType() != ND_TEXTNODE  ++nSttNd  
nEndNd);
+
 pIo-pPaM-GetPoint()-nContent.Assign(pIo-pPaM-GetCntntNode(), 0);
 pIo-rDoc.SetTxtFmtColl(*pIo-pPaM, 
(SwTxtFmtColl*)pIo-pDfltTxtFmtColl);
 }
@@ -2869,9 +2877,15 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
 //or not so that we can collect paragraph proproties over
 //all the cells, but in that case on the valid cell we do not
 //want to reset the fmt properties
-if (pIo-pPaM-GetPoint()-nNode != pTabBox-GetSttIdx() + 1)
+sal_uLong nSttNd = pTabBox-GetSttIdx() + 1,
+  nEndNd = pTabBox-GetSttNd()-EndOfSectionIndex();
+if (pIo-pPaM-GetPoint()-nNode != nSttNd)
 {
-pIo-pPaM-GetPoint()-nNode = pTabBox-GetSttIdx() + 1;
+do
+{
+pIo-pPaM-GetPoint()-nNode = nSttNd;
+}
+while (pIo-pPaM-GetNode().GetNodeType() != ND_TEXTNODE  
++nSttNd  nEndNd);
 pIo-pPaM-GetPoint()-nContent.Assign(pIo-pPaM-GetCntntNode(), 
0);
 // Precautionally set now, otherwise the style is not set for cells
 // that are inserted for margin balancing.
commit 80a6351f7794cc730e89ef6b0d5e49e2f4d9b1f2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Dec 3 14:59:23 2014 +

coverity#1256310 Don't call rand

Change-Id: I0a8f21fd03cf110b321906c0b1b88a8edc225b5a

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 95329f3..6423b0b 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -8,6 +8,7 @@
  */
 
 #include comphelper/processfactory.hxx
+#include comphelper/random.hxx
 #include cppuhelper/bootstrap.hxx
 #include com/sun/star/lang/XMultiServiceFactory.hpp
 #include com/sun/star/lang/XInitialization.hpp
@@ -31,7 +32,7 @@
 #include vcl/bmpacc.hxx
 #include basegfx/numeric/ftools.hxx
 #include basegfx/matrix/b2dhommatrix.hxx
-
+#include boost/math/special_functions/next.hpp
 #include vcldemo-debug.hxx
 
 #include rtl/math.hxx
@@ -316,7 +317,7 @@ public:
 for (int i = 0; i  PRINT_N_TEXT; i++) {
 rDev.SetTextColor(Color(nCols[i % SAL_N_ELEMENTS(nCols)]));
 // random font size to avoid buffering
-vcl::Font aFont(maFontNames[i % maFontNames.size()], Size(0, 1 
+ i * (0.9 + (double)rand()/10/RAND_MAX) * (r.Top() - 
r.Bottom())/PRINT_N_TEXT));
+vcl::Font aFont(maFontNames[i % maFontNames.size()], Size(0, 1 
+ i * (0.9 + comphelper::rng::uniform_real_distribution(0.0, 
boost::math::nextafter(0.1, DBL_MAX))) * (r.Top() - r.Bottom())/PRINT_N_TEXT));
 rDev.SetFont(aFont);
 rDev.DrawText(r, aText.copy(0, 4 + (aText.getLength() - 4) * 
(PRINT_N_TEXT - i)/PRINT_N_TEXT));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/win/source/gdi/salnativewidgets-luna.cxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 21f755aad421927ed622ba48d567205121500e57
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 16:57:42 2014 +0100

windows opengl: Call PreDraw() earlier.

Change-Id: I30ceb29cc0321022733385f902685ceac78869f2

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 401e0678..67c5a75 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1288,19 +1288,18 @@ bool WinSalGraphics::drawNativeControl( ControlType 
nType,
 if (ImplDrawNativeControl(aBlackDC.getCompatibleHDC(), hTheme, rc, 
nType, nPart, nState, aValue, aCaptionStr) 
 ImplDrawNativeControl(aWhiteDC.getCompatibleHDC(), hTheme, rc, 
nType, nPart, nState, aValue, aCaptionStr))
 {
-boost::scoped_ptrOpenGLTexture 
pBlackTexture(aBlackDC.getTexture());
-if (!pBlackTexture)
-return false;
+pImpl-PreDraw();
 
+boost::scoped_ptrOpenGLTexture 
pBlackTexture(aBlackDC.getTexture());
 boost::scoped_ptrOpenGLTexture 
pWhiteTexture(aWhiteDC.getTexture());
-if (!pWhiteTexture)
-return false;
 
-pImpl-PreDraw();
-pImpl-DrawTextureDiff(*pWhiteTexture, *pBlackTexture, 
aBlackDC.getTwoRect());
-pImpl-PostDraw();
+if (pBlackTexture  pWhiteTexture)
+{
+pImpl-DrawTextureDiff(*pWhiteTexture, *pBlackTexture, 
aBlackDC.getTwoRect());
+bOk = true;
+}
 
-bOk = true;
+pImpl-PostDraw();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/win/source/gdi/salnativewidgets-luna.cxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 90adb5412f1066f53a8db339ce5aac543431617e
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 16:57:42 2014 +0100

windows opengl: Call PreDraw() earlier.

Change-Id: I30ceb29cc0321022733385f902685ceac78869f2

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 401e0678..67c5a75 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1288,19 +1288,18 @@ bool WinSalGraphics::drawNativeControl( ControlType 
nType,
 if (ImplDrawNativeControl(aBlackDC.getCompatibleHDC(), hTheme, rc, 
nType, nPart, nState, aValue, aCaptionStr) 
 ImplDrawNativeControl(aWhiteDC.getCompatibleHDC(), hTheme, rc, 
nType, nPart, nState, aValue, aCaptionStr))
 {
-boost::scoped_ptrOpenGLTexture 
pBlackTexture(aBlackDC.getTexture());
-if (!pBlackTexture)
-return false;
+pImpl-PreDraw();
 
+boost::scoped_ptrOpenGLTexture 
pBlackTexture(aBlackDC.getTexture());
 boost::scoped_ptrOpenGLTexture 
pWhiteTexture(aWhiteDC.getTexture());
-if (!pWhiteTexture)
-return false;
 
-pImpl-PreDraw();
-pImpl-DrawTextureDiff(*pWhiteTexture, *pBlackTexture, 
aBlackDC.getTwoRect());
-pImpl-PostDraw();
+if (pBlackTexture  pWhiteTexture)
+{
+pImpl-DrawTextureDiff(*pWhiteTexture, *pBlackTexture, 
aBlackDC.getTwoRect());
+bOk = true;
+}
 
-bOk = true;
+pImpl-PostDraw();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/uiconfig/scalc/toolbar/formatobjectbar.xml |   14 +++---
 sc/uiconfig/scalc/toolbar/standardbar.xml |2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ebf31a9b2c98167c2d46e16a19a75c287b0a4c6b
Author: Yousuf Philips philip...@hotmail.com
Date:   Wed Dec 3 05:31:02 2014 +0400

fdo#85594 enabling date format and rearranging others

Change-Id: I839f6a3a01c1a9758b7997858416f15b73dba0bd
Reviewed-on: https://gerrit.libreoffice.org/13284
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml 
b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index ab547e6..2de1389 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -44,12 +44,6 @@
  toolbar:toolbaritem xlink:href=.uno:ToggleMergeCells 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:WrapText/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:ParaLeftToRight toolbar:style=radio/
- toolbar:toolbaritem xlink:href=.uno:ParaRightToLeft toolbar:style=radio/
- toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:TextdirectionLeftToRight/
- toolbar:toolbaritem xlink:href=.uno:TextdirectionTopToBottom/
- toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:AlignTop toolbar:style=radio auto/
  toolbar:toolbaritem xlink:href=.uno:AlignVCenter toolbar:style=radio 
auto/
  toolbar:toolbaritem xlink:href=.uno:AlignBottom toolbar:style=radio 
auto/
@@ -58,7 +52,7 @@
  toolbar:toolbaritem xlink:href=.uno:NumberFormatCurrency/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatPercent/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatDecimal/
- toolbar:toolbaritem xlink:href=.uno:NumberFormatDate 
toolbar:visible=false/
+ toolbar:toolbaritem xlink:href=.uno:NumberFormatDate/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatScientific 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatIncDecimals/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatDecDecimals/
@@ -76,4 +70,10 @@
  toolbar:toolbaritem xlink:href=.uno:IconSetFormatDialog 
toolbar:visible=false/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:ToggleSheetGrid 
toolbar:visible=false/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:ParaLeftToRight toolbar:style=radio/
+ toolbar:toolbaritem xlink:href=.uno:ParaRightToLeft toolbar:style=radio/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:TextdirectionLeftToRight/
+ toolbar:toolbaritem xlink:href=.uno:TextdirectionTopToBottom/
 /toolbar:toolbar
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml 
b/sc/uiconfig/scalc/toolbar/standardbar.xml
index 55978ab..e71225d 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -47,8 +47,8 @@
  toolbar:toolbaritem xlink:href=.uno:Navigator toolbar:visible=false/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:InsertRows/
- toolbar:toolbaritem xlink:href=.uno:DeleteRows/
  toolbar:toolbaritem xlink:href=.uno:InsertColumns/
+ toolbar:toolbaritem xlink:href=.uno:DeleteRows/
  toolbar:toolbaritem xlink:href=.uno:DeleteColumns/
  toolbar:toolbaritem xlink:href=.uno:ToggleMergeCells/
  toolbar:toolbaritem xlink:href=.uno:SplitCell toolbar:visible=false/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/uiconfig/scalc/toolbar/formatobjectbar.xml |   14 +++---
 sc/uiconfig/scalc/toolbar/standardbar.xml |2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6583a82584ae9e716cd27f05ce02b3b63b6d4c80
Author: Yousuf Philips philip...@hotmail.com
Date:   Wed Dec 3 05:31:02 2014 +0400

fdo#85594 enabling date format and rearranging others

Change-Id: I839f6a3a01c1a9758b7997858416f15b73dba0bd
Reviewed-on: https://gerrit.libreoffice.org/13284
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com
(cherry picked from commit ebf31a9b2c98167c2d46e16a19a75c287b0a4c6b)
Reviewed-on: https://gerrit.libreoffice.org/13291

diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml 
b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index ab547e6..2de1389 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -44,12 +44,6 @@
  toolbar:toolbaritem xlink:href=.uno:ToggleMergeCells 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:WrapText/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:ParaLeftToRight toolbar:style=radio/
- toolbar:toolbaritem xlink:href=.uno:ParaRightToLeft toolbar:style=radio/
- toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:TextdirectionLeftToRight/
- toolbar:toolbaritem xlink:href=.uno:TextdirectionTopToBottom/
- toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:AlignTop toolbar:style=radio auto/
  toolbar:toolbaritem xlink:href=.uno:AlignVCenter toolbar:style=radio 
auto/
  toolbar:toolbaritem xlink:href=.uno:AlignBottom toolbar:style=radio 
auto/
@@ -58,7 +52,7 @@
  toolbar:toolbaritem xlink:href=.uno:NumberFormatCurrency/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatPercent/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatDecimal/
- toolbar:toolbaritem xlink:href=.uno:NumberFormatDate 
toolbar:visible=false/
+ toolbar:toolbaritem xlink:href=.uno:NumberFormatDate/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatScientific 
toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatIncDecimals/
  toolbar:toolbaritem xlink:href=.uno:NumberFormatDecDecimals/
@@ -76,4 +70,10 @@
  toolbar:toolbaritem xlink:href=.uno:IconSetFormatDialog 
toolbar:visible=false/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:ToggleSheetGrid 
toolbar:visible=false/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:ParaLeftToRight toolbar:style=radio/
+ toolbar:toolbaritem xlink:href=.uno:ParaRightToLeft toolbar:style=radio/
+ toolbar:toolbarseparator/
+ toolbar:toolbaritem xlink:href=.uno:TextdirectionLeftToRight/
+ toolbar:toolbaritem xlink:href=.uno:TextdirectionTopToBottom/
 /toolbar:toolbar
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml 
b/sc/uiconfig/scalc/toolbar/standardbar.xml
index ed439fd..3428567 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -47,8 +47,8 @@
  toolbar:toolbaritem xlink:href=.uno:Navigator toolbar:visible=false/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:InsertRows/
- toolbar:toolbaritem xlink:href=.uno:DeleteRows/
  toolbar:toolbaritem xlink:href=.uno:InsertColumns/
+ toolbar:toolbaritem xlink:href=.uno:DeleteRows/
  toolbar:toolbaritem xlink:href=.uno:DeleteColumns/
  toolbar:toolbaritem xlink:href=.uno:ToggleMergeCells/
  toolbar:toolbaritem xlink:href=.uno:SplitCell toolbar:visible=false/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 dev/null   |binary
 icon-themes/sifr/svx/res/fr01.png  |binary
 icon-themes/sifr/svx/res/fr010.png |binary
 icon-themes/sifr/svx/res/fr011.png |binary
 icon-themes/sifr/svx/res/fr012.png |binary
 icon-themes/sifr/svx/res/fr02.png  |binary
 icon-themes/sifr/svx/res/fr03.png  |binary
 icon-themes/sifr/svx/res/fr04.png  |binary
 icon-themes/sifr/svx/res/fr05.png  |binary
 icon-themes/sifr/svx/res/fr06.png  |binary
 icon-themes/sifr/svx/res/fr07.png  |binary
 icon-themes/sifr/svx/res/fr08.png  |binary
 icon-themes/sifr/svx/res/fr09.png  |binary
 13 files changed

New commits:
commit c52ac92afe4c529ce4fd78734cdf7ff5dafc4089
Author: Yousuf Philips philip...@hotmail.com
Date:   Wed Dec 3 06:02:47 2014 +0400

fdo#86472 fix icons on dark theme in oxygen and sifr

Change-Id: I02f2877c5eefbadea6734b15732b46ba80cdcf37
Reviewed-on: https://gerrit.libreoffice.org/13285
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git a/icon-themes/oxygen/svx/res/fr01.png 
b/icon-themes/oxygen/svx/res/fr01.png
deleted file mode 100644
index 9c48e6d..000
Binary files a/icon-themes/oxygen/svx/res/fr01.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr010.png 
b/icon-themes/oxygen/svx/res/fr010.png
deleted file mode 100644
index a5ad672..000
Binary files a/icon-themes/oxygen/svx/res/fr010.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr011.png 
b/icon-themes/oxygen/svx/res/fr011.png
deleted file mode 100644
index 890573d..000
Binary files a/icon-themes/oxygen/svx/res/fr011.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr012.png 
b/icon-themes/oxygen/svx/res/fr012.png
deleted file mode 100644
index c9f5d14..000
Binary files a/icon-themes/oxygen/svx/res/fr012.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr02.png 
b/icon-themes/oxygen/svx/res/fr02.png
deleted file mode 100644
index 2e7e8b4..000
Binary files a/icon-themes/oxygen/svx/res/fr02.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr03.png 
b/icon-themes/oxygen/svx/res/fr03.png
deleted file mode 100644
index f4f22086..000
Binary files a/icon-themes/oxygen/svx/res/fr03.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr05.png 
b/icon-themes/oxygen/svx/res/fr05.png
deleted file mode 100644
index 2e3343c..000
Binary files a/icon-themes/oxygen/svx/res/fr05.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr06.png 
b/icon-themes/oxygen/svx/res/fr06.png
deleted file mode 100644
index a632f86..000
Binary files a/icon-themes/oxygen/svx/res/fr06.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr07.png 
b/icon-themes/oxygen/svx/res/fr07.png
deleted file mode 100644
index 336624d..000
Binary files a/icon-themes/oxygen/svx/res/fr07.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr08.png 
b/icon-themes/oxygen/svx/res/fr08.png
deleted file mode 100644
index ddca7e6..000
Binary files a/icon-themes/oxygen/svx/res/fr08.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr09.png 
b/icon-themes/oxygen/svx/res/fr09.png
deleted file mode 100644
index a0b0472..000
Binary files a/icon-themes/oxygen/svx/res/fr09.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr01.png 
b/icon-themes/oxygen/svx/res/pr01.png
deleted file mode 100644
index 449562f..000
Binary files a/icon-themes/oxygen/svx/res/pr01.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr017.png 
b/icon-themes/oxygen/svx/res/pr017.png
deleted file mode 100644
index fa349b1..000
Binary files a/icon-themes/oxygen/svx/res/pr017.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr018.png 
b/icon-themes/oxygen/svx/res/pr018.png
deleted file mode 100644
index ee52941..000
Binary files a/icon-themes/oxygen/svx/res/pr018.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr019.png 
b/icon-themes/oxygen/svx/res/pr019.png
deleted file mode 100644
index 01bc178..000
Binary files a/icon-themes/oxygen/svx/res/pr019.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr02.png 
b/icon-themes/oxygen/svx/res/pr02.png
deleted file mode 100644
index 1fca2a1..000
Binary files a/icon-themes/oxygen/svx/res/pr02.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr020.png 
b/icon-themes/oxygen/svx/res/pr020.png
deleted file mode 100644
index 8376803..000
Binary files a/icon-themes/oxygen/svx/res/pr020.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr021.png 
b/icon-themes/oxygen/svx/res/pr021.png
deleted file mode 100644
index a7bd1c8..000
Binary files a/icon-themes/oxygen/svx/res/pr021.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr03.png 
b/icon-themes/oxygen/svx/res/pr03.png
deleted file mode 100644
index 895d106..000
Binary files a/icon-themes/oxygen/svx/res/pr03.png and /dev/null differ
diff

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/oxygen icon-themes/sifr

 dev/null   |binary
 icon-themes/sifr/svx/res/fr01.png  |binary
 icon-themes/sifr/svx/res/fr010.png |binary
 icon-themes/sifr/svx/res/fr011.png |binary
 icon-themes/sifr/svx/res/fr012.png |binary
 icon-themes/sifr/svx/res/fr02.png  |binary
 icon-themes/sifr/svx/res/fr03.png  |binary
 icon-themes/sifr/svx/res/fr04.png  |binary
 icon-themes/sifr/svx/res/fr05.png  |binary
 icon-themes/sifr/svx/res/fr06.png  |binary
 icon-themes/sifr/svx/res/fr07.png  |binary
 icon-themes/sifr/svx/res/fr08.png  |binary
 icon-themes/sifr/svx/res/fr09.png  |binary
 13 files changed

New commits:
commit 4b01e72a35e636f94e2631d64242da039c44ed19
Author: Yousuf Philips philip...@hotmail.com
Date:   Wed Dec 3 06:02:47 2014 +0400

fdo#86472 fix icons on dark theme in oxygen and sifr

Change-Id: I02f2877c5eefbadea6734b15732b46ba80cdcf37
Reviewed-on: https://gerrit.libreoffice.org/13285
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com
(cherry picked from commit c52ac92afe4c529ce4fd78734cdf7ff5dafc4089)
Reviewed-on: https://gerrit.libreoffice.org/13292

diff --git a/icon-themes/oxygen/svx/res/fr01.png 
b/icon-themes/oxygen/svx/res/fr01.png
deleted file mode 100644
index 9c48e6d..000
Binary files a/icon-themes/oxygen/svx/res/fr01.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr010.png 
b/icon-themes/oxygen/svx/res/fr010.png
deleted file mode 100644
index a5ad672..000
Binary files a/icon-themes/oxygen/svx/res/fr010.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr011.png 
b/icon-themes/oxygen/svx/res/fr011.png
deleted file mode 100644
index 890573d..000
Binary files a/icon-themes/oxygen/svx/res/fr011.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr012.png 
b/icon-themes/oxygen/svx/res/fr012.png
deleted file mode 100644
index c9f5d14..000
Binary files a/icon-themes/oxygen/svx/res/fr012.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr02.png 
b/icon-themes/oxygen/svx/res/fr02.png
deleted file mode 100644
index 2e7e8b4..000
Binary files a/icon-themes/oxygen/svx/res/fr02.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr03.png 
b/icon-themes/oxygen/svx/res/fr03.png
deleted file mode 100644
index f4f22086..000
Binary files a/icon-themes/oxygen/svx/res/fr03.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr05.png 
b/icon-themes/oxygen/svx/res/fr05.png
deleted file mode 100644
index 2e3343c..000
Binary files a/icon-themes/oxygen/svx/res/fr05.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr06.png 
b/icon-themes/oxygen/svx/res/fr06.png
deleted file mode 100644
index a632f86..000
Binary files a/icon-themes/oxygen/svx/res/fr06.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr07.png 
b/icon-themes/oxygen/svx/res/fr07.png
deleted file mode 100644
index 336624d..000
Binary files a/icon-themes/oxygen/svx/res/fr07.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr08.png 
b/icon-themes/oxygen/svx/res/fr08.png
deleted file mode 100644
index ddca7e6..000
Binary files a/icon-themes/oxygen/svx/res/fr08.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/fr09.png 
b/icon-themes/oxygen/svx/res/fr09.png
deleted file mode 100644
index a0b0472..000
Binary files a/icon-themes/oxygen/svx/res/fr09.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr01.png 
b/icon-themes/oxygen/svx/res/pr01.png
deleted file mode 100644
index 449562f..000
Binary files a/icon-themes/oxygen/svx/res/pr01.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr017.png 
b/icon-themes/oxygen/svx/res/pr017.png
deleted file mode 100644
index fa349b1..000
Binary files a/icon-themes/oxygen/svx/res/pr017.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr018.png 
b/icon-themes/oxygen/svx/res/pr018.png
deleted file mode 100644
index ee52941..000
Binary files a/icon-themes/oxygen/svx/res/pr018.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr019.png 
b/icon-themes/oxygen/svx/res/pr019.png
deleted file mode 100644
index 01bc178..000
Binary files a/icon-themes/oxygen/svx/res/pr019.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr02.png 
b/icon-themes/oxygen/svx/res/pr02.png
deleted file mode 100644
index 1fca2a1..000
Binary files a/icon-themes/oxygen/svx/res/pr02.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr020.png 
b/icon-themes/oxygen/svx/res/pr020.png
deleted file mode 100644
index 8376803..000
Binary files a/icon-themes/oxygen/svx/res/pr020.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr021.png 
b/icon-themes/oxygen/svx/res/pr021.png
deleted file mode 100644
index a7bd1c8..000
Binary files a/icon-themes/oxygen/svx/res/pr021.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/pr03.png

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

 sfx2/source/dialog/backingwindow.cxx |   18 +++---
 sfx2/source/dialog/backingwindow.hxx |3 +++
 2 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 37cc33e27188a5686e15751c5bb39b422909f201
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 3 17:40:24 2014 +0100

Delay potentially expensive first-time template initialization

...from first start of soffice to first click on Templates button.  At 
least in
an --enable-dbgutil build (no idea whether it's substantially faster for a
product build) with lots of templates (--enable-extra-templates, 
--enable-sun-
templates) the UI still becomes unacceptabliy unrepsonsive when you clik on 
the
Templates button for the first time, though.

Change-Id: I226acaf26e20022b825478f47bb6a1f791c7c145

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index f121c21..0e6a8bd 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -90,6 +90,7 @@ static bool cmpSelectionItems (const ThumbnailViewItem 
*pItem1, const ThumbnailV
 BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 Window( i_pParent ),
 mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) ),
+mbLocalViewInitialized(false),
 mbIsSaveMode( false ),
 mbInitControls( false ),
 mnHideExternalLinks( 0 ),
@@ -259,10 +260,7 @@ void BackingWindow::initControls()
 
 //initialize Template view
 mpLocalView-SetStyle( mpLocalView-GetStyle() | WB_VSCROLL);
-mpLocalView-Populate();
-mpLocalView-showRootRegion();
 mpLocalView-Hide();
-mpLocalView-filterItems(ViewFilter_Application(FILTER_APP_NONE));
 
 mpTemplateButton-SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
 
@@ -315,6 +313,17 @@ void BackingWindow::initControls()
 set_height_request(mpAllButtonsBox-GetOptimalSize().Height());
 }
 
+void BackingWindow::initializeLocalView()
+{
+if (!mbLocalViewInitialized)
+{
+mbLocalViewInitialized = true;
+mpLocalView-Populate();
+mpLocalView-showRootRegion();
+mpLocalView-filterItems(ViewFilter_Application(FILTER_APP_NONE));
+}
+}
+
 void BackingWindow::setupButton( PushButton* pButton )
 {
 // the buttons should have a bit bigger font
@@ -552,6 +561,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 else if( pButton == mpTemplateButton )
 {
 mpAllRecentThumbnails-Hide();
+initializeLocalView();
 mpLocalView-filterItems(ViewFilter_Application(FILTER_APP_NONE));
 mpLocalView-Show();
 mpLocalView-reload();
@@ -562,6 +572,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 
 IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, pButton )
 {
+initializeLocalView();
+
 OString sId = pButton-GetCurItemIdent();
 
 if( sId == filter_writer )
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index 3c96626..aa6e498 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -87,6 +87,7 @@ class BackingWindow
 
 RecentDocsView* mpAllRecentThumbnails;
 TemplateDefaultView*  mpLocalView;
+boolmbLocalViewInitialized;
 
 std::vectorvcl::Window*maDndWindows;
 
@@ -119,6 +120,8 @@ class BackingWindow
 
 void initControls();
 
+void initializeLocalView();
+
 public:
 BackingWindow( vcl::Window* pParent );
 virtual ~BackingWindow();
___
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

 sc/inc/document.hxx|2 +-
 sc/source/core/data/documen2.cxx   |2 +-
 sc/source/core/data/documen4.cxx   |8 
 sc/source/ui/docshell/dbdocfun.cxx |2 +-
 sc/source/ui/docshell/docfunc.cxx  |4 ++--
 sc/source/ui/undo/undodat.cxx  |2 +-
 sc/source/ui/undo/undosort.cxx |2 +-
 sc/source/ui/view/dbfunc3.cxx  |2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 135b8d6466ade1e8724e604f705f95cecf4c4881
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 3 17:47:35 2014 +0100

remove boolean parameter default from ScDocument::SetDirty

... and force the caller to make a decision. In fact some needed to
include empty cells.

Change-Id: I82b6ef72f7ecda6543b3cafc70f475519870b471

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index afa215d..41e1093 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1012,7 +1012,7 @@ public:
 voidResetChanged( const ScRange rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-voidSetDirty( const ScRange, bool bIncludeEmptyCells = false 
);
+voidSetDirty( const ScRange, bool bIncludeEmptyCells );
 voidSetTableOpDirty( const ScRange );  // for Interpreter 
TableOp
 voidInterpretDirtyCells( const ScRangeList rRanges );
 SC_DLLPUBLIC void CalcAll();
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index bfa78cb..404dd31 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1004,7 +1004,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, 
SCTAB nSrcPos,
 sc::StartListeningContext aSLCxt(*this);
 maTabs[nDestPos]-StartListeners(aSLCxt, true);
 }
-SetDirty( ScRange( 0, 0, nDestPos, MAXCOL, MAXROW, nDestPos));
+SetDirty( ScRange( 0, 0, nDestPos, MAXCOL, MAXROW, nDestPos), false);
 
 if ( bResultsOnly )
 pSrcDoc-SetAutoCalc( bOldAutoCalcSrc );
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 5f11898..b29b1b6 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -126,7 +126,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB 
nFTab,
 while ( !bDoneIteration  ( nIter++  nMaxIter ) )
 {
 *pVCell = fX;
-SetDirty( aVRange );
+SetDirty( aVRange, false );
 pFormula-Interpret();
 bError = ( pFormula-GetErrCode() != 0 );
 fF = pFormula-GetValue() - fTargetVal;
@@ -160,7 +160,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB 
nFTab,
 fHorX = fX - fabs( fF ) * fHorTangent;
 
 *pVCell = fHorX;
-SetDirty( aVRange );
+SetDirty( aVRange, false );
 pFormula-Interpret();
 bHorMoveError = ( pFormula-GetErrCode() != 0 );
 if ( bHorMoveError )
@@ -224,7 +224,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB 
nFTab,
 if ( bDoneIteration )
 {
 *pVCell = nX;
-SetDirty( aVRange );
+SetDirty( aVRange, false );
 pFormula-Interpret();
 if ( fabs( pFormula-GetValue() - fTargetVal )  fabs( fF ) )
 nX = fBestX;
@@ -235,7 +235,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB 
nFTab,
 nX = fBestX;
 }
 *pVCell = fSaveVal;
-SetDirty( aVRange );
+SetDirty( aVRange, false );
 pFormula-Interpret();
 if ( !bDoneIteration )
 {
diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index 72a11a3..fe254a2 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1065,7 +1065,7 @@ bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const 
ScSubTotalParam rParam,
 }
 ScRange aDirtyRange( aNewParam.nCol1, aNewParam.nRow1, nTab,
 aNewParam.nCol2, aNewParam.nRow2, nTab );
-rDoc.SetDirty( aDirtyRange );
+rDoc.SetDirty( aDirtyRange, true );
 
 if (bRecord)
 {
diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 9cd90e8..ae2d64c 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4148,7 +4148,7 @@ bool ScDocFunc::TabOp( const ScRange rRange, const 
ScMarkData* pTabMark,
 if ( aTester.IsEditable() )
 {
 WaitObject aWait( rDocShell.GetActiveDialogParent() );
-rDoc.SetDirty( rRange );
+rDoc.SetDirty( rRange, false );
 if ( bRecord )
 {
 //! auch bei Undo

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

 sc/inc/table.hxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 093b3d30f257a01122042eb4d116ee54fbdb7033
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Dec 3 15:43:21 2014 +

coverity#1242942 Use of untrusted scalar value

see can we make this somewhat more obvious to coverity

Change-Id: I2a3d9259f36c45b74391ecb5d96bf168959eb268

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c7898f1..318805a 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1163,6 +1163,15 @@ private:
 SCROW mnUBound;
 };
 
+bool ValidCol(SCCOL nCol) const
+{
+return nCol = 0  static_castsize_t(nCol)  SAL_N_ELEMENTS(aCol);
+}
+
+bool ValidColRow(SCCOL nCol, SCROW nRow) const
+{
+return ValidCol(nCol)  ValidRow(nRow);
+}
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/win/source/gdi/winlayout.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e1a6b67946f48dc91690353fefe64e516cb37739
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 17:51:02 2014 +0100

windows opengl: Call PreDraw() earlier in the text rendering too.

Change-Id: I2a29082291338af6fcd25e931802b0267d7da6f3

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index e405e49..228e67a 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -218,13 +218,13 @@ void WinLayout::DrawText(SalGraphics rGraphics) const
 WinOpenGLSalGraphicsImpl *pImpl = 
dynamic_castWinOpenGLSalGraphicsImpl*(rWinGraphics.mpImpl.get());
 if (pImpl)
 {
+pImpl-PreDraw();
+
 boost::scoped_ptrOpenGLTexture pTexture(aDC.getTexture());
 if (pTexture)
-{
-pImpl-PreDraw();
 pImpl-DrawMask(*pTexture, salColor, aDC.getTwoRect());
-pImpl-PostDraw();
-}
+
+pImpl-PostDraw();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/win/source/gdi/winlayout.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fe8eddc8d31451550593cb5789b5b5b5071a8d11
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Dec 3 17:51:02 2014 +0100

windows opengl: Call PreDraw() earlier in the text rendering too.

Change-Id: I2a29082291338af6fcd25e931802b0267d7da6f3

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index e405e49..228e67a 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -218,13 +218,13 @@ void WinLayout::DrawText(SalGraphics rGraphics) const
 WinOpenGLSalGraphicsImpl *pImpl = 
dynamic_castWinOpenGLSalGraphicsImpl*(rWinGraphics.mpImpl.get());
 if (pImpl)
 {
+pImpl-PreDraw();
+
 boost::scoped_ptrOpenGLTexture pTexture(aDC.getTexture());
 if (pTexture)
-{
-pImpl-PreDraw();
 pImpl-DrawMask(*pTexture, salColor, aDC.getTwoRect());
-pImpl-PostDraw();
-}
+
+pImpl-PostDraw();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/inc/column.hxx  |2 +-
 sc/inc/document.hxx|2 +-
 sc/inc/table.hxx   |2 +-
 sc/source/core/data/documen2.cxx   |2 +-
 sc/source/core/data/documen4.cxx   |8 
 sc/source/core/data/table4.cxx |2 +-
 sc/source/ui/docshell/dbdocfun.cxx |2 +-
 sc/source/ui/docshell/docfunc.cxx  |4 ++--
 sc/source/ui/undo/undodat.cxx  |2 +-
 sc/source/ui/undo/undosort.cxx |2 +-
 sc/source/ui/view/dbfunc3.cxx  |2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 632fae27880f552fb20598805a1e15a6d0c35199
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 3 17:47:35 2014 +0100

remove boolean parameter default from ScDocument::SetDirty

... and force the caller to make a decision. In fact some needed to
include empty cells.

Change-Id: I82b6ef72f7ecda6543b3cafc70f475519870b471
(cherry picked from commit 135b8d6466ade1e8724e604f705f95cecf4c4881)

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index afa215d..41e1093 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1012,7 +1012,7 @@ public:
 voidResetChanged( const ScRange rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-voidSetDirty( const ScRange, bool bIncludeEmptyCells = false 
);
+voidSetDirty( const ScRange, bool bIncludeEmptyCells );
 voidSetTableOpDirty( const ScRange );  // for Interpreter 
TableOp
 voidInterpretDirtyCells( const ScRangeList rRanges );
 SC_DLLPUBLIC void CalcAll();
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index bfa78cb..404dd31 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1004,7 +1004,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, 
SCTAB nSrcPos,
 sc::StartListeningContext aSLCxt(*this);
 maTabs[nDestPos]-StartListeners(aSLCxt, true);
 }
-SetDirty( ScRange( 0, 0, nDestPos, MAXCOL, MAXROW, nDestPos));
+SetDirty( ScRange( 0, 0, nDestPos, MAXCOL, MAXROW, nDestPos), false);
 
 if ( bResultsOnly )
 pSrcDoc-SetAutoCalc( bOldAutoCalcSrc );
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 5f11898..b29b1b6 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -126,7 +126,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB 
nFTab,
 while ( !bDoneIteration  ( nIter++  nMaxIter ) )
 {
 *pVCell = fX;
-SetDirty( aVRange );
+SetDirty( aVRange, false );
 pFormula-Interpret();
 bError = ( pFormula-GetErrCode() != 0 );
 fF = pFormula-GetValue() - fTargetVal;
@@ -160,7 +160,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB 
nFTab,
 fHorX = fX - fabs( fF ) * fHorTangent;
 
 *pVCell = fHorX;
-SetDirty( aVRange );
+SetDirty( aVRange, false );
 pFormula-Interpret();
 bHorMoveError = ( pFormula-GetErrCode() != 0 );
 if ( bHorMoveError )
@@ -224,7 +224,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB 
nFTab,
 if ( bDoneIteration )
 {
 *pVCell = nX;
-SetDirty( aVRange );
+SetDirty( aVRange, false );
 pFormula-Interpret();
 if ( fabs( pFormula-GetValue() - fTargetVal )  fabs( fF ) )
 nX = fBestX;
@@ -235,7 +235,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB 
nFTab,
 nX = fBestX;
 }
 *pVCell = fSaveVal;
-SetDirty( aVRange );
+SetDirty( aVRange, false );
 pFormula-Interpret();
 if ( !bDoneIteration )
 {
diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index 72a11a3..fe254a2 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1065,7 +1065,7 @@ bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const 
ScSubTotalParam rParam,
 }
 ScRange aDirtyRange( aNewParam.nCol1, aNewParam.nRow1, nTab,
 aNewParam.nCol2, aNewParam.nRow2, nTab );
-rDoc.SetDirty( aDirtyRange );
+rDoc.SetDirty( aDirtyRange, true );
 
 if (bRecord)
 {
diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 9cd90e8..ae2d64c 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4148,7 +4148,7 @@ bool ScDocFunc::TabOp( const ScRange rRange, const 
ScMarkData* pTabMark,
 if ( aTester.IsEditable() )
 {

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 5 commits - configure.ac editeng/qa external/icu sc/inc sc/source sw/source

 configure.ac|2 
 editeng/qa/unit/core-test.cxx   |4 
 external/icu/UnpackedTarball_icu.mk |1 
 external/icu/icu4c-scriptrun.patch  |   58 
 sc/inc/column.hxx   |2 
 sc/inc/document.hxx |2 
 sc/inc/refhint.hxx  |   18 ++
 sc/inc/table.hxx|2 
 sc/source/core/data/column.cxx  |   17 ++
 sc/source/core/data/document.cxx|5 
 sc/source/core/data/formulacell.cxx |   10 +
 sc/source/core/data/table2.cxx  |4 
 sc/source/core/data/table3.cxx  |  245 +++-
 sc/source/core/tool/refhint.cxx |6 
 sc/source/ui/docshell/dbdocfun.cxx  |2 
 sw/source/ui/misc/swruler.cxx   |3 
 16 files changed, 283 insertions(+), 98 deletions(-)

New commits:
commit 2580fb2882343b7b80cc3c0317d8f99379cc8acb
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Dec 3 08:21:05 2014 -0800

Bump version to 4.2-20

Change-Id: I9838eede17e52ba377f072f967acf65f081d1985

diff --git a/configure.ac b/configure.ac
index ed38062..5ef7055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.10.19],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.20],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
commit d1b9bad9414b91787760a320cd80467139c064f5
Author: Eike Rathke er...@redhat.com
Date:   Mon Dec 1 23:56:44 2014 +0100

fdo#86762 re-establish listeners to move cell broadcasters

... for UpdateReferenceOnSort=false

(cherry picked from commit 6c2111f17089eb667bf526561d7667d17825e822)

Conflicts:
sc/source/core/data/table3.cxx

fdo#86762 broadcast also empty cells after sort

(cherry picked from commit 08793e08c7e9cefe594c49130f782725e386c463)

Conflicts:
sc/inc/column.hxx
sc/source/core/data/column.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table2.cxx
sc/source/ui/docshell/dbdocfun.cxx

fdo#86762 re-establish listeners on moved broadcasters

...  also in SortReorderByColumn() similar to SortReorderByRow()

(cherry picked from commit e119f3883513aeaa49f332362620e955dc8b453f)

Conflicts:
sc/source/core/data/table3.cxx

e275a754c530d6039ed14304900dd71416f36e46
7665dcc90d70fcf3b08bef0adb9ab6aaff1cdcdf

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

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 4bda39d..86d39ab 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -334,7 +334,7 @@ public:
 bool IsFormulaDirty( SCROW nRow ) const;
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-voidSetDirty( SCROW nRow1, SCROW nRow2 );
+voidSetDirty( SCROW nRow1, SCROW nRow2, bool bIncludeEmptyCells = 
false );
 voidSetDirtyVar();
 voidSetDirtyAfterLoad();
 voidSetTableOpDirty( const ScRange );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 432cf13..e7cd762 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -996,7 +996,7 @@ public:
 voidResetChanged( const ScRange rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-voidSetDirty( const ScRange );
+voidSetDirty( const ScRange, bool bIncludeEmptyCells = false 
);
 voidSetTableOpDirty( const ScRange );  // for Interpreter 
TableOp
 voidInterpretDirtyCells( const ScRangeList rRanges );
 SC_DLLPUBLIC void CalcAll();
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index 6ccda8b..9ff8d30 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -21,7 +21,9 @@ public:
 enum Type {
 Moved,
 ColumnReordered,
-RowReordered
+RowReordered,
+StartListening,
+StopListening
 };
 
 private:
@@ -95,6 +97,20 @@ public:
 SCCOL getEndColumn() const;
 };
 
+class RefStartListeningHint : public RefHint
+{
+public:
+RefStartListeningHint();
+virtual ~RefStartListeningHint();
+};
+
+class RefStopListeningHint : public RefHint
+{
+public:
+RefStopListeningHint();
+virtual ~RefStopListeningHint();
+};
+
 }
 
 #endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 0b451a4..cc0257e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -521,7 +521,7 @@ public:
 voidResetChanged( const ScRange rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext

[Libreoffice-commits] core.git: vcl/README.GDIMetaFile

2014-12-03 Thread Khaled Hosny

 vcl/README.GDIMetaFile |  416 -
 1 file changed, 208 insertions(+), 208 deletions(-)

New commits:
commit 5de46c11e48407acdeb9dbee8f80d4f6d063a0d2
Author: Khaled Hosny khaledho...@eglug.org
Date:   Wed Dec 3 19:42:26 2014 +0200

Donât use DOS line endings

Change-Id: I55b9bad4e1f6c3519b095a09101ddcc2bca29d41

diff --git a/vcl/README.GDIMetaFile b/vcl/README.GDIMetaFile
index f25ca9a..b7282a3 100644
--- a/vcl/README.GDIMetaFile
+++ b/vcl/README.GDIMetaFile
@@ -1,208 +1,208 @@
-GDIMetaFile class
-=
-
-The GDIMetaFile class reads, writes, manipulates and replays metafiles via the 
VCL module. 
-
-A typical usecase is to intialize a new GDIMetaFile, open the actual stored 
metafile and
-read it in via GDIMetaFile::Read( aIStream ). This reads in the metafile into 
the GDIMetafile
-object - it can read in an old-style VCLMTF metafile (back in the days that 
Microsoft didn't
-document the metafile format this was used), as well as EMF+ files - and adds 
them to a list
-(vector) of MetaActions. You can also populate your own GDIMetaFile via 
AddAction(),
-RemoveAction(), ReplaceAction(), etc. 
-
-Once the GDIMetafile object is read to be used, you can play the metafile, 
pause it, wind
-forward or rewind the metafile. The metafile can be moved, scaled, rotated and 
clipped, as
-well have the colours adjusted or replaced, or even made monochrome. 
-
-The GDIMetafile can be used to get an OutputDevice's metafile via the Linker() 
and Record()
-functions. 
-
-
-Using GDIMetafile
--
-
-First, create a new GDIMetafile, this can be done via the default constructor. 
It can then
-be constructed manually, or you can use Record() on an OutputDevice to 
populate the
-GDIMetaFile, or of course you can read it from file with Read(). From here you 
can then
-elect to manipulate the metafile, or play it back to another GDIMetafile or to 
an
-OutputDevice via Play(). To store the file, use Write().
-
-CONSTRUCTORS AND DESTRUCTORS
-
-- GDIMetaFile
-- GDIMetaFile( cosnt GDIMetaFile rMtf ) - copy constructor
-- ~GDIMetaFile
-
-
-OPERATORS
-
-- operator =
-- operator ==
-- operator !=
-
-
-RECORDING AND PLAYBACK FUNCTIONS
-
-- Play(GDIMetaFile, size_t)   - play back metafile into another 
metafile up
- to position
-- Play(OutputDevice*, size_t)  - play back metafile into 
OutputDevice up to
- position
-- Play(OutputDevice*, Point, Size, size_t) - play back metafile into 
OutputDevice at a
- particular location on the 
OutputDevice, up
- to the position in the metafile
-- Pause- pauses or continues the playback
-- IsPause
-- Stop - stop playback fully
-- WindStart- windback to start of the metafile
-- windPrev - windback one record
-- GetActionSize- get the number of records in the 
metafile
-
-
-METAFILE RECORD FUNCTIONS
-
-- FirstAction  - get the first metafile record
-- NextAction   - get the next metafile record from 
the
- current position
-- GetAction(size_t)- get the metafile record at 
location in file
-- GetCurAction - get the current metafile record
-- AddAction(MetaAction*)   - appends a metafile record
-- AddAction(MetaAction*, size_t)   - adds a metafile record to a 
particular
- location in the file
-- RemoveAction - removes record at file location
-- Clear- first stops if recording, then 
removes all
- metafile records
-- push_back- pushes back, basically a thin 
wrapper to the
- metafile record list
-
-
-READ AND WRITING
-
-- Read
-- Write
-- GetChecksum
-- GetSizeBytes
-
-
-DISPLACEMENT FUNCTIONS
-
-- Move( long nX, long nX)
-- Move( long nX, long nX, long nDPIX, long nDPIY ) - Move method getting 
specifics how to
- handle MapMode( MAP_PIXEL )
-
-
-TRANSFORMATION FUNCTIONS
-
-- Scale( double fScaleX, double fScaleY )
-- Scale( const Fraction rScaleX, const Fraction rScaleY )
-- Mirror
-- Rotate( long nAngle10 )
-- Clip( const Rectangle )
-
-
-COLOR ADJUSTMENT FUNCTIONS
-
-- Adjust- change luminance, contrast, 
gamma and RGB via a
-  percentage
-- Convert   - colour conversion
-- ReplaceColors
-- GetMonochromeMtf
-

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-2-8' - source/cs source/da source/nl source/sq source/th source/zh-CN

 source/cs/sw/uiconfig/swriter/ui.po   |8 +-
 source/da/helpcontent2/source/text/simpress.po|   10 +--
 source/nl/cui/uiconfig/ui.po  |8 +-
 source/sq/helpcontent2/source/auxiliary.po|   30 +-
 source/th/chart2/source/controller/dialogs.po |6 +-
 source/th/cui/source/dialogs.po   |6 +-
 source/th/cui/source/tabpages.po  |   16 ++---
 source/th/editeng/source/items.po |7 +-
 source/th/officecfg/registry/data/org/openoffice/Office/UI.po |8 +-
 source/th/sc/source/ui/sidebar.po |   18 +++---
 source/th/sc/uiconfig/scalc/ui.po |   12 ++--
 source/th/sw/uiconfig/swriter/ui.po   |7 +-
 source/th/swext/mediawiki/help.po |7 +-
 source/th/wizards/source/formwizard.po|   10 +--
 source/zh-CN/cui/uiconfig/ui.po   |   14 ++--
 source/zh-CN/sc/uiconfig/scalc/ui.po  |   16 ++---
 16 files changed, 90 insertions(+), 93 deletions(-)

New commits:
commit 2959f099a6b9ad8788f2f02a6135fd6a818aae7e
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Dec 3 18:44:49 2014 +0100

update translations for 4.2.8 rc2

and force-fix errors using pocheck

Change-Id: Ib3e43299e64390934432b57767132341a1b4f1c3

diff --git a/source/cs/sw/uiconfig/swriter/ui.po 
b/source/cs/sw/uiconfig/swriter/ui.po
index d3a8a14..7726ded 100644
--- a/source/cs/sw/uiconfig/swriter/ui.po
+++ b/source/cs/sw/uiconfig/swriter/ui.po
@@ -4,7 +4,7 @@ msgstr 
 Project-Id-Version: LibO 40l10n\n
 Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n;
 POT-Creation-Date: 2014-02-13 17:13+0100\n
-PO-Revision-Date: 2014-02-21 12:47+\n
+PO-Revision-Date: 2014-12-01 19:49+\n
 Last-Translator: Stanislav stanislav.hora...@gmail.com\n
 Language-Team: none\n
 Language: cs\n
@@ -12,9 +12,9 @@ msgstr 
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n=2  n=4) ? 1 : 2;\n
-X-Generator: Pootle 2.5.0\n
+X-Generator: Pootle 2.5.1\n
 X-Accelerator-Marker: ~\n
-X-POOTLE-MTIME: 1392986875.0\n
+X-POOTLE-MTIME: 1417463340.00\n
 
 #: abstractdialog.ui
 msgctxt 
@@ -11452,7 +11452,7 @@ msgctxt 
 label\n
 string.text
 msgid Remaining space 
-msgstr Pokud chcete pÅedmÄt zadat, napiÅ¡te jej nynÃ.
+msgstr ZbÃ½vajÃcÃ mÃsto
 
 #: tablecolumnpage.ui
 msgctxt 
diff --git a/source/da/helpcontent2/source/text/simpress.po 
b/source/da/helpcontent2/source/text/simpress.po
index 2535c78..b4651bf 100644
--- a/source/da/helpcontent2/source/text/simpress.po
+++ b/source/da/helpcontent2/source/text/simpress.po
@@ -4,17 +4,17 @@ msgstr 
 Project-Id-Version: PACKAGE VERSION\n
 Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n;
 POT-Creation-Date: 2013-11-20 13:02+0100\n
-PO-Revision-Date: 2013-12-14 12:39+\n
-Last-Translator: Leif leiflod...@gmail.com\n
+PO-Revision-Date: 2014-12-02 18:17+\n
+Last-Translator: Jesper jesper.her...@gmail.com\n
 Language-Team: LANGUAGE l...@li.org\n
 Language: da\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
-X-Generator: Pootle 2.5.0\n
+X-Generator: Pootle 2.5.1\n
 X-Accelerator-Marker: ~\n
-X-POOTLE-MTIME: 1387024765.0\n
+X-POOTLE-MTIME: 1417544234.00\n
 
 #: main.xhp
 msgctxt 
@@ -1635,7 +1635,7 @@ msgctxt 
 3\n
 help.text
 msgid For on-screen slide shows, animation, slide transitions and multimedia 
are a few of the techniques you can use to make your presentation more 
exciting.
-msgstr For skÃ¦rmprÃ¦sentationer er animation, diasovergange og multimedia 
nogle af de fÃ¥ teknikker, som du kan bruge til at gÃ¸re din prÃ¦sentation mere 
spÃ¦ndende.
+msgstr For skÃ¦rmprÃ¦sentationer er animation, diasovergange og multimedia 
nogle af de teknikker, som du kan bruge til at gÃ¸re din prÃ¦sentation mere 
spÃ¦ndende.
 
 #: main0503.xhp
 msgctxt 
diff --git a/source/nl/cui/uiconfig/ui.po b/source/nl/cui/uiconfig/ui.po
index dd0affb..22933d7 100644
--- a/source/nl/cui/uiconfig/ui.po
+++ b/source/nl/cui/uiconfig/ui.po
@@ -4,8 +4,8 @@ msgstr 
 Project-Id-Version: LibO 40l10n\n
 Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n;
 POT-Creation-Date: 2014-02-13 17:14+0100\n
-PO-Revision-Date: 2014-10-17 08:07+\n
-Last-Translator: Cor cor.no...@documentfoundation.org\n
+PO-Revision-Date: 2014-11-30 09:28+\n
+Last-Translator: kees538 kees...@hotmail.com\n
 Language-Team: none\n
 Language: nl\n
 MIME-Version: 1.0\n
@@

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

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

New commits:
commit 157ed09cc2da22eeed902d060d67104ca707b2f8
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Dec 3 18:44:49 2014 +0100

Updated core
Project: translations  2959f099a6b9ad8788f2f02a6135fd6a818aae7e

diff --git a/translations b/translations
index 609e303..2959f09 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 609e3039a017780dbb32893928deb7e848af809f
+Subproject commit 2959f099a6b9ad8788f2f02a6135fd6a818aae7e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

 readlicense_oo/license/CREDITS.fodt | 1940 ++--
 1 file changed, 976 insertions(+), 964 deletions(-)

New commits:
commit 5d8001c801efeed3dced312862d667d650b5dbfa
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Dec 3 20:20:16 2014 +0100

update credits

Change-Id: Icb64356d33e25ad3cce742232097a7cda4dccb18

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 4e7f43a..53de48e 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 ?xml version=1.0 encoding=UTF-8?
 
 office:document 
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 
xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 
xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 
xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 
xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 
xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 
xmlns:xlink=http://www.w3.org/1999/xlink; 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 
xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 
xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 
xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 
xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 
xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 
xmlns:config=urn:oas
 is:names:tc:opendocument:xmlns:config:1.0 
xmlns:ooo=http://openoffice.org/2004/office; 
xmlns:ooow=http://openoffice.org/2004/writer; 
xmlns:oooc=http://openoffice.org/2004/calc; 
xmlns:dom=http://www.w3.org/2001/xml-events; 
xmlns:xforms=http://www.w3.org/2002/xforms; 
xmlns:xsd=http://www.w3.org/2001/XMLSchema; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt=http://openoffice.org/2005/report; 
xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 
xmlns:xhtml=http://www.w3.org/1999/xhtml; 
xmlns:grddl=http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo=http://openoffice.org/2009/office; 
xmlns:tableooo=http://openoffice.org/2009/table; 
xmlns:drawooo=http://openoffice.org/2010/draw; 
xmlns:calcext=urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0
 
xmlns:loext=urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0
 xmlns:field=urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0 
xmlns:formx=urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0 
xmlns:css3t=http://www.w3.org/TR/css3-text/; office:version=1.2 
office:mimetype=application/vnd.oasis.opendocument.text
- office:metadc:titleCredits Â» 
LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits
 for the LibreOffice 
development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.3.2$Linux_X86_64
 
LibreOffice_project/9bb7eadab57b6755b1265afa86e04bf45fbfc644/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic
 meta:table-count=5 meta:image-count=1 meta:object-count=0 
meta:page-count=2 meta:paragraph-count=3009 meta:word-count=10577 
meta:character-count=76549 
meta:non-whitespace-character-count=67007/meta:user-defined 
meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta
+ office:metadc:titleCredits Â» 
LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits
 for the LibreOffice 
development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.4.1$Linux_X86_64
 
LibreOffice_project/bc356b2f991740509f321d70e4512a6a54c5f243/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic
 meta:table-count=5 meta:image-count=1 meta:object-count=0 
meta:page-count=2 meta:paragraph-count=3010 meta:word-count=10586 
meta:character-count=76626 
meta:non-whitespace-character-count=67077/meta:user-defined 
meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta
  office:settings
   config:config-item-set config:name=ooo:view-settings
-   config:config-item config:name=ViewAreaTop 
config:type=long1427/config:config-item
+   config:config-item config:name=ViewAreaTop 
config:type=long1559/config:config-item
config:config-item config:name=ViewAreaLeft 
config:type=long501/config:config-item
config:config-item config:name=ViewAreaWidth 
config:type=long32757/config:config-item
config:config-item

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-8' - readlicense_oo/license

 readlicense_oo/license/CREDITS.fodt | 1940 ++--
 1 file changed, 976 insertions(+), 964 deletions(-)

New commits:
commit 754a9ccb310116986ba135d0a13e4fb86cd8dc2c
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Dec 3 20:24:38 2014 +0100

update credits

Change-Id: Iebb1a629c6ea9880618a9fb60f4a509d2c882f73

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 4e7f43a..53de48e 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 ?xml version=1.0 encoding=UTF-8?
 
 office:document 
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 
xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 
xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 
xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 
xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 
xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 
xmlns:xlink=http://www.w3.org/1999/xlink; 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 
xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 
xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 
xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 
xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 
xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 
xmlns:config=urn:oas
 is:names:tc:opendocument:xmlns:config:1.0 
xmlns:ooo=http://openoffice.org/2004/office; 
xmlns:ooow=http://openoffice.org/2004/writer; 
xmlns:oooc=http://openoffice.org/2004/calc; 
xmlns:dom=http://www.w3.org/2001/xml-events; 
xmlns:xforms=http://www.w3.org/2002/xforms; 
xmlns:xsd=http://www.w3.org/2001/XMLSchema; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt=http://openoffice.org/2005/report; 
xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 
xmlns:xhtml=http://www.w3.org/1999/xhtml; 
xmlns:grddl=http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo=http://openoffice.org/2009/office; 
xmlns:tableooo=http://openoffice.org/2009/table; 
xmlns:drawooo=http://openoffice.org/2010/draw; 
xmlns:calcext=urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0
 
xmlns:loext=urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0
 xmlns:field=urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0 
xmlns:formx=urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0 
xmlns:css3t=http://www.w3.org/TR/css3-text/; office:version=1.2 
office:mimetype=application/vnd.oasis.opendocument.text
- office:metadc:titleCredits Â» 
LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits
 for the LibreOffice 
development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.3.2$Linux_X86_64
 
LibreOffice_project/9bb7eadab57b6755b1265afa86e04bf45fbfc644/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic
 meta:table-count=5 meta:image-count=1 meta:object-count=0 
meta:page-count=2 meta:paragraph-count=3009 meta:word-count=10577 
meta:character-count=76549 
meta:non-whitespace-character-count=67007/meta:user-defined 
meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta
+ office:metadc:titleCredits Â» 
LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits
 for the LibreOffice 
development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.4.1$Linux_X86_64
 
LibreOffice_project/bc356b2f991740509f321d70e4512a6a54c5f243/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic
 meta:table-count=5 meta:image-count=1 meta:object-count=0 
meta:page-count=2 meta:paragraph-count=3010 meta:word-count=10586 
meta:character-count=76626 
meta:non-whitespace-character-count=67077/meta:user-defined 
meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta
  office:settings
   config:config-item-set config:name=ooo:view-settings
-   config:config-item config:name=ViewAreaTop 
config:type=long1427/config:config-item
+   config:config-item config:name=ViewAreaTop 
config:type=long1559/config:config-item
config:config-item config:name=ViewAreaLeft 
config:type=long501/config:config-item
config:config-item config:name=ViewAreaWidth 
config:type=long32757/config:config-item
config:config-item

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e00410aa2c678cb99f9a8e7d756a7f297048e5f0
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Dec 3 20:27:40 2014 +0100

bump product version to 4.2.8.2.0+

Change-Id: I7c476db2115851433cca7d4fb991612cec19cdab

diff --git a/configure.ac b/configure.ac
index 221d8fd..c6ef4db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.8.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.8.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.8.2'

Tag 'libreoffice-4.2.8.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-12-03 19:27 -0800

Tag libreoffice-4.2.8.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUf2QFAAoJEPQ0oe+v7q6jFi8P/i/+7ZqoBVZfGqS/T48p+T53
gy6utyGyJ9qAGZxvV2/4J/mwi3b2C1h23DkJfi5qS9ebeUHHRd87jyTfAjQjMeeY
H2VuRyK0HgI0svXjmgRJFaXVe1fNckbAgTtNFjmhepyBte3OURxyDSg0GSIOBMIp
b6/3OSf8aaOPbCUc0E2rO1Qam83btGITA1L/9GxxH8y33XM4ftie/cfIsWkyhQXv
y+XLmttWvX/5c4OjzGdnvmvMXoVtcUgBTi204kaT6ecGb3B1U09ge3sI0Tqupuv+
tHk42Yj4FSivDA8A9zvqVCL2Lu26whDkqMhRG3qU77lPjXSrcQdMKiRbaVN9BDul
wZIfGBa/b6Y4WZmjtnlLiCxInnaBUl2PKOGXiSRhv3CmU0mcj3JZxkSLaYSekjsQ
tTrJqjc+2pUMCpwyduGOudOyG78aXimijAt2UxdDtN2Qng/QLhsoqjopGL8C19iB
H4gJRGMJybYlI+SfNH7MCpQBTs7kLW7YNiO+f3yXvLJzzrK5duJnQ+87i0n1zx0b
6BEdpmHayfxQFmjgJuSLca41wNVaK8YFSPK9da26jZ1vnTCiNgA90jprS83+jXc1
5vGIHNEqp/61CkI3p/Rt+Laa/r7BzBQFwJr4ZG6f6sMETEpuweyAiQ/3CnetiqAW
T5ALcHTKlLW2/LOOHCx2
=fQU7
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.8.2'

Tag 'libreoffice-4.2.8.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-12-03 19:27 -0800

Tag libreoffice-4.2.8.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUf2QMAAoJEPQ0oe+v7q6jHMEQAKcYjluI1UjVV75kvFVOA+Mh
IZUcihsC1Q1AfyCNW+l0TCLjD71SyMChiuACEzZf0YFBUx6gHqAqNpcT8uVqTNO/
LXvw9IdlxfCC6izjPa34vlXMgYdfn4X99zZg6iTGiRdOBY9Nlx9WAZgDa21yxRve
tmU1IJeIt72KM8YRv+J8KdA92x1LyXloMbhFKyM0IyCacEIVtCaL6SsoStiKkpKC
vNCGVJbzXfngnk3Ex+XVoE8ju1e+QS1hZYDSh13D+W5qnwlN20Cith6bYWOMD2Hi
xQDdkUsC4jZTr0ToHsLr5Kp37JIGlo2gU9y0Benj42eGvWL64FNY5c9Ddg1VMn3X
tbIMaF7Rn3ZqPU1Qzc0yxA+WytNxMtX2drA+tRVD1E/LUQNyvZUHT52cHImHUwzM
gfb882Kbklr6Gh/X1iG/zg7daAioECffhCPfU7hHE/8zd91lUtK4ordgNooUNdVc
MkIt7+ZEB2V13fgvLHb2SekxXocXZ8pCeXY5xyqeSdIYAb+kVN6WcU5TYHc/RIIk
53Yd5lxNlEH1l816CZtFrpWwheL3EzAXJ1UkK5k62SmP6JBqNY9ioYmVBGwSh5jM
8oJ5MNdIYDY9utdh1+6AwdVMv4uqpxCC6F9MrKBeoHcw/xNozgwbwA7bVfOBlrsj
/WvwkFV4cU+pSA5HaDpB
=c1ZT
-END PGP SIGNATURE-

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.8.2'

Tag 'libreoffice-4.2.8.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-12-03 19:27 -0800

Tag libreoffice-4.2.8.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUf2QJAAoJEPQ0oe+v7q6jXusP/iqg46PtQR/x5TODvOD+pK7c
C4fR4AJJCFpLmW5bsskLgSwdxcGi5nzMzKrTXJ0cTAmxSxhuoiL1zuDMloGbH+tv
dvsXZXu8EhKPNMdGO0voJ2eDKGerVFU3hHpY+YgRXzMk2vDYtu82M6N8hTTyT4qG
sn/ji1jFszUgOiYaNXoLiAl99IIg0+djn1lnwyu3UrKsv1keo6lmwuAwvJvhS3KM
wxQfhqYLW9HVJIKN6GKXDIJd7baCX+phv1vcpuQ+E+ddJK5P4SExdz8CR2wTHo6p
lL2i0lb4f9SpMQkS5E7Mh+xhPVhP4XCRxdhOHTyS5t24ndrTGdME7gyx88SSDCuO
CUv3ohskavOYHIRUwo50nj3eb9UuIQtelFsV6uLarmHkLtGl3epqOLEc7rJDrxx3
D3QbROvrTF7wYl+GNNHWfmOa0zxjsZ1Y2Aa63K+sF7S1S7YnOdLV8c/ODp8VcT/s
g+dD4sex4QufmJD4Lp2UPXq89trF7qSQ5+BgCtxXs7v0aH1SnS8KXKlbuUUSPpFj
MaRJoc9JgKby1zIv/wT0z23wdU8DpwkD+byvoKZ/eFGd+T8ohhoKouhUcLxmj6vM
Sc9UCE4zC4hLnm+3FvK9sdzKA7Rd5yzOn7d3jTuJWjtcmxP10LewsnGVxSed4D6Z
jB525zDEsKfaaApf+7Gb
=yD1P
-END PGP SIGNATURE-

Changes since cp-4.2-19-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.8.2'

Tag 'libreoffice-4.2.8.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-12-03 19:27 -0800

Tag libreoffice-4.2.8.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUf2QPAAoJEPQ0oe+v7q6jTOIP/1h7tDsrWbe6C9rZtkuyWBIY
/LnMltQhmcmnr0XjmgZH+qBASsCuH/RRdVx3Pu4prDwhH40969sGa3d1gbv8ULsO
HwLM3WUUyBScV3oH/Kb9Xy/Vv9IXsVxhSGPeC3P6lkJheQodCbU4lrNlWpGK2U5R
zfqLHiydBCYXAWNyOyaNFc1fOeroOh53IswJxN/aBMkkxzafguT0IAn9PoJGrPqM
fkfhRBJE+y0WOOeJMh56incOpcNvdFLM2ySZmxXyEebQx0PJnfyA5fwT7Y/kAVtv
x+SwoHGDjlAnMP9Pg1O1AldVzMxgMczgELCxFnvaCI9JkgQG6ljDSSI3zylQ65vr
T4jVh0BezupAWpykZEtuDDOaKnjeqsqi0yAPvpSxn3UJr70/61wxIBRr8jkgwpKq
82xDf17HuVLBx4tMQOPaqLMDKiV4B8npGmNqkW96meezlRWLiikyDY++9rEv8kPm
JZWS4XKbY2W7CdK2fqbgUBciohQH2njw6KDr6G4wB9484oFG082iUeXg2d6C/zuv
9APRfQ4rqpY0MtNJiiITpo2X19vWId95jOIZZ05QfgFM87LjRadxQQvqy59YRpLM
r+rbYETor75E+rpek6vJMcF0SCdQdRnnb50UxMZXw+DAS6fJfQ8cfMQEInm7hRQi
BuMd3Pzc5wvE76LsNO9Y
=AT+V
-END PGP SIGNATURE-

Changes since cp-4.2-branch-point-764:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basic/source cui/source framework/source unotools/source

 basic/source/inc/namecont.hxx   |2 
 basic/source/uno/namecont.cxx   |   33 ---
 cui/source/options/treeopt.cxx  |   28 --
 framework/source/fwe/classes/addonsoptions.cxx  |   23 -
 framework/source/uielement/imagebuttontoolbarcontroller.cxx |   39 -
 unotools/source/config/lingucfg.cxx |   51 +++-
 6 files changed, 26 insertions(+), 150 deletions(-)

New commits:
commit 179810cdf254177197a3108e970d9555468cd265
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 3 20:29:58 2014 +0100

Further clean-up

Change-Id: I20049b482c831e4ac2221fddfe80deb9847e72c3

diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index bcbd245..c1c90d3 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -34,7 +34,6 @@
 #include com/sun/star/ucb/XSimpleFileAccess3.hpp
 #include com/sun/star/io/XOutputStream.hpp
 #include com/sun/star/io/XInputStream.hpp
-#include com/sun/star/util/XMacroExpander.hpp
 #include com/sun/star/util/XStringSubstitution.hpp
 #include com/sun/star/document/XStorageBasedDocument.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
@@ -231,7 +230,6 @@ class SfxLibraryContainer : public 
SfxLibraryContainer_BASE, public ::utl::OEven
 protected:
 ::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext 
   mxContext;
 ::com::sun::star::uno::Reference 
::com::sun::star::ucb::XSimpleFileAccess3   mxSFI;
-::com::sun::star::uno::Reference ::com::sun::star::util::XMacroExpander  
mxMacroExpander;
 ::com::sun::star::uno::Reference 
::com::sun::star::util::XStringSubstitution mxStringSubstitution;
 ::com::sun::star::uno::WeakReference ::com::sun::star::frame::XModel 
mxOwnerDocument;
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 09fc0e6..d95596d 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -31,7 +31,6 @@
 #include osl/mutex.hxx
 #include tools/errinf.hxx
 #include rtl/ustring.hxx
-#include rtl/uri.hxx
 #include rtl/strbuf.hxx
 #include comphelper/getexpandeduri.hxx
 #include comphelper/processfactory.hxx
@@ -60,7 +59,6 @@
 #include com/sun/star/script/vba/VBAScriptEventId.hpp
 #include com/sun/star/ucb/SimpleFileAccess.hpp
 #include com/sun/star/util/PathSubstitution.hpp
-#include com/sun/star/util/theMacroExpander.hpp
 #include com/sun/star/deployment/ExtensionManager.hpp
 #include comphelper/storagehelper.hxx
 #include cppuhelper/exc_hlp.hxx
@@ -92,8 +90,6 @@ using namespace osl;
 
 using com::sun::star::uno::Reference;
 
-using ::rtl::Uri;
-
 // #i34411: Flag for error handling during migration
 static bool GbMigrationSuppressErrors = false;
 
@@ -1384,10 +1380,6 @@ throw(WrappedTargetException, RuntimeException)
 return true;
 }
 
-
-
-#define EXPAND_PROTOCOL vnd.sun.star.expand
-
 OUString SfxLibraryContainer::createAppLibraryFolder( SfxLibrary* pLib, const 
OUString aName )
 {
 OUString aLibDirPath = pLib-maStorageURL;
@@ -2877,23 +2869,8 @@ void SAL_CALL SfxLibraryContainer::exportLibrary( const 
OUString Name, const OU
 OUString SfxLibraryContainer::expand_url( const OUString url )
 throw(::com::sun::star::uno::RuntimeException)
 {
-if (url.startsWith( EXPAND_PROTOCOL : ))
+if (url.startsWithIgnoreAsciiCase( vnd.sun.star.expand: ))
 {
-if( !mxMacroExpander.is() )
-{
-Reference util::XMacroExpander  xExpander = 
util::theMacroExpander::get(mxContext);
-MutexGuard guard( Mutex::getGlobalMutex() );
-if( !mxMacroExpander.is() )
-{
-mxMacroExpander = xExpander;
-}
-}
-
-if( !mxMacroExpander.is() )
-{
-return url;
-}
-
 return comphelper::getExpandedUri(mxContext, url);
 }
 else if( mxStringSubstitution.is() )
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index dc0c169..05bb302 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -65,7 +65,6 @@
 #include com/sun/star/frame/ModuleManager.hpp
 #include com/sun/star/loader/CannotActivateFactoryException.hpp
 #include com/sun/star/linguistic2/LinguProperties.hpp
-#include com/sun/star/util/theMacroExpander.hpp
 #include com/sun/star/setup/UpdateCheck.hpp
 #include comphelper/getexpandeduri.hxx
 #include comphelper/processfactory.hxx
@@ -77,7 +76,6 @@
 #include osl/module.hxx
 #include osl/process.h
 #include rtl/bootstrap.hxx
-#include rtl/uri.hxx
 #include sfx2/app.hxx
 #include sfx2/dispatch.hxx
 #include sfx2/module.hxx
@@ -120,8 +118,6 @@ using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 
-#define EXPAND_PROTOCOL vnd.sun.star.expand:
-
 LastPageSaver*

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

 writerfilter/inc/resourcemodel/TableData.hxx |  423 --
 writerfilter/source/dmapper/TableData.hxx|  426 +++
 writerfilter/source/dmapper/TableManager.hxx |3 
 3 files changed, 427 insertions(+), 425 deletions(-)

New commits:
commit 1ef57521af0a53d03c68321817f9dadf7f4dd730
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Dec 3 21:27:46 2014 +0100

writerfilter: only dmapper needs TableData

Change-Id: I4c2ead05d845eebe101d34ed8fe9284509beb752

diff --git a/writerfilter/inc/resourcemodel/TableData.hxx 
b/writerfilter/source/dmapper/TableData.hxx
similarity index 97%
rename from writerfilter/inc/resourcemodel/TableData.hxx
rename to writerfilter/source/dmapper/TableData.hxx
index 53299b8..7f8b406 100644
--- a/writerfilter/inc/resourcemodel/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_TABLEDATA_HXX
-#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_TABLEDATA_HXX
+#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_RESOURCEMODEL_TABLEDATA_HXX
+#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_RESOURCEMODEL_TABLEDATA_HXX
 
 #include resourcemodel/WW8ResourceModel.hxx
 
@@ -27,6 +27,8 @@
 
 namespace writerfilter
 {
+namespace dmapper
+{
 
 template typename T, typename PropertiesPointer
 /**
@@ -417,7 +419,8 @@ public:
 };
 
 }
+}
 
-#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_TABLEDATA_HXX
+#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_RESOURCEMODEL_TABLEDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TableManager.hxx 
b/writerfilter/source/dmapper/TableManager.hxx
index 2559d54..b7fed59 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX
 
-#include resourcemodel/TableData.hxx
-
 #include resourcemodel/WW8ResourceModel.hxx
 
 #include ooxml/resourceids.hxx
@@ -33,6 +31,7 @@
 
 #include rtl/strbuf.hxx
 #include PropertyMap.hxx
+#include TableData.hxx
 
 namespace writerfilter
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: 2 commits - .gitignore Makefile.am

2014-12-03 Thread David Tardon

 .gitignore  |1 +
 Makefile.am |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9990891b8af5b8e91cea086f6122095868ea49a3
Author: David Tardon dtar...@redhat.com
Date:   Wed Dec 3 22:44:04 2014 +0100

add tags to .gitignore

Change-Id: Ia4601bd76a23f10a9d231b1b1a043331c7f9c47c

diff --git a/.gitignore b/.gitignore
index 9e03dc5..3ead918 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ m4
 missing
 mkinstalldirs
 stamp-h1
+tags
 *.pc
 *.rc
 *~
commit 33799daf513f761114756e8550d7b19abb95cfa7
Author: David Tardon dtar...@redhat.com
Date:   Wed Dec 3 22:43:27 2014 +0100

remove tags on distclean

Change-Id: Ie564dbd2be7d6dd744897ef7835f44103b9e6dbb

diff --git a/Makefile.am b/Makefile.am
index 3b52e8e..ca01bdd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = \
libvisio.pc.in
 
 distclean-local:
-   rm -rf *.cache *~ *.out *.pc
+   rm -rf *.cache *~ *.out *.pc tags
 
 dist-hook:
git log --date=short --pretty=format:@%cd  %an  %ae  
[%H]%n%n%s%n%n%e%b | sed -e s|^\([^@]\)|\t\1| -e s|^@|| 
$(distdir)/ChangeLog
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 3 commits - include/vcl vcl/generic vcl/headless vcl/inc vcl/opengl vcl/quartz vcl/source vcl/unx vcl/win

2014-12-03 Thread Louis-Francis Ratté-Boulianne

 include/vcl/bitmap.hxx   |4 
 include/vcl/bmpacc.hxx   |  120 --
 include/vcl/salbtype.hxx |   10 ++
 vcl/generic/print/genpspgraphics.cxx |4 
 vcl/headless/svpbmp.cxx  |6 -
 vcl/inc/headless/svpbmp.hxx  |4 
 vcl/inc/impbmp.hxx   |5 -
 vcl/inc/opengl/salbmp.hxx|4 
 vcl/inc/quartz/salbmp.h  |4 
 vcl/inc/salbmp.hxx   |5 -
 vcl/inc/unx/salbmp.h |4 
 vcl/inc/win/salbmp.h |4 
 vcl/opengl/salbmp.cxx|   32 ---
 vcl/opengl/scale.cxx |2 
 vcl/quartz/salbmp.cxx|6 -
 vcl/source/gdi/bitmap.cxx|   23 -
 vcl/source/gdi/bmpacc.cxx|  138 ++-
 vcl/source/gdi/impbmp.cxx|   10 +-
 vcl/unx/generic/gdi/gdiimpl.cxx  |   12 +-
 vcl/unx/generic/gdi/salbmp.cxx   |6 -
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   11 +-
 vcl/unx/gtk/window/gtksalframe.cxx   |8 -
 vcl/win/source/gdi/gdiimpl.cxx   |3 
 vcl/win/source/gdi/salbmp.cxx|   24 ++---
 24 files changed, 267 insertions(+), 182 deletions(-)

New commits:
commit f5b314cf64e9037aade80c64f0ce6b90e78a3bbb
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Wed Dec 3 17:05:01 2014 -0500

vcl: Reset data buffer after resizing bitmap on GPU

Change-Id: I516cdbc466f3d6427e36fea8c5cdbe718ce7d0ea

diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 7bcf7c0..4703c1f 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -192,6 +192,7 @@ bool OpenGLSalBitmap::ImplScale( const double rScaleX, 
const double rScaleY, s
 {
 SAL_INFO( vcl.opengl, ::ImplScale );
 
+maUserBuffer.reset();
 makeCurrent();
 
 if( nScaleFlag == BMP_SCALE_FAST )
@@ -253,7 +254,6 @@ bool OpenGLSalBitmap::Scale( const double rScaleX, const 
double rScaleY, sal_u
 nScaleFlag == BMP_SCALE_SUPER ||
 nScaleFlag == BMP_SCALE_LANCZOS )
 {
-//TODO maUserBuffer.reset();
 makeCurrent();
 if( mpContext == NULL )
 {
commit efdc26f77cdb142651fea0044b5bf3a1d0ab1a44
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Wed Dec 3 17:04:15 2014 -0500

vcl: Use right size to draw native GTK window background

Change-Id: Id446d20599f072f657c6106d6c6457fce08830e6

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index f3b1ecf6..2c6036b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1551,13 +1551,11 @@ bool GtkSalGraphics::NWPaintGTKFrame(
 bool GtkSalGraphics::NWPaintGTKWindowBackground(
 GdkDrawable* gdkDrawable,
 ControlType, ControlPart,
-const Rectangle /* rControlRectangle */,
+const Rectangle rControlRectangle,
 const clipList rClipList,
 ControlState /* nState */, const ImplControlValue,
 const OUString )
 {
-int w,h;
-gtk_window_get_size(GTK_WINDOW(m_pWindow),w,h);
 GdkRectangle clipRect;
 for( clipList::const_iterator it = rClipList.begin(); it != 
rClipList.end(); ++it )
 {
@@ -1566,7 +1564,12 @@ bool GtkSalGraphics::NWPaintGTKWindowBackground(
 clipRect.width = it-GetWidth();
 clipRect.height = it-GetHeight();
 
-
gtk_paint_flat_box(m_pWindow-style,gdkDrawable,GTK_STATE_NORMAL,GTK_SHADOW_NONE,clipRect,m_pWindow,base,0,0,w,h);
+
gtk_paint_flat_box(m_pWindow-style,gdkDrawable,GTK_STATE_NORMAL,GTK_SHADOW_NONE,clipRect,
+   m_pWindow,base,
+   rControlRectangle.Left(),
+   rControlRectangle.Top(),
+   rControlRectangle.GetWidth(),
+   rControlRectangle.GetHeight());
 }
 
 return true;
commit 046a4884082f9a030c2fe095f455c6e72fa5434a
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Wed Dec 3 17:02:37 2014 -0500

vcl: Add BitmapInfoAccess for bitmaps' metadata access

Change-Id: Iec9f8c7d8f7cded0aef9e017373e44387dc0b05c

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index accb763..7675418 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -294,6 +294,7 @@ private:
 }
 };
 
+class   BitmapInfoAccess;
 class   BitmapReadAccess;
 class   BitmapWriteAccess;
 class   BitmapPalette;
@@ -850,9 +851,10 @@ public:
 
 public:
 
+BitmapInfoAccess*   AcquireInfoAccess();
 BitmapReadAccess*   AcquireReadAccess();
 BitmapWriteAccess*  AcquireWriteAccess();
-voidReleaseAccess( BitmapReadAccess* pAccess );
+voidReleaseAccess( BitmapInfoAccess* pAccess );

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/source xmloff/source xmlscript/source

 sc/source/filter/excel/xiescher.cxx|3 +--
 xmloff/source/forms/elementexport.cxx  |4 
 xmloff/source/forms/layerimport.cxx|6 ++
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |1 +
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |8 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 62f144ef3b4e9e5d8cd9b624f86ff823380d425b
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Dec 3 14:11:34 2014 -0800

Revert ODF export: don't write invalid group-name attribute

This reverts commit 53824b05f99ac7c68e6d48b53e2bd98c0fe274c7.

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 8d86040..a739409 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2321,8 +2321,7 @@ void XclImpOptionButtonObj::DoProcessControl( 
ScfPropertySet rPropSet ) const
 ScfPropertySet aProps( xCtrlModel );
 OUString sGroupName = OUString::number( 
pLeader-GetDffShapeId() );
 
-// for radio buttons, Name is the group name
-aProps.SetStringProperty( Name, sGroupName );
+aProps.SetStringProperty( GroupName, sGroupName );
 aProps.SetStringProperty( RefValue, OUString::number( 
nRefVal++ ) );
 if ( pLeader-HasCellLink()  !pTbxObj-HasCellLink() )
 {
diff --git a/xmloff/source/forms/elementexport.cxx 
b/xmloff/source/forms/elementexport.cxx
index 3118b19..5d4e635 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1158,9 +1158,11 @@ namespace xmloff
 {
 static const sal_Int32 nStringPropertyAttributeIds[] =
 {   // attribute flags
+SCA_GROUP_NAME
 };
 static const OUString pStringPropertyNames[] =
 {   // property names
+OUString(PROPERTY_GROUP_NAME)
 };
 
 static const sal_Int32 nIdCount = sizeof( 
nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
@@ -1656,6 +1658,8 @@ namespace xmloff
 }
 if ( m_xPropertyInfo-hasPropertyByName( 
PROPERTY_IMAGE_POSITION ) )
 m_nIncludeSpecial |= SCA_IMAGE_POSITION;
+if ( m_xPropertyInfo-hasPropertyByName( PROPERTY_GROUP_NAME ) 
)
+m_nIncludeSpecial |= SCA_GROUP_NAME;
 m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
 m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
 break;
diff --git a/xmloff/source/forms/layerimport.cxx 
b/xmloff/source/forms/layerimport.cxx
index 39c5b4c..adc7998 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -78,11 +78,9 @@ 
OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport _rImporter)
 // string properties which are exported as attributes
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), 
PROPERTY_NAME);
-// map invalid group-name attribute to name
-// (since radio buttons are grouped by name)
-m_aAttributeMetaData.addStringProperty(
-OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_NAME);
 m_aAttributeMetaData.addStringProperty(
+OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_GROUP_NAME);
+m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), 
PROPERTY_IMAGEURL);
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), 
PROPERTY_LABEL);
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index e71389b..00d575e 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -427,6 +427,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * 
all_styles  )
 readImageURLAttr( ImageURL, XMLNS_DIALOGS_PREFIX :image-src );
 readImagePositionAttr( ImagePosition, XMLNS_DIALOGS_PREFIX 
:image-position );
 readBoolAttr( MultiLine, XMLNS_DIALOGS_PREFIX :multiline );
+readStringAttr( GroupName, XMLNS_DIALOGS_PREFIX :group-name );
 
 sal_Int16 nState = 0;
 if (readProp( State ) = nState)
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 3963e59..47ee825a 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1177,9 +1177,7 @@ void TitledBoxElement::endElement()
 ctx.importImageURLProperty( ImageURL ,  image-src , _xAttributes );
 ctx.importImagePositionProperty( ImagePosition,

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

 sc/source/filter/lotus/lotform.cxx |  101 +
 1 file changed, 69 insertions(+), 32 deletions(-)

New commits:
commit eca1d9ce9b171d8813ee19fc6fda966301f54ea6
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Dec 3 23:06:37 2014 +0100

Lotus 1-2-3: fix import of mathematical functions

@EVEN, @ODD, @CSC, CSCH, @LARGE, @SMALL, @MODULO, @ROUNDUP,
@ROUNDDOWN, @SEC, @SECH

Change-Id: I5b53bf662664a1a9adc56cb8da08b8d7a3916711

diff --git a/sc/source/filter/lotus/lotform.cxx 
b/sc/source/filter/lotus/lotform.cxx
index c9207db..e83d50a 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -161,6 +161,19 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, 
const sal_Char* pExtStri
 }
 }
 break;
+case ocRoundUp:
+case ocRoundDown:
+{
+// omit optional 3rd parameter
+if ( nAnz == 3 )
+{
+eParam[ 0 ] = eParam[ 1 ];
+eParam[ 1 ] = eParam[ 2 ];
+nAnz = 2;
+}
+
+}
+break;
 default:;
 }
 
@@ -1999,9 +2012,9 @@ static DefTokenId lcl_KnownAddIn( const OString rTest )
 else if (rTest == TANH)
 eId=ocTanHyp;
 else if (rTest == EVEN)
-eId=ocIsEven;
+eId=ocEven;
 else if (rTest == ODD)
-eId=ocIsOdd;
+eId=ocOdd;
 else if (rTest == ACOT)
 eId=ocArcCot;
 else if (rTest == COT)
@@ -2048,6 +2061,24 @@ static DefTokenId lcl_KnownAddIn( const OString rTest )
 eId=ocCountIf;
 else if (rTest == DPURECOUNT)
 eId=ocDBCount;
+else if (rTest == CSC)
+eId=ocCosecant;
+else if (rTest == CSCH)
+eId=ocCosecantHyp;
+else if (rTest == LARGE)
+eId=ocLarge;
+else if (rTest == SMALL)
+eId=ocSmall;
+else if (rTest == MODULO)
+eId=ocMod;
+else if (rTest == ROUNDDOWN)
+eId=ocRoundDown;
+else if (rTest == ROUNDUP)
+eId=ocRoundUp;
+else if (rTest == SEC)
+eId=ocSecant;
+else if (rTest == SECH)
+eId=ocSecantHyp;
 return eId;
 }
 
commit 1f0ab491cf5ccf1d05f54ab5864e10136cf59fac
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Dec 3 20:28:34 2014 +0100

Lotus 1-2-3: fix import of database functions

@DCOUNT, @DPURECOUNT, @DSTD, @DSTDS, @DVAR, @DVARS, @COUNTIF, @SUMIF

Change-Id: I0aafaee6e402d9e842a44327e0dd33ffdd27e2c1

diff --git a/sc/source/filter/lotus/lotform.cxx 
b/sc/source/filter/lotus/lotform.cxx
index 2393e16..c9207db 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1006,11 +1006,11 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
 ocHLookup,  //   90 Hlookup()
 ocDBSum,//   91 XlfDsum
 ocDBAverage,//   92 XlfDaverage
-ocDBCount,  //   93 XlfDcount
+ocDBCount2, //   93 XlfDcount
 ocDBMin,//   94 XlfDmin
 ocDBMax,//   95 XlfDmax
-ocDBVar,//   96 XlfDvar
-ocDBStdDev, //   97 XlfDstdev
+ocDBVarP,   //   96 XlfDvar
+ocDBStdDevP,//   97 XlfDstdev
 ocIndex,//   98 Index()
 ocColumns,  //   99 Cols()
 ocRows, //  100 Rows()
@@ -1535,11 +1535,11 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 
nIndex )
 ocHLookup,  //   90 Hlookup()
 ocDBSum,//   91 XlfDsum
 ocDBAverage,//   92 XlfDaverage
-ocDBCount,  //   93 XlfDcount
+ocDBCount2, //   93 XlfDcount
 ocDBMin,//   94 XlfDmin
 ocDBMax,//   95 XlfDmax
-ocDBVar,//   96 XlfDvar
-ocDBStdDev, //   97 XlfDstdev
+ocDBVarP,   //   96 XlfDvar
+ocDBStdDevP,//   97 XlfDstdev
 ocIndex,//   98 Index()
 ocColumns,  //   99 Cols()
 ocRows, //  100 Rows()
@@ -1575,8 +1575,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex 
)
 ocNoName,   //  130 Reserved (internal)
 ocGetActDate,   //  131 Today
 ocNoName,   //  132 Vdb
-ocDBVarP,   //  133 Dvars
-ocDBStdDevP,//  134 Dstds
+ocDBVar,//  133 Dvars
+ocDBStdDev, //  134 Dstds
 ocVarA, //  135 Vars
 ocStDevA,   //  136 Stds
 ocGetDiffDate360,   //  137 D360
@@ -2042,6 +2042,12 @@ static DefTokenId lcl_KnownAddIn( const OString rTest )
 eId=ocZZR;
 else if (rTest == CTERM)
 eId=ocZZR;
+else if (rTest == SUMIF)
+eId=ocSumIf;
+else if

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - sc/source xmloff/source xmlscript/source

 sc/source/filter/excel/xiescher.cxx|3 +--
 xmloff/source/forms/elementexport.cxx  |4 
 xmloff/source/forms/layerimport.cxx|6 ++
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |1 +
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |8 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit b09efb32073ad8a86af3b3ed6f3dcd276496ddf7
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Dec 3 14:28:07 2014 -0800

Revert ODF export: don't write invalid group-name attribute

This reverts commit e252913157146928f64d8594f8f142dd5966126c.

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 55df51e..29897285 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2287,8 +2287,7 @@ void XclImpOptionButtonObj::DoProcessControl( 
ScfPropertySet rPropSet ) const
 ScfPropertySet aProps( xCtrlModel );
 OUString sGroupName = OUString::number( 
pLeader-GetDffShapeId() );
 
-// for radio buttons, Name is the group name
-aProps.SetStringProperty( Name, sGroupName );
+aProps.SetStringProperty( GroupName, sGroupName );
 aProps.SetStringProperty( RefValue, OUString::number( 
nRefVal++ ) );
 if ( pLeader-HasCellLink()  !pTbxObj-HasCellLink() )
 {
diff --git a/xmloff/source/forms/elementexport.cxx 
b/xmloff/source/forms/elementexport.cxx
index 228e1d22..6a94b34 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1158,9 +1158,11 @@ namespace xmloff
 {
 static const sal_Int32 nStringPropertyAttributeIds[] =
 {   // attribute flags
+SCA_GROUP_NAME
 };
 static const OUString pStringPropertyNames[] =
 {   // property names
+OUString(PROPERTY_GROUP_NAME)
 };
 
 static const sal_Int32 nIdCount = sizeof( 
nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
@@ -1656,6 +1658,8 @@ namespace xmloff
 }
 if ( m_xPropertyInfo-hasPropertyByName( 
PROPERTY_IMAGE_POSITION ) )
 m_nIncludeSpecial |= SCA_IMAGE_POSITION;
+if ( m_xPropertyInfo-hasPropertyByName( PROPERTY_GROUP_NAME ) 
)
+m_nIncludeSpecial |= SCA_GROUP_NAME;
 m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
 m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
 break;
diff --git a/xmloff/source/forms/layerimport.cxx 
b/xmloff/source/forms/layerimport.cxx
index ce6c4e2..fa1ff91 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -76,11 +76,9 @@ 
OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport _rImporter)
 // string properties which are exported as attributes
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), 
PROPERTY_NAME);
-// map invalid group-name attribute to name
-// (since radio buttons are grouped by name)
-m_aAttributeMetaData.addStringProperty(
-OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_NAME);
 m_aAttributeMetaData.addStringProperty(
+OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), 
PROPERTY_GROUP_NAME);
+m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), 
PROPERTY_IMAGEURL);
 m_aAttributeMetaData.addStringProperty(
 OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), 
PROPERTY_LABEL);
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 531217d..e20fc17 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -424,6 +424,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * 
all_styles  )
 readImageURLAttr( ImageURL, XMLNS_DIALOGS_PREFIX :image-src );
 readImagePositionAttr( ImagePosition, XMLNS_DIALOGS_PREFIX 
:image-position );
 readBoolAttr( MultiLine, XMLNS_DIALOGS_PREFIX :multiline );
+readStringAttr( GroupName, XMLNS_DIALOGS_PREFIX :group-name );
 
 sal_Int16 nState = 0;
 if (readProp( State ) = nState)
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index a6a1a87..214b17e 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1174,9 +1174,7 @@ void TitledBoxElement::endElement()
 ctx.importImageURLProperty( ImageURL ,  image-src , _xAttributes );
 ctx.importImagePositionProperty( ImagePosition,

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

2014-12-03 Thread Zolnai Tamás

 include/svtools/grfmgr.hxx |1 +
 svx/source/svdraw/svdograf.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 02b17c1bbdd19a978b9de646c0dacdad179c60de
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Wed Dec 3 20:50:24 2014 +0100

Linked graphic is not displayed

Regression from:
17475638138c92162be1c0f34cf1f9cc95c63579

Change-Id: Ie2d484fbe065c24d19938c8c9c68818bd1076f2d

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 2bdbc9a..234ec9a 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -157,6 +157,7 @@ public:
 class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream
 {
 friend class GraphicManager;
+friend class SdrGrafObj;
 
 private:
 
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 8dbb3c4..a353e0f 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -624,6 +624,7 @@ void SdrGrafObj::SetGraphicLink(const OUString rFileName, 
const OUString rRefe
 aFilterName = rFilterName;
 ImpLinkAnmeldung();
 pGraphic-SetUserData();
+pGraphic-SetSwapState();
 }
 
 void SdrGrafObj::ReleaseGraphicLink()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/inc/table.hxx |2 +-
 sc/source/core/data/documen7.cxx |   23 +--
 sc/source/core/data/document.cxx |2 +-
 sc/source/core/data/table2.cxx   |4 ++--
 4 files changed, 21 insertions(+), 10 deletions(-)

New commits:
commit 7b95b0cc2b7806aa00e5b201e0cd922274d0c04d
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 3 21:09:41 2014 +0100

do not construct an ScAddress on each iteration

Change-Id: I3c89e649c289cd50035929d4025d0c18968b36f9

diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index dc511a5..45c9416 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -157,10 +157,15 @@ void ScDocument::BroadcastCells( const ScRange rRange, 
sal_uLong nHint )
 ScConditionalFormatList* pCondFormList = GetCondFormList(nTab);
 if (pCondFormList)
 {
+ScAddress aAddress( 0, 0, nTab);
 for (SCROW nRow = nRow1; nRow = nRow2; ++nRow)
 {
+aAddress.SetRow(nRow);
 for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
-pCondFormList-SourceChanged(ScAddress(nCol,nRow,nTab));
+{
+aAddress.SetCol(nCol);
+pCondFormList-SourceChanged(aAddress);
+}
 }
 }
 }
commit 99270aefbfbec2f759f1f96e8777f76bc113dabc
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 3 20:41:33 2014 +0100

slightly speed-up things by using ScTable access

Change-Id: I378cd0e1eaa0f41799e4e18d1daae813540da77d

diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 6429fa5..dc511a5 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -120,16 +120,22 @@ void ScDocument::BroadcastCells( const ScRange rRange, 
sal_uLong nHint )
 
 for (SCTAB nTab = nTab1; nTab = nTab2; ++nTab)
 {
+ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+continue;
+
 rPos.SetTab(nTab);
-for (SCROW nRow = nRow1; nRow = nRow2; ++nRow)
+for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
 {
-rPos.SetRow(nRow);
-for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
+rPos.SetCol(nCol);
+/* TODO: to speed-up things a per column iterator to
+ * cell-broadcast in a range of rows would come handy. */
+for (SCROW nRow = nRow1; nRow = nRow2; ++nRow)
 {
-rPos.SetCol(nCol);
-SvtBroadcaster* pBC = GetBroadcaster(rPos);
+SvtBroadcaster* pBC = pTab-GetBroadcaster( nCol, nRow);
 if (pBC)
 {
+rPos.SetRow(nRow);
 pBC-Broadcast(aHint);
 bIsBroadcasted = true;
 }
commit b8a7c39cf26f6d417efc34acdf6f4c2a6762052d
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 3 19:37:18 2014 +0100

introduce bool bBroadcast parameter for ScTable::SetDirty()

Change-Id: I62c3714c8036fe8d4b70ee188546c7d69ece1ea5

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 318805a..d5cb383 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -532,7 +532,7 @@ public:
 voidResetChanged( const ScRange rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-voidSetDirty( const ScRange, bool bIncludeEmptyCells );
+voidSetDirty( const ScRange, bool bBroadcast, bool 
bIncludeEmptyCells );
 voidSetDirtyAfterLoad();
 voidSetDirtyVar();
 voidSetTableOpDirty( const ScRange );
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index fdab204..a654eba 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3627,7 +3627,7 @@ void ScDocument::SetDirty( const ScRange rRange, bool 
bIncludeEmptyCells )
 ScBulkBroadcast aBulkBroadcast( GetBASM());
 SCTAB nTab2 = rRange.aEnd.Tab();
 for (SCTAB i=rRange.aStart.Tab(); i=nTab2  i  
static_castSCTAB(maTabs.size()); i++)
-if (maTabs[i]) maTabs[i]-SetDirty( rRange, bIncludeEmptyCells );
+if (maTabs[i]) maTabs[i]-SetDirty( rRange, true, 
bIncludeEmptyCells );
 }
 SetAutoCalc( bOldAutoCalc );
 }
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index fad5443..3665765 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1684,13 +1684,13 @@ void ScTable::SetAllFormulasDirty( const 
sc::SetFormulaDirtyContext rCxt )
 aCol[i].SetAllFormulasDirty(rCxt);
 }
 
-void ScTable::SetDirty( const ScRange rRange, bool bIncludeEmptyCells )
+void ScTable::SetDirty( const ScRange rRange, bool bBroadcast, bool 
bIncludeEmptyCells )
 {

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

2014-12-03 Thread Zolnai Tamás

 include/svtools/grfmgr.hxx |1 +
 svx/source/svdraw/svdograf.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit c4d57fc6b274c9155660514e478d6adc159aaaf2
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Wed Dec 3 20:50:24 2014 +0100

Linked graphic is not displayed

Regression from:
17475638138c92162be1c0f34cf1f9cc95c63579

Change-Id: Ie2d484fbe065c24d19938c8c9c68818bd1076f2d
(cherry picked from commit 02b17c1bbdd19a978b9de646c0dacdad179c60de)

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 2bdbc9a..234ec9a 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -157,6 +157,7 @@ public:
 class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream
 {
 friend class GraphicManager;
+friend class SdrGrafObj;
 
 private:
 
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 3e334fc..712a5e1 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -624,6 +624,7 @@ void SdrGrafObj::SetGraphicLink(const OUString rFileName, 
const OUString rRefe
 aFilterName = rFilterName;
 ImpLinkAnmeldung();
 pGraphic-SetUserData();
+pGraphic-SetSwapState();
 }
 
 void SdrGrafObj::ReleaseGraphicLink()
___
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

 sc/inc/table.hxx |2 +-
 sc/source/core/data/document.cxx |2 +-
 sc/source/core/data/table2.cxx   |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 27a8f9d70cb8a84e64e00d22a64cd7ed24bfd459
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 4 00:05:20 2014 +0100

Revert introduce bool bBroadcast parameter for ScTable::SetDirty()

This reverts commit b8a7c39cf26f6d417efc34acdf6f4c2a6762052d.

Bah, this was a leftover of an idea I didn't follow..

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index d5cb383..318805a 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -532,7 +532,7 @@ public:
 voidResetChanged( const ScRange rRange );
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-voidSetDirty( const ScRange, bool bBroadcast, bool 
bIncludeEmptyCells );
+voidSetDirty( const ScRange, bool bIncludeEmptyCells );
 voidSetDirtyAfterLoad();
 voidSetDirtyVar();
 voidSetTableOpDirty( const ScRange );
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index a654eba..fdab204 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3627,7 +3627,7 @@ void ScDocument::SetDirty( const ScRange rRange, bool 
bIncludeEmptyCells )
 ScBulkBroadcast aBulkBroadcast( GetBASM());
 SCTAB nTab2 = rRange.aEnd.Tab();
 for (SCTAB i=rRange.aStart.Tab(); i=nTab2  i  
static_castSCTAB(maTabs.size()); i++)
-if (maTabs[i]) maTabs[i]-SetDirty( rRange, true, 
bIncludeEmptyCells );
+if (maTabs[i]) maTabs[i]-SetDirty( rRange, bIncludeEmptyCells );
 }
 SetAutoCalc( bOldAutoCalc );
 }
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 3665765..fad5443 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1684,13 +1684,13 @@ void ScTable::SetAllFormulasDirty( const 
sc::SetFormulaDirtyContext rCxt )
 aCol[i].SetAllFormulasDirty(rCxt);
 }
 
-void ScTable::SetDirty( const ScRange rRange, bool bBroadcast, bool 
bIncludeEmptyCells )
+void ScTable::SetDirty( const ScRange rRange, bool bIncludeEmptyCells )
 {
 bool bOldAutoCalc = pDocument-GetAutoCalc();
 pDocument-SetAutoCalc( false );// Mehrfachberechnungen vermeiden
 SCCOL nCol2 = rRange.aEnd.Col();
 for (SCCOL i=rRange.aStart.Col(); i=nCol2; i++)
-aCol[i].SetDirty(rRange.aStart.Row(), rRange.aEnd.Row(), bBroadcast, 
bIncludeEmptyCells);
+aCol[i].SetDirty(rRange.aStart.Row(), rRange.aEnd.Row(), true, 
bIncludeEmptyCells);
 pDocument-SetAutoCalc( bOldAutoCalc );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - vcl/inc vcl/opengl

 vcl/inc/opengl/program.hxx   |4 
 vcl/opengl/win/WinDeviceInfo.cxx |1 +
 2 files changed, 5 insertions(+)

New commits:
commit 0a87740ebe2d525d7aab7dce962cf921857d4dd6
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Dec 1 21:46:12 2014 -0500

Fix Windows build.

Change-Id: I9ddd1a9bf572ffa570e23193b01176af8df6f8ed

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 824d0fc..3b3902c 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -12,6 +12,7 @@
 #include windows.h
 #include setupapi.h
 #include cstdint
+#include rtl/ustrbuf.hxx
 
 OUString* WinOpenGLDeviceInfo::mpDeviceVendors[wgl::DeviceVendorMax];
 std::vectorwgl::DriverInfo WinOpenGLDeviceInfo::maDriverInfo;
commit 946badc809116587840a0a041929bc222402e93f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 14:16:10 2014 +0100

Missing include

Change-Id: I4df2b0bb114b8a375d3557c8e33487af737957f4

diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 96fed09..996bc61 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -10,6 +10,10 @@
 #ifndef INCLUDED_VCL_INC_OPENGL_PROGRAM_H
 #define INCLUDED_VCL_INC_OPENGL_PROGRAM_H
 
+#include sal/config.h
+
+#include list
+
 #include GL/glew.h
 #include vcl/dllapi.h
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: imgcell not working on Master

2014-12-03 Thread Tamas Zolnai

 
On Wednesday, December 3, 2014 13:01 GMT, Stephan Bergmann 
sberg...@redhat.com wrote: 
 
 On 12/02/2014 04:35 AM, TANAKA Hidemune wrote:
  For the following extensions, I suffer from the problem of LibreOffice Calc.
 
  http://extensions.libreoffice.org/extension-center/imgcell-1
 
  I am studying the bibisect.
  I got the following results.
 
  http://tanaka-cs.co.jp/image/44alpha1.png
  http://tanaka-cs.co.jp/image/44alpha2.png
  http://tanaka-cs.co.jp/image/45alpha0.png
 
 ...so looks like the extension's Basic code
 
oRectangleShape.GraphicURL = ConvertToUrl(FileName)
oDrawPage.add(oRectangleShape)
 
 recently started to no longer do what it is supposed to do.  As a blind 
 guess, git log -GGraphicURL shows a bunch of recent commits by Zolnai 
 Tamás?

Yep, one of my commits broke handling of linked graphics.
I pushed fix for that both to master:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=02b17c1bbdd19a978b9de646c0dacdad179c60de
and 4-4 branch:
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-4id=c4d57fc6b274c9155660514e478d6adc159aaaf2

Thanks for the tip, Stephan.

TANAKA Hidemune: Just a note about that this imgcell does not seems to embed 
images into the document, but insert them as graphic
links which maybe not the expected behavior here. (?)


Best Regards,
Tamás
 
 
 


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

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

2014-12-03 Thread Bjoern Michaelsen

 sw/inc/ring.hxx|  192 +
 sw/source/core/access/accdoc.cxx   |2 
 sw/source/core/access/accframebase.cxx |2 
 sw/source/core/access/accmap.cxx   |   27 +---
 sw/source/core/access/accpara.cxx  |   48 +++-
 sw/source/core/crsr/crsrsh.cxx |   52 +++-
 sw/source/core/crsr/crstrvl.cxx|   21 +--
 sw/source/core/crsr/swcrsr.cxx |8 -
 sw/source/core/crsr/trvltbl.cxx|   12 +-
 sw/source/core/crsr/viscrs.cxx |6 -
 sw/source/core/doc/CntntIdxStore.cxx   |   14 +-
 sw/source/core/doc/doccomp.cxx |   14 +-
 sw/source/core/draw/dcontact.cxx   |6 -
 sw/source/core/draw/dpage.cxx  |2 
 sw/source/core/edit/autofmt.cxx|2 
 sw/source/core/edit/edatmisc.cxx   |   19 +--
 sw/source/core/edit/edattr.cxx |   61 +-
 sw/source/core/edit/eddel.cxx  |   16 +-
 sw/source/core/edit/editsh.cxx |   25 ++--
 sw/source/core/edit/ednumber.cxx   |   20 +--
 sw/source/core/edit/edredln.cxx|   11 -
 sw/source/core/edit/edws.cxx   |   37 ++
 sw/source/core/frmedt/fecopy.cxx   |6 -
 sw/source/core/frmedt/feshview.cxx |   18 +--
 sw/source/core/frmedt/fetab.cxx|7 -
 sw/source/core/frmedt/fews.cxx |   14 +-
 sw/source/core/graphic/ndgrf.cxx   |6 -
 sw/source/core/layout/fly.cxx  |   11 -
 sw/source/core/layout/frmtool.cxx  |   10 -
 sw/source/core/layout/layact.cxx   |   70 +---
 sw/source/core/layout/newfrm.cxx   |2 
 sw/source/core/layout/pagechg.cxx  |  119 
 sw/source/core/layout/paintfrm.cxx |   17 +-
 sw/source/core/text/xmldump.cxx|   13 --
 sw/source/core/undo/docundo.cxx|   11 +
 sw/source/core/unocore/unoobj2.cxx |   41 ++-
 sw/source/core/view/viewimp.cxx|   92 +--
 sw/source/core/view/viewsh.cxx |   95 ++--
 sw/source/core/view/vnew.cxx   |2 
 sw/source/filter/basflt/shellio.cxx|4 
 sw/source/filter/html/swhtml.cxx   |   13 +-
 sw/source/uibase/docvw/edtwin.cxx  |2 
 42 files changed, 518 insertions(+), 632 deletions(-)

New commits:
commit f810d84663742694a12bc1517c39bfd014839d7c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 3 19:21:12 2014 +0100

fix indent

Change-Id: I420009e0892a815e0017208c3bb2a90e1533c916

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 97c3338..d9b6a1c 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5431,7 +5431,7 @@ void SwEditWin::Command( const CommandEvent rCEvt )
 
 // Cancel all selections other than the last selected one.
 while( rSh.GetCrsr()-GetNext() != rSh.GetCrsr() )
-delete rSh.GetCrsr()-GetNext();
+delete rSh.GetCrsr()-GetNext();
 }
 
 if( pCrsr )
commit f87c46b0fa3c01a163d6aded8889ff305823166b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 3 19:19:00 2014 +0100

use C++11 iteration

Change-Id: Iaf050d7b574864c27b84919aa3a04eadd25312e0

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 2685a0a..fe225ba 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2590,13 +2590,12 @@ SwViewShell *SwHTMLParser::CallEndAction( bool 
bChkAction, bool bChkPtr )
 
 if( bSetCrsr )
 {
-// an allen CrsrEditShells die Cursor auf den Doc-Anfang setzen
-SwViewShell *pSh = pActionViewShell;
-do {
-if( pSh-IsA( TYPE( SwCrsrShell ) ) )
-static_castSwCrsrShell*(pSh)-SttEndDoc(true);
-pSh = static_castSwViewShell *(pSh-GetNext());
-} while( pSh != pActionViewShell );
+// set the cursor to the doc begin in all CrsrEditShells
+for(SwViewShell rSh : pActionViewShell-GetRingContainer())
+{
+if( rSh.IsA( TYPE( SwCrsrShell ) ) )
+static_castSwCrsrShell*(rSh)-SttEndDoc(true);
+}
 
 bSetCrsr = false;
 }
commit 12f2bcaee5948c3ac2d14d75180c357ae3830179
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 3 19:16:38 2014 +0100

unnecessary cast

Change-Id: I59988b27b199ffb50118255026a8d9e5aa3debbd

diff --git a/sw/source/filter/basflt/shellio.cxx 
b/sw/source/filter/basflt/shellio.cxx
index 06b3708..d01c456 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -776,7 +776,7 @@ sal_uLong SwWriter::Write( WriterRef rxWriter, const 
OUString* pRealFileName )
 while(true)
 {
 bHasMark = bHasMark || pPam-HasMark();
-pPam = static_castSwPaM *( pPam-GetNext() );
+pPam = pPam-GetNext();
 if(bHasMark || pPam ==

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

 sax/source/fastparser/fastparser.cxx |   22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

New commits:
commit a09a709594dd0f6e38f8c6bf28433bd391e8842d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 3 19:41:04 2014 -0500

Prevent hang during loading of xlsm doc.

* We need to call xmlInitParser() before using it in a multi-threaded
  way (according to the libxml2 doc).
* Better to use 'rEntity' which references the one stored in the vector
  rather than 'entity' whose copy gets stored in the vector. On Windows
  at least 'rEntity' and 'entity' hold different parser pointer values.
* Free the parser before popping the entity. Popping the entity first then
  freeing the parser using its pointer value stored in the entity looks
  weird.

Change-Id: I6b64a6d8ac9c1d4fea8339d8fb2d38dfffbba47b

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 92791fc..fc1f5a9 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -720,6 +720,8 @@ sal_Int32 FastSaxParserImpl::GetTokenWithContextNamespace( 
sal_Int32 nNamespaceT
 void FastSaxParserImpl::parseStream(const InputSource maStructSource)
 throw (SAXException, IOException, RuntimeException, std::exception)
 {
+xmlInitParser();
+
 // Only one text at one time
 MutexGuard guard( maMutex );
 
@@ -741,11 +743,11 @@ void FastSaxParserImpl::parseStream(const InputSource 
maStructSource)
 try
 {
 // start the document
-if( entity.mxDocumentHandler.is() )
+if( rEntity.mxDocumentHandler.is() )
 {
 Reference XLocator  xLoc( mxDocumentLocator.get() );
-entity.mxDocumentHandler-setDocumentLocator( xLoc );
-entity.mxDocumentHandler-startDocument();
+rEntity.mxDocumentHandler-setDocumentLocator( xLoc );
+rEntity.mxDocumentHandler-startDocument();
 }
 
 rEntity.mbEnableThreads = 
(rEntity.maStructSource.aInputStream-available()  1);
@@ -786,33 +788,33 @@ void FastSaxParserImpl::parseStream(const InputSource 
maStructSource)
 }
 
 // finish document
-if( entity.mxDocumentHandler.is() )
+if( rEntity.mxDocumentHandler.is() )
 {
-entity.mxDocumentHandler-endDocument();
+rEntity.mxDocumentHandler-endDocument();
 }
 }
 catch (const SAXException)
 {
-popEntity();
 // TODO free mpParser.myDoc ?
-xmlFreeParserCtxt( entity.mpParser );
+xmlFreeParserCtxt( rEntity.mpParser );
+popEntity();
 throw;
 }
 catch (const IOException)
 {
+xmlFreeParserCtxt( rEntity.mpParser );
 popEntity();
-xmlFreeParserCtxt( entity.mpParser );
 throw;
 }
 catch (const RuntimeException)
 {
+xmlFreeParserCtxt( rEntity.mpParser );
 popEntity();
-xmlFreeParserCtxt( entity.mpParser );
 throw;
 }
 
+xmlFreeParserCtxt( rEntity.mpParser );
 popEntity();
-xmlFreeParserCtxt( entity.mpParser );
 }
 
 void FastSaxParserImpl::setFastDocumentHandler( const Reference 
XFastDocumentHandler  Handler ) throw (RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sax/source/fastparser/fastparser.cxx |   22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 3e525f8f880f841cab5ac28325d04b3f92607f9a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 3 19:41:04 2014 -0500

Prevent hang during loading of xlsm doc.

* We need to call xmlInitParser() before using it in a multi-threaded
  way (according to the libxml2 doc).
* Better to use 'rEntity' which references the one stored in the vector
  rather than 'entity' whose copy gets stored in the vector. On Windows
  at least 'rEntity' and 'entity' hold different parser pointer values.
* Free the parser before popping the entity. Popping the entity first then
  freeing the parser using its pointer value stored in the entity looks
  weird.

Change-Id: I6b64a6d8ac9c1d4fea8339d8fb2d38dfffbba47b

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 83bd7da..d0d6979 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -718,6 +718,8 @@ sal_Int32 FastSaxParserImpl::GetTokenWithContextNamespace( 
sal_Int32 nNamespaceT
 void FastSaxParserImpl::parseStream(const InputSource maStructSource)
 throw (SAXException, IOException, RuntimeException, std::exception)
 {
+xmlInitParser();
+
 // Only one text at one time
 MutexGuard guard( maMutex );
 
@@ -739,11 +741,11 @@ void FastSaxParserImpl::parseStream(const InputSource 
maStructSource)
 try
 {
 // start the document
-if( entity.mxDocumentHandler.is() )
+if( rEntity.mxDocumentHandler.is() )
 {
 Reference XLocator  xLoc( mxDocumentLocator.get() );
-entity.mxDocumentHandler-setDocumentLocator( xLoc );
-entity.mxDocumentHandler-startDocument();
+rEntity.mxDocumentHandler-setDocumentLocator( xLoc );
+rEntity.mxDocumentHandler-startDocument();
 }
 
 rEntity.mbEnableThreads = 
(rEntity.maStructSource.aInputStream-available()  1);
@@ -784,33 +786,33 @@ void FastSaxParserImpl::parseStream(const InputSource 
maStructSource)
 }
 
 // finish document
-if( entity.mxDocumentHandler.is() )
+if( rEntity.mxDocumentHandler.is() )
 {
-entity.mxDocumentHandler-endDocument();
+rEntity.mxDocumentHandler-endDocument();
 }
 }
 catch (const SAXException)
 {
-popEntity();
 // TODO free mpParser.myDoc ?
-xmlFreeParserCtxt( entity.mpParser );
+xmlFreeParserCtxt( rEntity.mpParser );
+popEntity();
 throw;
 }
 catch (const IOException)
 {
+xmlFreeParserCtxt( rEntity.mpParser );
 popEntity();
-xmlFreeParserCtxt( entity.mpParser );
 throw;
 }
 catch (const RuntimeException)
 {
+xmlFreeParserCtxt( rEntity.mpParser );
 popEntity();
-xmlFreeParserCtxt( entity.mpParser );
 throw;
 }
 
+xmlFreeParserCtxt( rEntity.mpParser );
 popEntity();
-xmlFreeParserCtxt( entity.mpParser );
 }
 
 void FastSaxParserImpl::setFastDocumentHandler( const Reference 
XFastDocumentHandler  Handler ) throw (RuntimeException)
___
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

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

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|40780   |

-- 
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 75025] LibreOffice 4.3 most annoying bugs

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

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||40780

-- 
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: include/svl svl/source sw/inc

 include/svl/SfxBroadcaster.hxx   |   16 +-
 include/svl/lstner.hxx   |   14 +
 svl/source/notify/SfxBroadcaster.cxx |   88 +--
 svl/source/notify/lstner.cxx |   50 +--
 sw/inc/unotxdoc.hxx  |2 
 5 files changed, 99 insertions(+), 71 deletions(-)

New commits:
commit 4eb381147bd0c9c7a48f86de0e3ae1d4c3bbe12f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 3 23:19:39 2014 -0500

pIimplize SfxBroadcaster and SfxListener.

Change-Id: I0d1d73402f11cc61ea9e7629bea34e24c22f5beb

diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx
index a29a5c0..56a3357 100644
--- a/include/svl/SfxBroadcaster.hxx
+++ b/include/svl/SfxBroadcaster.hxx
@@ -21,7 +21,6 @@
 
 #include svl/svldllapi.h
 #include tools/rtti.hxx
-#include vector
 
 class SfxListener;
 class SfxHint;
@@ -29,11 +28,8 @@ class SfxBroadcasterTest;
 
 class SVL_DLLPUBLIC SfxBroadcaster
 {
-typedef std::vectorSfxListener* SfxListenerArr_Impl;
-
-/** Contains the positions of removed listeners. */
-std::vectorsize_t m_RemovedPositions;
-SfxListenerArr_Impl m_Listeners;
+struct Impl;
+Impl* mpImpl;
 
 private:
 voidAddListener( SfxListener rListener );
@@ -60,16 +56,12 @@ public:
 /** Get the size of the internally stored vector.
  * Use it to iterate over all listeners.
  */
-size_t  GetSizeOfVector() const {
-return m_Listeners.size();
-}
+size_t GetSizeOfVector() const;
 
 /** Get a listener by its position in the internally stored vector.
  * Note that this method may return NULL
  */
-SfxListener*GetListener( size_t nNo ) const {
-return m_Listeners[nNo];
-}
+SfxListener* GetListener( size_t nNo ) const;
 
 friend class SfxListener;
 friend class ::SfxBroadcasterTest;
diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx
index 0bdf6e2..8792c01 100644
--- a/include/svl/lstner.hxx
+++ b/include/svl/lstner.hxx
@@ -21,21 +21,17 @@
 
 #include svl/svldllapi.h
 #include tools/rtti.hxx
-#include deque
 
 class SfxBroadcaster;
 class SfxHint;
 
-typedef std::dequeSfxBroadcaster* SfxBroadcasterArr_Impl;
-
 #define SFX_NOTIFY( rBC, rBCT, rHint, rHintT ) \
 Notify( rBC, rHint )
 
-
-
 class SVL_DLLPUBLIC SfxListener
 {
-SfxBroadcasterArr_Impl aBCs;
+struct Impl;
+Impl* mpImpl;
 
 private:
 const SfxListener  operator=(const SfxListener ); // n.i., ist verboten
@@ -52,10 +48,8 @@ public:
 voidEndListeningAll();
 boolIsListening( SfxBroadcaster rBroadcaster ) const;
 
-sal_uInt16  GetBroadcasterCount() const
-{ return aBCs.size(); }
-SfxBroadcaster* GetBroadcasterJOE( sal_uInt16 nNo ) const
-{ return aBCs[nNo]; }
+sal_uInt16 GetBroadcasterCount() const;
+SfxBroadcaster* GetBroadcasterJOE( sal_uInt16 nNo ) const;
 
 virtual voidNotify( SfxBroadcaster rBC, const SfxHint rHint );
 
diff --git a/svl/source/notify/SfxBroadcaster.cxx 
b/svl/source/notify/SfxBroadcaster.cxx
index f7ae252..37527e4 100644
--- a/svl/source/notify/SfxBroadcaster.cxx
+++ b/svl/source/notify/SfxBroadcaster.cxx
@@ -17,29 +17,38 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include assert.h
+#include svl/SfxBroadcaster.hxx
 
 #include svl/hint.hxx
 #include svl/smplhint.hxx
 #include svl/lstner.hxx
+#include tools/debug.hxx
 
-#include svl/SfxBroadcaster.hxx
 #include algorithm
-#include tools/debug.hxx
+#include cassert
+#include vector
 
 TYPEINIT0(SfxBroadcaster);
 
+typedef std::vectorSfxListener* SfxListenerArr_Impl;
+
+struct SfxBroadcaster::Impl
+{
+/** Contains the positions of removed listeners. */
+std::vectorsize_t m_RemovedPositions;
+SfxListenerArr_Impl m_Listeners;
+};
+
 // broadcast immediately
 
 void SfxBroadcaster::Broadcast( const SfxHint rHint )
 {
 // notify all registered listeners exactly once
-for (size_t n = 0; n  m_Listeners.size(); ++n)
+for (size_t i = 0; i  mpImpl-m_Listeners.size(); ++i)
 {
-SfxListener *const pListener = m_Listeners[n];
-if (pListener) {
+SfxListener *const pListener = mpImpl-m_Listeners[i];
+if (pListener)
 pListener-Notify( *this, rHint );
-}
 }
 }
 
@@ -50,19 +59,20 @@ SfxBroadcaster::~SfxBroadcaster()
 Broadcast( SfxSimpleHint(SFX_HINT_DYING) );
 
 // remove all still registered listeners
-for (size_t nPos = 0; nPos  m_Listeners.size(); ++nPos)
+for (size_t i = 0; i  mpImpl-m_Listeners.size(); ++i)
 {
-SfxListener *const pListener = m_Listeners[nPos];
-if (pListener) {
+SfxListener *const pListener = mpImpl-m_Listeners[i];
+if (pListener)
 pListener-RemoveBroadcaster_Impl(*this);
-}
 }
+
+

[Libreoffice-commits] core.git: Changes to 'private/moggi/build-test-linux'

2014-12-03 Thread Markus Mohrhard

New branch 'private/moggi/build-test-linux' available with the following 
commits:
commit 3835d2ce431b8b52ffa0903e69f6c0a5ffd7d5f8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 08:18:46 2014 +0100

prevent crash when creating the platform context failed

It is not a double delete. It happens when creating the platform context
fails and therefore is not added to the list.

Change-Id: I2771da48a5d791bbf500b56d8734dd53b32f3fb7

commit a09b0093ef7ab323b2f0ee06547ae4a258e7cd68
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 08:08:50 2014 +0100

more asserts to detect double deletes

Change-Id: I54284d34db2446f28ba778ce26ebedb584bf2780

commit 85c8428797cfb047fea790e48e5a3260fcb83cc5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 08:05:33 2014 +0100

add assert to detect double delete

Change-Id: I13427cb698d29adb1d19b135ada91bcdfc8b8c92

commit 8e70b5bb89255e9ad5bb1f098d931c629b3343c2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 07:19:09 2014 +0100

add more debugging output

Change-Id: I91be83485dcd829800ca9611ab54b19d8eae19af

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

[Libreoffice-commits] core.git: compilerplugins/clang

 compilerplugins/clang/store/cstylecast.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit eff69c6b4c71332de2219288ed91bc1c7a280408
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 4 08:22:09 2014 +0100

Run loplugin:cstylecast on C++ and Ojbective C++ code

Change-Id: I4035318d35d468fa93d4dcfe56f9b0434fd1dfe7

diff --git a/compilerplugins/clang/store/cstylecast.cxx 
b/compilerplugins/clang/store/cstylecast.cxx
index c34a6bd..b8f7325 100644
--- a/compilerplugins/clang/store/cstylecast.cxx
+++ b/compilerplugins/clang/store/cstylecast.cxx
@@ -23,7 +23,11 @@ class CStyleCast:
 public:
 explicit CStyleCast(InstantiationData const  data): Plugin(data) {}
 
-virtual void run() override { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+virtual void run() override {
+if (compiler.getLangOpts().CPlusPlus) {
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+}
+}
 
 bool VisitCStyleCastExpr(const CStyleCastExpr * expr);
 };
@@ -66,7 +70,7 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr * 
expr) {
   expr-getLocStart());
 StringRef filename = 
compiler.getSourceManager().getFilename(spellingLocation);
 // ignore C code
-if ( filename.endswith(.h) || filename.endswith(.c) ) {
+if ( filename.endswith(.h) ) {
 return true;
 }
 if ( compat::isInMainFile(compiler.getSourceManager(), spellingLocation)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 unodevtools/source/skeletonmaker/cppcompskeleton.cxx  |   16 
 unodevtools/source/skeletonmaker/javacompskeleton.cxx |8 
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 7d4a6946500100966b34b162c150994a017b9238
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 4 08:22:55 2014 +0100

unodevtools: loplugin:cstylecast

Change-Id: Id4bd8bb8361204ae281a090840b08c502e5b4a7a

diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx 
b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index df64f1d..d8441c7 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -1056,16 +1056,16 @@ void generateSkeleton(ProgramOptions const  options,
 *pofs  (nm  0 ? // closing namespace\n\n : \n);
 }
 
-if ( !standardout  pofs  ((std::ofstream*)pofs)-is_open()) {
-((std::ofstream*)pofs)-close();
+if ( !standardout  pofs  
static_caststd::ofstream*(pofs)-is_open()) {
+static_caststd::ofstream*(pofs)-close();
 delete pofs;
 OSL_VERIFY(makeValidTypeFile(compFileName, tmpFileName, false));
 }
 } catch (CannotDumpException  e) {
 std::cerr  ERROR:   e.getMessage()  \n;
 if ( !standardout ) {
-if (pofs  ((std::ofstream*)pofs)-is_open()) {
-((std::ofstream*)pofs)-close();
+if (pofs  static_caststd::ofstream*(pofs)-is_open()) {
+static_caststd::ofstream*(pofs)-close();
 delete pofs;
 }
 // remove existing type file if something goes wrong to ensure
@@ -1219,16 +1219,16 @@ void generateCalcAddin(ProgramOptions const  options,
 
 generateCompFunctions(*pofs, nmspace);
 
-if ( !standardout  pofs  ((std::ofstream*)pofs)-is_open()) {
-((std::ofstream*)pofs)-close();
+if ( !standardout  pofs  
static_caststd::ofstream*(pofs)-is_open()) {
+static_caststd::ofstream*(pofs)-close();
 delete pofs;
 OSL_VERIFY(makeValidTypeFile(compFileName, tmpFileName, false));
 }
 } catch (CannotDumpException  e) {
 std::cerr  ERROR:   e.getMessage()  \n;
 if ( !standardout ) {
-if (pofs  ((std::ofstream*)pofs)-is_open()) {
-((std::ofstream*)pofs)-close();
+if (pofs  static_caststd::ofstream*(pofs)-is_open()) {
+static_caststd::ofstream*(pofs)-close();
 delete pofs;
 }
 // remove existing type file if something goes wrong to ensure
diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx 
b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index 44c9201..8edb92c 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -911,16 +911,16 @@ void generateSkeleton(ProgramOptions const  options,
 interfaces, properties, attributes, 
propertyhelper,
 supportxcomponent);
 
-if ( !standardout  pofs  ((std::ofstream*)pofs)-is_open()) {
-((std::ofstream*)pofs)-close();
+if ( !standardout  pofs  
static_caststd::ofstream*(pofs)-is_open()) {
+static_caststd::ofstream*(pofs)-close();
 delete pofs;
 OSL_VERIFY(makeValidTypeFile(compFileName, tmpFileName, false));
 }
 } catch (CannotDumpException  e) {
 std::cerr  ERROR:   e.getMessage()  \n;
 if ( !standardout ) {
-if (pofs  ((std::ofstream*)pofs)-is_open()) {
-((std::ofstream*)pofs)-close();
+if (pofs  static_caststd::ofstream*(pofs)-is_open()) {
+static_caststd::ofstream*(pofs)-close();
 delete pofs;
 }
 // remove existing type file if something goes wrong to ensure
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/graphic/ndgrf.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 183b89db121b8c6e02c14ebf2c2666ee807a9c82
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 4 08:21:39 2014 +0100

-Werror=unused-variable

Change-Id: I7445c699bf3fa6419411d4800db1b49f92b77a55

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 6e60afa..80b0504 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -1094,7 +1094,6 @@ bool SwGrfNode::IsSelected() const
 if( pESh )
 {
 const SwNode* pN = this;
-const SwViewShell* pV = pESh;
 for(const SwViewShell rCurrentShell : pESh-GetRingContainer())
 {
 if( rCurrentShell.ISA( SwEditShell )  pN == static_castconst 
SwCrsrShell*(rCurrentShell)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-03 Thread Markus Mohrhard

 vcl/source/opengl/OpenGLContext.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 2e9816e59f7f44356b5bdc8d0e7da21cdd497f9a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 08:18:46 2014 +0100

prevent crash when creating the platform context failed

It is not a double delete. It happens when creating the platform context
fails and therefore is not added to the list.

Conflicts:
vcl/source/opengl/OpenGLContext.cxx

Change-Id: I2771da48a5d791bbf500b56d8734dd53b32f3fb7

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index d7a2798..56e565f 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -96,9 +96,9 @@ OpenGLContext::~OpenGLContext()
 #if defined( WNT )
 if (m_aGLWin.hRC)
 {
-std::vectorHGLRC::const_iterator itr = 
std::remove(g_vShareList.begin(), g_vShareList.end(), m_aGLWin.hRC);
-assert(itr != g_vShareList.end());
-g_vShareList.erase(itr);
+std::vectorHGLRC::iterator itr = std::remove(g_vShareList.begin(), 
g_vShareList.end(), m_aGLWin.hRC);
+if (itr != g_vShareList.end())
+g_vShareList.erase(itr);
 
 wglMakeCurrent( m_aGLWin.hDC, 0 );
 wglDeleteContext( m_aGLWin.hRC );
@@ -111,7 +111,9 @@ OpenGLContext::~OpenGLContext()
 #elif defined( UNX )
 if(m_aGLWin.ctx)
 {
-g_vShareList.erase(std::remove( g_vShareList.begin(), 
g_vShareList.end(), m_aGLWin.ctx), g_vShareList.end());
+std::vectorGLXContext::iterator itr = std::remove( 
g_vShareList.begin(), g_vShareList.end(), m_aGLWin.ctx );
+if (itr != g_vShareList.end())
+g_vShareList.erase(itr);
 
 glXMakeCurrent(m_aGLWin.dpy, None, NULL);
 if( glGetError() != GL_NO_ERROR )
commit e167148c3f3e3a76335e6920ae31b0282be23e8c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 08:08:50 2014 +0100

more asserts to detect double deletes

Change-Id: I54284d34db2446f28ba778ce26ebedb584bf2780

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 0ebca34..d7a2798 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -128,11 +128,13 @@ OpenGLContext::~OpenGLContext()
 
 void OpenGLContext::AddRef()
 {
+assert(mnRefCount  0);
 mnRefCount++;
 }
 
 void OpenGLContext::DeRef()
 {
+assert(mnRefCount  0);
 if( --mnRefCount == 0 )
 delete this;
 }
commit f5425301052357499a41d798c43c9f2c3306db4d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 08:05:33 2014 +0100

add assert to detect double delete

Conflicts:
vcl/source/opengl/OpenGLContext.cxx

Change-Id: I13427cb698d29adb1d19b135ada91bcdfc8b8c92

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index c9c3ecb..0ebca34 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -96,7 +96,9 @@ OpenGLContext::~OpenGLContext()
 #if defined( WNT )
 if (m_aGLWin.hRC)
 {
-g_vShareList.erase(std::remove(g_vShareList.begin(), 
g_vShareList.end(), m_aGLWin.hRC), g_vShareList.end());
+std::vectorHGLRC::const_iterator itr = 
std::remove(g_vShareList.begin(), g_vShareList.end(), m_aGLWin.hRC);
+assert(itr != g_vShareList.end());
+g_vShareList.erase(itr);
 
 wglMakeCurrent( m_aGLWin.hDC, 0 );
 wglDeleteContext( m_aGLWin.hRC );
commit 64e45440ad11c1aabeaf853607bcb7e5f4fbafe4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 07:19:09 2014 +0100

add more debugging output

Change-Id: I91be83485dcd829800ca9611ab54b19d8eae19af

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 50a95da..c9c3ecb 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -65,6 +65,7 @@ OpenGLContext::OpenGLContext():
 mpPrevContext(NULL),
 mpNextContext(NULL)
 {
+SAL_INFO(vcl.opengl, new context:   this);
 #if defined( UNX )  !defined MACOSX  !defined IOS  !defined ANDROID
 mbPixmap = false;
 #endif
@@ -82,6 +83,7 @@ OpenGLContext::OpenGLContext():
 
 OpenGLContext::~OpenGLContext()
 {
+SAL_INFO(vcl.opengl, delete context:   this);
 ImplSVData* pSVData = ImplGetSVData();
 if( mpPrevContext )
 mpPrevContext-mpNextContext = mpNextContext;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-03 Thread Markus Mohrhard

 vcl/source/opengl/OpenGLContext.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit d32a03020d88410b17189d4cc84d44c749a88161
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 08:18:46 2014 +0100

prevent crash when creating the platform context failed

It is not a double delete. It happens when creating the platform context
fails and therefore is not added to the list.

Change-Id: I2771da48a5d791bbf500b56d8734dd53b32f3fb7

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 108e78a..1ff93cf 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -97,9 +97,9 @@ OpenGLContext::~OpenGLContext()
 #if defined( WNT )
 if (m_aGLWin.hRC)
 {
-std::vectorHGLRC::const_iterator itr = 
std::remove(vShareList.begin(), vShareList.end(), m_aGLWin.hRC);
-assert(itr != vShareList.end());
-vShareList.erase(itr);
+std::vectorHGLRC::iterator itr = std::remove(vShareList.begin(), 
vShareList.end(), m_aGLWin.hRC);
+if (itr != vShareList.end())
+vShareList.erase(itr);
 
 wglMakeCurrent( m_aGLWin.hDC, 0 );
 wglDeleteContext( m_aGLWin.hRC );
@@ -112,7 +112,9 @@ OpenGLContext::~OpenGLContext()
 #elif defined( UNX )
 if(m_aGLWin.ctx)
 {
-vShareList.erase(std::remove( vShareList.begin(), vShareList.end(), 
m_aGLWin.ctx ));
+std::vectorGLXContext::iterator itr = std::remove( 
vShareList.begin(), vShareList.end(), m_aGLWin.ctx );
+if (itr != vShareList.end())
+vShareList.erase(itr);
 
 glXMakeCurrent(m_aGLWin.dpy, None, NULL);
 if( glGetError() != GL_NO_ERROR )
commit a09b0093ef7ab323b2f0ee06547ae4a258e7cd68
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 08:08:50 2014 +0100

more asserts to detect double deletes

Change-Id: I54284d34db2446f28ba778ce26ebedb584bf2780

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 3a7a1fb..108e78a 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -129,11 +129,13 @@ OpenGLContext::~OpenGLContext()
 
 void OpenGLContext::AddRef()
 {
+assert(mnRefCount  0);
 mnRefCount++;
 }
 
 void OpenGLContext::DeRef()
 {
+assert(mnRefCount  0);
 if( --mnRefCount == 0 )
 delete this;
 }
commit 85c8428797cfb047fea790e48e5a3260fcb83cc5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 08:05:33 2014 +0100

add assert to detect double delete

Change-Id: I13427cb698d29adb1d19b135ada91bcdfc8b8c92

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index b0bc91d..3a7a1fb 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -97,7 +97,9 @@ OpenGLContext::~OpenGLContext()
 #if defined( WNT )
 if (m_aGLWin.hRC)
 {
-vShareList.erase(std::remove(vShareList.begin(), vShareList.end(), 
m_aGLWin.hRC));
+std::vectorHGLRC::const_iterator itr = 
std::remove(vShareList.begin(), vShareList.end(), m_aGLWin.hRC);
+assert(itr != vShareList.end());
+vShareList.erase(itr);
 
 wglMakeCurrent( m_aGLWin.hDC, 0 );
 wglDeleteContext( m_aGLWin.hRC );
commit 8e70b5bb89255e9ad5bb1f098d931c629b3343c2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 4 07:19:09 2014 +0100

add more debugging output

Change-Id: I91be83485dcd829800ca9611ab54b19d8eae19af

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 30a23b5..b0bc91d 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -65,6 +65,7 @@ OpenGLContext::OpenGLContext():
 mpPrevContext(NULL),
 mpNextContext(NULL)
 {
+SAL_INFO(vcl.opengl, new context:   this);
 #if defined( UNX )  !defined MACOSX  !defined IOS  !defined ANDROID
 mbPixmap = false;
 #endif
@@ -82,6 +83,7 @@ OpenGLContext::OpenGLContext():
 
 OpenGLContext::~OpenGLContext()
 {
+SAL_INFO(vcl.opengl, delete context:   this);
 ImplSVData* pSVData = ImplGetSVData();
 if( mpPrevContext )
 mpPrevContext-mpNextContext = mpNextContext;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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