date:20150227

[Libreoffice-commits] core.git: Changes to 'origin/private/moggi/conditional-format-api'

2015-02-27 Thread Markus Mohrhard

New branch 'origin/private/moggi/conditional-format-api' available with the 
following commits:
commit f0c327fc40766a9736e5fda64c5d10a8047b6647
Author: Markus Mohrhard 
Date:   Fri Feb 27 10:31:19 2015 +0100

more code for conditional format API

Change-Id: Iba10222186c84c7a8ecf6928b8145dc941840421

commit e7154614b3798f6878f2700505a007417d90c45d
Author: Markus Mohrhard 
Date:   Fri Feb 27 06:34:42 2015 +0100

fix gbuild-to-ide script

Change-Id: Iff624d9e31ef5ba7d87b92124c60b02cd577c50b

commit 396ae481ff0a732e7ca179a8ad0300121c6a3858
Author: Markus Mohrhard 
Date:   Fri Feb 27 03:16:35 2015 +0100

add implementation for new conditional formatting

Change-Id: I4c283ec8a1f5b51c0274d9c520cd653be7f75aa2

commit c19d80ec8edd9e8fa65c975bec29a9a204afb9c8
Author: Markus Mohrhard 
Date:   Tue Feb 24 02:37:26 2015 +0100

fix all UNO IDL errors in new cond format API

Change-Id: I004a3899363280c16a60a5cca03d8940baeeae5c

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

LibreOffice Gerrit News for core on 2015-02-28

2015-02-27 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ tdf#89141: reverted a workaround for getting activity time
  in https://gerrit.libreoffice.org/14671 from Vasily Melenchuk
  about module vcl
+ tdf#49893: final fix for blank rectangle problem
  in https://gerrit.libreoffice.org/14584 from Vasily Melenchuk
  about module sw, writerfilter
 End of freshness 

+ Resolves tdf#72152: respect page orientation of Calc files in recent docs
  in https://gerrit.libreoffice.org/14512 from Julien Nabet
  about module sc
+ tdf#40835 [part 1 of 2] add ODFF function FDIST
  in https://gerrit.libreoffice.org/14657 from Winfried Donkers
  about module formula, sc
+ tdf#89666: vcl: speed up text formatting further, sacrificing parentheses
  in https://gerrit.libreoffice.org/14642 from Michael Stahl
  about module vcl
+ render text with cairo under gtk3, not headless solution
  in https://gerrit.libreoffice.org/14664 from Caolán McNamara
  about module vcl


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

+ tdf#81475 Unhiding of entries in the standard and formatting toolbars
  in https://gerrit.libreoffice.org/14674 from Yousuf Philips
+ seperate headless textrendering into its own class
  in https://gerrit.libreoffice.org/14665 from Caolán McNamara
+ tdf#89679 - fix incorrect mapping of font-family-complex and CharFontName
  in https://gerrit.libreoffice.org/14663 from Mark Hung
+ tdf#46343: Add the tensor product operator to "Elements Dock"
  in https://gerrit.libreoffice.org/14652 from Takeshi Abe
+ Resolves tdf#71095 Calc doesn't paste images copied from some web browser
  in https://gerrit.libreoffice.org/14529 from Henry Castro
+ starmath: render the selected subexpression of MathML's 
  in https://gerrit.libreoffice.org/14600 from Takeshi Abe


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

+ Recent docs: Optimize a bit
  in https://gerrit.libreoffice.org/14507 from Julien Nabet
+ Speed up ScriptRun::getPairIndex
  in https://gerrit.libreoffice.org/11775 from Matthew Francis


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

+ fdo#87441-Sending document as Email removes invisible content - this shou
  in https://gerrit.libreoffice.org/14549 from Charu Tyagi
+ Drop MAC_OS_X_VERSION_... variables
  in https://gerrit.libreoffice.org/13212 from Douglas Mencken
+ fdo#63905: fix regression by using paper size set in printer properties
  in https://gerrit.libreoffice.org/13763 from Clément Lassieur
+ jpeg-turbo: OpenCL for decompression of jpegs.
  in https://gerrit.libreoffice.org/13315 from Jan Holesovsky
+ GPU Calc:Support string parameter in SUMIF an SUMIFS.
  in https://gerrit.libreoffice.org/12044 from Hao Chen
+ vcl: Reduce OpenGLX11CairoTextRender surface area to size of text bounds
  in https://gerrit.libreoffice.org/14148 from Chris Sherlock
+ wip: get rid of svx dbtoolsclient
  in https://gerrit.libreoffice.org/11737 from Lionel Elie Mamane
+ Fix typo code Persistant
  in https://gerrit.libreoffice.org/14030 from Andrea Gelmini
+ fdo#88309: Standardize, cleanup, and improve Assertions
  in https://gerrit.libreoffice.org/13945 from Ashod Nakashian
+ --with-macosx-app-name= is unused, so bin it from AC_ARG_WITH list
  in https://gerrit.libreoffice.org/13658 from Douglas Mencken
+ fdo#30541: Default icon set on Windows should be Galaxy, not Tango.
  in https://gerrit.libreoffice.org/13859 from Rimas Kudelis
+ fdo#75825-"Send Document as E-Mail" not working
  in https://gerrit.libreoffice.org/13786 from Charu Tyagi
+ solenv-filelists.pm: fix "can't call method `mode' on an undefined value"
  in https://gerrit.libreoffice.org/13669 from Douglas Mencken
+ gbuild-to-ide fixes
  in https://gerrit.libreoffice.org/11754 from Peter Foley
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ fdo#39625 Make existing CppUnittests work
  in https://gerrit.libreoffice.org/11605 from Tobias Madl
+ fdo#86784 make soffice commandline in juh Bootstrap.bootstrap() configura
  in https://gerrit.libreoffice.org/13290 from Christoph Lutz
+ start detection of kf5 stuff in configure.ac
  in https://gerrit.libreoffice.org/13079 from Jonathan Riddell
+ Perftest for loading autocorrect dictionaries, related fdo#79761
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan


Best,

Your friendly LibreOffice Gerrit Digest Mailer

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

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

2015-02-27 Thread Yousuf Philips

 sw/uiconfig/swriter/toolbar/standardbar.xml   |4 ++--
 sw/uiconfig/swriter/toolbar/textobjectbar.xml |9 +++--
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 85e4761b929797216a56e4c9eca3d8bb0685f883
Author: Yousuf Philips 
Date:   Sat Feb 28 09:18:13 2015 +0400

tdf#81475 Unhiding of entries in the standard and formatting toolbars

Change-Id: Icd572dd7ce723517f3d45ce932230e346bedc261
Reviewed-on: https://gerrit.libreoffice.org/14674
Tested-by: Yousuf Philips 
Reviewed-by: Yousuf Philips 

diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 1cffa61..2d77072 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -61,13 +61,13 @@
  
  
  
- 
+ 
  
  
  
  
  
- 
+ 
  
  
  
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 77bc1ef..79ec59e 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -49,18 +49,15 @@
  
  
  
- 
- 
- 
- 
- 
- 
  
  
  
  
  
  
+ 
+ 
+ 
  
  
  
___
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

2015-02-27 Thread László Németh

 sc/inc/dociter.hxx  |5 -
 sc/source/core/data/dociter.cxx |  187 +---
 2 files changed, 88 insertions(+), 104 deletions(-)

New commits:
commit 3d586d61d6a2b314783203d92fb0c1b62ea0e95e
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Sat Feb 28 01:40:13 2015 +0100

tdf#89436 ScHorizontalAttrIterator cleanup

+ optimization (removing cycle on cells with default attributes)

Change-Id: I4441fab13cb8ba6251d8524db4045e22514436fa

diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 65023b0..838c100 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -487,7 +487,7 @@ private:
 SCROW   nEndRow;
 
 SCROW*  pNextEnd;
-SCCOL*  pPrevColEnd;
+SCCOL*  pHorizEnd;
 SCSIZE* pIndices;
 const ScPatternAttr**   ppPatterns;
 SCCOL   nCol;
@@ -496,6 +496,9 @@ private:
 boolbRepeatedRow;
 SCROW   nMinNextEnd;
 
+void InitForNextRow(bool bInitialization);
+bool InitForNextAttr();
+
 public:
 ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable,
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2 );
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 77cf693..6ab77bc 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -2230,8 +2230,6 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( 
ScDocument* pDocument, SCTAB
 OSL_FAIL("try to access index out of bounds, FIX IT");
 OSL_ENSURE( pDoc->maTabs[nTab], "Table does not exist" );
 
-SCCOL i;
-
 nRow = nStartRow;
 nCol = nStartCol;
 bRowEmpty = false;
@@ -2239,49 +2237,97 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( 
ScDocument* pDocument, SCTAB
 
 pIndices= new SCSIZE[nEndCol-nStartCol+1];
 pNextEnd= new SCROW[nEndCol-nStartCol+1];
-pPrevColEnd = new SCCOL[nEndCol-nStartCol+1];
+pHorizEnd   = new SCCOL[nEndCol-nStartCol+1];
 ppPatterns  = new const ScPatternAttr*[nEndCol-nStartCol+1];
 
-nMinNextEnd = MAXROW;
+InitForNextRow(true);
+}
+
+ScHorizontalAttrIterator::~ScHorizontalAttrIterator()
+{
+delete[] ppPatterns;
+delete[] pHorizEnd;
+delete[] pNextEnd;
+delete[] pIndices;
+}
+
+void ScHorizontalAttrIterator::InitForNextRow(bool bInitialization)
+{
 bool bEmpty = true;
-for (i=nStartCol; i<=nEndCol; i++)
+nMinNextEnd = MAXROW;
+SCCOL nThisHead = 0;
+
+for (SCCOL i=nStartCol; i<=nEndCol; i++)
 {
 SCCOL nPos = i - nStartCol;
-const ScAttrArray* pArray = pDoc->maTabs[nTab]->aCol[i].pAttrArray;
-OSL_ENSURE( pArray, "pArray == 0" );
+if ( bInitialization || pNextEnd[nPos] < nRow )
+{
+const ScAttrArray* pArray = pDoc->maTabs[nTab]->aCol[i].pAttrArray;
+OSL_ENSURE( pArray, "pArray == 0" );
+
+SCSIZE nIndex;
+if (bInitialization)
+{
+pArray->Search( nStartRow, nIndex );
+pIndices[nPos] = nIndex;
+pHorizEnd[nPos] = MAXCOL+1; // only for OSL_ENSURE
+}
+else
+nIndex = ++pIndices[nPos];
 
-SCSIZE nIndex;
-pArray->Search( nStartRow, nIndex );
+if ( nIndex < pArray->nCount )
+{
+const ScPatternAttr* pPattern = pArray->pData[nIndex].pPattern;
+SCROW nThisEnd = pArray->pData[nIndex].nRow;
 
-const ScPatternAttr* pPattern = pArray->pData[nIndex].pPattern;
-SCROW nThisEnd = pArray->pData[nIndex].nRow;
+if ( IsDefaultItem( pPattern ) )
+pPattern = NULL;
+else
+bEmpty = false; // Found attributes
 
-if ( nThisEnd < nMinNextEnd )
-nMinNextEnd = nThisEnd; // nMinNextEnd can be set here already
+pNextEnd[nPos] = nThisEnd;
+OSL_ENSURE( pNextEnd[nPos] >= nRow, "Sequence out of order" );
+ppPatterns[nPos] = pPattern;
+}
+else
+{
+OSL_FAIL("AttrArray does not range to MAXROW");
+pNextEnd[nPos] = MAXROW;
+ppPatterns[nPos] = NULL;
+}
+}
+else if ( ppPatterns[nPos] )
+bEmpty = false; // Area not at the end yet
 
-if ( IsDefaultItem( pPattern ) )
-pPattern = NULL;
-else
-bEmpty = false; // Found attributes
+if ( nMinNextEnd > pNextEnd[nPos] )
+nMinNextEnd = pNextEnd[nPos];
 
-pIndices[nPos] = nIndex;
-pNextEnd[nPos] = nThisEnd;
-pPrevColEnd[nPos] = MAXCOL+1; // only for OSL_ENSURE
-ppPatterns[nPos] = pPattern;
+// store positions of ScHorizontalAttrIterator elements (minimizing 
expensive ScPatternAtt

[Libreoffice-commits] core.git: Branch 'feature/vclref' - cui/source include/vcl reportdesign/source sfx2/source svx/source sw/source vcl/source

2015-02-27 Thread Michael Meeks

 cui/source/options/optcolor.cxx|   13 +
 include/vcl/builder.hxx|   11 ++-
 include/vcl/tabpage.hxx|2 ++
 include/vcl/vclptr.hxx |   18 ++
 reportdesign/source/ui/dlg/Condition.cxx   |1 +
 sfx2/source/appl/newhelp.cxx   |3 +++
 sfx2/source/dialog/backingwindow.cxx   |1 +
 sfx2/source/dialog/dockwin.cxx |2 ++
 svx/source/dialog/ctredlin.cxx |4 
 svx/source/form/datanavi.cxx   |6 ++
 svx/source/sidebar/PanelLayout.cxx |1 +
 sw/source/ui/index/cnttab.cxx  |2 ++
 sw/source/uibase/sidebar/PagePropertyPanel.cxx |8 
 vcl/source/window/builder.cxx  |   11 +--
 vcl/source/window/dialog.cxx   |6 ++
 vcl/source/window/dockwin.cxx  |3 +++
 vcl/source/window/syswin.cxx   |2 ++
 vcl/source/window/tabpage.cxx  |   11 +++
 18 files changed, 102 insertions(+), 3 deletions(-)

New commits:
commit 3521ba3dc62b9a746d31180dd1344a60de06d457
Author: Michael Meeks 
Date:   Fri Feb 27 16:29:46 2015 +

vcl: ensure that VclBuilder is disposed before parent window.

Move VclBuilder to use VclPtr, link to documentation, and fix more
double dispose issues.

Change-Id: I4900b69dbb381bd7d6fda97f2a5e623bb58e0a9f

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 66fa298..a8dcf52 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -174,6 +174,8 @@ class ColorConfigWindow_Impl
 {
 public:
 ColorConfigWindow_Impl(vcl::Window* pParent);
+~ColorConfigWindow_Impl() { dispose(); }
+virtual void dispose() SAL_OVERRIDE;
 
 public:
 void SetLinks (Link const&, Link const&, Link const&);
@@ -508,6 +510,12 @@ 
ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent)
 SetAppearance();
 }
 
+void ColorConfigWindow_Impl::dispose()
+{
+disposeBuilder();
+VclContainer::dispose();
+}
+
 Size ColorConfigWindow_Impl::calculateRequisition() const
 {
 return getLayoutRequisition(*m_pGrid);
@@ -913,9 +921,14 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
 void ColorConfigCtrl_Impl::dispose()
 {
 delete m_pVScroll;
+m_pVScroll = NULL;
 delete m_pScrollWindow;
+m_pScrollWindow = NULL;
 delete m_pBody;
+m_pBody = NULL;
 delete m_pHeaderHB;
+m_pHeaderHB = NULL;
+
 VclVBox::dispose();
 }
 
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index ef8264b..8464b36 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -55,6 +56,9 @@ public:
 const css::uno::Reference 
&rFrame = css::uno::Reference());
 ~VclBuilder();
 
+///releases references and disposes all children.
+void disposeBuilder();
+
 //sID must exist and be of type T
 template  T* get(T*& ret, const OString& sID);
 
@@ -143,7 +147,7 @@ private:
 struct WinAndId
 {
 OString m_sID;
-vcl::Window *m_pWindow;
+VclPtr m_pWindow;
 short m_nResponseId;
 PackingData m_aPackingData;
 WinAndId(const OString &rId, vcl::Window *pWindow, bool bVertical)
@@ -439,12 +443,17 @@ inline PopupMenu* VclBuilder::get_menu(PopupMenu*& ret, 
const OString& sID)
 //
 //i.e.  class Dialog : public SystemWindow, public VclBuilderContainer
 //not   class Dialog : public VclBuilderContainer, public SystemWindow
+//
+//With the new 'dispose' framework, it is necessary to force the builder
+//dispose before the Window dispose; so a Dialog::dispose() method would
+//finish: disposeBuilder(); SystemWindow::dispose() to capture this ordering.
 
 class VCL_DLLPUBLIC VclBuilderContainer
 {
 public:
 VclBuilderContainer();
 virtual ~VclBuilderContainer();
+voiddisposeBuilder();
 
 static OUString getUIRootDir();
 boolhasBuilder() const { return m_pUIBuilder != NULL; }
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index c736197..7294d48 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -41,6 +41,8 @@ private:
 public:
 explicitTabPage( vcl::Window* pParent, WinBits nStyle = 0 );
 explicitTabPage( vcl::Window *pParent, const OString& rID, const 
OUString& rUIXMLDescription );
+   ~TabPage();
+virtual voiddispose() SAL_OVERRIDE;
 
 virtual voidPaint( const Rectangle& rRect ) SAL_OVERRIDE;
 virtual voidDraw( OutputDevice* pDev, const Point& rPos, const Size& 
rSize, sal_uLong nFlags ) SAL_OVERRIDE;
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 37da714..50a87b

minutes of ESC call ...

2015-02-27 Thread Michael Meeks

* Present: Caolán, Bjoern, Kendy, Andras, Miklos, Norbert, Sophi, Muthu, David 
T.,
   Lionel, Eike, Robinson, Stephan, Cloph
* Completed Action Items:
+ remove the OmegaT project from Gerrit, they moved it to GitHub (Norbert)
+ look into setting up OpenID proxy after 4.4.0 release (Cloph)
+ would work only if we were using only Google for authentication
+ not possible to have both Google OAuth + OpenID
 
* Pending Action Items:
+ please file an Easy-Hack this week: just a bug with whiteboard: (All)
"EasyHack DifficultyBeginner SkillCpp TopicCleanup"
+ thanks to:
+ Moggi, Bjoern
+ http://bit.ly/1Dd4y8b
+ reminder: Easy-Hacks need code pointers and a mentor!
+ write blog post to promote hack-fests (Bjoern)
+ make sure to create a new openid if you are using the Google openID (all)
 
* Release Engineering update (Cloph)
+ 4.4.1 RC2 status
+ released as final today
+ 4.3.7 due end of April
+ Late-feature approval
+ SkipImages -> 60s -> 7s for HTML conversions
+ triple review appreciated:
  https://gerrit.libreoffice.org/#/c/14628/
+ Android & iOS Remote
+ patches in gerrit status ?
+ need to get in contact with the submitter; will take care of them
+ no time to have a look - will have a look later today
 
* Infrastructure interim story (Cloph/?)
+ gerrit status; hardware status
+ running now - on the crash-testing machine
+ developer / crash-testing machine ?
+ pure virtual machines now (no oVirt)
+ now pending on H/W console, when they get it, will setup the 
crash-test
  machine again
 
* GSoC (Thorsten)
+ Wiki page there; we still have time to add tasks here:
https://wiki.documentfoundation.org/Development/Gsoc/Ideas
+ more ideas much appreciated.
+ awaiting Google's response.
+ interest from Haiku project on co-mentoring a port
+ application time is over, the next Monday we'll learn if we are accepted
+ no tasks for Basic, Base, Draw
AI: + Lionel can mentor finishing the Firebird driver - add the task 
(Lionel)
 
* Crashtest update (Markus)
+ waiting for infra
+ bug in the script - overwriting the last line of importCrash.log status ?
 
* Developer / Job adverts on dev-list ? (Michael)
+ thoughts / rules / feedback on this appreciated; Collabora is hiring etc.
+ let's wait for Michael (Kendy)
 
* Hackfests (Bjoern)
+ Las Palmas de Gran Canaria, Spain
+ happy to have us back
+ suggested March 19th, 20th: Thur / Fri.
+ happens during GSOC application phase.
Date is confirmed, sign up & book travel!
https://wiki.documentfoundation.org/Hackfest/GranCanaria2015
+ Bjoern won't be there, but will help organize.
 + if you are going, please add your name to the wiki!
 + be good to pick a hotel; if people have suggestions.
+ Cambridge, UK - May 2015 - contact (Michael)
+ Dates of 21st -> 23rd May confirmed Thur / Fri / Sat.
+ Cambridge Beer Festival overlap / Punting Excursion planned etc.
  https://wiki.documentfoundation.org/Hackfest/Cambridge2015
+ Kitchen, but no rings for Pasta:
 + Kettle / Dish-Washer Spaghetti cooking ?
 
* UX Update (Kendy)
+ reorganization of toolbars in Impress ongoing
 
* l10n Update (Sophie)
+ some people unhappy about the templates - they are not localized
+ planned for 4.5 (Kendy)
+ cannot ship 100x each template, the plan is to have the template 
once, but strings separate (Kendy)
+ possible to use autocorrect mechanism + go through pootle (Miklos)
+ will sync with Miklos offline (Kendy)
 
* Developer Certification (Stephan/Bjoern/Kendy)
+ would like to re-run the script to chase the clueful (Kendy)
 
* Jenkins update (Norbert)
+ http://ci.libreoffice.org/view/Dashboard/
   + pending new hardware, trying to move Windows VMs -> Infra.
+ running into issues due to infra problems
 
* Firebird Base driver removal (Miklos)
+ David O. asked if he can remove it
+ I guess the answer is clearly no, since the hope is that one day it'll
  replace the hsqldb Java driver by default in Base, any objections?
+ I would like to keep it too (Kendy)
+ better approach would be to improve it & fix it :-) (Kendy)
+ it's an experimental feature, should not block 64bit port (Michael S.)
+ but not to remove it (Michael S.)
+ OK to keep it (Lionel)
+ easier to get somebody to fix it than to implement it again later if 
removed (Norbert)
 
* QA (Robinson)
+ UNCONFIRMED at 292
   
https://bugs.documentfoundation.org/reports.cgi?product=LibreOffice&datasets=UNCONFIRMED
+ needAdvice down to 12
+ (Happy to have devs review this list, or QA can ping devs)

QA Meeting Minutes - 2015-02-25

2015-02-27 Thread Robinson Tryon

Thanks for the great meeting on Wednesday!

We had some great conversations about recruiting and university
collaboration, and apparently I'm now on the hook to make a flag
(thank you Arnaud and Beluga for that important action item ;-)
https://wiki.documentfoundation.org/QA/Meetings/2015/February_25

Our next meeting is on March 11th, which is close to but not actually
St. Patrick's Day. Feel free to wear some green to the meeting if it
strikes your fancy, and of course BYOB:
https://wiki.documentfoundation.org/QA/Meetings/2015/March_11

Best,
--R

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

Re: Calc function names saved to file and backward compatibility

2015-02-27 Thread Eike Rathke

Hi Winfried,

darn, another mail in the queue..

On Thursday, 2015-02-19 10:19:57 +0100, Winfried Donkers wrote:

> OK, then I suggest the following. 
> Current situation:
> Calc UI ODF Excel
> FDIST   LEGACY.FDISTFDIST
> F.DIST  COM.MICROSOFT.F.DISTF.DIST
> F.DIST.RT   COM.MICROSOFT.F.DIST.RT F.DIST.RT
> 
> New situation:
> Calc UIODF-old names, kept   ODF  Excel
> FDISTLEGACY.FDIST FDIST  (no 
> change)
> F.DIST COM.MICROSOFT.F.DIST  FDISTF.DIST
> F.DIST.RTCOM.MICROSOFT.F.DIST.RT  F.DIST.RT  (no 
> change)
> To be done in two steps.

Looks good to me.

> Shall I prepare step 1 for branch 4-4 and step 2 for master?

Yes, as you already did ;)

I'll review.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

Re: Trying to understand some points in RecentDocs management

2015-02-27 Thread Eike Rathke

Hi julien2412,

On Monday, 2015-02-16 14:43:03 -0700, julien2412 wrote:

> 1) I noticed that AddDocumentToPickList was called at the opening and at the
> close of a doc (+ some other events like saveAs)
> See
> http://opengrok.libreoffice.org/xref/core/sfx2/source/appl/sfxpicklist.cxx#406
> => I wonder in which case calling this method at close would be useful so
> submitted https://gerrit.libreoffice.org/#/c/14507/

See my comment there.

> 2) I noticed that this line in AddDocumentToPickList was always wrong:
> 178 if ( !pMed->IsUpdatePickList() )

Why wrong? A medium could be set to not updating / be mentioned in the picklist.

> I mean either the recent list or not, it seems we never return from 
> AddDocumentToPickList and so we generate thumbnail of the file (some lines
> below)
> Trying to investigate here, I must recognize I'm not sure what
> "bUpdatePickList" variable from SfxMedium_Impl (see
> http://opengrok.libreoffice.org/xref/core/sfx2/source/doc/docfile.cxx#174)
> means:
> a) boolean to indicate pick list should be updated

Yes.

> or b) boolean to indicate pick list has been updated
> IsUpdatePickList shows a bit this confusion, does it mean: "is updated
> PickList" or "must Update PickList" ?

"is UpdatePickList set" ;-)

> 3) I noticed that at each close, BackingWindow::initControls is called (see
> opengrok.libreoffice.org/xref/core/sfx2/source/dialog/backingwindow.cxx#217) 
> and we never return early from here:
> 217 void BackingWindow::initControls()
> 218 {
> 219 if( mbInitControls )
> 220 return;
> 221 
> 222 mbInitControls = true;
> 
> Indeed, by closing several times the same file (without any change in it
> each time), the object address is different:

Probably the BackingWindow is destroyed when a document is opened, which
makes sense because it is not needed anymore. Once the last document is
closed, a new BackingWindow is created. Just assumptions, I didn't
investigate, you'd have to place a break in dtor and ctor.

> /home/julien/compile-libreoffice/libreoffice/sfx2/source/dialog/backingcomp.cxx:436
> 
> the main problem here is we call mpAllRecentThumbnails->Reload(); (line 260
> of this same file) (see
> http://opengrok.libreoffice.org/xref/core/sfx2/source/control/recentdocsview.cxx#158)
> This method clears and reloads completely SvtHistoryOptions list

Why is that bad? The alternative would be to keep the BackingWindow (IF
my assumption of it being destroyed holds) but then you would have to
refresh the history and corresponding thumbnails of documents that were
opened or saved in the mean time. Which unnecessarily would tie memory
when a document is open and complicate handling.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

Re: [IMPORTANT] Google OpenId End-of-Life, Gerrit users need to take action

2015-02-27 Thread Norbert Thiebaud

FYI:

things that are known to work and already used by our gerrit users are:

launchpad, fedora, Yahoo, verisign

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

Re: another cppunit test core dump, java this time, building on xstreamos/illumos

2015-02-27 Thread Gabriele Bulfon

wowso? what can I do? is this cppunit stage necessary to complete the build?
What if I could disable this and go on? would it possibly work?
--
Da: Stephan Bergmann
A: libreoffice@lists.freedesktop.org
Data: 27 febbraio 2015 18.34.08 CET
Oggetto: Re: another cppunit test core dump, java this time, building on 
xstreamos/illumos
On 02/26/2015 12:35 PM, Gabriele Bulfon wrote:
0803d0e8 libc.so.1`_lwp_kill+0x15(1, 6, 10e3, fef66000, fef66000, 0)
0803d108 libc.so.1`raise+0x2b(6, 0, 803d120, efe70dd9, 0, 0)
0803d158 libc.so.1`abort+0x10e(0, f010, 803d308, effda2d3, 1, f00b877d)
0803d168 libjvm.so`__1cCosFabort6Fb_v_+0x51(1, f00b877d, 1, 7d0)
0803d308 libjvm.so`__1cHVMErrorOreport_and_die6M_v_+0xab3(803d380, 803d4b4)
0803d3d8 libjvm.so`JVM_handle_solaris_signal+0xa6e(b, 803d6b4, 803d4b4, 1)
0803d3f8 libjvm.so`signalHandler+0x26(b, 803d6b4, 803d4b4, fef66000,
803d470, feee7f73)
0803d410 libc.so.1`__sighndlr+0x15(b, 803d6b4, 803d4b4, ef81acd4, 0, 29)
0803d470 libc.so.1`call_user_handler+0x292(b, 803d6b4, 803d4b4,
fe0749ee, 0, 29)
0803d4a0 libc.so.1`sigacthandler+0x77(b, 803d6b4, 803d4b4)
0803d758 libc.so.1`memcpy+0x1b(8, fd35c7bc, 1b, 0, fef6a380, fea90180)
0803d788 libuno_sal.so.3`rtl_uString_newFromStr_WithLength+0x63(803d7cc,
fd35c7bc, 1b, fe0768b3, fef6ca00)
[...]
libfwklo.so`_ZN3com3sun4star3uno13WeakReferenceINS1_5frame7XFrame2EED1Ev+0x1d(f35cfc40,
fef6a380, 803dab8, fec06f85, fec19ac0)
0803da98
libfwklo.so`_Z41__static_initialization_and_destruction_0ii+0x4c(0,
, feffc480, ef2800c4, 803dad0, fefca3b1)
0803dab8 libfwklo.so`_GLOBAL__sub_D_frame.cxx+0x1a(803daf0, fefca394,
feffb0a4, f32ed90a, f34cc000, f7b60018)
0803dad8 0xf32ed950(feffb0a4, fefcebf3, feffb0a4, f7b60018, 803db30,
fefd21a8)
0803daf0 libfwklo.so`_fini+0x1b(feffc480, 0, f7b60018, f, 0, 8e)
0803db30 ld.so.1`call_fini+0xb3(feffc480, ef280018, 0, 0)
0803db60 ld.so.1`atexit_fini+0x66(0, 10, fef804f0, fef804f0, 101a, 6cf04)
0803dbb0 libc.so.1`__cxa_finalize+0x85(0, 10, 80560af, 0, fef66000, 803dbbc)
0803dbd0 libc.so.1`_exithandle+0x37(feffb0a4, 80560af, 0, 0, 803dc58,
8056042)
0803dbf4 libc.so.1`exit+0x12(15, 803e978, 803ea01, 803ea9d, 803eaa8,
803eb28)
That would be apparently be
static css::uno::WeakReference
m_xCloserFrame;
in framework/source/services/frame.cxx wreaking havoc when destroyed
during exit.  Looks like in your case rtl_allocateMemory is already
returning nullptr, probably indicating that atexit handlers of sal are
run prior to those of fwk, which would be a bug.
That said, static data with destructor is always bad (and just a lucky
coincidence this one appears to not wreak havoc elsewhere) and should be
removed, but also I don't see any immediate way how to do it in this case.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Macro that copy Writer form control entry to a Calc cell

2015-02-27 Thread Eike Rathke

Hi Robinson,

On Monday, 2015-02-23 16:14:15 -0500, Robinson Tryon wrote:

> >> Hi, I posted a project offer on many freelancers sites but had very 
> >> expansive offers (from 150$to 1000$ !)
> 
> I thought that by "expansive" he didn't mean "expensive,"

Well, given that he's French I interpreted expansive as expensive ;-)
without even thinking about, but maybe jumped to conclusions too early.

Sorry Jean-Francois, seems I caught myself on the wrong foot..

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

Re: [IMPORTANT] Google OpenId End-of-Life, Gerrit users need to take action

2015-02-27 Thread Eike Rathke

Hi Jesper,

On Sunday, 2015-02-22 15:01:12 +0100, Jesper Hertel wrote:

> And another list with detailed ratings and information:
> http://openidexplained.com/get

Way outdated, the recommended myopenid.com doesn't exist anymore,
claimid.com discontinued their service long ago, getopenid.com is
a Japanese blog now, and it even still lists Google and *gasp* AOL ...

That site should be entirely binned.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: 3 commits - chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_import.mk chart2/CppunitTest_chart2_xshape.mk cppcanvas/CppunitTest_cppcanvas_emfplus.mk dbacc

2015-02-27 Thread Michael Stahl

 chart2/CppunitTest_chart2_export.mk |2 --
 chart2/CppunitTest_chart2_import.mk |2 --
 chart2/CppunitTest_chart2_xshape.mk |2 --
 cppcanvas/CppunitTest_cppcanvas_emfplus.mk  |2 --
 dbaccess/CppunitTest_dbaccess_RowSetClones.mk   |4 
 dbaccess/CppunitTest_dbaccess_dialog_save.mk|4 
 dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk |4 
 dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk  |4 
 dbaccess/CppunitTest_dbaccess_firebird_test.mk  |2 --
 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk|4 
 dbaccess/CppunitTest_dbaccess_macros_test.mk|4 
 dbaccess/CppunitTest_dbaccess_nolib_save.mk |4 
 postprocess/CppunitTest_services.mk |2 --
 sc/CppunitTest_sc_annotationobj.mk  |2 --
 sc/CppunitTest_sc_annotationshapeobj.mk |2 --
 sc/CppunitTest_sc_annotationsobj.mk |2 --
 sc/CppunitTest_sc_cellrangeobj.mk   |2 --
 sc/CppunitTest_sc_chart_regression_test.mk  |2 --
 sc/CppunitTest_sc_condformats.mk|2 --
 sc/CppunitTest_sc_databaserangeobj.mk   |2 --
 sc/CppunitTest_sc_datapilotfieldobj.mk  |2 --
 sc/CppunitTest_sc_datapilottableobj.mk  |2 --
 sc/CppunitTest_sc_editfieldobj_cell.mk  |2 --
 sc/CppunitTest_sc_editfieldobj_header.mk|2 --
 sc/CppunitTest_sc_html_export_test.mk   |2 --
 sc/CppunitTest_sc_macros_test.mk|2 --
 sc/CppunitTest_sc_modelobj.mk   |2 --
 sc/CppunitTest_sc_namedrangeobj.mk  |2 --
 sc/CppunitTest_sc_namedrangesobj.mk |2 --
 sc/CppunitTest_sc_opencl_test.mk|2 --
 sc/CppunitTest_sc_outlineobj.mk |2 --
 sc/CppunitTest_sc_perfobj.mk|2 --
 sc/CppunitTest_sc_rangelst_test.mk  |2 --
 sc/CppunitTest_sc_recordchanges.mk  |2 --
 sc/CppunitTest_sc_styleloaderobj.mk |2 --
 sc/CppunitTest_sc_tablesheetobj.mk  |2 --
 sc/CppunitTest_sc_tablesheetsobj.mk |2 --
 sc/qa/unit/subsequent_filters-test.cxx  |3 ++-
 sd/CppunitTest_sd_export_tests.mk   |2 --
 sd/CppunitTest_sd_html_export_tests.mk  |2 --
 sd/CppunitTest_sd_import_tests.mk   |2 --
 solenv/gbuild/CppunitTest.mk|   11 +--
 sw/CppunitTest_sw_globalfilter.mk   |2 --
 sw/CppunitTest_sw_htmlexport.mk |2 --
 sw/CppunitTest_sw_htmlimport.mk |2 --
 sw/CppunitTest_sw_layout_test.mk|2 --
 sw/CppunitTest_sw_macros_test.mk|2 --
 sw/CppunitTest_sw_odfexport.mk  |2 --
 sw/CppunitTest_sw_odfimport.mk  |2 --
 sw/CppunitTest_sw_ooxmlfieldexport.mk   |2 --
 sw/CppunitTest_sw_ooxmlimport.mk|2 --
 sw/CppunitTest_sw_ooxmlsdrexport.mk |2 --
 sw/CppunitTest_sw_ooxmlw14export.mk |2 --
 sw/CppunitTest_sw_rtfexport.mk  |2 --
 sw/CppunitTest_sw_rtfimport.mk  |2 --
 sw/CppunitTest_sw_uiwriter.mk   |2 --
 sw/CppunitTest_sw_ww8export.mk  |2 --
 sw/CppunitTest_sw_ww8import.mk  |2 --
 sw/ooxmlexport_setup.mk |2 --
 59 files changed, 11 insertions(+), 131 deletions(-)

New commits:
commit f5b00ec964a9b4320543028e77fb6acb25f70e74
Author: Michael Stahl 
Date:   Fri Feb 27 19:20:03 2015 +0100

gbuild: gb_CppunitTest_use_filter_configuration was removed

... years ago in commit e1b51e7beb7f9cfa7b574b9c2a69799e62963a09

Change-Id: I588370796830dc379f6a004ec7e673b020360eb5

diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk 
b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index 3a149e0..7aa0bec 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -106,8 +106,6 @@ $(eval $(call 
gb_CppunitTest_use_components,dbaccess_RowSetClones,\
 
 $(eval $(call gb_CppunitTest_use_configuration,dbaccess_RowSetClones))

Re: key

2015-02-27 Thread Eike Rathke

Hi Christian,

On Friday, 2015-02-27 14:06:09 +0100, Christian Lohmaier wrote:

> > where is the fingerprint to check pgp signature
> > thanks
> 
> C283 9ECA D940 8FBE 9531  C3E9 F434 A1EF AFEE AEA3

Could you add the fingerprint to the Info pages, e.g.
http://download.documentfoundation.org/libreoffice/stable/4.4.1/rpm/x86_64/LibreOffice_4.4.1_Linux_x86-64_rpm.tar.gz.mirrorlist

behind where it says "PGP signature available" and links to the .asc file?
I assume that's where 'philorder' obained the signature from.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack

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

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

2015-02-27 Thread Adolfo Jayme Barrientos

 dev/null |binary
 icon-themes/tango/cmd/lc_autosum.png |binary
 icon-themes/tango/cmd/sc_autosum.png |binary
 icon-themes/tango/cmd/sc_autosum.svg | 2006 +++
 icon-themes/tango_testing/cmd/lc_autosum.svg | 1993 --
 5 files changed, 2006 insertions(+), 1993 deletions(-)

New commits:
commit a0a1a752cd08b54d3b12c74826882c734fc9c2be
Author: Adolfo Jayme Barrientos 
Date:   Fri Feb 27 00:07:35 2015 -0600

actually add all of the new autosum icons to Tango, related tdf#88915

Change-Id: I0a84f4216ff6120f00126a3bd2942f2e455e4190

diff --git a/icon-themes/tango/cmd/lc_autosum.png 
b/icon-themes/tango/cmd/lc_autosum.png
index e798513..01fbe29 100644
Binary files a/icon-themes/tango/cmd/lc_autosum.png and 
b/icon-themes/tango/cmd/lc_autosum.png differ
diff --git a/icon-themes/tango/cmd/sc_autosum.png 
b/icon-themes/tango/cmd/sc_autosum.png
index 4c5058a..56ad9e5 100644
Binary files a/icon-themes/tango/cmd/sc_autosum.png and 
b/icon-themes/tango/cmd/sc_autosum.png differ
diff --git a/icon-themes/tango_testing/cmd/lc_autosum.svg 
b/icon-themes/tango/cmd/sc_autosum.svg
similarity index 97%
rename from icon-themes/tango_testing/cmd/lc_autosum.svg
rename to icon-themes/tango/cmd/sc_autosum.svg
index 831aca1..5b8c79e 100644
--- a/icon-themes/tango_testing/cmd/lc_autosum.svg
+++ b/icon-themes/tango/cmd/sc_autosum.svg
@@ -10,13 +10,13 @@
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
-   width="24"
-   height="24"
+   width="16"
+   height="16"
id="svg2"
version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="lc_autosum.svg"
-   
inkscape:export-filename="/home/alexander/libo/icon-themes/tango_testing/cmd/lc_autosum.png"
+   inkscape:version="0.91 r"
+   sodipodi:docname="sc_autosum.svg"
+   
inkscape:export-filename="/home/adolfojb/Escritorio/Disclosure/sc_autosum.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
   
 
+   y2="1059.0797"
+   
gradientTransform="matrix(0.68485992,0,0,0.65140447,0.6770516,366.75368)" />
 
   
+
   
   
+ showborder="true"
+ inkscape:showpageshadow="true"
+ inkscape:window-width="1301"
+ inkscape:window-height="744"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ borderlayer="true">
 
+ transform="translate(0,-1036.3622)">
 
   
@@ -1194,8 +1207,8 @@
  sodipodi:nodetypes="c"
  inkscape:connector-curvature="0"
  id="path3969"
- 
style="font-variant:normal;font-stretch:normal;opacity:0.3;fill:none;stroke:#00;stroke-width:1;stroke-opacity:1;font-family:GentiumAlt;-inkscape-font-specification:GentiumAlt"
- d="M 21.500191,1051.9062 5.5,1051.8622 l 0,-0.3384 8.138472,-12.1284 
-8.129371,-10.3264 0,-0.1566 15.99109,-0.01 0,6.0034 -1.059852,-0.022 c 
-0.09879,-1.7663 -2.189654,-4.1586 -3.578382,-4.0344 l -6.8693083,0.01 
6.3732003,8.537 -7.2440787,10.4797 8.1600307,2e-4 c 2.133386,-0.7845 
2.978569,-2.8932 3.189808,-4.0003 0.919915,0 1.028583,9e-4 1.028583,9e-4 z" />
+ 
style="font-variant:normal;font-stretch:normal;font-family:GentiumAlt;-inkscape-font-specification:GentiumAlt;opacity:0.3518;fill:url(#radialGradient4341);fill-opacity:1;stroke:#00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1"
+ d="M 15.35787,1051.9552 4.4,1051.9262 l 0,-0.2202 5.5737026,-7.8988 
-5.5674697,-6.7248 0,-0.1018 10.9516371,0 0,3.9099 -0.72585,-0.014 c 
-0.06765,-1.1504 -1.499602,-2.7083 -2.450685,-2.6276 l -4.7045051,0 
4.3647411,5.5597 -4.9611701,6.8251 5.5884671,0 c 1.461068,-0.5109 
2.039899,-1.8841 2.184568,-2.6051 0.630013,0 0.704434,6e-4 0.704434,6e-4 z" />

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

2015-02-27 Thread Stephan Bergmann

 framework/source/services/frame.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7791521e97361ae5a39df44a5a3afe9a2d8b562e
Author: Stephan Bergmann 
Date:   Fri Feb 27 18:36:25 2015 +0100

Remove nonsense

Change-Id: Ia9528660190b0359c59818c82265081d9e73b9d9

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 587a058..7ab2d3a 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -415,7 +415,7 @@ protected:
 FrameContainer  
m_aChildFrameContainer;   /// array of child frames
 };
 
-css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame = 
css::uno::WeakReference< css::frame::XFrame2 >();
+css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame;
 
 //  XInterface, XTypeProvider, XServiceInfo
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: another cppunit test core dump, java this time, building on xstreamos/illumos

2015-02-27 Thread Stephan Bergmann


On 02/26/2015 12:35 PM, Gabriele Bulfon wrote:

0803d0e8 libc.so.1`_lwp_kill+0x15(1, 6, 10e3, fef66000, fef66000, 0)
0803d108 libc.so.1`raise+0x2b(6, 0, 803d120, efe70dd9, 0, 0)
0803d158 libc.so.1`abort+0x10e(0, f010, 803d308, effda2d3, 1, f00b877d)
0803d168 libjvm.so`__1cCosFabort6Fb_v_+0x51(1, f00b877d, 1, 7d0)
0803d308 libjvm.so`__1cHVMErrorOreport_and_die6M_v_+0xab3(803d380, 803d4b4)
0803d3d8 libjvm.so`JVM_handle_solaris_signal+0xa6e(b, 803d6b4, 803d4b4, 1)
0803d3f8 libjvm.so`signalHandler+0x26(b, 803d6b4, 803d4b4, fef66000,
803d470, feee7f73)
0803d410 libc.so.1`__sighndlr+0x15(b, 803d6b4, 803d4b4, ef81acd4, 0, 29)
0803d470 libc.so.1`call_user_handler+0x292(b, 803d6b4, 803d4b4,
fe0749ee, 0, 29)
0803d4a0 libc.so.1`sigacthandler+0x77(b, 803d6b4, 803d4b4)
0803d758 libc.so.1`memcpy+0x1b(8, fd35c7bc, 1b, 0, fef6a380, fea90180)
0803d788 libuno_sal.so.3`rtl_uString_newFromStr_WithLength+0x63(803d7cc,
fd35c7bc, 1b, fe0768b3, fef6ca00)

[...]

libfwklo.so`_ZN3com3sun4star3uno13WeakReferenceINS1_5frame7XFrame2EED1Ev+0x1d(f35cfc40,
fef6a380, 803dab8, fec06f85, fec19ac0)
0803da98
libfwklo.so`_Z41__static_initialization_and_destruction_0ii+0x4c(0,
, feffc480, ef2800c4, 803dad0, fefca3b1)
0803dab8 libfwklo.so`_GLOBAL__sub_D_frame.cxx+0x1a(803daf0, fefca394,
feffb0a4, f32ed90a, f34cc000, f7b60018)
0803dad8 0xf32ed950(feffb0a4, fefcebf3, feffb0a4, f7b60018, 803db30,
fefd21a8)
0803daf0 libfwklo.so`_fini+0x1b(feffc480, 0, f7b60018, f, 0, 8e)
0803db30 ld.so.1`call_fini+0xb3(feffc480, ef280018, 0, 0)
0803db60 ld.so.1`atexit_fini+0x66(0, 10, fef804f0, fef804f0, 101a, 6cf04)
0803dbb0 libc.so.1`__cxa_finalize+0x85(0, 10, 80560af, 0, fef66000, 803dbbc)
0803dbd0 libc.so.1`_exithandle+0x37(feffb0a4, 80560af, 0, 0, 803dc58,
8056042)
0803dbf4 libc.so.1`exit+0x12(15, 803e978, 803ea01, 803ea9d, 803eaa8,
803eb28)


That would be apparently be


static css::uno::WeakReference< css::frame::XFrame2 >   
m_xCloserFrame;


in framework/source/services/frame.cxx wreaking havoc when destroyed 
during exit.  Looks like in your case rtl_allocateMemory is already 
returning nullptr, probably indicating that atexit handlers of sal are 
run prior to those of fwk, which would be a bug.


That said, static data with destructor is always bad (and just a lucky 
coincidence this one appears to not wreak havoc elsewhere) and should be 
removed, but also I don't see any immediate way how to do it in this case.

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

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

2015-02-27 Thread Stephan Bergmann

 connectivity/source/drivers/mork/MQueryHelper.cxx |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 35b07ae7a3ef2163de7dcff7a96029e28240fe11
Author: Stephan Bergmann 
Date:   Fri Feb 27 17:53:19 2015 +0100

Re tdf#87789: Fix opening mork CollectedAddressBook Table

...which now opened the AddressBook Table instead.  Apparently a regression 
from
a527ad98e58a7fc9af482f9088687d82e5c52cca "Resolves fdo#87789: show groups in
collected addresses."

Change-Id: I413adb3ee963262cac71547cde6e5ccc5a9a19ab

diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx 
b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 6398466..08e5447 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -195,19 +195,23 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* 
xConnection, MQueryExpression
 OString oStringTable = OUStringToOString( m_aAddressbook, 
RTL_TEXTENCODING_UTF8 );
 std::set listRecords;
 bool handleListTable = false;
+MorkParser* xMork;
 
-// Let's try to retrieve the list in Collected Addresses book
-MorkParser* xMork = 
xConnection->getMorkParser(OString("CollectedAddressBook"));
-if (std::find(xMork->lists_.begin(), xMork->lists_.end(), m_aAddressbook) 
== xMork->lists_.end())
+// check if we are retrieving the default table
+if (oStringTable == "AddressBook" || oStringTable == 
"CollectedAddressBook")
 {
-// so the list is in Address book
-// TODO : manage case where an address book has been created
-xMork = xConnection->getMorkParser(OString("AddressBook"));
+xMork = xConnection->getMorkParser(oStringTable);
 }
-
-// check if we are retrieving the default table
-if (oStringTable != "AddressBook" && oStringTable != 
"CollectedAddressBook")
+else
 {
+// Let's try to retrieve the list in Collected Addresses book
+xMork = xConnection->getMorkParser(OString("CollectedAddressBook"));
+if (std::find(xMork->lists_.begin(), xMork->lists_.end(), 
m_aAddressbook) == xMork->lists_.end())
+{
+// so the list is in Address book
+// TODO : manage case where an address book has been created
+xMork = xConnection->getMorkParser(OString("AddressBook"));
+}
 handleListTable = true;
 // retrieve row ids for that list table
 std::string listTable = oStringTable.getStr();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

help needed for starting free software developing

2015-02-27 Thread Nabiha Iqbal

Hi.I want to participate in GSOC 2015 and I am interested in your project
 ideas but I need help to where I would start.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source

2015-02-27 Thread Miklos Vajna

 sw/source/uibase/docvw/edtwin.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 34759884acb4ffe51aa6b7004d1aae7550745b75
Author: Miklos Vajna 
Date:   Fri Feb 27 16:44:23 2015 +0100

SwEditWin::SetCursorLogicPosition: use SwCrsrShell::getShellCrsr

Using raw GetCrsr() would return the shell cursor even if there is a
table cursor. With this, if there is a table selection, the selection
start handle can properly shrink and expand the start of the selection.

Change-Id: Ic525071639333a00bb5a03a3dd74c4f8052e24f7

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 751a7e1..482c142 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6262,10 +6262,10 @@ void SwEditWin::SetCursorLogicPosition(const Point& 
rPosition, bool bPoint, bool
 // If the mark is to be updated, then exchange the point and mark before
 // and after, as we can't easily set the mark.
 if (!bPoint)
-rShell.GetCrsr()->Exchange();
+rShell.getShellCrsr(/*bBlock=*/false)->Exchange();
 rShell.SetCrsr(rPosition);
 if (!bPoint)
-rShell.GetCrsr()->Exchange();
+rShell.getShellCrsr(/*bBlock=*/false)->Exchange();
 }
 
 /* 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: connectivity/source

2015-02-27 Thread Stephan Bergmann

 connectivity/source/drivers/kab/KConnection.cxx |   35 +++
 connectivity/source/drivers/kab/KConnection.hxx |   20 -
 connectivity/source/drivers/kab/KDriver.cxx |   36 ++--
 connectivity/source/drivers/kab/KDriver.hxx |   13 
 connectivity/source/drivers/kab/KStatement.cxx  |2 -
 5 files changed, 54 insertions(+), 52 deletions(-)

New commits:
commit 6a319aa381a1ab704a6c523198baccca021918bd
Author: Stephan Bergmann 
Date:   Fri Feb 27 16:35:01 2015 +0100

Clean up interface between kab and kabdrv libs

...to not need to see the KDriver class from the outer kab wrapper in the 
inner
kabdrv, and the KConnection class from the inner kabdrv in the outer kab
wrapper, which caused false positives from -fsanitize=vptr.

Change-Id: Ifae4c837ba4da660df0928b50de5114d567e5d9c

diff --git a/connectivity/source/drivers/kab/KConnection.cxx 
b/connectivity/source/drivers/kab/KConnection.cxx
index e98ee24..1938336 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -22,7 +22,6 @@
 #include "KDatabaseMetaData.hxx"
 #include "KStatement.hxx"
 #include "KPreparedStatement.hxx"
-#include "KDriver.hxx"
 #include "KCatalog.hxx"
 #include 
 #include 
@@ -37,23 +36,20 @@ using namespace com::sun::star::sdbcx;
 
 IMPLEMENT_SERVICE_INFO(KabConnection, 
"com.sun.star.sdbc.drivers.KabConnection", "com.sun.star.sdbc.Connection")
 
-KabConnection::KabConnection(KabDriver* _pDriver)
+KabConnection::KabConnection(
+css::uno::Reference const & componentContext,
+css::uno::Reference const & driver)
  : OMetaConnection_BASE(m_aMutex),
- OSubComponent((::cppu::OWeakObject*)_pDriver, this),
+ OSubComponent(driver, this),
  m_xMetaData(NULL),
  m_pAddressBook(NULL),
- m_pDriver(_pDriver)
-{
-m_pDriver->acquire();
-}
+ m_xComponentContext(componentContext)
+{}
 
 KabConnection::~KabConnection()
 {
 if (!isClosed())
 close();
-
-m_pDriver->release();
-m_pDriver = NULL;
 }
 
 void SAL_CALL KabConnection::release() throw()
@@ -61,15 +57,15 @@ void SAL_CALL KabConnection::release() throw()
 relase_ChildImpl();
 }
 
-void KabConnection::construct(const OUString&, const Sequence< PropertyValue 
>&) throw(SQLException)
+//TODO: is doing this after the ctor, and the manual ref counting really
+// necessary?
+void KabConnection::construct()
 {
 osl_atomic_increment( &m_refCount );
 
 // create a KDE address book object
 m_pAddressBook = KABC::StdAddressBook::self();
 KABC::StdAddressBook::setAutomaticSave(false);
-// perhaps we should analyze the URL to know whether the addressbook is local, 
over LDAP, etc...
-// perhaps we should get some user and password information from "info" 
properties
 
 osl_atomic_decrement( &m_refCount );
 }
@@ -309,12 +305,15 @@ Reference< XTablesSupplier > SAL_CALL 
KabConnection::createCatalog()
 return m_pAddressBook;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void*  SAL_CALL createKabConnection( void* 
_pDriver )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+createKabConnection(
+css::uno::Reference const & componentContext,
+css::uno::Reference const & driver)
 {
-KabConnection* pConnection = new KabConnection( static_cast< KabDriver* >( 
_pDriver ) );
-// by definition, the pointer crossing library boundaries as void ptr is 
acquired once
-pConnection->acquire();
-return pConnection;
+rtl::Reference con(
+new KabConnection(componentContext, driver));
+con->construct();
+return cppu::acquire(con.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KConnection.hxx 
b/connectivity/source/drivers/kab/KConnection.hxx
index 848dce4..aeb6b3f 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -37,6 +37,9 @@ namespace KABC
 class StdAddressBook;
 class AddressBook;
 }
+namespace com { namespace sun { namespace star { namespace sdbc {
+class XDriver;
+} } } }
 
 namespace connectivity
 {
@@ -48,8 +51,6 @@ namespace connectivity
 
::com::sun::star::lang::XServiceInfo
 > OMetaConnection_BASE;
 
-class KabDriver;
-
 typedef OMetaConnection_BASEKabConnection_BASE; // 
implements basics and text encoding
 typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > 
OWeakRefArray;
 
@@ -69,14 +70,17 @@ namespace connectivity
 // for 
this Connection
 
 ::KABC::StdAddressBook* m_pAddressBook; // the 
address book
-KabDriver*  m_pDriver;  // pointer 
to the owning driver object
+cs

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

2015-02-27 Thread Michael Stahl

 testtools/source/bridgetest/currentcontextchecker.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ee5a79a280dcacc326aafffb0a109ee63016c59
Author: Michael Stahl 
Date:   Fri Feb 27 16:27:41 2015 +0100

testtools: mark CurrentContextChecker as DLLPRIVATE

The problem is that currentcontextchecker.cxx is linked statically into 2
dynamic libraries, and with clang now using -fvisibility-ms-compat since
commit f0aa1a78fb209310e8baef53c02f365fca518d11 the ASAN complains about
ODR violation in testttols uno_test:

==1818==ERROR: AddressSanitizer: odr-violation (0x2aef08e9c600):
  [1] size=192 'vtable for testtools::bridgetest::CurrentContextChecker'
  testtools/source/bridgetest/currentcontextchecker.cxx
  [2] size=192 'vtable for testtools::bridgetest::CurrentContextChecker'
  testtools/source/bridgetest/currentcontextchecker.cxx

Change-Id: Ie705788dbf035f7a9f64878c6dcf3cec9b7e7ba1

diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx 
b/testtools/source/bridgetest/currentcontextchecker.hxx
index cd4feef..3c728c9 100644
--- a/testtools/source/bridgetest/currentcontextchecker.hxx
+++ b/testtools/source/bridgetest/currentcontextchecker.hxx
@@ -30,7 +30,7 @@
 
 namespace testtools { namespace bridgetest {
 
-class CurrentContextChecker:
+class SAL_DLLPRIVATE CurrentContextChecker :
 public ::osl::DebugBase< CurrentContextChecker >,
 public ::cppu::WeakImplHelper1<
 ::test::testtools::bridgetest::XCurrentContextChecker >
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclref' - reportdesign/source sw/source vcl/source

2015-02-27 Thread Michael Meeks

 reportdesign/source/ui/report/DesignView.cxx|2 +-
 sw/source/uibase/docvw/FrameControlsManager.cxx |5 +
 sw/source/uibase/docvw/PageBreakWin.cxx |6 +-
 sw/source/uibase/docvw/SidebarWin.cxx   |4 
 sw/source/uibase/docvw/edtwin.cxx   |   14 ++
 sw/source/uibase/inc/FrameControlsManager.hxx   |3 ++-
 vcl/source/window/window.cxx|2 ++
 7 files changed, 33 insertions(+), 3 deletions(-)

New commits:
commit cfec0497e1cd98fb355464eb6466708b13e0414e
Author: Michael Meeks 
Date:   Fri Feb 27 15:39:58 2015 +

sw: more double dispose work.

Change-Id: I746623d14a96bb1b2756e49da4d41adf9dbc55ca

diff --git a/reportdesign/source/ui/report/DesignView.cxx 
b/reportdesign/source/ui/report/DesignView.cxx
index b5fc1f8..f7d865f 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -206,7 +206,7 @@ bool ODesignView::PreNotify( NotifyEvent& rNEvt )
 const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode();
 util::URL aUrl;
 aUrl.Complete = 
m_pAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rCode));
-if ( aUrl.Complete.isEmpty() || 
!m_rController.isCommandEnabled( aUrl.Complete ) )
+if ( aUrl.Complete.isEmpty() || 
!m_xController->isCommandEnabled( aUrl.Complete ) )
 nRet = false;
 }
 }
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx 
b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 7cd0e7f..e168096 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -34,6 +34,11 @@ SwFrameControlsManager::SwFrameControlsManager( const 
SwFrameControlsManager& rC
 {
 }
 
+void SwFrameControlsManager::dispose()
+{
+m_aControls.clear();
+}
+
 const SwFrameControlsManager& SwFrameControlsManager::operator=( const 
SwFrameControlsManager& rCopy )
 {
 m_pEditWin = rCopy.m_pEditWin;
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx 
b/sw/source/uibase/docvw/PageBreakWin.cxx
index 6c8d3d3..a8361ff 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -124,9 +124,13 @@ void SwPageBreakWin::dispose()
 m_bDestroyed = true;
 m_aFadeTimer.Stop();
 
-delete m_pPopupMenu;
 delete m_pLine;
+m_pLine = NULL;
+delete m_pPopupMenu;
+m_pPopupMenu = NULL;
 delete m_pMousePt;
+m_pMousePt = NULL;
+
 MenuButton::dispose();
 }
 
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx 
b/sw/source/uibase/docvw/SidebarWin.cxx
index c540473..58a943a 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -142,6 +142,9 @@ SwSidebarWin::~SwSidebarWin()
 
 void SwSidebarWin::dispose()
 {
+if (IsDisposed())
+return;
+
 mrMgr.DisconnectSidebarWinFromFrm( 
*(mrSidebarItem.maLayoutInfo.mpAnchorFrm),
*this );
 
@@ -206,6 +209,7 @@ void SwSidebarWin::dispose()
 
 if (mnEventId)
 Application::RemoveUserEvent( mnEventId );
+
 vcl::Window::dispose();
 }
 
diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 819c2bc..24575a3 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5023,16 +5023,30 @@ SwEditWin::~SwEditWin()
 void SwEditWin::dispose()
 {
 m_aKeyInputTimer.Stop();
+
 delete m_pShadCrsr;
+m_pShadCrsr = NULL;
+
 delete m_pRowColumnSelectionStart;
+m_pRowColumnSelectionStart = NULL;
+
 if( m_pQuickHlpData->m_bIsDisplayed && m_rView.GetWrtShellPtr() )
 m_pQuickHlpData->Stop( m_rView.GetWrtShell() );
+
 bExecuteDrag = false;
 delete m_pApplyTempl;
+m_pApplyTempl = NULL;
+
 m_rView.SetDrawFuncPtr(NULL);
 
 delete m_pUserMarker;
+m_pUserMarker = NULL;
+
 delete m_pAnchorMarker;
+m_pAnchorMarker = NULL;
+
+m_aFrameControlsManager.dispose();
+
 vcl::Window::dispose();
 }
 
diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx 
b/sw/source/uibase/inc/FrameControlsManager.hxx
index 75585ea..42584a1 100644
--- a/sw/source/uibase/inc/FrameControlsManager.hxx
+++ b/sw/source/uibase/inc/FrameControlsManager.hxx
@@ -35,7 +35,8 @@ class SwFrameControlsManager
 
 public:
 SwFrameControlsManager( SwEditWin* pEditWin );
-~SwFrameControlsManager( );
+~SwFrameControlsManager();
+void dispose();
 
 SwFrameControlsManager( const SwFrameControlsManager& rCopy );
 const SwFrameControlsManager& operator=( const SwFrameControlsManager& 
rCopy );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index c7ef813..2dd3354 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2530,6 +2530,8 @@ void Window::GetBorder( sal_Int32& rLeftBorde

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

2015-02-27 Thread Tor Lillqvist

 vcl/source/gdi/pdfwriter_impl.cxx |  348 ++
 1 file changed, 241 insertions(+), 107 deletions(-)

New commits:
commit 2c78736c19a8f2a1df0f406c3e92f5ac55576148
Author: Tor Lillqvist 
Date:   Fri Feb 27 17:24:44 2015 +0200

tdf#84881: Timestamp the right data (Win32 version)

Now Adobe Reader is satisfied with the signature timestamp also for a
PDF signed and timestamped on Windows.

My gleeful commit comment from yesterday about how much simpler the
Win32 crypto API was to use for this task was not entirely true. It is
simpler than using NSS and curl, but not as simple as I had hoped. Oh
well, I am not really surprised.

I now use the "low-level" message functions instead of the single
"simplified" CryptSignMessage(). And just like with NSS, I need to
create the message twice; first to get the signature to timestamp, and
then a second time to attach the timestamp. But now I wonder whether
doing CryptSignMessage() twice would work too. Anyway, won't touch the
code now for a while.

I am actually a bit surprised that the code works... Must have been my
lucky day. Or then I just am good at making educated guesses at what
an API does, even if the documentation doesn't make it perfectly
clear. Especially, I am a bit surprised that calling
CryptMsgGetParam(hMsg, CMSG_BARE_CONTENT_PARAM) returns (just) the
signature. OTOH, what else would it return?

Change-Id: Iec20c7605cf3d841b9e1787184c7b665837f1bc2

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index aedb48b..4e048a1 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7249,13 +7249,6 @@ bool PDFWriterImpl::finalizeSignature()
 // Prepare buffer and calculate PDF file digest
 CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) );
 
-PCCERT_CONTEXT pCertContext = 
CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 
reinterpret_cast(n_derArray), n_derLength);
-if (pCertContext == NULL)
-{
-SAL_WARN("vcl.pdfwriter", "CertCreateCertificateContext failed: " << 
WindowsError(GetLastError()));
-return false;
-}
-
 boost::scoped_array buffer1(new char[m_nSignatureContentOffset - 1]);
 sal_uInt64 bytesRead1;
 
@@ -7263,7 +7256,6 @@ bool PDFWriterImpl::finalizeSignature()
 bytesRead1 != (sal_uInt64)m_nSignatureContentOffset - 1)
 {
 SAL_WARN("vcl.pdfwriter", "First buffer read failed");
-CertFreeCertificateContext(pCertContext);
 return false;
 }
 
@@ -7275,12 +7267,18 @@ bool PDFWriterImpl::finalizeSignature()
 bytesRead2 != (sal_uInt64) nLastByteRangeNo)
 {
 SAL_WARN("vcl.pdfwriter", "Second buffer read failed");
-CertFreeCertificateContext(pCertContext);
 return false;
 }
 
 OString pass = OUStringToOString( m_aContext.SignPassword, 
RTL_TEXTENCODING_UTF8 );
 
+PCCERT_CONTEXT pCertContext = 
CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 
reinterpret_cast(n_derArray), n_derLength);
+if (pCertContext == NULL)
+{
+SAL_WARN("vcl.pdfwriter", "CertCreateCertificateContext failed: " << 
WindowsError(GetLastError()));
+return false;
+}
+
 CRYPT_SIGN_MESSAGE_PARA aPara;
 
 memset(&aPara, 0, sizeof(aPara));
@@ -7292,45 +7290,70 @@ bool PDFWriterImpl::finalizeSignature()
 aPara.cMsgCert = 1;
 aPara.rgpMsgCert = &pCertContext;
 
-const BYTE *aBuffers[] =
-{ reinterpret_cast(buffer1.get()), 
reinterpret_cast(buffer2.get()) };
-DWORD aBufferLens[] =
-{ bytesRead1, bytesRead2 };
-assert(SAL_N_ELEMENTS(aBuffers) == SAL_N_ELEMENTS(aBufferLens));
-
-DWORD nSigLen(0);
+HCRYPTPROV hCryptProv;
+DWORD nKeySpec;
+BOOL bFreeNeeded;
 
-if (!CryptSignMessage(&aPara, TRUE, SAL_N_ELEMENTS(aBuffers), aBuffers, 
aBufferLens, NULL, &nSigLen))
+if (!CryptAcquireCertificatePrivateKey(pCertContext,
+   CRYPT_ACQUIRE_CACHE_FLAG,
+   NULL,
+   &hCryptProv,
+   &nKeySpec,
+   &bFreeNeeded))
 {
-SAL_WARN("vcl.pdfwriter", "CryptSignMessage failed: " << 
WindowsError(GetLastError()));
+SAL_WARN("vcl.pdfwriter", "CryptAcquireCertificatePrivateKey failed: " 
<< WindowsError(GetLastError()));
 CertFreeCertificateContext(pCertContext);
 return false;
 }
+assert(!bFreeNeeded);
 
-if (nSigLen*2 > MAX_SIGNATURE_CONTENT_LENGTH)
+CMSG_SIGNER_ENCODE_INFO aSignerInfo;
+
+memset(&aSignerInfo, 0, sizeof(aSignerInfo));
+aSignerInfo.cbSize = sizeof(aSignerInfo);
+aSignerInfo.pCertInfo = pCertContext->pCertInfo;
+aSignerInfo.hCryptProv = hCryptProv;
+aSigne

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/Bootstrap android/experimental desktop/source include/LibreOfficeKit libreofficekit/qa

2015-02-27 Thread Miklos Vajna

 android/Bootstrap/src/org/libreoffice/kit/Document.java
 |8 +
 android/Bootstrap/src/org/libreoffice/kit/Office.java  
 |8 -
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
|6 -
 desktop/source/lib/init.cxx
 |   45 +-
 desktop/source/lib/lokandroid.cxx  
 |   14 +--
 include/LibreOfficeKit/LibreOfficeKit.h
 |8 +
 include/LibreOfficeKit/LibreOfficeKit.hxx  
 |   26 ++---
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
 |4 
 8 files changed, 61 insertions(+), 58 deletions(-)

New commits:
commit 36293a5d1db27ee022a7d00536f1d389417b17ce
Author: Miklos Vajna 
Date:   Fri Feb 27 15:38:30 2015 +0100

LOK: move Office::postKeyEvent to Document

The implementation still sends them to the currently active VCL frame,
not to the given document, though.

Change-Id: I6fa2decdea3f949c55287e802cb3373c85664207

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index f410693..c692099 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -107,6 +107,14 @@ public class Document {
 public native void initializeForRendering();
 
 /**
+ * Post a key event to LibreOffice.
+ * @param type - type of key event
+ * @param charCode - the Unicode character generated by this event or 0.
+ * @param keyCode - the integer code representing the key of the event 
(non-zero for control keys).
+ */
+public native void postKeyEvent(int type, int charCode, int keyCode);
+
+/**
  * Post a mouse event to LOK
  * @param type - mouse event type
  * @param x - x coordinate
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Office.java 
b/android/Bootstrap/src/org/libreoffice/kit/Office.java
index 8bd780b..86eda5c 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Office.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Office.java
@@ -34,14 +34,6 @@ public class Office {
 return document;
 }
 
-/**
- * Post a key event to LibreOffice.
- * @param type - type of key event
- * @param charCode - the Unicode character generated by this event or 0.
- * @param keyCode - the integer code representing the key of the event 
(non-zero for control keys).
- */
-public native void postKeyEvent(int type, int charCode, int keyCode);
-
 public native void destroy();
 public native void destroyAndExit();
 }
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index c2d59e0..7a90382 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -313,12 +313,12 @@ public class LOKitTileProvider implements TileProvider, 
Document.MessageCallback
 String keyString = keyEvent.getCharacters();
 for (int i = 0; i < keyString.length(); i++) {
 int codePoint = keyString.codePointAt(i);
-mOffice.postKeyEvent(Office.KEY_PRESS, codePoint, 
getKeyCode(keyEvent));
+mDocument.postKeyEvent(Office.KEY_PRESS, codePoint, 
getKeyCode(keyEvent));
 }
 } else if (keyEvent.getAction() == KeyEvent.ACTION_DOWN) {
-mOffice.postKeyEvent(Office.KEY_PRESS, getCharCode(keyEvent), 
getKeyCode(keyEvent));
+mDocument.postKeyEvent(Office.KEY_PRESS, getCharCode(keyEvent), 
getKeyCode(keyEvent));
 } else if (keyEvent.getAction() == KeyEvent.ACTION_UP) {
-mOffice.postKeyEvent(Office.KEY_RELEASE, getCharCode(keyEvent), 
getKeyCode(keyEvent));
+mDocument.postKeyEvent(Office.KEY_RELEASE, getCharCode(keyEvent), 
getKeyCode(keyEvent));
 }
 }
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4aea3d0..0c2f4a9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -203,6 +203,10 @@ static void 
doc_initializeForRendering(LibreOfficeKitDocument* pThis);
 static void doc_registerCallback(LibreOfficeKitDocument* pThis,
 LibreOfficeKitCallback pCallback,
 void* pData);
+static void doc_postKeyEvent(LibreOfficeKitDocument* pThis,
+ int nType,
+ int nCharCode,
+ int nKeyCode);
 static void doc_postMouseEvent (LibreOfficeKitDocument* pThis,
 int nType,
 int nX,
@@ -23

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

2015-02-27 Thread Mark Hung

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

New commits:
commit ce7a2502810615b64e83036211e6149313604fff
Author: Mark Hung 
Date:   Thu Feb 26 16:55:46 2015 -0800

tdf#89679 - fix incorrect mapping of font-family-complex and 
CharFontNameAsian

Change-Id: I4adad1675f2a880e14ed870a3c74e43e8898c371
Reviewed-on: https://gerrit.libreoffice.org/14663
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit cda9ae79e58d861a85128d6a37587b633b956aae)
Reviewed-on: https://gerrit.libreoffice.org/14668

diff --git a/sc/source/filter/xml/editattributemap.cxx 
b/sc/source/filter/xml/editattributemap.cxx
index e5feb6b..fd5de8c 100644
--- a/sc/source/filter/xml/editattributemap.cxx
+++ b/sc/source/filter/xml/editattributemap.cxx
@@ -21,7 +21,7 @@ ScXMLEditAttributeMap::Entry aEntries[] = {
 { XML_NAMESPACE_STYLE, "font-charset-complex", "CharFontCharSetComplex", 
EE_CHAR_FONTINFO_CTL, MID_FONT_CHAR_SET },
 { XML_NAMESPACE_FO, "font-family", "CharFontName", EE_CHAR_FONTINFO, 
MID_FONT_FAMILY_NAME },
 { XML_NAMESPACE_STYLE, "font-family-asian", "CharFontNameAsian", 
EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY_NAME },
-{ XML_NAMESPACE_STYLE, "font-family-complex", "CharFontNameAsian", 
EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
+{ XML_NAMESPACE_STYLE, "font-family-complex", "CharFontNameComplex", 
EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
 { XML_NAMESPACE_STYLE, "font-family-generic", "CharFontFamily", 
EE_CHAR_FONTINFO, MID_FONT_FAMILY },
 { XML_NAMESPACE_STYLE, "font-family-generic-asian", "CharFontFamilyAsian", 
EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY },
 { XML_NAMESPACE_STYLE, "font-family-generic-complex", 
"CharFontFamilyComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY },
___
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/source

2015-02-27 Thread Mark Hung

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

New commits:
commit cb493f5b9d59a82b2aae729f0b02a76f2b9b8e50
Author: Mark Hung 
Date:   Thu Feb 26 16:55:46 2015 -0800

tdf#89679 - fix incorrect mapping of font-family-complex and 
CharFontNameAsian

Change-Id: I4adad1675f2a880e14ed870a3c74e43e8898c371
Reviewed-on: https://gerrit.libreoffice.org/14663
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit cda9ae79e58d861a85128d6a37587b633b956aae)
Reviewed-on: https://gerrit.libreoffice.org/14667

diff --git a/sc/source/filter/xml/editattributemap.cxx 
b/sc/source/filter/xml/editattributemap.cxx
index e5feb6b..fd5de8c 100644
--- a/sc/source/filter/xml/editattributemap.cxx
+++ b/sc/source/filter/xml/editattributemap.cxx
@@ -21,7 +21,7 @@ ScXMLEditAttributeMap::Entry aEntries[] = {
 { XML_NAMESPACE_STYLE, "font-charset-complex", "CharFontCharSetComplex", 
EE_CHAR_FONTINFO_CTL, MID_FONT_CHAR_SET },
 { XML_NAMESPACE_FO, "font-family", "CharFontName", EE_CHAR_FONTINFO, 
MID_FONT_FAMILY_NAME },
 { XML_NAMESPACE_STYLE, "font-family-asian", "CharFontNameAsian", 
EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY_NAME },
-{ XML_NAMESPACE_STYLE, "font-family-complex", "CharFontNameAsian", 
EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
+{ XML_NAMESPACE_STYLE, "font-family-complex", "CharFontNameComplex", 
EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
 { XML_NAMESPACE_STYLE, "font-family-generic", "CharFontFamily", 
EE_CHAR_FONTINFO, MID_FONT_FAMILY },
 { XML_NAMESPACE_STYLE, "font-family-generic-asian", "CharFontFamilyAsian", 
EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY },
 { XML_NAMESPACE_STYLE, "font-family-generic-complex", 
"CharFontFamilyComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: need help for participating in GSOC

2015-02-27 Thread Miklos Vajna

Hi,

On Sat, Feb 28, 2015 at 03:04:44AM +, 13beseniq...@seecs.edu.pk wrote:
> Hi.I want to participate in GSOC 2015 and I am interested in your project
>  ideas but I need help to where I would start.

See here:

https://wiki.documentfoundation.org/Development/GSoC/2015#How_to_apply

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

2015-02-27 Thread Mark Hung

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

New commits:
commit cda9ae79e58d861a85128d6a37587b633b956aae
Author: Mark Hung 
Date:   Thu Feb 26 16:55:46 2015 -0800

tdf#89679 - fix incorrect mapping of font-family-complex and 
CharFontNameAsian

Change-Id: I4adad1675f2a880e14ed870a3c74e43e8898c371
Reviewed-on: https://gerrit.libreoffice.org/14663
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/filter/xml/editattributemap.cxx 
b/sc/source/filter/xml/editattributemap.cxx
index e5feb6b..fd5de8c 100644
--- a/sc/source/filter/xml/editattributemap.cxx
+++ b/sc/source/filter/xml/editattributemap.cxx
@@ -21,7 +21,7 @@ ScXMLEditAttributeMap::Entry aEntries[] = {
 { XML_NAMESPACE_STYLE, "font-charset-complex", "CharFontCharSetComplex", 
EE_CHAR_FONTINFO_CTL, MID_FONT_CHAR_SET },
 { XML_NAMESPACE_FO, "font-family", "CharFontName", EE_CHAR_FONTINFO, 
MID_FONT_FAMILY_NAME },
 { XML_NAMESPACE_STYLE, "font-family-asian", "CharFontNameAsian", 
EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY_NAME },
-{ XML_NAMESPACE_STYLE, "font-family-complex", "CharFontNameAsian", 
EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
+{ XML_NAMESPACE_STYLE, "font-family-complex", "CharFontNameComplex", 
EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
 { XML_NAMESPACE_STYLE, "font-family-generic", "CharFontFamily", 
EE_CHAR_FONTINFO, MID_FONT_FAMILY },
 { XML_NAMESPACE_STYLE, "font-family-generic-asian", "CharFontFamilyAsian", 
EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY },
 { XML_NAMESPACE_STYLE, "font-family-generic-complex", 
"CharFontFamilyComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/Library_vcl.mk vcl/StaticLibrary_headless.mk

2015-02-27 Thread Caolán McNamara

 vcl/Library_vcl.mk |1 
 vcl/StaticLibrary_headless.mk  |1 
 vcl/headless/svpgdi.cxx|   27 --
 vcl/headless/svptext.cxx   |  396 ++---
 vcl/headless/svptextrender.cxx |  496 +
 vcl/inc/devicetextrender.hxx   |   24 +
 vcl/inc/headless/svpgdi.hxx|   18 -
 vcl/inc/headless/svptextrender.hxx |   82 ++
 8 files changed, 651 insertions(+), 394 deletions(-)

New commits:
commit dd179370e0905dc4ae206467d65cb69b70d5356e
Author: CaolÃ¡n McNamara 
Date:   Fri Feb 27 11:01:49 2015 +

seperate headless textrendering into its own class

and forward calls to it from the SvpGraphics

Change-Id: I6d1fbc8919596d5f47661b3471570fcb7e14bc3e

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e114ae3..6aeb70b 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -558,6 +558,7 @@ vcl_headless_code= \
 vcl_headless_freetype_code=\
 vcl/headless/svpprn \
 vcl/headless/svptext \
+vcl/headless/svptextrender \
 
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
index 1b63851..941f4ed 100644
--- a/vcl/StaticLibrary_headless.mk
+++ b/vcl/StaticLibrary_headless.mk
@@ -25,6 +25,7 @@ $(eval $(call 
gb_StaticLibrary_add_exception_objects,headless,\
vcl/headless/svpframe \
vcl/headless/svpprn \
vcl/headless/svptext \
+   vcl/headless/svptextrender \
vcl/headless/svpvd \
 ))
 
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 3f63146..677d165 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -19,6 +19,7 @@
 
 #include "headless/svpgdi.hxx"
 #include "headless/svpbmp.hxx"
+#include "headless/svptextrender.hxx"
 #include "saldatabasic.hxx"
 
 #include 
@@ -101,12 +102,9 @@ SvpSalGraphics::SvpSalGraphics() :
 m_bUseFillColor( false ),
 m_aFillColor( COL_WHITE ),
 m_aDrawMode( basebmp::DrawMode_PAINT ),
-m_aTextColor( COL_BLACK ),
-m_eTextFmt( basebmp::FORMAT_EIGHT_BIT_GREY ),
 m_bClipSetup( false )
 {
-for( int i = 0; i < MAX_FALLBACK; ++i )
-m_pServerFont[i] = NULL;
+m_xTextRenderImpl.reset(new SvpTextRender(*this));
 }
 
 SvpSalGraphics::~SvpSalGraphics()
@@ -117,26 +115,7 @@ void SvpSalGraphics::setDevice( 
basebmp::BitmapDeviceSharedPtr& rDevice )
 {
 m_aOrigDevice = rDevice;
 ResetClipRegion();
-
-// determine matching bitmap format for masks
-basebmp::Format nDeviceFmt = m_aDevice ? m_aDevice->getScanlineFormat() : 
basebmp::FORMAT_EIGHT_BIT_GREY;
-switch( nDeviceFmt )
-{
-case basebmp::FORMAT_EIGHT_BIT_GREY:
-case basebmp::FORMAT_SIXTEEN_BIT_LSB_TC_MASK:
-case basebmp::FORMAT_SIXTEEN_BIT_MSB_TC_MASK:
-case basebmp::FORMAT_TWENTYFOUR_BIT_TC_MASK:
-case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX:
-case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
-case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB:
-case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR:
-case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA:
-m_eTextFmt = basebmp::FORMAT_EIGHT_BIT_GREY;
-break;
-default:
-m_eTextFmt = basebmp::FORMAT_ONE_BIT_LSB_GREY;
-break;
-}
+m_xTextRenderImpl->setDevice(rDevice);
 }
 
 #endif
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index ef6e1ab..1651a3a 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -18,279 +18,43 @@
  */
 
 #include 
-
-#include 
-
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
-
-#include "generic/geninst.h"
-#include "generic/genpspgraphics.h"
-#include "generic/glyphcache.hxx"
-#include "headless/svpbmp.hxx"
 #include "headless/svpgdi.hxx"
-#include "impfont.hxx"
-#include "outfont.hxx"
-#include "PhysicalFontFace.hxx"
-
-class PhysicalFontCollection;
-
-using namespace basegfx;
-using namespace basebmp;
-
-class SvpGlyphPeer : public GlyphCachePeer
-{
-public:
-SvpGlyphPeer() {}
-
-BitmapDeviceSharedPtr GetGlyphBmp( ServerFont&, sal_GlyphId,
-   basebmp::Format nBmpFormat, B2IPoint& 
rTargetPos );
-
-protected:
-virtual voidRemovingFont( ServerFont& ) SAL_OVERRIDE;
-virtual voidRemovingGlyph( GlyphData& ) SAL_OVERRIDE;
-
-class SvpGcpHelper
-{
-public:
-RawBitmap   maRawBitmap;
-BitmapDeviceSharedPtr   maBitmapDev;
-};
-};
-
-class SvpGlyphCache : public GlyphCache
-{
-public:
-SvpGlyphCache( SvpGlyphPeer& rPeer ) : GlyphCache( rPeer) {}
-SvpGlyphPeer& GetPeer() { return reinterpret_cast( mrPeer 
); }
-static SvpGlyphCache& GetInstance();
-};
-
-namespace
-{
-struct GlyphCacheHolder
-{
-private:
-SvpGlyphPeer* m_pSvpGlyphPeer;
-SvpGlyphCache* m_pSvpGlyphCache;
-public:
-

need help for participating in GSOC

2015-02-27 Thread 13beseniqbal

Hi.I want to participate in GSOC 2015 and I am interested in your project
 ideas but I need help to where I would start.






Sent from Windows Mail___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[no subject]

2015-02-27 Thread 13beseniqbal








Sent from Windows Mail___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-02-27 Thread Mihai Varga

 src/lib/VSDMetaData.cpp  |  152 +--
 src/lib/VSDMetaData.h|4 -
 src/lib/VSDParser.cpp|   26 +---
 src/lib/VSDXMetaData.cpp |   21 ++
 src/lib/VSDXParser.cpp   |   38 ---
 src/lib/VSDXParser.h |2 
 src/lib/tokens.txt   |5 +
 src/test/Makefile.am |2 
 src/test/data/dwg.vsd|binary
 src/test/data/dwg.vsdx   |binary
 src/test/importtest.cpp  |   21 ++
 11 files changed, 219 insertions(+), 52 deletions(-)

New commits:
commit 3a8a08caebd5c8fbbc28ff34b0d7d0979662a56a
Author: Mihai Varga 
Date:   Fri Feb 27 14:32:11 2015 +0200

More metadata extracted from VSD/VSDX files

Template, language, company and category metadata are extracted from
VSD/VSDX files. Company and category are set as custom properties.
I've also added unit tests for those 4 new document properties.

Change-Id: Ic14bfa11a2a8253c79dd4c4466afc7f6b2ce4ea9
Signed-off-by: Miklos Vajna 

diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index 4235b56..6449384 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -9,6 +9,8 @@
 
 #include "VSDMetaData.h"
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -21,6 +23,60 @@ libvisio::VSDMetaData::~VSDMetaData()
 {
 }
 
+enum PIDDSI
+{
+  PIDDSI_CODEPAGE  = 0x0001,
+  PIDDSI_CATEGORY  = 0x0002,
+  PIDDSI_PRESFORMAT= 0x0003,
+  PIDDSI_BYTECOUNT = 0x0004,
+  PIDDSI_LINECOUNT = 0x0005,
+  PIDDSI_PARACOUNT = 0x0006,
+  PIDDSI_SLIDECOUNT= 0x0007,
+  PIDDSI_NOTECOUNT = 0x0008,
+  PIDDSI_HIDDENCOUNT   = 0x0009,
+  PIDDSI_MMCLIPCOUNT   = 0x000A,
+  PIDDSI_SCALE = 0x000B,
+  PIDDSI_HEADINGPAIR   = 0x000C,
+  PIDDSI_DOCPARTS  = 0x000D,
+  PIDDSI_MANAGER   = 0x000E,
+  PIDDSI_COMPANY   = 0x000F,
+  PIDDSI_LINKSDIRTY= 0x0010,
+  PIDDSI_CCHWITHSPACES = 0x0011,
+  PIDDSI_SHAREDDOC = 0x0013,
+  PIDDSI_LINKBASE  = 0x0014,
+  PIDDSI_HLINKS= 0x0015,
+  PIDDSI_HYPERLINKSCHANGED = 0x0016,
+  PIDDSI_VERSION   = 0x0017,
+  PIDDSI_DIGSIG= 0x0018,
+  PIDDSI_CONTENTTYPE   = 0x001A,
+  PIDDSI_CONTENTSTATUS = 0x001B,
+  PIDDSI_LANGUAGE  = 0x001C,
+  PIDDSI_DOCVERSION= 0x001D
+};
+
+enum PIDSI
+{
+  CODEPAGE_PROPERTY_IDENTIFIER = 0x0001,
+  PIDSI_TITLE  = 0x0002,
+  PIDSI_SUBJECT= 0x0003,
+  PIDSI_AUTHOR = 0x0004,
+  PIDSI_KEYWORDS   = 0x0005,
+  PIDSI_COMMENTS   = 0x0006,
+  PIDSI_TEMPLATE   = 0x0007,
+  PIDSI_LASTAUTHOR = 0x0008,
+  PIDSI_REVNUMBER  = 0x0009,
+  PIDSI_EDITTIME   = 0x000A,
+  PIDSI_LASTPRINTED= 0x000B,
+  PIDSI_CREATE_DTM = 0x000C,
+  PIDSI_LASTSAVE_DTM   = 0x000D,
+  PIDSI_PAGECOUNT  = 0x000E,
+  PIDSI_WORDCOUNT  = 0x000F,
+  PIDSI_CHARCOUNT  = 0x0010,
+  PIDSI_THUMBNAIL  = 0x0011,
+  PIDSI_APPNAME= 0x0012,
+  PIDSI_DOC_SECURITY   = 0x0013
+};
+
 bool libvisio::VSDMetaData::parse(librevenge::RVNGInputStream *input)
 {
   if (!input)
@@ -44,12 +100,24 @@ void 
libvisio::VSDMetaData::readPropertySetStream(librevenge::RVNGInputStream *i
   // NumPropertySets
   input->seek(4, librevenge::RVNG_SEEK_CUR);
   // FMTID0
-  input->seek(16, librevenge::RVNG_SEEK_CUR);
+  //input->seek(16, librevenge::RVNG_SEEK_CUR);
+  uint32_t data1 = readU32(input);
+  uint16_t data2 = readU16(input);
+  uint16_t data3 = readU16(input);
+  uint8_t data4[8];
+  for (int i = 0; i < 8; i++)
+  {
+data4[i] = readU8(input);
+  }
+  char FMTID0[36];
+  sprintf(FMTID0, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", data1, 
data2, data3,
+  data4[0], data4[1], data4[2], data4[3], data4[4], data4[5], 
data4[6], data4[7]);
+
   uint32_t offset0 = readU32(input);
-  readPropertySet(input, offset0);
+  readPropertySet(input, offset0, FMTID0);
 }
 
-void libvisio::VSDMetaData::readPropertySet(librevenge::RVNGInputStream 
*input, uint32_t offset)
+void libvisio::VSDMetaData::readPropertySet(librevenge::RVNGInputStream 
*input, uint32_t offset, char *FMTID)
 {
   input->seek(offset, librevenge::RVNG_SEEK_SET);
 
@@ -62,17 +130,15 @@ void 
libvisio::VSDMetaData::readPropertySet(librevenge::RVNGInputStream *input,
   {
 if (i >= m_idsAndOffsets.size())
   break;
-readTypedPropertyValue(input, i, offset + m_idsAndOffsets[i].second);
+readTypedPropertyValue(input, i, offset + m_idsAndOffsets[i].second, 
FMTID);
   }
 }
 
-#define CODEPAGE_PROPERTY_IDENTIFIER 0x0001
-
 uint32_t libvisio::VSDMetaData::getCodePage()
 {
   for (size_t i = 0; i < m_idsAndOffsets.s

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

2015-02-27 Thread Caolán McNamara

 starmath/source/mathmlimport.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 56580e906416b2ff3afd99c7bfb5cbe4f6b53bc2
Author: CaolÃ¡n McNamara 
Date:   Fri Feb 27 13:50:15 2015 +

initialize pActionAttrTokenMap

Change-Id: I3d68ec1c7c43773c05344e88cc4eec8edbd4108b

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 8a42baf..5713d1c 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -408,6 +408,7 @@ SmXMLImport::SmXMLImport(
 pPresScriptEmptyElemTokenMap(0),
 pPresTableElemTokenMap(0),
 pColorTokenMap(0),
+pActionAttrTokenMap(0),
 bSuccess(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-3' - include/unotools

2015-02-27 Thread David Tardon

 include/unotools/streamwrap.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ec8a13ed975be89098d31979c7b3e3794ca2aa6
Author: David Tardon 
Date:   Wed Feb 11 22:56:53 2015 +0100

fix linker error


/builddir/build/BUILD/libreoffice-4.4.1.1/workdir/CxxObject/svtools/source/misc/imageresourceaccess.o:
 In function 
`com::sun::star::uno::Reference::Reference(com::sun::star::io::XOutputStream*)':

/builddir/build/BUILD/libreoffice-4.4.1.1/include/com/sun/star/uno/Reference.hxx:137:
 undefined reference to `non-virtual thunk to 
utl::OSeekableOutputStreamWrapper::acquire()'

(cherry picked from commit 8bb0446974282b32d06cdbd35af83f91e033b4af)

see also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812

Change-Id: Ic644a8299cf2f79f02c1e3ca0de9687520f402a9
Signed-off-by: Michael Stahl 

diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index c52d09e..4eae03c 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -125,12 +125,12 @@ typedef ::cppu::ImplHelper1 <   
::com::sun::star::io::XSeekable
 /** helper class for wrapping an SvStream into an 
com.sun.star.io::XOutputStream
 which is seekable (i.e. supports the com.sun.star.io::XSeekable interface).
 */
-class OSeekableOutputStreamWrapper
+class UNOTOOLS_DLLPUBLIC OSeekableOutputStreamWrapper
 :public OOutputStreamWrapper
 ,public OSeekableOutputStreamWrapper_Base
 {
 public:
-UNOTOOLS_DLLPUBLIC OSeekableOutputStreamWrapper(SvStream& _rStream);
+OSeekableOutputStreamWrapper(SvStream& _rStream);
 
 private:
 virtual ~OSeekableOutputStreamWrapper();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-27 Thread Stephan Bergmann

 connectivity/source/drivers/kab/KDriver.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27e85dd314e02dc97612bf1682fccacaf0244127
Author: Stephan Bergmann 
Date:   Fri Feb 27 14:14:55 2015 +0100

sdbc:address:kab URLs don't have a trailing ":"

broken since 4bf95c4c31dd871065d4042028a4b3ae476dab70 "make use of 
startsWith()"
where the tricky

  !url.compareTo(::rtl::OUString("sdbc:address:kab:"), 16)

was replaced with

  url.startsWith("sdbc:address:kab:")

even though the original exempted the trailing ":" from the comparison

Change-Id: I45175b2669d61eb4cee36d4456ccb69d0f11ef63

diff --git a/connectivity/source/drivers/kab/KDriver.cxx 
b/connectivity/source/drivers/kab/KDriver.cxx
index d28c0c8..e13bbac 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -414,7 +414,7 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& 
url )
 return sal_False;
 
 // here we have to look whether we support this URL format
-return url.startsWith("sdbc:address:" KAB_SERVICE_NAME ":");
+return url.startsWith("sdbc:address:" KAB_SERVICE_NAME);
 }
 
 Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const 
OUString&, const Sequence< PropertyValue >& ) throw(SQLException, 
RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-27 Thread Stephan Bergmann

 connectivity/source/drivers/kab/KDriver.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d8a2a0b84a9aa570116febf23a6f1d6430fec287
Author: Stephan Bergmann 
Date:   Fri Feb 27 14:12:54 2015 +0100

Adapt code to changed libkabdrv1lo.so name

broken since LO 3.6, commit 07d512eff12fc89adbfb73e546b3946494f21472
"connectivity: convert kab to gbuild"

Change-Id: I65cc32fa55f1d5c0358585489b8b3dc3aaf8004b

diff --git a/connectivity/source/drivers/kab/KDriver.cxx 
b/connectivity/source/drivers/kab/KDriver.cxx
index 788099a..d28c0c8 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "resource/kab_res.hrc"
 #include "resource/sharedresources.hxx"
 
@@ -130,7 +131,7 @@ bool KabImplModule::impl_loadModule()
 OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc && 
!m_pApplicationInitFunc && !m_pApplicationShutdownFunc && 
!m_pKDEVersionCheckFunc,
 "KabImplModule::impl_loadModule: inconsistence: inconsistency (never 
attempted load before, but some values already set)!");
 
-const OUString sModuleName( SAL_MODULENAME( KAB_SERVICE_NAME "drv1"  ));
+const OUString sModuleName( SVLIBRARY( KAB_SERVICE_NAME "drv1"  ));
 m_hConnectorModule = osl_loadModuleRelative( &thisModule, 
sModuleName.pData, SAL_LOADMODULE_NOW );   // LAZY! #i61335#
 OSL_ENSURE( m_hConnectorModule, "KabImplModule::impl_loadModule: could not 
load the implementation library!" );
 if ( !m_hConnectorModule )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: key

2015-02-27 Thread Christian Lohmaier

Hi *,

On Fri, Feb 27, 2015 at 12:14 AM,   wrote:
> where is the fingerprint to check pgp signature
> thanks

The public key is on the public keyservers, you can obtain it e.g.
with the following command:

gpg --keyserver hkp://keys.gnupg.net --recv-keys AFEEAEA3

If it asks you to verify the key's fingerprint, it is:

C283 9ECA D940 8FBE 9531  C3E9 F434 A1EF AFEE AEA3

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

key

2015-02-27 Thread philorder

where is the fingerprint to check pgp signature
thanks
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-02-27 Thread Caolán McNamara

 sc/source/ui/view/viewfun3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92da476fedc144dad3c4f5ffe4b8e4b91091fd66
Author: CaolÃ¡n McNamara 
Date:   Fri Feb 27 12:49:04 2015 +

fix build

Change-Id: I692a3ce8c917f97bcaa05903c89784c213e6c864

diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index a4c1868..79182b4 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -475,7 +475,7 @@ void ScViewFunc::PasteFromSystem()
 sal_uLong nBiff8 = 
SotExchange::RegisterFormatName(OUString("Biff8"));
 sal_uLong nBiff5 = 
SotExchange::RegisterFormatName(OUString("Biff5"));
 
-sal_uInt16 nDestination = EXCHG_DEST_SCDOC_FREE_AREA;
+SotExchangeDest nDestination = SotExchangeDest::SCDOC_FREE_AREA;
 sal_uInt16 nSourceOptions = EXCHG_IN_ACTION_COPY;
 sal_uLong nFormat;  // output param for GetExchangeAction
 sal_uInt16 nEventAction;// output param for GetExchangeAction
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: another cppunit test core dump, java this time, building on xstreamos/illumos

2015-02-27 Thread Gabriele Bulfon

The core dump mdb extracts actually reflects this thread from the jvm core dump:
Thread 2 (LWP1):
#0  0xfeef7da5 in _lwp_kill () from /lib/libc.so.1
No symbol table info available.
#1  0xfeeef65e in thr_kill () from /lib/libc.so.1
No symbol table info available.
#2  0xfee91c8b in raise () from /lib/libc.so.1
No symbol table info available.
#3  0xfee6d49e in abort () from /lib/libc.so.1
No symbol table info available.
#4  0xefe5c6e1 in __1cCosFabort6Fb_v_ () from 
/usr/jdk/jdk1.7.0_45/jre/lib/i386/client/libjvm.so
No symbol table info available.
#5  0xeffda2d3 in __1cHVMErrorOreport_and_die6M_v_ () from 
/usr/jdk/jdk1.7.0_45/jre/lib/i386/client/libjvm.so
No symbol table info available.
#6  0xef81b77a in JVM_handle_solaris_signal () from 
/usr/jdk/jdk1.7.0_45/jre/lib/i386/client/libjvm.so
No symbol table info available.
#7  0xef81acfa in signalHandler () from 
/usr/jdk/jdk1.7.0_45/jre/lib/i386/client/libjvm.so
No symbol table info available.
#8  0xfeef32a5 in __sighndlr () from /lib/libc.so.1
No symbol table info available.
#9  0xfeee7f73 in call_user_handler () from /lib/libc.so.1
No symbol table info available.
#10
No symbol table info available.
#11 0xfee6293b in .movew () from /lib/libc.so.1
No symbol table info available.
#12 0xfe670270 in ?? () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppuhelpergcc3.so.3
No symbol table info available.
#13 0xfea416d5 in rtl_uString_newFromStr_WithLength () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_sal.so.3
No symbol table info available.
#14 0xfea4178c in rtl_uString_newFromSubString () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_sal.so.3
No symbol table info available.
#15 0xfe07797c in rtl::OUString::copy(long) const () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppu.so.3
No symbol table info available.
#16 0xfe075d36 in typelib_typedescription_getByName () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppu.so.3
No symbol table info available.
#17 0xfe076860 in typelib_typedescriptionreference_getDescription () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppu.so.3
No symbol table info available.
#18 0xfe07209c in TYPELIB_DANGER_GET () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppu.so.3
No symbol table info available.
#19 0xfe0962ef in uno_type_sequence_construct () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppu.so.3
No symbol table info available.
#20 0xfe60cc0e in com::sun::star::uno::Sequence
::Sequence(long) () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppuhelpergcc3.so.3
No symbol table info available.
#21 0xfe60aac1 in cppu::sequenceRemoveElementAt(com::sun::star::uno::Sequence
& long) () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppuhelpergcc3.so.3
No symbol table info available.
#22 0xfe60b30c in 
cppu::OInterfaceContainerHelper::removeInterface(com::sun::star::uno::Reference
const& () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppuhelpergcc3.so.3
No symbol table info available.
#23 0xfe67029f in 
cppu::OWeakConnectionPoint::removeReference(com::sun::star::uno::Reference
const& () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppuhelpergcc3.so.3
No symbol table info available.
#24 0xfe670e52 in com::sun::star::uno::WeakReferenceHelper::clear() () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppuhelpergcc3.so.3
No symbol table info available.
#25 0xfe671005 in 
com::sun::star::uno::WeakReferenceHelper::~WeakReferenceHelper() () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/lib/libuno_cppuhelpergcc3.so.3
No symbol table info available.
#26 0xf33c6931 in com::sun::star::uno::WeakReference
::~WeakReference() () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/program/libfwklo.so
No symbol table info available.
#27 0xf33c5c0e in __static_initialization_and_destruction_0 () from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/program/libfwklo.so
No symbol table info available.

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

2015-02-27 Thread Stephan Bergmann

 forms/source/component/FormattedFieldWrapper.cxx |   44 +--
 forms/source/component/FormattedFieldWrapper.hxx |   12 --
 2 files changed, 51 insertions(+), 5 deletions(-)

New commits:
commit fa6c09877ed6502593de2f73541d91f31c8feea1
Author: Stephan Bergmann 
Date:   Fri Feb 27 13:25:42 2015 +0100

Fix OFormattedFieldWrapper[_ForcedFormatted] instance creation

broken with 5d05f7ed8582193c39e29b7dc16767fb850e9f28 "forms: use constructor
feature for form modules" and follow-up misguided clean up

Change-Id: If9447740e6408472722b81d112cd85349020eabe

diff --git a/forms/source/component/FormattedFieldWrapper.cxx 
b/forms/source/component/FormattedFieldWrapper.cxx
index 43d81f6..f278132 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -48,6 +48,40 @@ OFormattedFieldWrapper::OFormattedFieldWrapper(const 
Reference& 
_rxFactory, bool bActAsFormatted)
+{
+OFormattedFieldWrapper *pRef = new OFormattedFieldWrapper(_rxFactory);
+
+if (bActAsFormatted)
+{
+// instantiate an FormattedModel
+InterfaceRef  xFormattedModel;
+// (instantiate it directly ..., as the OFormattedModel isn't
+// registered for any service names anymore)
+OFormattedModel* pModel = new OFormattedModel(pRef->m_xContext);
+query_interface(static_cast(pModel), xFormattedModel);
+
+pRef->m_xAggregate = Reference (xFormattedModel, 
UNO_QUERY);
+OSL_ENSURE(pRef->m_xAggregate.is(), "the OFormattedModel didn't have 
an XAggregation interface !");
+
+// _before_ setting the delegator, give it to the member references
+query_interface(xFormattedModel, pRef->m_xFormattedPart);
+pRef->m_pEditPart = rtl::Reference< OEditModel >(new 
OEditModel(pRef->m_xContext));
+}
+
+increment(pRef->m_refCount);
+
+if (pRef->m_xAggregate.is())
+{   // has to be in it's own block because of the temporary variable 
created by *this
+pRef->m_xAggregate->setDelegator(static_cast(pRef));
+}
+
+InterfaceRef xRef(*pRef);
+decrement(pRef->m_refCount);
+
+return xRef;
+}
+
 Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone() throw 
(RuntimeException, std::exception)
 {
 ensureAggregate();
@@ -311,14 +345,20 @@ extern "C" SAL_DLLPUBLIC_EXPORT 
::com::sun::star::uno::XInterface* SAL_CALL
 
com_sun_star_form_OFormattedFieldWrapper_get_implementation(::com::sun::star::uno::XComponentContext*
 component,
 ::com::sun::star::uno::Sequence const &)
 {
-return cppu::acquire(new frm::OFormattedFieldWrapper(component));
+css::uno::Reference inst(
+OFormattedFieldWrapper::createFormattedFieldWrapper(component, false));
+inst->acquire();
+return inst.get();
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
 
com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation(::com::sun::star::uno::XComponentContext*
 component,
 ::com::sun::star::uno::Sequence const &)
 {
-return cppu::acquire(new frm::OFormattedFieldWrapper(component));
+css::uno::Reference inst(
+OFormattedFieldWrapper::createFormattedFieldWrapper(component, true));
+inst->acquire();
+return inst.get();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedFieldWrapper.hxx 
b/forms/source/component/FormattedFieldWrapper.hxx
index b510957..36a8c47 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -41,9 +41,6 @@ class OFormattedFieldWrapper : public 
OFormattedFieldWrapper_Base
 {
 ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext> m_xContext;
 
-public:
-OFormattedFieldWrapper(const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext>& _rxFactory);
-
 protected:
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> 
 m_xAggregate;
 
@@ -51,10 +48,19 @@ protected:
 // if we act as formatted this is used to write the EditModel part
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>
 m_xFormattedPart;
 
+private:
+OFormattedFieldWrapper(const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext>& _rxFactory);
+
 protected:
 virtual ~OFormattedFieldWrapper();
 
 public:
+// if we act as formatted, this is the PersistObject interface of our 
aggregate, used
+// to read and write the FormattedModel part
+// if bActAsFormatted is false, the state is undetermined until somebody 
calls
+// ::read or does anything which requires a living aggregate
+static InterfaceRef createFormattedFieldWrapper(const 
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& 
_rxFactory, bool bActAsFormatted);
+
 // UNO
 DECLARE_UNO3_AGG_DEFAULTS(OFormattedFi

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

2015-02-27 Thread Takeshi Abe

 starmath/source/ElementsDockingWindow.cxx |3 ++-
 starmath/source/commands.src  |4 
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2459936cda33fb0ec7aecad9b8cbde8cd6a84cfb
Author: Takeshi Abe 
Date:   Thu Feb 26 13:51:40 2015 +0900

tdf#46343: Add the tensor product operator to "Elements Dock"

This is not exactly what the reporter of the issue requested
because this is for "Elements Dock", not for "Elements".
However, according to tdf#68871, Elements Dock would be the
desired place to be improved.

Change-Id: I6806d33f1ea89c7fe7565753f000f7bf747552a5
Reviewed-on: https://gerrit.libreoffice.org/14652
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 6f47b03..84591f7 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -56,7 +56,8 @@ const sal_uInt16 
SmElementsControl::aUnaryBinaryOperatorsList[][2] =
 {0x, 0},
 {RID_XPLUSY, RID_XPLUSY_HELP}, {RID_XMINUSY, RID_XMINUSY_HELP},
 {RID_XCDOTY, RID_XCDOTY_HELP}, {RID_XTIMESY, RID_XTIMESY_HELP},
-{RID_XSYMTIMESY, RID_XSYMTIMESY_HELP}, {RID_XOVERY, RID_XOVERY_HELP},
+{RID_XSYMTIMESY, RID_XSYMTIMESY_HELP}, {RID_XOTIMESY, RID_XOTIMESY_HELP},
+{RID_XOVERY, RID_XOVERY_HELP},
 {RID_XDIVY, RID_XDIVY_HELP}, {RID_XSYMDIVIDEY, RID_XSYMDIVIDEY_HELP},
 {RID_XCIRCY, RID_XCIRCY_HELP}, {RID_XWIDESLASHY, RID_XWIDESLASHY_HELP},
 {RID_XWIDEBSLASHY, RID_XWIDEBSLASHY_HELP},
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index f758d2d..6b8a957 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -90,6 +90,10 @@ String RID_XODOTY   { Text = " odot  " ; };
 String RID_XOMINUSY { Text = " ominus  " ; };
 String RID_XOPLUSY  { Text = " oplus  " ; };
 String RID_XOTIMESY { Text = " otimes  " ; };
+String RID_XOTIMESY_HELP
+{
+Text [ en-US ] = "Tensor Product" ;
+};
 String RID_XANDY{ Text = " and  " ; };
 String RID_XANDY_HELP
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-27 Thread Miklos Vajna

 sw/qa/extras/rtfimport/data/tdf88811.rtf |   26 ++
 sw/qa/extras/rtfimport/rtfimport.cxx |8 
 sw/source/core/unocore/unotext.cxx   |   13 ++---
 3 files changed, 44 insertions(+), 3 deletions(-)

New commits:
commit c56abb3c952e3062099d32702719825ee55b5112
Author: Miklos Vajna 
Date:   Tue Feb 3 12:29:21 2015 +0100

tdf#88811 SwXText::convertToTextFrame: handle shapes anchored to us

(cherry picked from commit 38f2b8b3b16aab19a2564ec699d253d3dccecc3c)

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

Change-Id: Iedf8eacd37b8ed8e307a10e8ade32f53c7417c4a
Reviewed-on: https://gerrit.libreoffice.org/14629
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/rtfimport/data/tdf88811.rtf 
b/sw/qa/extras/rtfimport/data/tdf88811.rtf
new file mode 100644
index 000..a20835c
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf88811.rtf
@@ -0,0 +1,26 @@
+{\rtf1\ansi\deff0
+\margl0\margr0\margt0\margb0
+\paperw11905\paperh16837
+{\shp
+{\*\shpinst\shpleft4420\shptop2720\shpright4420\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0
+{\sp
+{\sn shapeType}
+{\sv 20}
+}
+}
+}
+{\pard\plain\ql\sl-180\sb40\phmrg\pvmrg\posx3520\posy2900\absw680\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0
+{\f1\fs18\b Frame1}
+\par}
+{\shp
+{\*\shpinst\shpleft5760\shptop2720\shpright5760\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0
+{\sp
+{\sn shapeType}
+{\sv 20}
+}
+}
+}
+{\pard\plain\ql\sl-180\sb40\phmrg\pvmrg\posx4800\posy2900\absw800\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0
+{\f1\fs18\b Frame2}
+\par}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index db67a12..41a1064 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2095,6 +2095,14 @@ DECLARE_RTFIMPORT_TEST(testFdo82114, "fdo82114.rtf")
 CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf88811, "tdf88811.rtf")
+{
+// The problem was that shapes anchored to the paragraph that is moved 
into a textframe were lost, so this was 2.
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+CPPUNIT_ASSERT_EQUAL(static_cast(4), xDrawPage->getCount());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index cd31f50..25dd3f5 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1658,14 +1658,21 @@ SwXText::convertToTextFrame(
 
 // see if there are frames already anchored to this node
 std::set aAnchoredFrames;
+// for shapes, we have to work with the SdrObjects, as unique name is not 
guaranteed in their frame format
+std::set aAnchoredShapes;
 for (size_t i = 0; i < m_pImpl->m_pDoc->GetSpzFrmFmts()->size(); ++i)
 {
 SwFrmFmt* pFrmFmt = (*m_pImpl->m_pDoc->GetSpzFrmFmts())[i];
 const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-if (FLY_AT_PARA == rAnchor.GetAnchorId() &&
+if ((FLY_AT_PARA == rAnchor.GetAnchorId() || FLY_AT_CHAR == 
rAnchor.GetAnchorId()) &&
 aStartPam.Start()->nNode.GetIndex() <= 
rAnchor.GetCntntAnchor()->nNode.GetIndex() &&
 aStartPam.End()->nNode.GetIndex() >= 
rAnchor.GetCntntAnchor()->nNode.GetIndex())
-aAnchoredFrames.insert(pFrmFmt->GetName());
+{
+if (pFrmFmt->Which() == RES_DRAWFRMFMT)
+aAnchoredShapes.insert(pFrmFmt->FindSdrObject());
+else
+aAnchoredFrames.insert(pFrmFmt->GetName());
+}
 }
 
 SwXTextFrame *const pNewFrame = new SwXTextFrame(m_pImpl->m_pDoc);
@@ -1708,7 +1715,7 @@ SwXText::convertToTextFrame(
 for (size_t i = 0; i < 
m_pImpl->m_pDoc->GetSpzFrmFmts()->size(); ++i)
 {
 SwFrmFmt* pFrmFmt = 
(*m_pImpl->m_pDoc->GetSpzFrmFmts())[i];
-if( aAnchoredFrames.find( pFrmFmt->GetName() ) != 
aAnchoredFrames.end() )
+if (aAnchoredFrames.find(pFrmFmt->GetName()) != 
aAnchoredFrames.end() || aAnchoredShapes.find(pFrmFmt->FindSdrObject()) != 
aAnchoredShapes.end())
 {
 // copy the anchor to the next paragraph
 SwFmtAnchor aAnchor(pFrmFmt->GetAnchor());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/inc sw/source

2015-02-27 Thread Miklos Vajna

 sw/inc/viscrs.hxx  |6 +++---
 sw/source/core/crsr/viscrs.cxx |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b978405882e11097166dcb4aa9528fcee2707052
Author: Miklos Vajna 
Date:   Fri Feb 27 13:02:24 2015 +0100

SwSelPaintRects::FillStartEnd(): missing const

Change-Id: I644535d94894e51bc134ba8394238d3044eab488

diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 7de57a2..db3a964 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -90,7 +90,7 @@ public:
 
 virtual void FillRects() = 0;
 /// Fill rStart and rEnd with a rectangle that represents the start and 
end for selection handles.
-virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) = 0;
+virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) const = 0;
 
 // #i75172# in SwCrsrShell::CreateCrsr() the content of SwSelPaintRects is 
exchanged. To
 // make a complete swap access to mpCursorOverlay is needed there
@@ -129,7 +129,7 @@ public:
 
 virtual void FillRects() SAL_OVERRIDE;   // For Table- und normal cursors.
 /// @see SwSelPaintRects::FillStartEnd(), override for text selections.
-virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) SAL_OVERRIDE;
+virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) const SAL_OVERRIDE;
 
 void Show();// Update and display all selections.
 void Hide();// Hide all selections.
@@ -180,7 +180,7 @@ public:
 
 virtual void FillRects() SAL_OVERRIDE;   // For table and normal cursor.
 /// @see SwSelPaintRects::FillStartEnd(), override for table selections.
-virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) SAL_OVERRIDE;
+virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) const SAL_OVERRIDE;
 
 // Check if SPoint is within table SSelection.
 bool IsInside( const Point& rPt ) const;
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 3d0d883..1422f3d 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -276,7 +276,7 @@ static SwRect lcl_getLayoutRect(const Point& rPoint, const 
SwPosition& rPosition
 return aRect;
 }
 
-void SwShellCrsr::FillStartEnd(SwRect& rStart, SwRect& rEnd)
+void SwShellCrsr::FillStartEnd(SwRect& rStart, SwRect& rEnd) const
 {
 const SwShellCrsr* pCursor = GetShell()->getShellCrsr(false);
 rStart = lcl_getLayoutRect(pCursor->GetSttPos(), *pCursor->Start());
@@ -773,7 +773,7 @@ void SwShellTableCrsr::FillRects()
 insert( begin(), aReg.begin(), aReg.end() );
 }
 
-void SwShellTableCrsr::FillStartEnd(SwRect& rStart, SwRect& rEnd)
+void SwShellTableCrsr::FillStartEnd(SwRect& rStart, SwRect& rEnd) const
 {
 rStart = m_aStart;
 rEnd = m_aEnd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-27 Thread Henry Castro

 sc/source/ui/view/viewfun3.cxx |  152 -
 1 file changed, 92 insertions(+), 60 deletions(-)

New commits:
commit b05330c64799067ca2e0b8ea8bfdee8ce8b023b2
Author: Henry Castro 
Date:   Sun Feb 22 19:30:42 2015 -0400

Resolves tdf#71095 Calc doesn't paste images copied from some web browsers

Fixed. When I try to paste an web image copied from web browser, it paste 
now

Change-Id: I696feb3438022b506303b2f354ac9c4d306e08f4
Reviewed-on: https://gerrit.libreoffice.org/14529
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index f1ce4fe..a4c1868 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -475,76 +475,108 @@ void ScViewFunc::PasteFromSystem()
 sal_uLong nBiff8 = 
SotExchange::RegisterFormatName(OUString("Biff8"));
 sal_uLong nBiff5 = 
SotExchange::RegisterFormatName(OUString("Biff5"));
 
+sal_uInt16 nDestination = EXCHG_DEST_SCDOC_FREE_AREA;
+sal_uInt16 nSourceOptions = EXCHG_IN_ACTION_COPY;
+sal_uLong nFormat;  // output param for GetExchangeAction
+sal_uInt16 nEventAction;// output param for GetExchangeAction
+
+uno::Reference 
xTransferable( aDataHelper.GetXTransferable() );
+sal_uInt16 nAction = SotExchange::GetExchangeAction(
+aDataHelper.GetDataFlavorExVector(),
+nDestination,
+nSourceOptions,
+EXCHG_IN_ACTION_DEFAULT,
+nFormat, nEventAction, 0,
+&xTransferable );
+
+if ( nAction != EXCHG_INOUT_ACTION_NONE )
+{
+nAction = ( nAction & EXCHG_ACTION_MASK );
+
+switch( nAction )
+{
+case EXCHG_OUT_ACTION_INSERT_SVXB:
+case EXCHG_OUT_ACTION_INSERT_GDIMETAFILE:
+case EXCHG_OUT_ACTION_INSERT_BITMAP:
+case EXCHG_OUT_ACTION_INSERT_GRAPH:
+// FORMAT_BITMAP
+// SOT_FORMATSTR_ID_PNG
+// FORMAT_GDIMETAFILE
+// SOT_FORMATSTR_ID_SVXB
+PasteFromSystem(nFormat);
+break;
+default:
+nAction = EXCHG_INOUT_ACTION_NONE;
+}
+}
+
+if ( nAction == EXCHG_INOUT_ACTION_NONE )
+{
 //  first SvDraw-model, then drawing
 //  (only one drawing is allowed)
 
-if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING ))
-{
-// special case for tables from drawing
-if( aDataHelper.HasFormat( SOT_FORMAT_RTF ) )
+if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING ))
 {
-PasteFromSystem( FORMAT_RTF );
+// special case for tables from drawing
+if( aDataHelper.HasFormat( SOT_FORMAT_RTF ) )
+{
+PasteFromSystem( FORMAT_RTF );
+}
+else
+{
+PasteFromSystem( SOT_FORMATSTR_ID_DRAWING );
+}
 }
-else
+else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE 
))
 {
-PasteFromSystem( SOT_FORMATSTR_ID_DRAWING );
-}
-}
-else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB ))
-PasteFromSystem( SOT_FORMATSTR_ID_SVXB );
-else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ))
-{
-//  If it's a Writer object, insert RTF instead of OLE
+//  If it's a Writer object, insert RTF instead of OLE
 
-//  Else, if the class id is all-zero, and SYLK is available,
-//  it probably is spreadsheet cells that have been put
-//  on the clipboard by OOo, so use the SYLK. (fdo#31077)
+//  Else, if the class id is all-zero, and SYLK is 
available,
+//  it probably is spreadsheet cells that have been put
+//  on the clipboard by OOo, so use the SYLK. (fdo#31077)
 
-bool bDoRtf = false;
-TransferableObjectDescriptor aObjDesc;
-if( aDataHelper.GetTransferableObjectDescriptor( 
SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) )
-{
-bDoRtf = ( ( aObjDesc.maClassName == SvGlobalName( 
SO3_SW_CLASSID ) ||
- aObjDesc.maClassName == SvGlobalName( 
SO3_SWWEB_CLASSID )

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

2015-02-27 Thread Eike Rathke

 sc/inc/tokenarray.hxx  |3 
 sc/source/core/data/column.cxx |   29 +
 sc/source/core/tool/token.cxx  |  132 +++--
 3 files changed, 158 insertions(+), 6 deletions(-)

New commits:
commit 58deeaea725eca0e8140b09420d5144d5d3f800c
Author: Eike Rathke 
Date:   Thu Feb 26 12:54:13 2015 +0100

Resolves: tdf#81659 handle expand reference edge correctly

split formula grouping for reference edge expansion, tdf#81659 related

Edge expansion may change expressions individually, which must be split
off the group.

(cherry picked from commit 0cd15b4494f8e8abe67a258fb10189135bf5a8ac)

tdf#81659 check that references are at least 2 cols/rows to expand edge

Needs also 0cd15b4494f8e8abe67a258fb10189135bf5a8ac if edges are to be
expanded and formula grouping is affected.

(cherry picked from commit 23b0112ecea2f8796a4e237e9061de1a36997a30)

Backported.

b3cee8dd214d216907248316a2ac5a290399b169

Change-Id: Id4328bd8c42f2ff9f83d2edc845537971f3a39d3
Reviewed-on: https://gerrit.libreoffice.org/14656
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 1768ba9..e134f12 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -233,6 +233,9 @@ public:
 void CheckRelativeReferenceBounds(
 const ScAddress& rPos, SCROW nGroupLen, const ScRange& rRange, 
std::vector& rBounds ) const;
 
+void CheckExpandReferenceBounds(
+const sc::RefUpdateContext& rCxt, const ScAddress& rPos, SCROW 
nGroupLen, std::vector& rBounds ) const;
+
 /**
  * Create a string representation of formula token array without modifying
  * the internal state of the token array.
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 64174ab..431e9b1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2300,6 +2300,27 @@ public:
 }
 };
 
+class UpdateRefExpandGroupBoundChecker : public SharedTopFormulaCellPicker
+{
+const sc::RefUpdateContext& mrCxt;
+std::vector& mrBounds;
+
+public:
+UpdateRefExpandGroupBoundChecker(const sc::RefUpdateContext& rCxt, 
std::vector& rBounds) :
+mrCxt(rCxt), mrBounds(rBounds) {}
+
+virtual ~UpdateRefExpandGroupBoundChecker() {}
+
+virtual void processSharedTop( ScFormulaCell** ppCells, size_t /*nRow*/, 
size_t /*nLength*/ ) SAL_OVERRIDE
+{
+// Check its tokens and record its reference boundaries.
+ScFormulaCell& rCell = **ppCells;
+const ScTokenArray& rCode = *rCell.GetCode();
+rCode.CheckExpandReferenceBounds(
+mrCxt, rCell.aPos, rCell.GetSharedLength(), mrBounds);
+}
+};
+
 class FormulaGroupPicker : public SharedTopFormulaCellPicker
 {
 std::vector& mrGroups;
@@ -2385,6 +2406,14 @@ bool ScColumn::UpdateReference( sc::RefUpdateContext& 
rCxt, ScDocument* pUndoDoc
 UpdateRefGroupBoundChecker aBoundChecker(rCxt, aBounds);
 std::for_each(maCells.begin(), maCells.end(), aBoundChecker);
 
+// If expand reference edges is on, splitting groups may happen anywhere
+// where a reference points to an adjacent row of the insertion.
+if (rCxt.mnRowDelta > 0 && rCxt.mrDoc.IsExpandRefs())
+{
+UpdateRefExpandGroupBoundChecker aExpandChecker(rCxt, aBounds);
+std::for_each(maCells.begin(), maCells.end(), aExpandChecker);
+}
+
 // Do the actual splitting.
 sc::SharedFormulaUtil::splitFormulaCellGroups(maCells, aBounds);
 
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1b550af..9961b58 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2642,9 +2642,18 @@ bool expandRange( const sc::RefUpdateContext& rCxt, 
ScRange& rRefRange, const Sc
 // Selected range is only partially overlapping in vertical 
direction. Bail out.
 return false;
 
-if (!rCxt.mrDoc.IsExpandRefs() && rSelectedRange.aStart.Col() <= 
rRefRange.aStart.Col())
-// Selected range is at the left end and the edge expansion is 
turned off.  No expansion.
-return false;
+if (rCxt.mrDoc.IsExpandRefs())
+{
+if (rRefRange.aEnd.Col() - rRefRange.aStart.Col() < 1)
+// Reference must be at least two columns wide.
+return false;
+}
+else
+{
+if (rSelectedRange.aStart.Col() <= rRefRange.aStart.Col())
+// Selected range is at the left end and the edge expansion is 
turned off.  No expansion.
+return false;
+}
 
 // Move the last column position to the right.
 SCCOL nDelta = rSelectedRange.aEnd.Col() - rSelectedRange.aStart.Col() 
+ 1;
@@ -2658,9 +2667,18 @@ bool expandRange( const sc::RefUpdateContext& rCxt, 
ScRange& rRefRange, const Sc
 // Selected range is on

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

2015-02-27 Thread Eike Rathke

 sc/inc/tokenarray.hxx  |3 
 sc/source/core/data/column.cxx |   29 +
 sc/source/core/tool/token.cxx  |  132 +++--
 3 files changed, 158 insertions(+), 6 deletions(-)

New commits:
commit e8f059f918faf8a44787f8f0bdf61217f4439d7f
Author: Eike Rathke 
Date:   Thu Feb 26 12:54:13 2015 +0100

Resolves: tdf#81659 handle expand reference edge correctly

split formula grouping for reference edge expansion, tdf#81659 related

Edge expansion may change expressions individually, which must be split
off the group.

Change-Id: Id4328bd8c42f2ff9f83d2edc845537971f3a39d3
(cherry picked from commit 0cd15b4494f8e8abe67a258fb10189135bf5a8ac)

tdf#81659 check that references are at least 2 cols/rows to expand edge

Needs also 0cd15b4494f8e8abe67a258fb10189135bf5a8ac if edges are to be
expanded and formula grouping is affected.

Change-Id: Ib3cee8dd214d216907248316a2ac5a290399b169
(cherry picked from commit 23b0112ecea2f8796a4e237e9061de1a36997a30)
Reviewed-on: https://gerrit.libreoffice.org/14655
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 412ecfe..54f1d1e 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -232,6 +232,9 @@ public:
 void CheckRelativeReferenceBounds(
 const ScAddress& rPos, SCROW nGroupLen, const ScRange& rRange, 
std::vector& rBounds ) const;
 
+void CheckExpandReferenceBounds(
+const sc::RefUpdateContext& rCxt, const ScAddress& rPos, SCROW 
nGroupLen, std::vector& rBounds ) const;
+
 /**
  * Create a string representation of formula token array without modifying
  * the internal state of the token array.
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index b60fcc2..5e975c7 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2279,6 +2279,27 @@ public:
 }
 };
 
+class UpdateRefExpandGroupBoundChecker : public SharedTopFormulaCellPicker
+{
+const sc::RefUpdateContext& mrCxt;
+std::vector& mrBounds;
+
+public:
+UpdateRefExpandGroupBoundChecker(const sc::RefUpdateContext& rCxt, 
std::vector& rBounds) :
+mrCxt(rCxt), mrBounds(rBounds) {}
+
+virtual ~UpdateRefExpandGroupBoundChecker() {}
+
+virtual void processSharedTop( ScFormulaCell** ppCells, size_t /*nRow*/, 
size_t /*nLength*/ ) SAL_OVERRIDE
+{
+// Check its tokens and record its reference boundaries.
+ScFormulaCell& rCell = **ppCells;
+const ScTokenArray& rCode = *rCell.GetCode();
+rCode.CheckExpandReferenceBounds(
+mrCxt, rCell.aPos, rCell.GetSharedLength(), mrBounds);
+}
+};
+
 class FormulaGroupPicker : public SharedTopFormulaCellPicker
 {
 std::vector& mrGroups;
@@ -2364,6 +2385,14 @@ bool ScColumn::UpdateReference( sc::RefUpdateContext& 
rCxt, ScDocument* pUndoDoc
 UpdateRefGroupBoundChecker aBoundChecker(rCxt, aBounds);
 std::for_each(maCells.begin(), maCells.end(), aBoundChecker);
 
+// If expand reference edges is on, splitting groups may happen anywhere
+// where a reference points to an adjacent row of the insertion.
+if (rCxt.mnRowDelta > 0 && rCxt.mrDoc.IsExpandRefs())
+{
+UpdateRefExpandGroupBoundChecker aExpandChecker(rCxt, aBounds);
+std::for_each(maCells.begin(), maCells.end(), aExpandChecker);
+}
+
 // Do the actual splitting.
 sc::SharedFormulaUtil::splitFormulaCellGroups(maCells, aBounds);
 
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 9218498..7710f30 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2476,9 +2476,18 @@ bool expandRange( const sc::RefUpdateContext& rCxt, 
ScRange& rRefRange, const Sc
 // Selected range is only partially overlapping in vertical 
direction. Bail out.
 return false;
 
-if (!rCxt.mrDoc.IsExpandRefs() && rSelectedRange.aStart.Col() <= 
rRefRange.aStart.Col())
-// Selected range is at the left end and the edge expansion is 
turned off.  No expansion.
-return false;
+if (rCxt.mrDoc.IsExpandRefs())
+{
+if (rRefRange.aEnd.Col() - rRefRange.aStart.Col() < 1)
+// Reference must be at least two columns wide.
+return false;
+}
+else
+{
+if (rSelectedRange.aStart.Col() <= rRefRange.aStart.Col())
+// Selected range is at the left end and the edge expansion is 
turned off.  No expansion.
+return false;
+}
 
 // Move the last column position to the right.
 SCCOL nDelta = rSelectedRange.aEnd.Col() - rSelectedRange.aStart.Col() 
+ 1;
@@ -2492,9 +2501,18 @@ bool expandRange( const sc::RefUpdateContext& rCxt, 
ScRange& rRefRange, const Sc
 // Selected range is only partially overla

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

2015-02-27 Thread Takeshi Abe

 starmath/qa/extras/data/maction.mml   |   10 
 starmath/qa/extras/mmlimport-test.cxx |9 
 starmath/source/mathmlimport.cxx  |   70 +++---
 starmath/source/mathmlimport.hxx  |6 ++
 4 files changed, 89 insertions(+), 6 deletions(-)

New commits:
commit fe43c9227bd77c6471126b2553820c14b4721d6f
Author: Takeshi Abe 
Date:   Tue Feb 24 13:55:58 2015 +0900

starmath: render the selected subexpression of MathML's 

... specified by the selection attribute.
For its expected behavior, see the section  in MathML 1.01:


Change-Id: I70c1b2cfe1afec730f3e67ba0938bbaf8ada8e23
Reviewed-on: https://gerrit.libreoffice.org/14600
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/starmath/qa/extras/data/maction.mml 
b/starmath/qa/extras/data/maction.mml
new file mode 100644
index 000..3650087
--- /dev/null
+++ b/starmath/qa/extras/data/maction.mml
@@ -0,0 +1,10 @@
+
+http://www.w3.org/1998/Math/MathML";>
+  
+ 
+100
+020
+003
+ 
+  
+
diff --git a/starmath/qa/extras/mmlimport-test.cxx 
b/starmath/qa/extras/mmlimport-test.cxx
index 2fbeda7..adf80aa 100644
--- a/starmath/qa/extras/mmlimport-test.cxx
+++ b/starmath/qa/extras/mmlimport-test.cxx
@@ -30,9 +30,11 @@ public:
 virtual void tearDown() SAL_OVERRIDE;
 
 void testSimple();
+void testMaction();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testSimple);
+CPPUNIT_TEST(testMaction);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -83,6 +85,13 @@ void Test::testSimple()
 loadURL(getURLFromSrc("starmath/qa/extras/data/simple.mml"));
 }
 
+void Test::testMaction()
+{
+loadURL(getURLFromSrc("starmath/qa/extras/data/maction.mml"));
+OUString sExpected("matrix {italic \"1\" ## italic \"2\" ## italic 
\"3\"}");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("loaded text", sExpected, 
mxDocShell->GetText());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 488797e..8a42baf 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1756,12 +1756,16 @@ public:
 
 class SmXMLActionContext_Impl : public SmXMLRowContext_Impl
 {
+size_t mnSelection; // 1-based
+
 public:
 SmXMLActionContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
 const OUString& rLName) :
 SmXMLRowContext_Impl(rImport,nPrefix,rLName)
+  , mnSelection(1)
 {}
 
+void StartElement(const uno::Reference 
&xAttrList) SAL_OVERRIDE;
 void EndElement() SAL_OVERRIDE;
 };
 
@@ -1957,6 +1961,13 @@ static const SvXMLTokenMapEntry aColorTokenMap[] =
 XML_TOKEN_MAP_END
 };
 
+static const SvXMLTokenMapEntry aActionAttrTokenMap[] =
+{
+{ XML_NAMESPACE_MATH,   XML_SELECTION,  XML_TOK_SELECTION },
+XML_TOKEN_MAP_END
+};
+
+
 const SvXMLTokenMap& SmXMLImport::GetPresLayoutElemTokenMap()
 {
 if (!pPresLayoutElemTokenMap)
@@ -2022,6 +2033,12 @@ const SvXMLTokenMap& SmXMLImport::GetColorTokenMap()
 return *pColorTokenMap;
 }
 
+const SvXMLTokenMap& SmXMLImport::GetActionAttrTokenMap()
+{
+if (!pActionAttrTokenMap)
+pActionAttrTokenMap = new SvXMLTokenMap(aActionAttrTokenMap);
+return *pActionAttrTokenMap;
+}
 
 
 SvXMLImportContext *SmXMLDocContext_Impl::CreateChildContext(
@@ -2589,18 +2606,58 @@ void SmXMLMultiScriptsContext_Impl::EndElement()
 ProcessSubSupPairs(bHasPrescripts);
 }
 
-void SmXMLActionContext_Impl::EndElement()
+void SmXMLActionContext_Impl::StartElement(const 
uno::Reference & xAttrList)
 {
-/*For now we will just assume that the
- selected attribute is one, and then just display
- that expression alone, i.e. remove all expect the
- first pushed one*/
+sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
+for (sal_Int16 i=0;igetNameByIndex(i);
+OUString aLocalName;
+sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
+GetKeyByAttrName(sAttrName,&aLocalName);
 
+OUString sValue = xAttrList->getValueByIndex(i);
+const SvXMLTokenMap &rAttrTokenMap =
+GetSmImport().GetActionAttrTokenMap();
+switch(rAttrTokenMap.Get(nPrefix,aLocalName))
+{
+case XML_TOK_SELECTION:
+{
+sal_uInt32 n = sValue.toUInt32();
+if (n > 0) mnSelection = static_cast(n);
+}
+break;
+default:
+break;
+}
+}
+}
+
+void SmXMLActionContext_Impl::EndElement()
+{
 SmNodeStack &rNodeStack = GetSmImport().GetNodeStack();
-for (auto i=rNodeStack.size()-nElementCount;i > 1;i--)
+auto nSize = rNodeStack.size();
+if (nSize <= nElementCount) {
+// not compliant to maction's specification, e.g., no subexpressions
+return;
+}
+assert(mnSelection > 0);
+if

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

2015-02-27 Thread Michael Stahl

 vcl/generic/glyphs/gcach_layout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 623f16d7a47020600e2b4ba03aa6a617545b0d93
Author: Michael Stahl 
Date:   Tue Feb 24 21:32:54 2015 +0100

tdf#89666: vcl: speed up HbLayoutEngine line layout for large paragraphs

When formatting a 180k char Writer paragraph, most of the time is spent
in vcl::ScriptRun::next(), which is called twice per line from
SwTxtGuess::Guess(), once via GetTxtBreak() and once via GetTxtSize().

In the second call, from GetTxtSize(), the end position of the line is
known, and passed to vcl, and iterating beyond that position seems
pointless.

This reduces vcl::ScriptRun::next() from 24 to 11 billion callgrind
cycles when built with GCC 4.9.2 -m32 -Os.

(cherry picked from commit 7fde44c85620f8079bc4863fe3f7ea1f69a0f88c)

Conflicts:
vcl/generic/glyphs/gcach_layout.cxx

Change-Id: Ia23fcccaf5ef9c9ecdcb54bfc8f0f8a043c8711e
Reviewed-on: https://gerrit.libreoffice.org/14645
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 3f065bb..bf2eab2 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -372,7 +372,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 
 rLayout.Reserve(nGlyphCapacity);
 
-ScriptRun aScriptRun(reinterpret_cast(rArgs.mpStr), 
rArgs.mnLength);
+ScriptRun aScriptRun(reinterpret_cast(rArgs.mpStr), 
rArgs.mnEndCharPos);
 
 Point aCurrPos(0, 0);
 while (true)
___
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/generic

2015-02-27 Thread Michael Stahl

 vcl/generic/glyphs/gcach_layout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a58579a35bb275c985ff0fd412c92f10cd8a085
Author: Michael Stahl 
Date:   Tue Feb 24 21:32:54 2015 +0100

tdf#89666: vcl: speed up HbLayoutEngine line layout for large paragraphs

When formatting a 180k char Writer paragraph, most of the time is spent
in vcl::ScriptRun::next(), which is called twice per line from
SwTxtGuess::Guess(), once via GetTxtBreak() and once via GetTxtSize().

In the second call, from GetTxtSize(), the end position of the line is
known, and passed to vcl, and iterating beyond that position seems
pointless.

This reduces vcl::ScriptRun::next() from 24 to 11 billion callgrind
cycles when built with GCC 4.9.2 -m32 -Os.

Change-Id: Ia23fcccaf5ef9c9ecdcb54bfc8f0f8a043c8711e
(cherry picked from commit 7fde44c85620f8079bc4863fe3f7ea1f69a0f88c)
Reviewed-on: https://gerrit.libreoffice.org/14646
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index abd04ba..f7523a1 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -372,7 +372,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 
 rLayout.Reserve(nGlyphCapacity);
 
-vcl::ScriptRun aScriptRun(reinterpret_cast(rArgs.mpStr), 
rArgs.mnLength);
+vcl::ScriptRun aScriptRun(reinterpret_cast(rArgs.mpStr), 
rArgs.mnEndCharPos);
 
 Point aCurrPos(0, 0);
 while (true)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - canvas/source

2015-02-27 Thread Michael Jaumann

 canvas/source/opengl/ogl_canvascustomsprite.cxx |   15 +--
 canvas/source/opengl/ogl_canvastools.cxx|9 ++---
 2 files changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 50f1e7e71bc59cec9c1afee473a94ff49c6de32a
Author: Michael Jaumann 
Date:   Fri Feb 27 10:46:49 2015 +

don't try to render with no vertices

Change-Id: I42a5c21b32771fcff1fd148b55cad2d697648409

diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx 
b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 7acaceb..be4372e 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -218,14 +218,17 @@ namespace oglcanvas
 aSpriteSizePixel.x,
 aSpriteSizePixel.y)));
 
-std::vector vertices;
-vertices.reserve(rTriangulatedPolygon.count());
-for( sal_uInt32 i=0; i vertices;
+vertices.reserve(rTriangulatedPolygon.count());
+for( sal_uInt32 i=0; irenderVertexTex( vertices, fWidth, 
fHeight,  color, GL_TRIANGLES);
 }
-pRenderHelper->renderVertexTex( vertices, fWidth, fHeight, 
 color, GL_TRIANGLES);
 }
 else
 {
diff --git a/canvas/source/opengl/ogl_canvastools.cxx 
b/canvas/source/opengl/ogl_canvastools.cxx
index 6490cff..3c09f96 100644
--- a/canvas/source/opengl/ogl_canvastools.cxx
+++ b/canvas/source/opengl/ogl_canvastools.cxx
@@ -48,7 +48,8 @@ namespace oglcanvas
 vertices.push_back(glm::vec2(rPt.getX(),rPt.getY()));
 }
 
-renderHelper->renderVertexConstColor(vertices, color, 
GL_TRIANGLES);
+if(vertices.size() !=0)
+renderHelper->renderVertexConstColor(vertices, color, 
GL_TRIANGLES);
 }
 }
 
@@ -72,7 +73,8 @@ namespace oglcanvas
 const ::basegfx::B2DPoint& rPt( 
rTriangulatedPolygon.getB2DPoint(i) );
 vertices.push_back(glm::vec2(rPt.getX(),rPt.getY()));
 }
-renderHelper->renderTextureTransform( vertices, nWidth, nHeight,  
color, GL_TRIANGLES, transform);
+if(vertices.size()!=0)
+renderHelper->renderTextureTransform( vertices, nWidth, 
nHeight,  color, GL_TRIANGLES, transform);
 }
 }
 
@@ -102,7 +104,8 @@ namespace oglcanvas
 const ::basegfx::B2DPoint& rPt( rPolygon.getB2DPoint( j % 
nPts ) );
 vertices.push_back(glm::vec2(rPt.getX(),rPt.getY()));
 }
-renderHelper->renderVertexConstColor(vertices, color, 
GL_LINE_STRIP);
+if(vertices.size()!=0)
+renderHelper->renderVertexConstColor(vertices, color, 
GL_LINE_STRIP);
 }
 }
 
___
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' - compilerplugins/clang

2015-02-27 Thread Stephan Bergmann

 compilerplugins/clang/compat.hxx  |   16 ++--
 compilerplugins/clang/salbool.cxx |3 +--
 2 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 005ee4fc396b998a34fb5a9e03e9e6ef4e46cc34
Author: Stephan Bergmann 
Date:   Thu Feb 26 17:21:37 2015 +0100

Adapt compilerplugins to Clang trunk towards 3.7

Change-Id: I5b41039bf63a4c2f313fe7a57c0f6934dcb0752d
(cherry picked from commit 193957750ab857dc5e01ee7259964ee92a54ee0d)

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index e0e3cbb..4727d55 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -168,9 +168,15 @@ inline std::unique_ptr 
create_raw_fd_ostream(
 #endif
 }
 
-inline clang::NamedDecl * const * begin(
-clang::DeclContextLookupConstResult const & result)
-{
+#if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3
+typedef clang::DeclContext::lookup_result DeclContextLookupResult;
+typedef clang::DeclContext::lookup_iterator DeclContextLookupIterator;
+#else
+typedef clang::DeclContext::lookup_const_result DeclContextLookupResult;
+typedef clang::DeclContext::lookup_const_iterator DeclContextLookupIterator;
+#endif
+
+inline DeclContextLookupIterator begin(DeclContextLookupResult const & result) 
{
 #if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
 return result.begin();
 #else
@@ -178,9 +184,7 @@ inline clang::NamedDecl * const * begin(
 #endif
 }
 
-inline clang::NamedDecl * const * end(
-clang::DeclContextLookupConstResult const & result)
-{
+inline DeclContextLookupIterator end(DeclContextLookupResult const & result) {
 #if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
 return result.end();
 #else
diff --git a/compilerplugins/clang/salbool.cxx 
b/compilerplugins/clang/salbool.cxx
index b32c0a7..f5ee945 100644
--- a/compilerplugins/clang/salbool.cxx
+++ b/compilerplugins/clang/salbool.cxx
@@ -85,8 +85,7 @@ OverrideKind getOverrideKind(FunctionDecl const * decl) {
 // encounter in practice:
 bool hasBoolOverload(FunctionDecl const * decl, bool mustBeDeleted) {
 unsigned n = decl->getNumParams();
-DeclContextLookupConstResult res
-= decl->getDeclContext()->lookup(decl->getDeclName());
+auto res = decl->getDeclContext()->lookup(decl->getDeclName());
 for (auto d = compat::begin(res); d != compat::end(res); ++d) {
 FunctionDecl const * f = dyn_cast(*d);
 if (f != nullptr && (!mustBeDeleted || f->isDeleted())) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/opengl-transitions-rework'

2015-02-27 Thread Stefan Weiberg

New branch 'feature/opengl-transitions-rework' available with the following 
commits:
commit de64fbf92ef0a630d7429cf6a9e81d37cafc8a5c
Author: Stefan Weiberg 
Date:   Mon Jan 19 12:16:26 2015 +

experimental replacement for matrix stack

Change-Id: I73b0c54c8bf513b226ffdb7b84c85a9cc05a2c8d

commit 2aeac69636f56ba5d2087e3efd1d4eff6bca630f
Author: Stefan Weiberg 
Date:   Mon Jan 19 13:12:28 2015 +0100

starting to remove push/pop cmds

Change-Id: I887b68bce97e6de57b54cd21c815123c30b48dc5

commit 3dd5d18fc9050b49c10983755b872857f3382123
Author: Stefan Weiberg 
Date:   Tue Nov 11 10:01:01 2014 +

starting to remove fixed funtions

Change-Id: I9a4ba1fe9a8b3198b5ebc311f7833f62898feeaf

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

[Libreoffice-commits] core.git: 2 commits - comphelper/source i18npool/source

2015-02-27 Thread Michael Stahl

 comphelper/source/misc/string.cxx   |   13 ++--
 i18npool/source/transliteration/transliteration_commonclass.cxx |   15 
+++---
 2 files changed, 9 insertions(+), 19 deletions(-)

New commits:
commit 543b432f132ef928216526854aa0df4d94b76dca
Author: Michael Stahl 
Date:   Thu Feb 26 22:40:16 2015 +0100

18npool: these variables should be signed

Change-Id: I6519a4c9da2a95efcc54288b3ef9d0a19ccfef3c

diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx 
b/i18npool/source/transliteration/transliteration_commonclass.cxx
index 8981641..1bdddcc 100644
--- a/i18npool/source/transliteration/transliteration_commonclass.cxx
+++ b/i18npool/source/transliteration/transliteration_commonclass.cxx
@@ -80,24 +80,19 @@ transliteration_commonclass::compareSubstring(
 const OUString& str2, sal_Int32 off2, sal_Int32 len2)
 throw(RuntimeException, std::exception)
 {
-const sal_Unicode* unistr1 = NULL;
-const sal_Unicode* unistr2 = NULL;
-sal_uInt32 strlen1;
-sal_uInt32 strlen2;
-
 Sequence  offset1(2*len1);
 Sequence  offset2(2*len2);
 
 OUString in_str1 = this->transliterate(str1, off1, len1, offset1);
 OUString in_str2 = this->transliterate(str2, off2, len2, offset2);
-strlen1 = in_str1.getLength();
-strlen2 = in_str2.getLength();
-unistr1 = in_str1.getStr();
-unistr2 = in_str2.getStr();
+sal_Int32 strlen1 = in_str1.getLength();
+sal_Int32 strlen2 = in_str2.getLength();
+const sal_Unicode* unistr1 = in_str1.getStr();
+const sal_Unicode* unistr2 = in_str2.getStr();
 
 while (strlen1 && strlen2)
 {
-sal_uInt32 ret = *unistr1 - *unistr2;
+sal_Int32 ret = *unistr1 - *unistr2;
 if (ret)
 return ret;
 
commit 802fe48751e3baaecd9d279ef496c8a2c3cb0a2c
Author: Michael Stahl 
Date:   Thu Feb 26 22:28:31 2015 +0100

comphelper: compare implemented as subtraction

Change-Id: Ic7abd7dd588339e06b6764659829f35b4ea87adb

diff --git a/comphelper/source/misc/string.cxx 
b/comphelper/source/misc/string.cxx
index b58c67e..9839174 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -323,18 +323,13 @@ sal_Int32 compareNatural( const OUString & rLHS, const 
OUString & rRHS,
 sal_uInt32 nLHS = 
comphelper::string::decimalStringToNumber(rLHS.copy(nLHSFirstDigitPos, 
nLHSChunkLen));
 sal_uInt32 nRHS = 
comphelper::string::decimalStringToNumber(rRHS.copy(nRHSFirstDigitPos, 
nRHSChunkLen));
 
-nRet = nLHS-nRHS;
-if (nRet != 0)
+if (nLHS != nRHS)
+{
+nRet = (nLHS < nRHS) ? -1 : 1;
 break;
+}
 }
 
-//Squeeze these down to -1, 0, 1 in case there is an assumption those are
-//the only valid returns
-if (nRet > 0)
-nRet = 1;
-else if (nRet < 0)
-nRet = -1;
-
 return nRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclref' - dbaccess/source include/dbaccess

2015-02-27 Thread Michael Meeks

 dbaccess/source/core/dataaccess/databasedocument.cxx |1 +
 dbaccess/source/ui/app/AppDetailPageHelper.cxx   |4 ++--
 dbaccess/source/ui/app/AppDetailPageHelper.hxx   |4 ++--
 dbaccess/source/ui/browser/dataview.cxx  |   13 ++---
 include/dbaccess/dataview.hxx|4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit fe64e57f2d37d77811a3648ccf11b76eaa7e5f0e
Author: Michael Meeks 
Date:   Fri Feb 27 10:09:37 2015 +

dbaccess: nail the last double-dispose issue breaking the test.

Change-Id: I861c970db9c36c973bcb2fa94a3e8e12f8de4f13

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 4e8099d..7203779 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1505,6 +1505,7 @@ void SAL_CALL ODatabaseDocument::close( sal_Bool 
_bDeliverOwnership ) throw (Clo
 // SYNCHRONIZED ->
 {
 DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
+assert (!m_bClosing);
 m_bClosing = true;
 }
 // <- SYNCHRONIZED
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx 
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 5461767..1516bb4 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -193,7 +193,6 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* 
_pParent,OAppBorderWindo
 ,m_aBorder(new Window(this,WB_BORDER | WB_READONLY))
 ,m_aPreview(new OPreviewWindow(m_aBorder.get()))
 ,m_aDocumentInfo(new ::svtools::ODocumentInfoPreview(m_aBorder.get(), 
WB_LEFT | WB_VSCROLL | WB_READONLY) )
-,m_pTablePreview(NULL)
 ,m_ePreviewMode(_ePreviewMode)
 {
 
@@ -212,7 +211,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* 
_pParent,OAppBorderWindo
 
 m_aPreview->SetHelpId(HID_APP_VIEW_PREVIEW_1);
 
-m_pTablePreview = new OTablePreviewWindow(m_aBorder.get(), WB_READONLY | 
WB_DIALOGCONTROL );
+m_pTablePreview.set( new OTablePreviewWindow(m_aBorder.get(), WB_READONLY 
| WB_DIALOGCONTROL ) );
 m_pTablePreview->SetHelpId(HID_APP_VIEW_PREVIEW_2);
 
 m_aDocumentInfo->SetHelpId(HID_APP_VIEW_PREVIEW_3);
@@ -259,6 +258,7 @@ void OAppDetailPageHelper::dispose()
 m_aTBPreview.disposeAndClear();
 m_aPreview.disposeAndClear();
 m_aDocumentInfo.disposeAndClear();
+m_pTablePreview.disposeAndClear();
 m_aBorder.disposeAndClear();
 m_aMenu.reset();
 
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx 
b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index ef9899f..9e8d5e9 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -84,8 +84,8 @@ namespace dbaui
 VclPtrm_aBorder;
 VclPtrm_aPreview;
 VclPtr<::svtools::ODocumentInfoPreview>
- m_aDocumentInfo;
-vcl::Window* m_pTablePreview;
+  m_aDocumentInfo;
+VclPtr   m_pTablePreview;
 ::std::unique_ptr m_aMenu;
 PreviewMode m_ePreviewMode;
 ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
diff --git a/dbaccess/source/ui/browser/dataview.cxx 
b/dbaccess/source/ui/browser/dataview.cxx
index 3f15879..e023e5b 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -65,10 +65,9 @@ namespace dbaui
 WinBits nStyle)
 :Window(pParent,nStyle)
 ,m_xContext(_rxContext)
-,m_rController( _rController )
+,m_xController( &_rController )
 ,m_aSeparator( new FixedLine(this) )
 {
-m_rController.acquire();
 m_pAccel.reset(::svt::AcceleratorExecute::createAcceleratorHelper());
 m_aSeparator->Show();
 }
@@ -84,7 +83,7 @@ namespace dbaui
 
 void ODataView::dispose()
 {
-m_rController.release();
+m_xController.clear();
 m_aSeparator.disposeAndClear();
 m_pAccel.reset();
 vcl::Window::dispose();
@@ -141,7 +140,7 @@ namespace dbaui
 case MouseNotifyEvent::KEYUP:
 case MouseNotifyEvent::MOUSEBUTTONDOWN:
 case MouseNotifyEvent::MOUSEBUTTONUP:
-bHandled = m_rController.interceptUserInput( _rNEvt );
+bHandled = m_xController->interceptUserInput( _rNEvt );
 break;
 default:
 break;
@@ -155,7 +154,7 @@ namespace dbaui
 if ( nType == StateChangedType::CONTROLBACKGROUND )
 {
 // Check if we need to get new images for normal/high contrast mode
-m_rController.notifyHiContrastChanged();
+m_xController->notifyHiContrastChanged();
 }
 
 if ( nType == StateChangedType::INITSHOW )
@@

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

2015-02-27 Thread Stephan Bergmann

 svtools/source/contnr/svimpbox.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 787387810721d9fba6a5b7fce6e3260171526e01
Author: Stephan Bergmann 
Date:   Fri Feb 27 10:39:49 2015 +0100

Avoid unnecessary bad downcast

Change-Id: Ib7ed62599b9e088c4a91a39c3181f3a13e641d70

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index f014b6f..760497e 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -3192,7 +3192,7 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt )
 {
 // recalculate text rectangle
 SvLBoxTab* pTab;
-SvLBoxString* pItem = static_cast(pView->GetItem( 
pEntry, aPos.X(), &pTab ));
+SvLBoxItem* pItem = pView->GetItem( pEntry, aPos.X(), &pTab );
 if (!pItem || pItem->GetType() != SV_ITEM_ID_LBOXSTRING)
 return false;
 
@@ -3225,7 +3225,7 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt )
 aItemRect.Bottom() = aPt.Y();
 
 Help::ShowQuickHelp( pView, aItemRect,
- pItem->GetText(), QUICKHELP_LEFT | 
QUICKHELP_VCENTER );
+ 
static_cast(pItem)->GetText(), QUICKHELP_LEFT | 
QUICKHELP_VCENTER );
 return true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/inc sw/source

2015-02-27 Thread Miklos Vajna

 sw/inc/viscrs.hxx  |   10 
 sw/source/core/crsr/viscrs.cxx |   46 ++---
 2 files changed, 49 insertions(+), 7 deletions(-)

New commits:
commit 9c4c40ac2c2cdcb1e634df52d15d0c6fdc833410
Author: Miklos Vajna 
Date:   Fri Feb 27 10:33:10 2015 +0100

SwSelPaintRects: add FillStartEnd() interface

Previously we always assumed non-table selections in SwSelPaintRects,
but that is not always true, resulting in incorrect handles for table
selections. Add a FillStartEnd() interface to fill the passed SwRects
with the rectangle of the start and end handle, and implement it in both
SwShellCrsr and SwShellTableCrsr.

This makes adjusting the end of table selections using the end selection
handle work (be it shrinking or extending).

Change-Id: Iba8657466b102ec60c41829f00660dfe295643ab

diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index b24bea5..7de57a2 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -89,6 +89,8 @@ public:
 virtual ~SwSelPaintRects();
 
 virtual void FillRects() = 0;
+/// Fill rStart and rEnd with a rectangle that represents the start and 
end for selection handles.
+virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) = 0;
 
 // #i75172# in SwCrsrShell::CreateCrsr() the content of SwSelPaintRects is 
exchanged. To
 // make a complete swap access to mpCursorOverlay is needed there
@@ -126,6 +128,8 @@ public:
 virtual ~SwShellCrsr();
 
 virtual void FillRects() SAL_OVERRIDE;   // For Table- und normal cursors.
+/// @see SwSelPaintRects::FillStartEnd(), override for text selections.
+virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) SAL_OVERRIDE;
 
 void Show();// Update and display all selections.
 void Hide();// Hide all selections.
@@ -159,6 +163,10 @@ public:
 
 class SwShellTableCrsr : public virtual SwShellCrsr, public virtual 
SwTableCursor
 {
+/// Left edge of the selection start (top left cell).
+SwRect m_aStart;
+/// Right edge of the selection end (bottom right cell).
+SwRect m_aEnd;
 // The Selection has the same order as the table boxes, i.e.
 // if something is deleted from the one array at a certain position
 // it has to be deleted from the other one as well!!
@@ -171,6 +179,8 @@ public:
 virtual ~SwShellTableCrsr();
 
 virtual void FillRects() SAL_OVERRIDE;   // For table and normal cursor.
+/// @see SwSelPaintRects::FillStartEnd(), override for table selections.
+virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) SAL_OVERRIDE;
 
 // Check if SPoint is within table SSelection.
 bool IsInside( const Point& rPt ) const;
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 89bcc28..3d0d883 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -276,6 +276,13 @@ static SwRect lcl_getLayoutRect(const Point& rPoint, const 
SwPosition& rPosition
 return aRect;
 }
 
+void SwShellCrsr::FillStartEnd(SwRect& rStart, SwRect& rEnd)
+{
+const SwShellCrsr* pCursor = GetShell()->getShellCrsr(false);
+rStart = lcl_getLayoutRect(pCursor->GetSttPos(), *pCursor->Start());
+rEnd = lcl_getLayoutRect(pCursor->GetEndPos(), *pCursor->End());
+}
+
 #endif
 
 void SwSelPaintRects::Show()
@@ -345,13 +352,20 @@ void SwSelPaintRects::Show()
 // events, if there is a real selection.
 // This can be used to easily show selection handles on the
 // client side.
-const SwShellCrsr* pCursor = GetShell()->getShellCrsr(false);
-SwRect aStartRect = lcl_getLayoutRect(pCursor->GetSttPos(), 
*pCursor->Start());
-OString sRect = aStartRect.SVRect().toString();
-
GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_START, 
sRect.getStr());
-SwRect aEndRect = lcl_getLayoutRect(pCursor->GetEndPos(), 
*pCursor->End());
-sRect = aEndRect.SVRect().toString();
-
GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_END, 
sRect.getStr());
+SwRect aStartRect;
+SwRect aEndRect;
+FillStartEnd(aStartRect, aEndRect);
+
+if (aStartRect.Height())
+{
+OString sRect = aStartRect.SVRect().toString();
+
GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_START, 
sRect.getStr());
+}
+if (aEndRect.Height())
+{
+OString sRect = aEndRect.SVRect().toString();
+
GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_END, 
sRect.getStr());
+}
 }
 
 std::stringstream ss;
@@ -703,10 +717,12 @@ void SwShellTableCrsr::FillRects()
 if (m_SelectedBoxes.empty() || bParked || !GetPoint()->nNode

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

2015-02-27 Thread Stephan Bergmann

 vcl/inc/unx/gtk/gtksalmenu.hxx|1 -
 vcl/unx/gtk/window/gtksalmenu.cxx |2 --
 2 files changed, 3 deletions(-)

New commits:
commit 05caf43ff5e78bbc0e672be1547fd1ef098d02bd
Author: Stephan Bergmann 
Date:   Fri Feb 27 10:26:59 2015 +0100

Remove unused mpOldSalMenu

...added in 34504e4af678b52b6d6cfe7519ee1934f89c95dd "Chart menu works now" 
but
never read?

Change-Id: Ie756f831eda6bbb9ac0edb14758e097e30a9be6a

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 3a3d79e..e74de22 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -42,7 +42,6 @@ private:
 
 boolmbMenuBar;
 Menu*   mpVCLMenu;
-GtkSalMenu* mpOldSalMenu;
 GtkSalMenu* mpParentSalMenu;
 const GtkSalFrame*  mpFrame;
 
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 6a3a7b00..8448a91 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -393,7 +393,6 @@ void GtkSalMenu::UpdateFull()
 GtkSalMenu::GtkSalMenu( bool bMenuBar ) :
 mbMenuBar( bMenuBar ),
 mpVCLMenu( NULL ),
-mpOldSalMenu( NULL ),
 mpParentSalMenu( NULL ),
 mpFrame( NULL ),
 mpMenuModel( NULL ),
@@ -509,7 +508,6 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
 // if we had a menu on the GtkSalMenu we have to free it as we generate a
 // full menu anyway and we might need to reuse an existing model and
 // actiongroup
-mpOldSalMenu = static_cast< GtkSalMenu* >( pFrameNonConst->GetMenu() );
 pFrameNonConst->SetMenu( this );
 pFrameNonConst->EnsureAppMenuWatch();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libabw external/libcdr external/libebook external/libmspub external/libmwaw external/libodfgen external/libpagemaker external/librevenge external/libvisio sole

2015-02-27 Thread Stephan Bergmann

 external/libabw/UnpackedTarball_libabw.mk |   10 ++
 external/libabw/ubsan-visibility.patch|   11 +++
 external/libcdr/UnpackedTarball_libcdr.mk |   10 ++
 external/libcdr/ubsan-visibility.patch|   11 +++
 external/libebook/UnpackedTarball_libebook.mk |8 
 external/libebook/ubsan-visibility.patch  |   11 +++
 external/libmspub/UnpackedTarball_libmspub.mk |8 
 external/libmspub/ubsan-visibility.patch  |   11 +++
 external/libmwaw/UnpackedTarball_libmwaw.mk   |8 
 external/libmwaw/ubsan-visibility.patch.0 |   11 +++
 external/libodfgen/UnpackedTarball_libodfgen.mk   |8 
 external/libodfgen/ubsan-visibility.patch |   11 +++
 external/libpagemaker/UnpackedTarball_libpagemaker.mk |   10 ++
 external/libpagemaker/ubsan-visibility.patch  |   11 +++
 external/librevenge/UnpackedTarball_librevenge.mk |   10 +-
 external/librevenge/ubsan-visibility.patch|   11 +++
 external/libvisio/UnpackedTarball_libvisio.mk |8 
 external/libvisio/ubsan-visibility.patch  |   11 +++
 solenv/gbuild/platform/com_GCC_defs.mk|8 +++-
 19 files changed, 185 insertions(+), 2 deletions(-)

New commits:
commit f0aa1a78fb209310e8baef53c02f365fca518d11
Author: Stephan Bergmann 
Date:   Fri Feb 27 10:05:22 2015 +0100

For Clang -fsanitize=vptr use -fvisibility-ms-compat, not 
-fvisibility=hidden

As discussed in b4f6b26b5a1a78fecfa95ec2eb7ac8b80495d8aa 
"SAL_DLLPUBLIC_RTTI for
proper RTTI visibility for LLVM," RTTI-based -fsanitize= checks with Clang 
on
Linux need special precautions to make RTTI symbols visible across DSOs.  
The
approach taken there, as well as in 598d8194b0ea1a64e0ebba28a86c128bafa57c7c
"Visible function type RTTI for Clang -fsanitize=function," was to add 
explicit
SAL_DLLPUBLIC_RTTI annontations to relevant type definitions.  However, for
-fsanitize=vptr that would have required many more of those, so it appears
easier to "misuse" -fsanitize-ms-compat in that case, which happens to give 
all
RTTI symbols default visibility (while otherwise still honoring our
SAL_DLLPUBLIC/PRIVATE annotations).

The SAL_DLLPUBLIC_RTTI annotations from 
598d8194b0ea1a64e0ebba28a86c128bafa57c7c
"Visible function type RTTI for Clang -fsanitize=function" can likely be 
removed
again.

Change-Id: Ibeff7ab8c908111a7dc66ff0677204f112b24db8

diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 6288b0e..eb6b75c 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,4 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
+
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
+external/libabw/ubsan-visibility.patch \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/ubsan-visibility.patch 
b/external/libabw/ubsan-visibility.patch
new file mode 100644
index 000..2285ef8
--- /dev/null
+++ b/external/libabw/ubsan-visibility.patch
@@ -0,0 +1,11 @@
+--- configure
 configure
+@@ -16635,7 +16635,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 
-fvisibility=hidden compiler flag" >&5
+ $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
+ saved_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk 
b/external/libcdr/UnpackedTarball_libcdr.mk
index a91bc8e..f43bd1b 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -11,4 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
+
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
+external/libcdr/ubsan-visibility.patch \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libcdr/ubsan-visibility.patch 
b/external/libcdr/ubsan-visibility.patch
new file mode 100644
index 000..2581786
--- /dev/null
+++ b/external/libcdr/ubsan-visibility.patch
@@ -0,0 +1,11 @@
+--- configure
 configure
+@@ -17651,7 +17641,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking

[Libreoffice-commits] core.git: external/libatomic_ops external/liborcus external/libwpd external/poppler solenv/gbuild

2015-02-27 Thread Stephan Bergmann

 external/libatomic_ops/ExternalProject_libatomic_ops.mk |2 +-
 external/liborcus/ExternalProject_liborcus.mk   |2 +-
 external/liborcus/UnpackedTarball_liborcus.mk   |4 ++--
 external/libwpd/ExternalProject_libwpd.mk   |2 +-
 external/poppler/ExternalProject_poppler.mk |2 +-
 solenv/gbuild/platform/com_GCC_defs.mk  |3 ++-
 6 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit fc6f894d2211cee7b28cb93345e90297ec04fe06
Author: Stephan Bergmann 
Date:   Fri Feb 27 09:55:02 2015 +0100

Pass -fvisibility-inlines-hidden into external modules

Change-Id: Icf872e269c7e427ba1287ccd0082974c9426449e

diff --git a/external/libatomic_ops/ExternalProject_libatomic_ops.mk 
b/external/libatomic_ops/ExternalProject_libatomic_ops.mk
index 28384ad..afbad2e 100644
--- a/external/libatomic_ops/ExternalProject_libatomic_ops.mk
+++ b/external/libatomic_ops/ExternalProject_libatomic_ops.mk
@@ -17,7 +17,7 @@ $(eval $(call 
gb_ExternalProject_register_targets,libatomic_ops,\
 
 $(call gb_ExternalProject_get_state_target,libatomic_ops,build) :
$(call gb_ExternalProject_run,build,\
-   $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) 
$(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) 
$(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \
+   $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) 
$(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) 
$(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \
./configure \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index 9e68331..90d453c 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS)
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)
 liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 66022d5..126f250 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,9 +21,9 @@ liborcus_patches :=
 # don't use dllimport
 liborcus_patches += liborcus_0.1.0-dllimport.patch
 
-ifneq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
+# Any -fvisibility= etc. settings are passed into liborcus' CXXFLAGS via
+# gb_VISIBILITY_FLAGS[_CXX]:
 liborcus_patches += visibility.patch
-endif
 
 #

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

2015-02-27 Thread Tor Lillqvist

 vcl/source/gdi/pdfwriter_impl.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ce0e240ef10566f1cc334386dbde83b43ebb9281
Author: Tor Lillqvist 
Date:   Fri Feb 27 10:36:57 2015 +0200

tdf#84881: Timestamp the right data (NSS version)

Now Adobe Reader is satisfied with the signature timestamp.

I just need to figure out how to do the corresponding fix for the Win32
version, too.

Change-Id: Ie2cce177a9a356e729ca157b4c181e95a2c60c91

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index b435e84..aedb48b 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6944,7 +6944,7 @@ bool PDFWriterImpl::finalizeSignature()
 }
 
 HASH_Begin(ts_hc.get());
-HASH_Update(ts_hc.get(), reinterpret_cast(ts_cms_output.data), ts_cms_output.len);
+HASH_Update(ts_hc.get(), ts_cms_signer->encDigest.data, 
ts_cms_signer->encDigest.len);
 SECItem ts_digest;
 unsigned char ts_hash[SHA1_LENGTH];
 ts_digest.type = siBuffer;
@@ -6966,7 +6966,9 @@ bool PDFWriterImpl::finalizeSignature()
 src.version.data = &cOne;
 src.version.len = sizeof(cOne);
 
-src.messageImprint.hashAlgorithm = ts_cms_signer->digestAlg;
+src.messageImprint.hashAlgorithm.algorithm.data = NULL;
+src.messageImprint.hashAlgorithm.parameters.data = NULL;
+SECOID_SetAlgorithmID(NULL, &src.messageImprint.hashAlgorithm, 
SEC_OID_SHA1, NULL);
 src.messageImprint.hashedMessage = ts_digest;
 
 src.reqPolicy.type = siBuffer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: another cppunit test core dump, java this time, building on xstreamos/illumos

2015-02-27 Thread Gabriele Bulfon

Tried adding the join call, but no luck.
Now I tried to run make for debugging, entered gdb and issued run.
Looks like I need to enable some debugs. What module though?
GNU gdb (GDB) 7.6
Copyright (C) 2013 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-pc-solaris2.11".
For bug reporting instructions, please see:
...
Reading symbols from 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/LinkTarget/Executable/cppunittester...(no
 debugging symbols found)...done.
(gdb) run
Starting program: 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/LinkTarget/Executable/cppunittester
 
/sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/LinkTarget/CppunitTest/libtest_dbaccess_macros_test.so
 --headless 
-env:BRAND_BASE_DIR=file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir
 -env:BRAND_SHARE_SUBDIR=share 
-env:UserInstallation=file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/CppunitTest/dbaccess_macros_test.test.user
 
-env:CONFIGURATION_LAYERS=xcsxcu:file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/share/registry\
 
xcsxcu:file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/unittest/registry
 
-env:UNO_TYPES=file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/program/types/offapi.rdb\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/program/types/oovbaapi.rdb\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/instdir/ure/share/misc/types.rdb
 
-env:UNO_SERVICES=file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/Rdb/ure/services.rdb\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/basic/util/sb.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/comphelper/util/comphelp.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/configmgr/source/configmgr.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/dbaccess/util/dba.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/dbaccess/util/dbu.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/dbaccess/util/sdbt.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/dbaccess/source/filter/xml/dbaxml.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/filter/source/config/cache/filterconfig1.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/forms/util/frm.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/framework/util/fwk.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/i18npool/util/i18npool.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/oox/util/oox.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/package/source/xstor/xstor.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/package/util/package2.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/sax/source/expatwrap/expwrap.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/scripting/source/basprov/basprov.component\
 
file:///sources/sonicle/xstream-desktop-gate/components/libreoffice/libreoffice/libreoffice-4.4.0.3/workdir/ComponentTarget/scripting/ut

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

2015-02-27 Thread Miklos Vajna

 sw/inc/docary.hxx   |2 +-
 sw/source/core/crsr/bookmrk.cxx |9 ++---
 sw/source/core/doc/docredln.cxx |   16 
 sw/source/core/docnode/nodedump.cxx |   30 --
 4 files changed, 23 insertions(+), 34 deletions(-)

New commits:
commit 5020ed93a40ea24d259b316a02a30eb868c41c2d
Author: Miklos Vajna 
Date:   Fri Feb 27 09:01:06 2015 +0100

Move SwExtraRedlineTbl::dumpAsXml() out of docnode

Change-Id: Ic9762d9392493a84fe124349e7616ac21f7e8586

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 8b36d6a..abe1480 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -204,7 +204,7 @@ public:
 void DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen = 1 );
 void DeleteAndDestroyAll();
 
-void dumpAsXml(xmlTextWriterPtr w) const;
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 
 /** Search next or previous Redline with the same Seq. No.
Search can be restricted via Lookahaed.
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 7eae977..6a6f5f6 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -182,9 +182,12 @@ namespace sw { namespace mark
 xmlTextWriterStartElement(pWriter, BAD_CAST("markPos"));
 GetMarkPos().dumpAsXml(pWriter);
 xmlTextWriterEndElement(pWriter);
-xmlTextWriterStartElement(pWriter, BAD_CAST("otherMarkPos"));
-GetOtherMarkPos().dumpAsXml(pWriter);
-xmlTextWriterEndElement(pWriter);
+if (IsExpanded())
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("otherMarkPos"));
+GetOtherMarkPos().dumpAsXml(pWriter);
+xmlTextWriterEndElement(pWriter);
+}
 xmlTextWriterEndElement(pWriter);
 }
 
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 2182451..ec1e7f9 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -76,6 +76,22 @@ SwExtraRedlineTbl::~SwExtraRedlineTbl()
 DeleteAndDestroyAll();
 }
 
+void SwExtraRedlineTbl::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("swExtraRedlineTbl"));
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
+
+for (sal_uInt16 nCurExtraRedlinePos = 0; nCurExtraRedlinePos < GetSize(); 
++nCurExtraRedlinePos)
+{
+const SwExtraRedline* pExtraRedline = GetRedline(nCurExtraRedlinePos);
+xmlTextWriterStartElement(pWriter, BAD_CAST("swExtraRedline"));
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", 
this);
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("symbol"), "%s", 
BAD_CAST(typeid(*pExtraRedline).name()));
+xmlTextWriterEndElement(pWriter);
+}
+xmlTextWriterEndElement(pWriter);
+}
+
 #if OSL_DEBUG_LEVEL > 0
 bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
 {
diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index 43f628a..ad37ca1 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -292,34 +292,4 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w ) const
 writer.endElement();
 }
 
-void SwExtraRedlineTbl::dumpAsXml( xmlTextWriterPtr w ) const
-{
-WriterHelper writer( w );
-
-writer.startElement( "swextraredlinetbl" );
-writer.writeFormatAttribute( "ptr", "%p", this );
-
-const SwExtraRedlineTbl& extraRedlineTbl = (*this);
-
-for( sal_uInt16 nCurExtraRedlinePos = 0; nCurExtraRedlinePos < GetSize(); 
++nCurExtraRedlinePos )
-{
-const SwExtraRedline* pExtraRedline = extraRedlineTbl.GetRedline( 
nCurExtraRedlinePos );
-
-writer.startElement( "swextraredline" );
-{
-const SwTableRowRedline*   pTableRowRedline   = 
dynamic_cast(pExtraRedline);
-const SwTableCellRedline*  pTableCellRedline  = 
dynamic_cast(pExtraRedline);
-if (pTableRowRedline)
-writer.writeFormatAttribute( "extra_redline_type", "%s", 
BAD_CAST( "table row" ) );
-else if (pTableCellRedline)
-writer.writeFormatAttribute( "extra_redline_type", "%s", 
BAD_CAST( "table cell" ) );
-else
-writer.writeFormatAttribute( "extra_redline_type", "%s", 
BAD_CAST( "UNKNOWN" ) );
-}
-writer.endElement( );// extra_redline_data
-}
-
-writer.endElement( );// swextraredlinetbl
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

65 matches

Mail list logo