LibreOffice Gerrit News for core on 2014-02-08

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ fdo#52547 SOT: Prefer embedding image data to embedding linked image.
  in https://gerrit.libreoffice.org/7928 from Andrzej Hunt
  about module sot
+ Bug #63962 Dynamically scan the config directory for icon themes
  in https://gerrit.libreoffice.org/7935 from Tobias Lippert
  about module cui, framework, include, sfx2, svtools, vcl
+ Replace handwritten reference counting with stl shared_ptr
  in https://gerrit.libreoffice.org/7934 from Tobias Lippert
  about module include, vcl
+ Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxx
  in https://gerrit.libreoffice.org/7933 from Tobias Lippert
  about module accessibility, avmedia, basctl, basic, chart2, cui, dbaccess, 
desktop, drawinglayer, editeng, extensions, filter, forms, formula, fpicker, 
framework, include, oox, padmin, reportdesign, sc, scripting, sd, sdext, sfx2, 
slideshow, starmath, svtools, svx, sw, toolkit, uui, vcl, writerfilter, 
xmlsecurity
+ fdo#52461 Multiple instances of same cell now get same color.
  in https://gerrit.libreoffice.org/7514 from Rachit Gupta
  about module sc
+ FDO#74430: File Corruption due to repetition of docPr Id
  in https://gerrit.libreoffice.org/7916 from Umesh Kadam
  about module chart2, sw
+ fdo#69646 Export of table with auto-width, at least one column with auto-
  in https://gerrit.libreoffice.org/7594 from Sushil Shinde
  about module sw
+ fdo#69656 table with auto-width and at least one column with auto-width.
  in https://gerrit.libreoffice.org/7593 from Sushil Shinde
  about module offapi, sw, writerfilter
 End of freshness 

+ Linked with -> Inherit from in style dialog (Which indicates that there i
  in https://gerrit.libreoffice.org/7941 from Alexander Wilms
  about module sfx2
+ The accessibleaction click changed name to press, adjust wrapper
  in https://gerrit.libreoffice.org/7932 from Niklas Johansson
  about module vcl
+ fdo#74424 HasMirroredGraphics changes
  in https://gerrit.libreoffice.org/7912 from Chris Sherlock
  about module include, vcl
+ remove SvStream::operator>> methods
  in https://gerrit.libreoffice.org/7915 from Noel Grandin
  about module cppcanvas, idl, include, sc, starmath, svl, sw, vcl
+ more SvStream:operator>> conversion
  in https://gerrit.libreoffice.org/7895 from Noel Grandin
  about module basic, editeng, idl, include, sc, sd, sot, svl, svtools, svx, 
sw, tools, vcl
+ convert SvStream::operator>> methods to ReadXXX methods
  in https://gerrit.libreoffice.org/7879 from Noel Grandin
  about module basctl, basic, chart2, compilerplugins, connectivity, cppcanvas, 
dbaccess, desktop, editeng, extensions, filter, idl, include, linguistic, 
lotuswordpro, sc, sd, sfx2, sot, starmath, svl, svtools, svx, sw, toolkit, 
tools, vcl, writerfilter
+ fdo#74137: Fix for courruption of Pie chart after roundtrip.
  in https://gerrit.libreoffice.org/7910 from Rohit Deshmukh
  about module chart2, oox


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

+ fdo#74499: - FILESAVE:System throws a segmentation fault while saving fil
  in https://gerrit.libreoffice.org/7894 from Tushar Bende
+ Use css namespace alias
  in https://gerrit.libreoffice.org/7917 from Chris Sherlock
+ Remove useless comment decorations
  in https://gerrit.libreoffice.org/7914 from Chris Sherlock
+ Remove commented code in OutputDevice::ReMirror
  in https://gerrit.libreoffice.org/7913 from Chris Sherlock
+ Related: fdo#35105 initially map HEADING to ATK_ROLE_HEADING
  in https://gerrit.libreoffice.org/7834 from Ioan Radu
+ Renamed VCL's OutputDevice mirroring functions
  in https://gerrit.libreoffice.org/7911 from Chris Sherlock
+ Document OutputDevice class
  in https://gerrit.libreoffice.org/7892 from Chris Sherlock
+ Group like Impl* functions in outdev.hxx
  in https://gerrit.libreoffice.org/7890 from Chris Sherlock
+ Change from com::sun::star and ::com::sun::star to css alias.
  in https://gerrit.libreoffice.org/7889 from Chris Sherlock
+ Reindent outdev.hxx - minor formatting change
  in https://gerrit.libreoffice.org/7888 from Chris Sherlock
+ fdo#60586 - [Template manager] Switching tabs does not update breadcrumbs
  in https://gerrit.libreoffice.org/7905 from Joren De Cuyper
+ fdo#74506 fdo#74291 -Template manager-store selection before calling dial
  in https://gerrit.libreoffice.org/7902 from Joren De Cuyper
+ fdo#65430 add OnItemDblClicked and setOpenTemplateHdl in templateSearchVi
  in https://gerrit.libreoffice.org/7918 from Joren De Cuyper
+ fdo#69358 only draw native style when toolbar is docked on top
  in https://gerrit.libreoffice.org/7920 from Joren De Cuyper
+ fdo#39468 Translate German comments
  in https://gerrit.libreoffice.org/7921 from Sven Wehner
+ sidebar: even more cleanup of text panel
  in https://gerrit.libreoffice.org/7893 from Maxim Monastirsky
+ fdo#73374 Trendline: correct R^2 for forced intercept
  in https

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

[Kohei Yoshida]

 sc/qa/unit/subsequent_export-test.cxx |  127 --
 xmloff/source/style/cdouthdl.cxx  |2 
 2 files changed, 106 insertions(+), 23 deletions(-)

New commits:
commit 503b7191737eafa5621dc0aa552092793676c998
Author: Kohei Yoshida 
Date:   Fri Feb 7 21:47:19 2014 -0500

fdo#73281: Why!?

This restriction makes absolutely no sense.  It was likely someone's
temporarily hack that was totally forgotten in the past 10 years...

Not to mention removing this fixes my bug.

Change-Id: I7394cccdc9fe486fda6cdd9b7eaf98fd291895a9

diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index e2bf0e2..d559eb8 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -135,7 +135,7 @@ bool XMLCrossedOutTypePropHdl::exportXML( OUString& 
rStrExpValue, const uno::Any
 sal_Int16 nValue = sal_Int16();
 OUStringBuffer aOut;
 
-if( (rValue >>= nValue) && awt::FontStrikeout::DOUBLE==nValue )
+if (rValue >>= nValue)
 {
 bRet = SvXMLUnitConverter::convertEnum(
 aOut, (sal_uInt16)nValue, pXML_CrossedoutType_Enum );
commit 27251f37e564ed7b83891875d7d269ff21f18fd9
Author: Kohei Yoshida 
Date:   Fri Feb 7 21:46:33 2014 -0500

fdo#73281: Write an export test for strike-through text attribute.

Change-Id: Ib9cffac17a8f2e0bb016952ae5dd1b00bd4fc9f9

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 5e67df9..47278e0 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -41,6 +41,7 @@
 #include "editeng/eeitem.hxx"
 #include "editeng/editobj.hxx"
 #include "editeng/section.hxx"
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -340,6 +341,45 @@ void ScExportTest::testMiscRowHeightExport()
 miscRowHeightsTest( aTestValues, SAL_N_ELEMENTS(aTestValues) );
 }
 
+namespace {
+
+void setAttribute( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart, 
sal_Int32 nEnd, sal_uInt16 nType )
+{
+ESelection aSel;
+aSel.nStartPara = aSel.nEndPara = nPara;
+aSel.nStartPos = nStart;
+aSel.nEndPos = nEnd;
+
+SfxItemSet aItemSet = rEE.GetEmptyItemSet();
+switch (nType)
+{
+case EE_CHAR_WEIGHT:
+{
+SvxWeightItem aWeight(WEIGHT_BOLD, nType);
+aItemSet.Put(aWeight);
+rEE.QuickSetAttribs(aItemSet, aSel);
+}
+break;
+case EE_CHAR_ITALIC:
+{
+SvxPostureItem aItalic(ITALIC_NORMAL, nType);
+aItemSet.Put(aItalic);
+rEE.QuickSetAttribs(aItemSet, aSel);
+}
+break;
+case EE_CHAR_STRIKEOUT:
+{
+SvxCrossedOutItem aCrossOut(STRIKEOUT_SINGLE, nType);
+aItemSet.Put(aCrossOut);
+rEE.QuickSetAttribs(aItemSet, aSel);
+}
+break;
+default:
+;
+}
+}
+
+}
 
 void ScExportTest::testNamedRangeBugfdo62729()
 {
@@ -406,6 +446,23 @@ void ScExportTest::testRichTextExportODS()
 return false;
 }
 
+static bool isStrikeOut(const editeng::Section& rAttr)
+{
+if (rAttr.maAttributes.empty())
+return false;
+
+std::vector::const_iterator it = 
rAttr.maAttributes.begin(), itEnd = rAttr.maAttributes.end();
+for (; it != itEnd; ++it)
+{
+const SfxPoolItem* p = *it;
+if (p->Which() != EE_CHAR_STRIKEOUT)
+continue;
+
+return static_cast(p)->GetStrikeout() == STRIKEOUT_SINGLE;
+}
+return false;
+}
+
 bool checkB2(const EditTextObject* pText) const
 {
 if (!pText)
@@ -498,6 +555,38 @@ void ScExportTest::testRichTextExportODS()
 return true;
 }
 
+bool checkB6(const EditTextObject* pText) const
+{
+if (!pText)
+return false;
+
+if (pText->GetParagraphCount() != 1)
+return false;
+
+if (pText->GetText(0) != "Strike Me")
+return false;
+
+std::vector aSecAttrs;
+pText->GetAllSections(aSecAttrs);
+if (aSecAttrs.size() != 2)
+return false;
+
+// Check the first strike-out section.
+const editeng::Section* pAttr = &aSecAttrs[0];
+if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 0 || pAttr->mnEnd 
!= 6)
+return false;
+
+if (pAttr->maAttributes.size() != 1 || !isStrikeOut(*pAttr))
+return false;
+
+// The last section should be unformatted.
+pAttr = &aSecAttrs[1];
+if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 6 || pAttr->mnEnd 
!= 9)
+return false;
+
+return true;
+}
+
 } aCheckFunc;
 
 // Start 

[Libreoffice-commits] core.git: 5 commits - include/oox include/svx include/xmloff offapi/com oox/source sw/inc sw/qa sw/source xmloff/source

[Zolnai Tamás]

 include/oox/drawingml/drawingmltypes.hxx|6 +
 include/svx/sdtaitm.hxx |1 
 include/xmloff/xmltypes.hxx |1 
 offapi/com/sun/star/text/BaseFrameProperties.idl|8 ++
 oox/source/drawingml/drawingmltypes.cxx |   39 +
 oox/source/drawingml/fillpropertiesgroupcontext.cxx |   10 --
 oox/source/drawingml/textbodypropertiescontext.cxx  |   13 ---
 oox/source/export/drawingml.cxx |   17 
 oox/source/shape/WpsContext.cxx |8 ++
 sw/inc/format.hxx   |1 
 sw/inc/frmatr.hxx   |4 +
 sw/inc/hintids.hxx  |   47 ++--
 sw/inc/swatrset.hxx |2 
 sw/inc/unoprnms.hxx |1 
 sw/qa/extras/odfexport/data/textframe-vertadjust.odt|binary
 sw/qa/extras/odfexport/odfexport.cxx|   15 +++
 sw/qa/extras/ooxmlexport/data/dml-textframe-vertadjust.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   16 
 sw/source/core/bastyp/init.cxx  |3 
 sw/source/core/unocore/unoframe.cxx |   13 +++
 sw/source/core/unocore/unomap.cxx   |5 +
 sw/source/filter/html/css1atr.cxx   |2 
 sw/source/filter/html/htmlatr.cxx   |2 
 sw/source/filter/ww8/docxsdrexport.cxx  |6 +
 xmloff/source/text/txtprhdl.cxx |   17 +++-
 xmloff/source/text/txtprmap.cxx |1 
 26 files changed, 179 insertions(+), 59 deletions(-)

New commits:
commit 38ce69a1d10bd18b45b192ee4a5e650f817be676
Author: Zolnai Tamás 
Date:   Sat Feb 8 00:15:02 2014 +0100

drawingML: remove code duplication: use GetRelativeRect()

Change-Id: I7368ad15292c82e5320deb9ab60e04f70d0c92b8

diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx 
b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index 8483e81..ad8cf41 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -229,15 +229,7 @@ ContextHandlerRef BlipFillContext::onCreateContext(
 return new BlipContext( *this, rAttribs, mrBlipProps );
 
 case A_TOKEN( srcRect ):
-{
-OUString aDefault( "0" );
-::com::sun::star::geometry::IntegerRectangle2D aClipRect;
-aClipRect.X1 = GetPercent( rAttribs.getString( XML_l, aDefault 
) );
-aClipRect.Y1 = GetPercent( rAttribs.getString( XML_t, aDefault 
) );
-aClipRect.X2 = GetPercent( rAttribs.getString( XML_r, aDefault 
) );
-aClipRect.Y2 = GetPercent( rAttribs.getString( XML_b, aDefault 
) );
-mrBlipProps.moClipRect = aClipRect;
-}
+mrBlipProps.moClipRect = GetRelativeRect( 
rAttribs.getFastAttributeList() );
 break;
 
 case A_TOKEN( tile ):
commit aec959dea00bfb362377fe1007da1f381f45559e
Author: Zolnai Tamás 
Date:   Sat Feb 8 00:07:03 2014 +0100

drawingML: remove code duplication: use WriteStretch()

Change-Id: I0d589da01bf6afed86b5811d6b27f72f6e1bb160

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f2dd046..22a1d97 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -828,9 +828,7 @@ void DrawingML::WriteBlipMode( Reference< XPropertySet > 
rXPropSet )
 mpFS->singleElementNS( XML_a, XML_tile, FSEND );
 break;
 case BitmapMode_STRETCH:
-mpFS->startElementNS( XML_a, XML_stretch, FSEND );
-mpFS->singleElementNS( XML_a, XML_fillRect, FSEND );
-mpFS->endElementNS( XML_a, XML_stretch );
+WriteStretch();
 break;
 default:
 ;
commit feae30c4ce1a1aa303500371b858f871d4ef88fc
Author: Zolnai Tamás 
Date:   Sat Feb 8 01:50:55 2014 +0100

ODF export/import: text vertical adjustment attribute of text frames

ODF standard handle 'textarea-vertical-align' as a
'graphic-property' which "specifies formatting
properties for chart, draw, graphic, and frame elements".
So this change fit to the standard.

Change-Id: I956f512953380983c2c882e943178335fd4dbfeb

diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx
index 55cac83..3c8d737 100644
--- a/include/xmloff/xmltypes.hxx
+++ b/include/xmloff/xmltypes.hxx
@@ -276,6 +276,7 @@
 
 #define XML_TYPE_CHAR_SCRIPT(XML_TEXT_TYPES_START + 116)
 #define XML_TYPE_CHAR_RFC_LANGUAGE_TAG  (XML_TEXT_TYPES_START + 117)
+#define XML_TYPE_VERTICAL_ALIGN (XML_TEXT_TYPES_START + 118)
 
 #define 

Gerrit turorial in the Wiki: Bad file permission

[Alexander Wilms]

Hi,

one issue that I noticed when following the tutorial 
(https://wiki.documentfoundation.org/Development/gerrit) was that the 
.ssh/config file had bad permissions after creating it via gedit. Thus, 
"./logerrit test" failed. chmod 600 fixed this, so I'm wondering whether 
this should be mentioned in the Wiki?


Cheers,

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

HiDPI for Mac, Windows, etc.

[Keith Curtis]

Hi;

Norbert has done a patch to master that should turn off the Mac
auto-doubling mode, but it doesn't appear to be doing anything. This
is confusing, but once it does work, then people can begin to decide
whether the benefits outweigh the disadvantages of turning off
compatibility mode now. (If not, then what should be done to tip the
balance?)

Also, no one has of yet tried to see what happens on Windows and no
one has responded with the right hardware on the QA alias:
http://nabble.documentfoundation.org/Libreoffice-qa-HiDPI-testing-for-LibreOffice-4-2-1-td4095055.html

If the patches can get into a pre-release, it can get out to more
people who can find or help fix problems.

The change should be quite safe in that it only kicks in when the OS
returns >=144 dpi. One can almost think of this as an experimental
mode because so few OSes return that currently. This means it won't
enable the behavior in a number of machines that need it, but it
should be enough to be worthwhile, and allow input from more people. I
could try to submit a patch to enable it for more DEs and versions of
Windows, but it is perhaps better to be conservative initially. Xfce
already allows you to set the DPI. Maybe the next version of Unity
will be smart enough to return 192 dpi sometimes like Gnome 3.10 does?
It would be nice to get some testing on Ubuntu.

I'm not sure what to do next, and so I email you.

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

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

[Michael Stahl]

 editeng/qa/unit/core-test.cxx   |4 ++--
 editeng/source/editeng/edtspell.cxx |8 
 editeng/source/editeng/edtspell.hxx |2 +-
 editeng/source/misc/svxacorr.cxx|6 +++---
 include/editeng/svxacorr.hxx|2 +-
 sw/source/core/edit/acorrect.cxx|9 +
 sw/source/core/inc/acorrect.hxx |2 +-
 7 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit ebd0d0056d89a6a69d2cb75e28758132cb5c236b
Author: Michael Stahl 
Date:   Sat Feb 8 00:23:10 2014 +0100

fdo#74363: fix auto correct of initial capitals on start of first para

The GetPrevPara() method apparently has to return 0 when there is no
previous paragraph.

(regression from ac85b6cff11d193f5f71d11b1f3cc1c474653f59)

Change-Id: I09a3e1d3a3adb33562e4e03c0755447047cbd433

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index bae28f4..2f7b7d8 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -267,10 +267,10 @@ private:
 //fprintf(stderr, "TestAutoCorrDoc::SetINetAttr\n");
 return true;
 }
-virtual OUString GetPrevPara( sal_Bool )
+virtual OUString const* GetPrevPara(bool)
 {
 //fprintf(stderr, "TestAutoCorrDoc::GetPrevPara\n");
-return OUString();
+return 0;
 }
 virtual bool ChgAutoCorrWord( sal_Int32& rSttPos,
 sal_Int32 nEndPos, SvxAutoCorrect& rACorrect,
diff --git a/editeng/source/editeng/edtspell.cxx 
b/editeng/source/editeng/edtspell.cxx
index 160a77e..1ee9734 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -696,7 +696,7 @@ sal_Bool EdtAutoCorrDoc::SetINetAttr(sal_Int32 nStt, 
sal_Int32 nEnd,
 return true;
 }
 
-OUString EdtAutoCorrDoc::GetPrevPara( sal_Bool )
+OUString const* EdtAutoCorrDoc::GetPrevPara(bool const)
 {
 // Return previous paragraph, so that it can be determined,
 // whether the current word is at the beginning of a sentence.
@@ -719,16 +719,16 @@ OUString EdtAutoCorrDoc::GetPrevPara( sal_Bool )
 bBullet = true;
 }
 if ( bBullet )
-return OUString();
+return 0;
 
 for ( sal_Int32 n = nPos; n; )
 {
 n--;
 ContentNode* pNode = rNodes[n];
 if ( pNode->Len() )
-return pNode->GetString();
+return & pNode->GetString();
 }
-return OUString();
+return 0;
 
 }
 
diff --git a/editeng/source/editeng/edtspell.hxx 
b/editeng/source/editeng/edtspell.hxx
index 2af8d1f..75e1ef0 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -147,7 +147,7 @@ public:
 virtual sal_BoolSetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 
nSlotId, SfxPoolItem& );
 virtual sal_BoolSetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const 
OUString& rURL );
 
-virtual OUStringGetPrevPara( sal_Bool bAtNormalPos );
+virtual OUString const* GetPrevPara(bool bAtNormalPos) SAL_OVERRIDE;
 
 virtual boolChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
   SvxAutoCorrect& rACorrect, OUString* pPara );
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 651b380..fcb91dd 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -865,8 +865,8 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& 
rDoc,
 {
 // Check out the previous paragraph, if it exists.
 // If so, then check to paragraph separator at the end.
-OUString aPrevPara = rDoc.GetPrevPara( bNormalPos );
-if( !aPrevPara.isEmpty() )
+OUString const*const pPrevPara = rDoc.GetPrevPara(bNormalPos);
+if (!pPrevPara)
 {
 // valid separator -> replace
 OUString sChar( *pWordStt );
@@ -875,7 +875,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& 
rDoc,
 rDoc.ReplaceRange( pWordStt - pStart, 1, sChar );
 }
 
-aText = aPrevPara;
+aText = *pPrevPara;
 bAtStart = sal_False;
 pStart = aText.getStr();
 pStr = pStart + aText.getLength();
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index ce43b62..97ca2f4 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -101,7 +101,7 @@ public:
 //  TRUE: before the normal insertion position (TRUE)
 //  FALSE: in which the corrected word was inserted.
 // (Does not to have to be the same paragraph )
-virtual OUString GetPrevPara( sal_Bool bAtNormalPos ) = 0;
+virtual OUString const* GetPrevPara(bool bAtNormalPos) = 0;
 
 virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
   SvxAutoCorrect& rACorrect,
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 33472cd..4d6c10e 100644
--- 

[Bug 67350] sanity check utility for help ids

[bugzilla-daemon]

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

--- Comment #3 from Mat M  ---
Hello

To confirm the goal:

With 
https://gerrit.libreoffice.org/gitweb?p=help.git;a=blob;f=source/text/sbasic/shared/01/0613.xhp;hb=297543fff266d60698d32021757ad9b419a9862c
line 43: 

We go to 
http://opengrok.libreoffice.org/xref/core/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
 
and we don't find libraries, which should raise an error

With 
https://gerrit.libreoffice.org/gitweb?p=help.git;a=blob;f=source/text/scalc/01/04070400.xhp;hb=297543fff266d60698d32021757ad9b419a9862c
line48: 

we go to 
http://opengrok.libreoffice.org/xref/core/sc/uiconfig/scalc/ui/namerangesdialog.ui#105
which has the edassign value, so is clear.


TY

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

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

[Kohei Yoshida]

 sc/qa/unit/ucalc.cxx|   52 +++-
 sc/qa/unit/ucalc.hxx|2 -
 sc/source/core/data/column3.cxx |4 ---
 3 files changed, 31 insertions(+), 27 deletions(-)

New commits:
commit 8f60dd0223f8834224b196153f0d8601403d76dc
Author: Kohei Yoshida 
Date:   Fri Feb 7 16:02:25 2014 -0500

fdo#74273: Let's not shift the note twice. Once is enough.

The notes already are shifted at the top of the function.  We don't
need this bottom one.

Change-Id: I10858d937674e236eecbc42ee08bf6eba197755a

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index ccd62e9..7da6860 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -291,10 +291,6 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
 maCellTextAttrs.erase(nStartRow, nEndRow);
 maCellTextAttrs.resize(MAXROWCOUNT);
 
-// Shift the cell notes array too (before the broadcast).
-maCellNotes.erase(nStartRow, nEndRow);
-maCellNotes.resize(MAXROWCOUNT);
-
 CellStorageModified();
 
 if (!bShiftCells)
commit 06c17598fb944aebcd0ef0783d2d4a81662208bb
Author: Kohei Yoshida 
Date:   Fri Feb 7 16:00:08 2014 -0500

fdo#74273: Adopt existing test to catch this.

Apparently having a non-empty cell where the note is makes the note take
a slightly different code path.

Change-Id: I23decb83eeb34ee9e16b4f56816648815f102db8

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 275e4a0..b91255e 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4763,59 +4763,67 @@ void Test::testNoteBasic()
 OUString aTabName2("Table2");
 m_pDoc->InsertTab(0, aTabName);
 
-ScAddress rAddr(2, 2, 0); // cell C3
-ScPostIt *pNote = m_pDoc->GetOrCreateNote(rAddr);
+ScAddress aAddr(2, 2, 0); // cell C3
+ScPostIt *pNote = m_pDoc->GetOrCreateNote(aAddr);
 
-pNote->SetText(rAddr, aHello);
+pNote->SetText(aAddr, aHello);
 pNote->SetAuthor(aJimBob);
 
-ScPostIt *pGetNote = m_pDoc->GetNote(rAddr);
-CPPUNIT_ASSERT_MESSAGE("note should be itself", pGetNote == pNote );
+ScPostIt *pGetNote = m_pDoc->GetNote(aAddr);
+CPPUNIT_ASSERT_MESSAGE("note should be itself", pGetNote == pNote);
 
 // Insert one row at row 1.
 bool bInsertRow = m_pDoc->InsertRow(0, 0, MAXCOL, 0, 1, 1);
 CPPUNIT_ASSERT_MESSAGE("failed to insert row", bInsertRow );
 
-CPPUNIT_ASSERT_MESSAGE("note hasn't moved", m_pDoc->GetNote(rAddr) == 
NULL);
-rAddr.IncRow(); // cell C4
-CPPUNIT_ASSERT_MESSAGE("note not there", m_pDoc->GetNote(rAddr) == pNote);
+CPPUNIT_ASSERT_MESSAGE("note hasn't moved", m_pDoc->GetNote(aAddr) == 
NULL);
+aAddr.IncRow(); // cell C4
+CPPUNIT_ASSERT_MESSAGE("note not there", m_pDoc->GetNote(aAddr) == pNote);
 
 // Insert column at column A.
 bool bInsertCol = m_pDoc->InsertCol(0, 0, MAXROW, 0, 1, 1);
 CPPUNIT_ASSERT_MESSAGE("failed to insert column", bInsertCol );
 
-CPPUNIT_ASSERT_MESSAGE("note hasn't moved", m_pDoc->GetNote(rAddr) == 
NULL);
-rAddr.IncCol(); // cell D4
-CPPUNIT_ASSERT_MESSAGE("note not there", m_pDoc->GetNote(rAddr) == pNote);
+CPPUNIT_ASSERT_MESSAGE("note hasn't moved", m_pDoc->GetNote(aAddr) == 
NULL);
+aAddr.IncCol(); // cell D4
+CPPUNIT_ASSERT_MESSAGE("note not there", m_pDoc->GetNote(aAddr) == pNote);
 
 // Insert a new sheet to shift the current sheet to the right.
 m_pDoc->InsertTab(0, aTabName2);
-CPPUNIT_ASSERT_MESSAGE("note hasn't moved", m_pDoc->GetNote(rAddr) == 
NULL);
-rAddr.IncTab(); // Move to the next sheet.
-CPPUNIT_ASSERT_MESSAGE("note not there", m_pDoc->GetNote(rAddr) == pNote);
+CPPUNIT_ASSERT_MESSAGE("note hasn't moved", m_pDoc->GetNote(aAddr) == 
NULL);
+aAddr.IncTab(); // Move to the next sheet.
+CPPUNIT_ASSERT_MESSAGE("note not there", m_pDoc->GetNote(aAddr) == pNote);
 
 m_pDoc->DeleteTab(0);
-rAddr.IncTab(-1);
-CPPUNIT_ASSERT_MESSAGE("note not there", m_pDoc->GetNote(rAddr) == pNote);
+aAddr.IncTab(-1);
+CPPUNIT_ASSERT_MESSAGE("note not there", m_pDoc->GetNote(aAddr) == pNote);
 
 // Insert cell at C4.  This should NOT shift the note position.
 bInsertRow = m_pDoc->InsertRow(2, 0, 2, 0, 3, 1);
 CPPUNIT_ASSERT_MESSAGE("Failed to insert cell at C4.", bInsertRow);
-CPPUNIT_ASSERT_MESSAGE("Note shouldn't have moved but it has.", 
m_pDoc->GetNote(rAddr) == pNote);
+CPPUNIT_ASSERT_MESSAGE("Note shouldn't have moved but it has.", 
m_pDoc->GetNote(aAddr) == pNote);
 
 // Delete cell at C4.  Again, this should NOT shift the note position.
 m_pDoc->DeleteRow(2, 0, 2, 0, 3, 1);
-CPPUNIT_ASSERT_MESSAGE("Note shouldn't have moved but it has.", 
m_pDoc->GetNote(rAddr) == pNote);
+CPPUNIT_ASSERT_MESSAGE("Note shouldn't have moved but it has.", 
m_pDoc->GetNote(aAddr) == pNote);
 
 // Now, with the note at D4, delete cell D3. This should shift the note 
one cell up.
 

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

[Eike Rathke]

 sc/source/core/data/column.cxx  |   29 -
 sc/source/core/data/column3.cxx |   28 
 2 files changed, 48 insertions(+), 9 deletions(-)

New commits:
commit 0d8253bc17cb5476fb558c0e17f5422d76f3e3db
Author: Eike Rathke 
Date:   Fri Feb 7 21:27:22 2014 +0100

resolved fdo#74622 re-intern shared strings copied between documents

(cherry picked from commit bba69a3449598eddc465e3467e52ff975fd81938)

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

Change-Id: I64719e12be1f1c61bc86c99f1698f35db87d97be
Reviewed-on: https://gerrit.libreoffice.org/7937
Tested-by: Kohei Yoshida 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 5e85ace..31da531 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1714,6 +1714,7 @@ class CopyByCloneHandler
 ScColumn& mrDestCol;
 sc::ColumnBlockPosition maDestPos;
 sc::ColumnBlockPosition* mpDestPos;
+svl::SharedStringPool* mpSharedStringPool;
 sal_uInt16 mnCopyFlags;
 
 void setDefaultAttrToDest(size_t nRow)
@@ -1827,8 +1828,10 @@ class CopyByCloneHandler
 }
 
 public:
-CopyByCloneHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, 
sc::ColumnBlockPosition* pDestPos, sal_uInt16 nCopyFlags) :
-mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos), 
mnCopyFlags(nCopyFlags)
+CopyByCloneHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, 
sc::ColumnBlockPosition* pDestPos,
+sal_uInt16 nCopyFlags, svl::SharedStringPool* pSharedStringPool) :
+mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos), 
mpSharedStringPool(pSharedStringPool),
+mnCopyFlags(nCopyFlags)
 {
 if (mpDestPos)
 maDestPos = *mpDestPos;
@@ -1896,8 +1899,18 @@ public:
 }
 else
 {
-maDestPos.miCellPos =
-mrDestCol.GetCellStore().set(maDestPos.miCellPos, 
nRow, rStr);
+if (mpSharedStringPool)
+{
+// Re-intern the string if source is a different 
document.
+svl::SharedString aInterned = 
mpSharedStringPool->intern( rStr.getString());
+maDestPos.miCellPos =
+
mrDestCol.GetCellStore().set(maDestPos.miCellPos, nRow, aInterned);
+}
+else
+{
+maDestPos.miCellPos =
+
mrDestCol.GetCellStore().set(maDestPos.miCellPos, nRow, rStr);
+}
 setDefaultAttrToDest(nRow);
 }
 }
@@ -1998,7 +2011,13 @@ void ScColumn::CopyToColumn(
 }
 else
 {
-CopyByCloneHandler aFunc(*this, rColumn, 
rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), nFlags);
+// Compare the ScDocumentPool* to determine if we are copying
+// within the same document. If not, re-intern shared strings.
+svl::SharedStringPool* pSharedStringPool =
+(pDocument->GetPool() != rColumn.pDocument->GetPool()) ?
+&rColumn.pDocument->GetSharedStringPool() : NULL;
+CopyByCloneHandler aFunc(*this, rColumn, 
rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), nFlags,
+pSharedStringPool);
 sc::ParseBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
 }
 
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 54b53f2..4fdaf11 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -683,6 +683,7 @@ class CopyCellsFromClipHandler
 long mnRowOffset;
 sc::ColumnBlockPosition maDestBlockPos;
 sc::ColumnBlockPosition* mpDestBlockPos; // to save it for next iteration.
+svl::SharedStringPool* mpSharedStringPool;
 
 bool isDateCell(SCROW nSrcRow) const
 {
@@ -713,7 +714,7 @@ class CopyCellsFromClipHandler
 }
 
 public:
-CopyCellsFromClipHandler(sc::CopyFromClipContext& rCxt, ScColumn& rSrcCol, 
ScColumn& rDestCol, SCTAB nDestTab, SCCOL nDestCol, long nRowOffset) :
+CopyCellsFromClipHandler(sc::CopyFromClipContext& rCxt, ScColumn& rSrcCol, 
ScColumn& rDestCol, SCTAB nDestTab, SCCOL nDestCol, long nRowOffset, 
svl::SharedStringPool* pSharedStringPool) :
 mrCxt(rCxt),
 mrSrcCol(rSrcCol),
 mrDestCol(rDestCol),
@@ -722,7 +723,8 @@ public:
 mnSrcTab(rSrcCol.GetTab()),
 mnSrcCol(rSrcCol.GetCol()),
 mnRowOffset(nRowOffset),
-mpDestBlockPos(mrCxt.getBlockPosition(nDestTab, nDestCol))
+mpDestBlockPos(mrCxt.getBlockPosition(nDestTab, nDestCol)),
+mpSharedStringPool(pSharedStringPool)
 {
 if (mpDestBlockPos)
 

Java not found after pull today

[Marcos Paulo de souza]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi guys, after a pull today, I'm getting this error:

checking the installed JDK... configure: error: Java not found. You need
at least jdk-1.5, or gcj-4

I have openjdk installed in my Fedora 20... and I installed gcj too..

I really don't know how to fix that :)

Can someone help me in this?
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJS9UojAAoJEIqCNZtY966qJb4H/3ElA70ARf1mMllqS+W9+puA
6mjdT0U9Kid6VX7qF8opIYdWy0BpjHi5Z+04joYSbNhbgssiCflPUuHr8uzIXps2
EAOwh+HJFBdaIbbI+HAnTdq1qQ16WwLzKnByLxdndqEjCoNZzcrHPBRl6WcTTF1d
dJHmwEuWiMLqXItS4B10j6TlUrX0TfDnhBIo+e7zdnidMwR+PuwqoXw3iHmioPZ8
GqRu8JwQ61P3Kc/5S0ikSFaiQY3Yf7IBZl9WUCY7dGaa65q5HWQDlcP7h0U23HvA
M19GSrZV2by5QkZ6tWeKGmdvTI/BmO6+sOIAxTEc+zHZraVlK88WMv0QAIdbQQ4=
=KNyd
-END PGP SIGNATURE-

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

Java not found after pull today

[Marcos Paulo de souza]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi guys, after a pull today, I'm getting this error:

checking the installed JDK... configure: error: Java not found. You need
at least jdk-1.5, or gcj-4

I have openjdk installed in my Fedora 20... and I installed gcj too..

I really don't know how to fix that :)

Can someone help me in this?
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJS9UojAAoJEIqCNZtY966qJb4H/3ElA70ARf1mMllqS+W9+puA
6mjdT0U9Kid6VX7qF8opIYdWy0BpjHi5Z+04joYSbNhbgssiCflPUuHr8uzIXps2
EAOwh+HJFBdaIbbI+HAnTdq1qQ16WwLzKnByLxdndqEjCoNZzcrHPBRl6WcTTF1d
dJHmwEuWiMLqXItS4B10j6TlUrX0TfDnhBIo+e7zdnidMwR+PuwqoXw3iHmioPZ8
GqRu8JwQ61P3Kc/5S0ikSFaiQY3Yf7IBZl9WUCY7dGaa65q5HWQDlcP7h0U23HvA
M19GSrZV2by5QkZ6tWeKGmdvTI/BmO6+sOIAxTEc+zHZraVlK88WMv0QAIdbQQ4=
=KNyd
-END PGP SIGNATURE-

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

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

[Caolán McNamara]

 chart2/inc/ChartView.hxx |3 ++-
 chart2/source/view/main/ChartView.cxx|2 +-
 vcl/unx/generic/dtrans/X11_selection.cxx |   11 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 6377907addf266d783ba741a7d4f425f86fb7b20
Author: Caolán McNamara 
Date:   Fri Feb 7 20:50:48 2014 +

coverity#705773 Resource leak

Change-Id: I630fc03502b7bc510313656ae11ae1159f2319ae

diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx 
b/vcl/unx/generic/dtrans/X11_selection.cxx
index c3b878d..ead695c 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -1194,12 +1194,15 @@ bool SelectionManager::getPasteData( Atom selection, 
const OUString& rType, Sequ
 
 sal_Int32 nOutSize = 0;
 sal_uInt8* pBytes = X11_getBmpFromPixmap( m_pDisplay, aPixmap, 
aColormap, nOutSize );
-if( pBytes && nOutSize )
+if( pBytes )
 {
-rData = Sequence< sal_Int8 >( nOutSize );
-memcpy( rData.getArray(), pBytes, nOutSize );
+if( nOutSize )
+{
+rData = Sequence< sal_Int8 >( nOutSize );
+memcpy( rData.getArray(), pBytes, nOutSize );
+bSuccess = true;
+}
 X11_freeBmp( pBytes );
-bSuccess = true;
 }
 }
 }
commit 4fe6abdf69488dd52806085f812b69317b0d2d49
Author: Caolán McNamara 
Date:   Fri Feb 7 20:47:18 2014 +

coverity#737046 Uncaught exception

Change-Id: Icc089ca0b320c7db0e00b48a787e1657d65514ae

diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 766563a..f44d952 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -191,7 +191,8 @@ public:
 
 // XDumper
 virtual OUString SAL_CALL dump()
-throw(::com::sun::star::uno::RuntimeException);
+throw(::com::sun::star::uno::RuntimeException,
+  std::exception);
 
 void setViewDirty();
 
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 001c786..3bdf762 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3014,7 +3014,7 @@ uno::Sequence< OUString > 
ChartView::getAvailableServiceNames() throw (uno::Runt
 return aServiceNames;
 }
 
-OUString ChartView::dump() throw (uno::RuntimeException)
+OUString ChartView::dump() throw (uno::RuntimeException, std::exception)
 {
 impl_updateView();
 if(!mxRootShape.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/view/viewprn.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit d32883b641724f7e9efa205a55068bc664660bbf
Author: Caolán McNamara 
Date:   Fri Feb 7 20:43:38 2014 +

coverity#735493 Logically dead code

Change-Id: Iddf09c1acb7d2e812b86c6f14f5394a6a266d258

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 2a82e00..c7bb3fc 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -871,8 +871,6 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 // so it will only be deleted here if dialog was cancelled
 DELETEZ( pDlgPrinter );
 rReq.Ignore();
-if ( SID_PRINTDOC == nId )
-rReq.SetReturnValue(SfxBoolItem(0,false));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/data/column.cxx  |   29 -
 sc/source/core/data/column3.cxx |   28 
 sc/source/core/data/column4.cxx |   12 ++--
 3 files changed, 58 insertions(+), 11 deletions(-)

New commits:
commit bba69a3449598eddc465e3467e52ff975fd81938
Author: Eike Rathke 
Date:   Fri Feb 7 21:27:22 2014 +0100

resolved fdo#74622 re-intern shared strings copied between documents

Change-Id: I64719e12be1f1c61bc86c99f1698f35db87d97be

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 52eb27e..7d10c20 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1714,6 +1714,7 @@ class CopyByCloneHandler
 ScColumn& mrDestCol;
 sc::ColumnBlockPosition maDestPos;
 sc::ColumnBlockPosition* mpDestPos;
+svl::SharedStringPool* mpSharedStringPool;
 sal_uInt16 mnCopyFlags;
 
 void setDefaultAttrToDest(size_t nRow)
@@ -1827,8 +1828,10 @@ class CopyByCloneHandler
 }
 
 public:
-CopyByCloneHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, 
sc::ColumnBlockPosition* pDestPos, sal_uInt16 nCopyFlags) :
-mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos), 
mnCopyFlags(nCopyFlags)
+CopyByCloneHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, 
sc::ColumnBlockPosition* pDestPos,
+sal_uInt16 nCopyFlags, svl::SharedStringPool* pSharedStringPool) :
+mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos), 
mpSharedStringPool(pSharedStringPool),
+mnCopyFlags(nCopyFlags)
 {
 if (mpDestPos)
 maDestPos = *mpDestPos;
@@ -1896,8 +1899,18 @@ public:
 }
 else
 {
-maDestPos.miCellPos =
-mrDestCol.GetCellStore().set(maDestPos.miCellPos, 
nRow, rStr);
+if (mpSharedStringPool)
+{
+// Re-intern the string if source is a different 
document.
+svl::SharedString aInterned = 
mpSharedStringPool->intern( rStr.getString());
+maDestPos.miCellPos =
+
mrDestCol.GetCellStore().set(maDestPos.miCellPos, nRow, aInterned);
+}
+else
+{
+maDestPos.miCellPos =
+
mrDestCol.GetCellStore().set(maDestPos.miCellPos, nRow, rStr);
+}
 setDefaultAttrToDest(nRow);
 }
 }
@@ -1998,7 +2011,13 @@ void ScColumn::CopyToColumn(
 }
 else
 {
-CopyByCloneHandler aFunc(*this, rColumn, 
rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), nFlags);
+// Compare the ScDocumentPool* to determine if we are copying
+// within the same document. If not, re-intern shared strings.
+svl::SharedStringPool* pSharedStringPool =
+(pDocument->GetPool() != rColumn.pDocument->GetPool()) ?
+&rColumn.pDocument->GetSharedStringPool() : NULL;
+CopyByCloneHandler aFunc(*this, rColumn, 
rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), nFlags,
+pSharedStringPool);
 sc::ParseBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
 }
 
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index b97e396..ccd62e9 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -683,6 +683,7 @@ class CopyCellsFromClipHandler
 long mnRowOffset;
 sc::ColumnBlockPosition maDestBlockPos;
 sc::ColumnBlockPosition* mpDestBlockPos; // to save it for next iteration.
+svl::SharedStringPool* mpSharedStringPool;
 
 void insertRefCell(SCROW nSrcRow, SCROW nDestRow)
 {
@@ -705,7 +706,7 @@ class CopyCellsFromClipHandler
 }
 
 public:
-CopyCellsFromClipHandler(sc::CopyFromClipContext& rCxt, ScColumn& rSrcCol, 
ScColumn& rDestCol, SCTAB nDestTab, SCCOL nDestCol, long nRowOffset) :
+CopyCellsFromClipHandler(sc::CopyFromClipContext& rCxt, ScColumn& rSrcCol, 
ScColumn& rDestCol, SCTAB nDestTab, SCCOL nDestCol, long nRowOffset, 
svl::SharedStringPool* pSharedStringPool) :
 mrCxt(rCxt),
 mrSrcCol(rSrcCol),
 mrDestCol(rDestCol),
@@ -714,7 +715,8 @@ public:
 mnSrcTab(rSrcCol.GetTab()),
 mnSrcCol(rSrcCol.GetCol()),
 mnRowOffset(nRowOffset),
-mpDestBlockPos(mrCxt.getBlockPosition(nDestTab, nDestCol))
+mpDestBlockPos(mrCxt.getBlockPosition(nDestTab, nDestCol)),
+mpSharedStringPool(pSharedStringPool)
 {
 if (mpDestBlockPos)
 maDestBlockPos = *mpDestBlockPos;
@@ -789,6 +791,12 @@ public:
 {
 if (bAsLink)
 insertRefCell(nSrcRow, nSrcRow + 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2d/6f7c351fd53de62af5262778173538942aa4b1

[Caolán McNamara]

 2d/6f7c351fd53de62af5262778173538942aa4b1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a20b6fc258c8ad4b402f17def69c5060aa6f0a8e
Author: Caolán McNamara 
Date:   Fri Feb 7 20:41:50 2014 +

Notes added by 'git notes add'

diff --git a/2d/6f7c351fd53de62af5262778173538942aa4b1 
b/2d/6f7c351fd53de62af5262778173538942aa4b1
new file mode 100644
index 000..e975ca5
--- /dev/null
+++ b/2d/6f7c351fd53de62af5262778173538942aa4b1
@@ -0,0 +1 @@
+merged as: b1e45c93e8e6339df6d7b7158029cbd9550c08cc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/osx/salinst.cxx  |2 +-
 vcl/source/window/window.cxx |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4fcaa8ee1f94799321596eab2f6fd2c768bbec9d
Author: Caolán McNamara 
Date:   Fri Feb 7 20:38:29 2014 +

coverity#441048 silence Dereference after null check

Change-Id: I3869657bbf20ac3152090a96428456c2a9eb9d14

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5163cc2..7ee6c70 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9040,6 +9040,7 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* 
pLayout, const Rectangle&
 OutputDevice *pOutDev = GetOutDev();
 pOutDev->ImplInitOutDevData();
 }
+assert(mpOutDevData);
 mpOutDevData->mpRecordLayout = pLayout;
 mpOutDevData->maRecordRect = rRect;
 Paint( rRect );
commit b1e45c93e8e6339df6d7b7158029cbd9550c08cc
Author: Herbert Dürr 
Date:   Fri Feb 7 14:29:20 2014 +

Related: #i124201# fix frame-list handling with AppleRemote events

(cherry picked from commit 2d6f7c351fd53de62af5262778173538942aa4b1)

Conflicts:
vcl/osx/salinst.cxx

Change-Id: I3f80bacd673f06be92406d397260d5b7bb0d1a19

diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 58b0f0f..723ad00 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -586,7 +586,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* 
pEvent )
 break;
 }
 AquaSalFrame* pFrame = pSalData->maFrames.front();
-Window * pWindow = pFrame->GetWindow() ? 
pSalData->maFrames.front()->GetWindow() : NULL;
+Window* pWindow = pFrame ? pFrame->GetWindow() : NULL;
 
 if( pWindow )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tushar Bende]

 sw/qa/extras/ooxmlexport/data/test_segfault_while_save.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|9 +
 2 files changed, 9 insertions(+)

New commits:
commit 1edca1fe0aaadbd48ea23b691dc244ad2a6b6f73
Author: Tushar Bende 
Date:   Thu Feb 6 15:45:30 2014 +0530

fdo#74499: - FILESAVE:System throws a segmentation fault while saving files

Description: Docx containing text frame giving segmentation fault while 
saving file.
Reason found is inside writeDMLTextFrame() it was getting SdrObject pointer 
which is NULL
and accessing this NULL pointer was giving seg fault.
issue is fixed with commit 4de30fa7fd6abb5c2ea2b63a0e306954f7acc1b1 here is 
the export test.

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

Change-Id: I0ab4bbf2126abbfa0fa37d2156aa3390ded0997c
Reviewed-on: https://gerrit.libreoffice.org/7894
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/ooxmlexport/data/test_segfault_while_save.docx 
b/sw/qa/extras/ooxmlexport/data/test_segfault_while_save.docx
new file mode 100644
index 000..1c364dd
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/test_segfault_while_save.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a192a3d..1284699 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2859,6 +2859,15 @@ DECLARE_OOXMLEXPORT_TEST(testPageref, "testPageref.docx")
 CPPUNIT_ASSERT(contents.match("PAGEREF _Toc355095261 \\h"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testSegFaultWhileSave, 
"test_segfault_while_save.docx")
+{
+// fdo#74499
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+CPPUNIT_ASSERT(getXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tblGrid/w:gridCol[2]", "w").match("6138"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a5/00e21d96e40159dd6969a3f494e8a10b571fed

[Caolán McNamara]

 a5/00e21d96e40159dd6969a3f494e8a10b571fed |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 89636dbbe5a1e8f6c0657d3b97d433b768bb7ecf
Author: Caolán McNamara 
Date:   Fri Feb 7 20:36:01 2014 +

Notes added by 'git notes add'

diff --git a/a5/00e21d96e40159dd6969a3f494e8a10b571fed 
b/a5/00e21d96e40159dd6969a3f494e8a10b571fed
new file mode 100644
index 000..e245b64
--- /dev/null
+++ b/a5/00e21d96e40159dd6969a3f494e8a10b571fed
@@ -0,0 +1 @@
+prefer: cda4ec28135cae431fa24fcbe5c36ee422d63b38
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f8/eebff890810dc4cc507db875c3402ce073765d

[Caolán McNamara]

 f8/eebff890810dc4cc507db875c3402ce073765d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8a33c14ae6813d5392c7dbe0d2e124e7e8e9dc04
Author: Caolán McNamara 
Date:   Fri Feb 7 20:28:46 2014 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 77/a3b588293e8c86131158c21aede3cbebf0ff2d

[Caolán McNamara]

 77/a3b588293e8c86131158c21aede3cbebf0ff2d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3171d996869e0ccb52a5111bf54afd42ad652fcb
Author: Caolán McNamara 
Date:   Fri Feb 7 20:30:31 2014 +

Notes added by 'git notes add'

diff --git a/77/a3b588293e8c86131158c21aede3cbebf0ff2d 
b/77/a3b588293e8c86131158c21aede3cbebf0ff2d
new file mode 100644
index 000..5842411
--- /dev/null
+++ b/77/a3b588293e8c86131158c21aede3cbebf0ff2d
@@ -0,0 +1 @@
+prefer: fbd82ae8835adf40930be35e7cf14ce812786224
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock]

 vcl/source/gdi/outdev.cxx |   48 ++
 1 file changed, 23 insertions(+), 25 deletions(-)

New commits:
commit 285de07b2b268d49aa92b462cb295ff58bf6452d
Author: Chris Sherlock 
Date:   Fri Feb 7 23:33:23 2014 +1100

Use css namespace alias

Change-Id: Icb1c96e9652d475438119b481641e0064e26ca16
Reviewed-on: https://gerrit.libreoffice.org/7917
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 39e02a6..dd7f733 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -61,8 +61,6 @@
 
 #include 
 
-using namespace ::com::sun::star;
-
 #ifdef DISABLE_DYNLOADING
 // Linking all needed LO code into one .so/executable, these already
 // exist in the tools library, so put them in the anonymous namespace
@@ -1399,7 +1397,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const 
Point& rEndPt )
 aB2DPolyLine = 
basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyLine);
 }
 
-if( mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, 
basegfx::B2DLINEJOIN_NONE, com::sun::star::drawing::LineCap_BUTT, this))
+if( mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, 
basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, this))
 {
 return;
 }
@@ -1503,7 +1501,7 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand(
 
 if(bTryAA)
 {
-bDone = mpGraphics->DrawPolyLine( aCandidate, 0.0, 
basegfx::B2DVector(1.0,1.0), basegfx::B2DLINEJOIN_NONE, 
com::sun::star::drawing::LineCap_BUTT, this);
+bDone = mpGraphics->DrawPolyLine( aCandidate, 0.0, 
basegfx::B2DVector(1.0,1.0), basegfx::B2DLINEJOIN_NONE, 
css::drawing::LineCap_BUTT, this);
 }
 
 if(!bDone)
@@ -1682,7 +1680,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly )
 aB2DPolyLine = 
basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyLine);
 }
 
-if(mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, 
basegfx::B2DLINEJOIN_NONE, com::sun::star::drawing::LineCap_BUTT, this))
+if(mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, 
basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, this))
 {
 return;
 }
@@ -1857,7 +1855,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly )
 0.0,
 aB2DLineWidth,
 basegfx::B2DLINEJOIN_NONE,
-com::sun::star::drawing::LineCap_BUTT,
+css::drawing::LineCap_BUTT,
 this);
 }
 
@@ -1950,7 +1948,7 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& 
rPolyPoly )
 0.0,
 aB2DLineWidth,
 basegfx::B2DLINEJOIN_NONE,
-com::sun::star::drawing::LineCap_BUTT,
+css::drawing::LineCap_BUTT,
 this);
 }
 }
@@ -2065,7 +2063,7 @@ void 
OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPo
 0.0,
 aB2DLineWidth,
 basegfx::B2DLINEJOIN_NONE,
-com::sun::star::drawing::LineCap_BUTT,
+css::drawing::LineCap_BUTT,
 this);
 }
 }
@@ -2087,7 +2085,7 @@ bool OutputDevice::ImpTryDrawPolyLineDirect(
 double fLineWidth,
 double fTransparency,
 basegfx::B2DLineJoin eLineJoin,
-com::sun::star::drawing::LineCap eLineCap)
+css::drawing::LineCap eLineCap)
 {
 const basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation();
 basegfx::B2DVector aB2DLineWidth(1.0, 1.0);
@@ -2127,7 +2125,7 @@ bool OutputDevice::TryDrawPolyLineDirect(
 double fLineWidth,
 double fTransparency,
 basegfx::B2DLineJoin eLineJoin,
-com::sun::star::drawing::LineCap eLineCap)
+css::drawing::LineCap eLineCap)
 {
 // AW: Do NOT paint empty PolyPolygons
 if(!rB2DPolygon.count())
@@ -2177,7 +2175,7 @@ void OutputDevice::DrawPolyLine(
 const basegfx::B2DPolygon& rB2DPolygon,
 double fLineWidth,
 basegfx::B2DLineJoin eLineJoin,
-com::sun::star::drawing::LineCap eLineCap)
+css::drawing::LineCap eLineCap)
 {
 
 if( mpMetaFile )
@@ -2520,10 +2518,10 @@ sal_Bool OutputDevice::HasAlpha()
 return mpAlphaVDev != NULL;
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > 
OutputDevice::CreateUnoGraphics()
+css::uno::Reference< css::awt::XGraphics > OutputDevice::CreateUnoGraphics()
 {
 UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
-return pWrapper ? pWrapper->CreateGraphics( this ) : 
::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >();
+return pWrapper ? pWrapper->CreateGraphics( this ) : css::uno::Reference< 
css::awt::XGraphics >();
 }

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

[Chris Sherlock]

 vcl/source/gdi/outdev.cxx |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit ed28cbb1ea7f2cb5e9ad88a0b49196b11db971ed
Author: Chris Sherlock 
Date:   Fri Feb 7 22:54:18 2014 +1100

Remove useless comment decorations

Change-Id: I652932b0a82641d01c6e64a3c8acc5c983cee022
Reviewed-on: https://gerrit.libreoffice.org/7914
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 4d716b1..39e02a6 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -90,12 +90,8 @@ const char* ImplDbgCheckOutputDevice( const void* pObj )
 }
 #endif
 
-// ===
-
 #define OUTDEV_POLYPOLY_STACKBUF32
 
-// ===
-
 struct ImplObjStack
 {
 ImplObjStack*   mpPrev;
@@ -198,9 +194,6 @@ bool OutputDevice::ImplSelectClipRegion( const Region& 
rRegion, SalGraphics* pGr
 return bClipRegion;
 }
 
-
-// ===
-
 Polygon ImplSubdivideBezier( const Polygon& rPoly )
 {
 Polygon aPoly;
@@ -211,8 +204,6 @@ Polygon ImplSubdivideBezier( const Polygon& rPoly )
 return aPoly;
 }
 
-// ===
-
 PolyPolygon ImplSubdivideBezier( const PolyPolygon& rPolyPoly )
 {
 sal_uInt16 i, nPolys = rPolyPoly.Count();
@@ -223,8 +214,6 @@ PolyPolygon ImplSubdivideBezier( const PolyPolygon& 
rPolyPoly )
 return aPolyPoly;
 }
 
-// ===
-
 // #100127# Extracted from OutputDevice::DrawPolyPolygon()
 void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& 
rPolyPoly )
 {
@@ -314,8 +303,6 @@ void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, 
const PolyPolygon& rPo
 }
 }
 
-// ===
-
 OutputDevice::OutputDevice() :
 maRegion(true),
 maFillColor( COL_WHITE ),
@@ -2009,7 +1996,6 @@ void OutputDevice::DrawPolygon( const 
basegfx::B2DPolygon& rB2DPolygon)
 }
 }
 
-// ---
 // Caution: This method is nearly the same as
 // OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, 
double fTransparency),
 // so when changes are made here do not forget to make change sthere, too
@@ -2572,7 +2558,6 @@ SystemGraphicsData OutputDevice::GetSystemGfxData() const
 uno::Reference xContext = 
comphelper::getProcessComponentContext();
 
 // Create canvas instance with window handle
-// =
 static uno::Reference xCanvasFactory( 
rendering::CanvasFactory::create( xContext ) );
 
 uno::Reference xCanvas;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock]

 vcl/source/gdi/outdev.cxx |   17 -
 1 file changed, 17 deletions(-)

New commits:
commit b634aa656a74e1f8ebeaf8a9092829294c49171d
Author: Chris Sherlock 
Date:   Fri Feb 7 22:50:28 2014 +1100

Remove commented code in OutputDevice::ReMirror

The following code was reimplemented in a cleaner fashion some time
ago. However, it was just commented out and never removed. There is
no need for it now, so removing. It's in the DVCS if it's really
needed :-)

Change-Id: Ia7d3c480ba70ccbd8dcf2808d9b712499c4cef4f
Reviewed-on: https://gerrit.libreoffice.org/7913
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 026b4b9..4d716b1 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -536,23 +536,6 @@ voidOutputDevice::ReMirror( Region &rRegion ) const
 
 rRegion = aMirroredRegion;
 
-//  longnX;
-//  longnY;
-//  longnWidth;
-//  longnHeight;
-//  ImplRegionInfo  aInfo;
-//  sal_BoolbRegionRect;
-//Region  aMirroredRegion;
-//
-//  bRegionRect = rRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight );
-//  while ( bRegionRect )
-//  {
-//Rectangle aRect( Point(nX, nY), Size(nWidth, nHeight) );
-//ImplReMirror( aRect );
-//aMirroredRegion.Union( aRect );
-//  bRegionRect = rRegion.ImplGetNextRect( aInfo, nX, nY, nWidth, nHeight 
);
-//  }
-//rRegion = aMirroredRegion;
 }
 
 SalGraphics* OutputDevice::ImplGetGraphics() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 sfx2/source/doc/templatedlg.cxx |   22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 57df90332e823d501744a87c8c94ad51ed5aead6
Author: Joren De Cuyper 
Date:   Thu Feb 6 16:36:07 2014 +0100

fdo#74506 fdo#74291 -Template manager-store selection before calling dialog

It looks like calling a dialog/querybox result in a deselection of
the selected ThumbnailViewItem(s). Therefore lets save this selection
first, before calling such dialog.

Change-Id: I45a1da4307759ca6472f793fff29b1e2507fd5c9
Reviewed-on: https://gerrit.libreoffice.org/7902
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit a411bf38da3668094698c06c8424aa9d68c85702)
Reviewed-on: https://gerrit.libreoffice.org/7925

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index e2b81d5..08608aa 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1079,7 +1079,7 @@ void SfxTemplateManagerDlg::OnTemplateExport()
 {
 sal_uInt16 i = 1;
 
-std::set::const_iterator pIter = 
maSelTemplates.begin();
+std::set::const_iterator pIter;
 for (pIter = maSelTemplates.begin(); pIter != 
maSelTemplates.end(); ++pIter, ++i)
 {
 const TemplateSearchViewItem *pItem = static_cast(*pIter);
@@ -1268,6 +1268,11 @@ void SfxTemplateManagerDlg::OnTemplateProperties ()
 
 void SfxTemplateManagerDlg::OnTemplateDelete ()
 {
+// Store selected templates before calling a dialog/QueryBox
+// which will result in a deselection of all ThumbnailViewItem.
+// Also avoid invalid iterators
+std::set aSelTemplates = 
maSelTemplates;
+
 QueryBox aQueryDlg(this, WB_YES_NO | WB_DEF_YES, 
SfxResId(STR_QMSG_SEL_TEMPLATE_DELETE).toString());
 
 if ( aQueryDlg.Execute() == RET_NO )
@@ -1277,8 +1282,6 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
 
 if (mpSearchView->IsVisible())
 {
-std::set aSelTemplates = 
maSelTemplates; //Avoids invalid iterators
-
 std::set::const_iterator 
pIter;
 for (pIter = aSelTemplates.begin(); pIter != aSelTemplates.end(); 
++pIter)
 {
@@ -1299,7 +1302,6 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
 else
 {
 sal_uInt16 nRegionItemId = mpLocalView->getCurRegionItemId();
-std::set aSelTemplates = 
maSelTemplates;  //Avoid invalid iterators
 
 std::set::const_iterator 
pIter;
 for (pIter = aSelTemplates.begin(); pIter != aSelTemplates.end(); 
++pIter)
@@ -1353,6 +1355,11 @@ void SfxTemplateManagerDlg::OnFolderNew()
 
 void SfxTemplateManagerDlg::OnFolderDelete()
 {
+// Store selected folders before calling a dialog/QueryBox
+// which will result in a deselection of all ThumbnailViewItem.
+// Also copy to avoid invalidating an iterator
+std::set aSelFolders = 
maSelFolders;
+
 QueryBox aQueryDlg(this, WB_YES_NO | WB_DEF_YES, 
SfxResId(STR_QMSG_SEL_FOLDER_DELETE).toString());
 
 if ( aQueryDlg.Execute() == RET_NO )
@@ -1361,7 +1368,6 @@ void SfxTemplateManagerDlg::OnFolderDelete()
 OUString aFolderList;
 
 std::set::const_iterator pIter;
-std::set aSelFolders = 
maSelFolders; //Copy to avoid invalidating an iterator
 
 for (pIter = aSelFolders.begin(); pIter != aSelFolders.end(); ++pIter)
 {
@@ -1396,6 +1402,10 @@ void SfxTemplateManagerDlg::OnRepositoryDelete()
 
 void SfxTemplateManagerDlg::OnTemplateSaveAs()
 {
+// Store selected folders before calling a dialog/QueryBox
+// which will result in a deselection of all ThumbnailViewItem
+std::set aSelFolders = 
maSelFolders;
+
 assert(m_xModel.is());
 
 if (!mpLocalView->isNonRootRegionVisible() && maSelFolders.empty())
@@ -1435,7 +1445,7 @@ void SfxTemplateManagerDlg::OnTemplateSaveAs()
 else
 {
 std::set::const_iterator pIter;
-for (pIter = maSelFolders.begin(); pIter != 
maSelFolders.end(); ++pIter)
+for (pIter = aSelFolders.begin(); pIter != aSelFolders.end(); 
++pIter)
 {
 TemplateContainerItem *pItem = 
(TemplateContainerItem*)(*pIter);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 sfx2/source/control/templatesearchview.cxx |   10 ++
 sfx2/source/doc/templatedlg.cxx|1 +
 sfx2/source/inc/templatesearchview.hxx |8 
 3 files changed, 19 insertions(+)

New commits:
commit 497a36366efece255303a82f6ea0c96677f3ae9f
Author: Joren De Cuyper 
Date:   Fri Feb 7 15:08:12 2014 +0100

fdo#65430 add OnItemDblClicked and setOpenTemplateHdl in templateSearchView

Currently only templateAbstractView had such handler, which are
templateLocalView and templateRemoteView are based on.

Change-Id: I6694d0804a8b7e58abc0ddc970e811d053394d6f
Reviewed-on: https://gerrit.libreoffice.org/7918
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 96e7225260aac0815643a4043f4ddb4e6b5764a1)
Reviewed-on: https://gerrit.libreoffice.org/7924

diff --git a/sfx2/source/control/templatesearchview.cxx 
b/sfx2/source/control/templatesearchview.cxx
index 2942b66..f0b87d2 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -20,6 +20,16 @@ TemplateSearchView::~TemplateSearchView ()
 {
 }
 
+void TemplateSearchView::setOpenTemplateHdl(const Link &rLink)
+{
+maOpenTemplateHdl = rLink;
+}
+
+void TemplateSearchView::OnItemDblClicked (ThumbnailViewItem *pItem)
+{
+maOpenTemplateHdl.Call(pItem);
+}
+
 void TemplateSearchView::AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 
nRegionId, sal_uInt16 nIdx,
 const OUString &rTitle, const OUString 
&rSubtitle,
 const OUString &rPath,
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index a31c235..e6e464c 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -236,6 +236,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 TEMPLATE_ITEM_PADDING);
 
 
mpSearchView->setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl));
+
mpSearchView->setOpenTemplateHdl(LINK(this,SfxTemplateManagerDlg,OpenTemplateHdl));
 
 
maTabControl.SetActivatePageHdl(LINK(this,SfxTemplateManagerDlg,ActivatePageHdl));
 
diff --git a/sfx2/source/inc/templatesearchview.hxx 
b/sfx2/source/inc/templatesearchview.hxx
index a6a81a3..f1bb49c 100644
--- a/sfx2/source/inc/templatesearchview.hxx
+++ b/sfx2/source/inc/templatesearchview.hxx
@@ -20,9 +20,17 @@ public:
 
 virtual ~TemplateSearchView();
 
+void setOpenTemplateHdl (const Link &rLink);
+
 void AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 
nIdx,
 const OUString &rTitle, const OUString &rSubtitle,
 const OUString &rPath, const BitmapEx &rImage );
+
+protected:
+virtual void OnItemDblClicked(ThumbnailViewItem *pItem);
+
+protected:
+Link maOpenTemplateHdl;
 };
 
 #endif // __SFX2_TEMPLATESEARCHVIEW_HXX__
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 sfx2/source/control/templatesearchview.cxx |   10 ++
 sfx2/source/doc/templatedlg.cxx|1 +
 sfx2/source/inc/templatesearchview.hxx |8 
 3 files changed, 19 insertions(+)

New commits:
commit af32163ce76cf1fb2087486f0dff03f3d45ab548
Author: Joren De Cuyper 
Date:   Fri Feb 7 15:08:12 2014 +0100

fdo#65430 add OnItemDblClicked and setOpenTemplateHdl in templateSearchView

Currently only templateAbstractView had such handler, which are
templateLocalView and templateRemoteView are based on.

Change-Id: I6694d0804a8b7e58abc0ddc970e811d053394d6f
Reviewed-on: https://gerrit.libreoffice.org/7918
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 96e7225260aac0815643a4043f4ddb4e6b5764a1)
Reviewed-on: https://gerrit.libreoffice.org/7923

diff --git a/sfx2/source/control/templatesearchview.cxx 
b/sfx2/source/control/templatesearchview.cxx
index 87bd69c..7ebfbeb 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -20,6 +20,16 @@ TemplateSearchView::~TemplateSearchView ()
 {
 }
 
+void TemplateSearchView::setOpenTemplateHdl(const Link &rLink)
+{
+maOpenTemplateHdl = rLink;
+}
+
+void TemplateSearchView::OnItemDblClicked (ThumbnailViewItem *pItem)
+{
+maOpenTemplateHdl.Call(pItem);
+}
+
 void TemplateSearchView::AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 
nRegionId, sal_uInt16 nIdx,
 const OUString &rTitle, const OUString 
&rSubtitle,
 const OUString &rPath,
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index ea35031..e2b81d5 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -241,6 +241,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 TEMPLATE_ITEM_PADDING);
 
 
mpSearchView->setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl));
+
mpSearchView->setOpenTemplateHdl(LINK(this,SfxTemplateManagerDlg,OpenTemplateHdl));
 
 
maTabControl.SetActivatePageHdl(LINK(this,SfxTemplateManagerDlg,ActivatePageHdl));
 
diff --git a/sfx2/source/inc/templatesearchview.hxx 
b/sfx2/source/inc/templatesearchview.hxx
index 2b35ded..f8c6e98 100644
--- a/sfx2/source/inc/templatesearchview.hxx
+++ b/sfx2/source/inc/templatesearchview.hxx
@@ -20,9 +20,17 @@ public:
 
 virtual ~TemplateSearchView();
 
+void setOpenTemplateHdl (const Link &rLink);
+
 void AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 
nIdx,
 const OUString &rTitle, const OUString &rSubtitle,
 const OUString &rPath, const BitmapEx &rImage );
+
+protected:
+virtual void OnItemDblClicked(ThumbnailViewItem *pItem);
+
+protected:
+Link maOpenTemplateHdl;
 };
 
 #endif // INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/core/bastyp/calc.cxx |3 +--
 sw/source/ui/app/appenv.cxx|9 +
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e44e7942929ba063715861abe53412c6d867cd50
Author: Michael Stahl 
Date:   Thu Feb 6 23:49:20 2014 +0100

fdo#74474: sw: fix Label wizard document creation (2 in 1)

Infinite loop in InsertLabEnvText() due to wrong handling of starting '<'.

(regression from fa469b2e00d83459faebe4c1fcb3ea1aac5fb20d)

(cherry picked from commit 7e61bfe813347949307cdf2876ead3cc42e4cd7b)

The function ReplacePoint() was changed to return a value but not all
call sites were adapted.
(regression from 263153842741d7ce21cc0bf1c5296a55a1138024)

(cherry picked from commit 9dbe5a576330b7fadd8838249d07aafe548a4ee2)

Change-Id: I33efd9ce61611e025dfc76047187826aa0f8dd84
Reviewed-on: https://gerrit.libreoffice.org/7931
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index b550bfb..8463ac8 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -512,8 +512,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, 
sal_uInt16 ins )
 }
 
 // At this point the "real" case variable has to be used
-OUString sTmpName( rStr );
-::ReplacePoint( sTmpName );
+OUString const sTmpName( ::ReplacePoint(rStr) );
 
 if( !ins )
 {
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index 63b614a6..acf8684 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -88,10 +88,11 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& 
rFldMgr, const OUString& r
 bool bField = false;
 
 sal_Int32 nPos = aLine.indexOf( '<' );
-if ( nPos != -1)
+if (0 != nPos)
 {
-sTmpText = aLine.copy( 0, nPos );
-aLine = aLine.copy( nPos );
+sal_Int32 const nCopy((nPos != -1) ? nPos : aLine.getLength());
+sTmpText = aLine.copy(0, nCopy);
+aLine = aLine.copy(nCopy);
 }
 else
 {
@@ -111,7 +112,7 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& 
rFldMgr, const OUString& r
 sal_uInt16 nCnt = 
comphelper::string::getTokenCount(sDBName, '.');
 if (nCnt >= 3)
 {
-::ReplacePoint(sDBName, true);
+sDBName = ::ReplacePoint(sDBName, true);
 SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, 
aEmptyOUStr, 0, &rSh );
 rFldMgr.InsertFld( aData );
 sRet = sDBName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/filter/oox/worksheethelper.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1f7c6c54eda9bfcd1e4ef9136ccdfec434efcd69
Author: Kohei Yoshida 
Date:   Fri Feb 7 14:39:42 2014 -0500

fdo#74535: Don't forget clear the edit engine before re-using it.

Else you'd get a very comical result.

Change-Id: Ie73145dee47a8583f2e9cdb7ddb4f2d66f361dc1
(cherry picked from commit 10da10ee6ba37f4861045d1f8db0022293433cec)
Reviewed-on: https://gerrit.libreoffice.org/7936
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index 32fc416..b334052 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1068,6 +1068,7 @@ void WorksheetGlobals::insertHyperlink( const 
CellAddress& rAddress, const OUStr
 {
 OUString aStr = aCell.getString(&rDoc.getDoc());
 ScFieldEditEngine& rEE = rDoc.getDoc().GetEditEngine();
+rEE.Clear();
 
 SvxURLField aURLField(rUrl, aStr, SVXURLFORMAT_REPR);
 SvxFieldItem aURLItem(aURLField, EE_FEATURE_FIELD);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit OpenID authentication

[Norbert Thiebaud]

On Fri, Feb 7, 2014 at 12:21 PM, Mat M  wrote:
> Hello
>
> My account (matm) is bound to my blogspot url which does not support openId
> 2.0 but
> only 1.1 (See the nice error I got: error:No openid.mode
> ns:http://specs.openid.net/auth/2.0)
>
> Neither I can login, nor can I bind another openid url providing 2.0 level.
>
> What is the solution ?

login with a new openid.. that will create a new user.. but a proper
email/name so I can identify it without ambiguity)
then ping me with the reference to the two account (email used/name etc..)
and I'll manually merge the 2 accounts

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

[Bug 63962] Remove LibreOffice icon themes hardcoding

[bugzilla-daemon]

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

--- Comment #11 from Tobias Lippert  ---
I have submitted the patch (along with two preparatory commits) to gerrit.
https://gerrit.libreoffice.org/7933
https://gerrit.libreoffice.org/7934
https://gerrit.libreoffice.org/7935

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

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

[Kohei Yoshida]

 sc/qa/unit/data/xlsx/hyperlinks.xlsx |binary
 sc/qa/unit/subsequent_filters-test.cxx   |   14 ++
 sc/source/filter/oox/worksheethelper.cxx |1 +
 3 files changed, 15 insertions(+)

New commits:
commit 10da10ee6ba37f4861045d1f8db0022293433cec
Author: Kohei Yoshida 
Date:   Fri Feb 7 14:39:42 2014 -0500

fdo#74535: Don't forget clear the edit engine before re-using it.

Else you'd get a very comical result.

Change-Id: Ie73145dee47a8583f2e9cdb7ddb4f2d66f361dc1

diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index 47b759d..0a560d1 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1068,6 +1068,7 @@ void WorksheetGlobals::insertHyperlink( const 
CellAddress& rAddress, const OUStr
 {
 OUString aStr = aCell.getString(&rDoc.getDoc());
 ScFieldEditEngine& rEE = rDoc.getDoc().GetEditEngine();
+rEE.Clear();
 
 SvxURLField aURLField(rUrl, aStr, SVXURLFORMAT_REPR);
 SvxFieldItem aURLItem(aURLField, EE_FEATURE_FIELD);
commit 36e7fca5fa87fc72cdc9315438d9437fae9aa3da
Author: Kohei Yoshida 
Date:   Fri Feb 7 14:23:24 2014 -0500

fdo#74535: Write unit test for importing hyperlinks from xlsx.

Change-Id: I64e053106cee396a09f2a4915c19fcb1d69e5e82

diff --git a/sc/qa/unit/data/xlsx/hyperlinks.xlsx 
b/sc/qa/unit/data/xlsx/hyperlinks.xlsx
new file mode 100644
index 000..5faea7d
Binary files /dev/null and b/sc/qa/unit/data/xlsx/hyperlinks.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 448a9fa..83841b3 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -89,6 +89,7 @@ public:
 void testBasicCellContentODS();
 void testRangeNameXLS();
 void testRangeNameXLSX();
+void testHyperlinksXLSX();
 void testHardRecalcODS();
 void testFunctionsODS();
 void testFunctionsExcel2010();
@@ -164,6 +165,7 @@ public:
 CPPUNIT_TEST(testBasicCellContentODS);
 CPPUNIT_TEST(testRangeNameXLS);
 CPPUNIT_TEST(testRangeNameXLSX);
+CPPUNIT_TEST(testHyperlinksXLSX);
 CPPUNIT_TEST(testHardRecalcODS);
 CPPUNIT_TEST(testFunctionsODS);
 CPPUNIT_TEST(testFunctionsExcel2010);
@@ -342,6 +344,18 @@ void ScFiltersTest::testRangeNameXLSX()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testHyperlinksXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("hyperlinks.", XLSX);
+ScDocument* pDoc = xDocSh->GetDocument();
+
+CPPUNIT_ASSERT_EQUAL(OUString("10:ABC10"), 
pDoc->GetString(ScAddress(0,1,0)));
+CPPUNIT_ASSERT_EQUAL(OUString("10:ABC11"), 
pDoc->GetString(ScAddress(0,2,0)));
+CPPUNIT_ASSERT_EQUAL(OUString("10:ABC12"), 
pDoc->GetString(ScAddress(0,3,0)));
+
+xDocSh->DoClose();
+}
+
 void ScFiltersTest::testHardRecalcODS()
 {
 ScDocShellRef xDocSh = loadDoc("hard-recalc.", ODS);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes of ESC call

[bfoman]

Jan Holesovsky-4 wrote
> * Crash reporter (Caolan)
> + probably let's kill that for now, and if there is interest in
> resurrecting it, let's
>   revert that / bring it back from history? [Kendy]
> + yes [Caolan]
> + not needed on Linux anyway, distros do it differently [Miklos]

Hi!
I think that having integrated multi-platform (Windows, Mac, Linux) crash
reporting central system, together with public statistical UI, on TDF infra,
would be a next big milestone for a QA efforts. Hope this will be achieved
in the future, maybe as GSOC project. There are already some open source
frameworks available, both for the crash reporting system (like Breakpad by
Google) and crash stats UI (like Socorro by Mozilla). Therefore I am little
worried for such discouraging tone... Please remember that Linux distros are
not 100% of LibreOffice world and having one central location for crash bugs
would be very helpful to better quality of the product.
Best regards.




--
View this message in context: 
http://nabble.documentfoundation.org/Minutes-of-ESC-call-tp4095941p4096119.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Gerrit OpenID authentication

[Mat M]

Hello

My account (matm) is bound to my blogspot url which does not support  
openId 2.0 but

only 1.1 (See the nice error I got: error:No openid.mode
ns:http://specs.openid.net/auth/2.0)

Neither I can login, nor can I bind another openid url providing 2.0 level.

What is the solution ?

Thanks for your help !

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

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

[Armin Le Grand]

 svx/source/dialog/hyprdlg.hxx  |1 -
 svx/source/dialog/hyprlink.cxx |   22 ++
 2 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit a500e21d96e40159dd6969a3f494e8a10b571fed
Author: Armin Le Grand 
Date:   Fri Feb 7 16:52:18 2014 +

i124197 allow URL Toolbar to send URLs to the app more than once

diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
index 35443bc..bee1b6d 100644
--- a/svx/source/dialog/hyprdlg.hxx
+++ b/svx/source/dialog/hyprdlg.hxx
@@ -93,7 +93,6 @@ private:
 PopupMenu   aLinkPopup;
 PopupMenu   *pTargetMenu;
 sal_BoolbNoDoc;
-sal_BoolbSend;
 sal_BoolbHasOldName;
 longnMaxWidth;
 longnMinWidth;
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index c166bd8..db68cf4 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -114,7 +114,6 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, 
Window* pParent) :
 pTargetMenu ( NULL ),
 
 bNoDoc  ( sal_True ),
-bSend   ( sal_False ),
 bHasOldName ( sal_False ),
 bHtmlMode   ( sal_False )
 
@@ -344,8 +343,7 @@ IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox )
 {
 case BTN_LINK:
 {
-if (!bSend) // Link ins Dokument einfuegen
-SendToApp(HLINK_DEFAULT);
+SendToApp(HLINK_DEFAULT);
 }
 break;
 
@@ -650,12 +648,23 @@ void SvxHyperlinkDlg::EnableLink()
 
 void SvxHyperlinkDlg::SendToApp(sal_uInt16 nType)
 {
+static bool bAlreadyWorking(false);
+
+if(bAlreadyWorking)
+{
+OSL_ENSURE(false, "SvxHyperlinkDlg::SendToApp called to potentially 
run recursively, please check (!)");
+return;
+}
+
+bAlreadyWorking = true;
 sal_Bool bIsFile = sal_False;
-bSend = sal_True;
 String sURL( aUrlCB.GetText() );
 
 if ( !sURL.Len() )
+{
+bAlreadyWorking = false;
 return;
+}
 
 String aBase = 
GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL();
 INetURLObject aObj( URIHelper::SmartRel2Abs( INetURLObject(aBase), sURL, 
URIHelper::GetMaybeFileHdl(), true, false,
@@ -674,7 +683,10 @@ void SvxHyperlinkDlg::SendToApp(sal_uInt16 nType)
 LeaveWait();
 QueryBox aBox( this, SVX_RES( RID_SVXQB_DONTEXIST ) );
 if ( aBox.Execute() == RET_NO )
+{
+bAlreadyWorking = false;
 return;
+}
 }
 else
 LeaveWait();
@@ -700,6 +712,8 @@ void SvxHyperlinkDlg::SendToApp(sal_uInt16 nType)
 
 if ( sURL != aUrlCB.GetText() )
 aUrlCB.SetText( sURL );
+
+bAlreadyWorking = false;
 }
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 cui/source/tabpages/tparea.cxx  |  111 +++-
 xmloff/source/draw/sdpropls.cxx |7 +-
 2 files changed, 68 insertions(+), 50 deletions(-)

New commits:
commit 38d0047da7f964c862360b48d88cc869ad376b6b
Author: Michael Stahl 
Date:   Fri Feb 7 18:25:39 2014 +0100

related: fdo#74230: Area tab page: prevent default gradient/hatch/bitmap

The Area dialog for shapes unfortunately makes it possible to set
gradients/hatching/bitmap that uses the default items in the
SfxItemPool.  These items however cannot be stored to ODF files, since
these are represented as elements, not as attributes on a
style:default-style; what we get for defaults is a somewhat silly
draw:fill="hatch" without an draw:fill-hatch-name.
So prevent the dialog from creating them by forcing a selection of an
entry in the list.

Change-Id: I67cc6dbbf7b491f06d094d4de1e9c3ffe79b01f5

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 2b25f14..b0397f3 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -1405,12 +1405,69 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& 
rAttrs )
 
 void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
 {
+bool isMissingHatching(false);
+bool isMissingGradient(false);
+bool isMissingBitmap(false);
 XFillStyle eXFS;
 if( rAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE )
 {
 eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rAttrs.
 Get( GetWhich( XATTR_FILLSTYLE ) ) 
).GetValue() );
 m_pTypeLB->SelectEntryPos( sal::static_int_cast< sal_uInt16 >( eXFS ) 
);
+
+if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLCOLOR))
+{
+XFillColorItem const& rColorItem(static_cast(
+rAttrs.Get(XATTR_FILLCOLOR)) );
+m_pLbColor->SelectEntry( rColorItem.GetColorValue() );
+m_pLbHatchBckgrdColor->SelectEntry( rColorItem.GetColorValue() );
+}
+
+if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLGRADIENT))
+{
+XFillGradientItem const& rGradientItem(
+static_cast(
+rAttrs.Get(XATTR_FILLGRADIENT)) );
+OUString  const aString( rGradientItem.GetName() );
+XGradient const aGradient( rGradientItem.GetGradientValue() );
+
+m_pLbGradient->SelectEntryByList(pGradientList, aString, 
aGradient);
+}
+if (!m_pLbGradient->GetSelectEntryCount())
+{   // avoid relying on pool default - cannot export that
+m_pLbGradient->SelectEntryPos(0); // anything better than nothing
+isMissingGradient = true;
+}
+
+if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLHATCH))
+{
+m_pLbHatching->SelectEntry( static_cast(
+rAttrs.Get(XATTR_FILLHATCH)).GetName() );
+}
+if (!m_pLbHatching->GetSelectEntryCount())
+{   // avoid relying on pool default - cannot export that
+m_pLbHatching->SelectEntryPos(0); // anything better than nothing
+isMissingHatching = true;
+}
+if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLBACKGROUND))
+{
+m_pCbxHatchBckgrd->Check( static_cast(
+rAttrs.Get(XATTR_FILLBACKGROUND)).GetValue() );
+}
+
+if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLBITMAP))
+{
+XFillBitmapItem const& rBitmapItem(
+static_cast(
+rAttrs.Get(XATTR_FILLBITMAP)));
+m_pLbBitmap->SelectEntry(rBitmapItem.GetName());
+}
+if (!m_pLbBitmap->GetSelectEntryCount())
+{   // avoid relying on pool default - cannot export that
+m_pLbBitmap->SelectEntryPos(0); // anything better than nothing
+isMissingBitmap = true;
+}
+
 switch( eXFS )
 {
 case XFILL_NONE:
@@ -1418,69 +1475,26 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
 break;
 
 case XFILL_SOLID:
-if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLCOLOR 
) )
-{
-XFillColorItem aColorItem( ( const XFillColorItem& )
-rAttrs.Get( XATTR_FILLCOLOR ) );
-
-m_pLbColor->SelectEntry( aColorItem.GetColorValue() );
-m_pLbHatchBckgrdColor->SelectEntry( 
aColorItem.GetColorValue() );
-}
 ClickColorHdl_Impl();
-
 break;
 
 case XFILL_GRADIENT:
-if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( 
XATTR_FILLGRADIENT ) )
-{
-XFillGradientItem aGradientItem( ( ( const 
XFillGradientItem& )
-   

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

[Stephan Bergmann]

 binaryurp/source/bridge.cxx |   16 
 binaryurp/source/reader.cxx |1 +
 binaryurp/source/writer.cxx |1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 2ed67ffacb14c3e33f91f9f1e78f553397beca38
Author: Stephan Bergmann 
Date:   Fri Feb 7 14:28:07 2014 +0100

fdo#56511 Don't unduly delay Bridge termination

When terminate is called from the Reader or Writer thread, the final 
terminate
was delayed until disposal of the BridgeFactory, as an unfortunate 
consequence
of always trying to join on the Reader and Writer.  Instead, forgo the join 
in
such a case and rely on the underlying osl::Thread becoming detached after
calling termiante.

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

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 31fc342..f27f377 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -255,10 +255,18 @@ void Bridge::terminate(bool final) {
 osl::MutexGuard g2(mutex_);
 tp = threadPool_;
 threadPool_ = 0;
-assert(!(reader_.is() && isThread(reader_.get(;
-std::swap(reader_, r);
-assert(!(writer_.is() && isThread(writer_.get(;
-std::swap(writer_, w);
+if (reader_.is()) {
+if (!isThread(reader_.get())) {
+r = reader_;
+}
+reader_.clear();
+}
+if (writer_.is()) {
+if (!isThread(writer_.get())) {
+w = writer_;
+}
+writer_.clear();
+}
 state_ = STATE_FINAL;
 }
 assert(!(r.is() && w.is()));
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 184f037..331e4b3 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -128,6 +128,7 @@ void Reader::execute() {
 SAL_WARN("binaryurp", "caught C++ exception '" << e.what() << '\'');
 }
 bridge_->terminate(false);
+bridge_.clear();
 }
 
 void Reader::readMessage(Unmarshal & unmarshal) {
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 3d5c199..edcb0f5 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -177,6 +177,7 @@ void Writer::execute() {
 OSL_TRACE(OSL_LOG_PREFIX "caught C++ exception '%s'", e.what());
 }
 bridge_->terminate(false);
+bridge_.clear();
 }
 
 void Writer::sendRequest(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Radu Ioan]

 vcl/unx/gtk/a11y/atkwrapper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 396d4f1c911770895900301f453b6d8f46243252
Author: Radu Ioan 
Date:   Mon Feb 3 23:52:37 2014 +0200

Related: fdo#35105 initially map HEADING to ATK_ROLE_HEADING

gets overwritten anyway, but its less confusing this way

Change-Id: Ib7da2b7787afa7804496337358f0ef6fc7d42b3e
Reviewed-on: https://gerrit.libreoffice.org/7834
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index ba1e558..b01abcd 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -214,7 +214,7 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
 ATK_ROLE_IMAGE,   // GRAPHIC
 ATK_ROLE_UNKNOWN, // GROUP_BOX - registered below
 ATK_ROLE_HEADER,
-ATK_ROLE_PARAGRAPH,   // HEADING - registered below
+ATK_ROLE_HEADING, // HEADING - registered below
 ATK_ROLE_TEXT,// HYPER_LINK - registered below
 ATK_ROLE_ICON,
 ATK_ROLE_INTERNAL_FRAME,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/data/dociter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit adb85f81cec5783a3a70045731401f73aa76d6f4
Author: Kohei Yoshida 
Date:   Fri Feb 7 11:52:16 2014 -0500

fdo#74507: Ensure that we have non-null pointer to ScColumn.

Else it would cause a null pointer dereferencing when "precision as shown"
option is set.

Change-Id: Ie8d2fdb916b575fff7e0217c45c18a2c799577cb
(cherry picked from commit 738bd2cfd446debbc0e08fb554276fa28c7d)
Reviewed-on: https://gerrit.libreoffice.org/7927
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 0fd07c7..d93ee06 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -165,7 +165,7 @@ bool ScValueIterator::GetThis(double& rValue, sal_uInt16& 
rErr)
 bNextColumn = true;
 }
 
-ScColumn* pCol = NULL;
+ScColumn* pCol = &(pDoc->maTabs[mnTab])->aCol[mnCol];
 if (bNextColumn)
 {
 // Find the next available column.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock]

 include/vcl/outdev.hxx |8 
 vcl/source/control/ilstbox.cxx |2 +-
 vcl/source/gdi/outdev.cxx  |   12 ++--
 vcl/source/gdi/outdev3.cxx |4 ++--
 vcl/source/window/decoview.cxx |2 +-
 vcl/source/window/dndevdis.cxx |2 +-
 vcl/source/window/dockmgr.cxx  |4 ++--
 vcl/source/window/floatwin.cxx |8 
 vcl/source/window/status.cxx   |2 +-
 vcl/source/window/window.cxx   |   40 
 vcl/source/window/window2.cxx  |4 ++--
 vcl/source/window/winproc.cxx  |4 ++--
 12 files changed, 46 insertions(+), 46 deletions(-)

New commits:
commit 455d970206b4d5dda8120bdc1958885c2607e354
Author: Chris Sherlock 
Date:   Fri Feb 7 22:10:11 2014 +1100

Renamed VCL's OutputDevice mirroring functions

I have renamed the following functions:

* ImplReMirror-> ReMirror
* ImplHasMirroredGraphics -> HasMirroredGraphics

This has been done because these functions are definitely public
and there is no need to prefix them with "Impl" as they are exposed
to other objects.

Change-Id: Ib52493c9824e29a038de2fc35736a5ca863c091a
Reviewed-on: https://gerrit.libreoffice.org/7911
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index f492621..7458475 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -755,10 +755,10 @@ public:
  */
 ///@{
 SAL_DLLPRIVATE sal_Bool ImplIsRecordLayout() const;
-SAL_DLLPRIVATE bool ImplHasMirroredGraphics() const;
-SAL_DLLPRIVATE void ImplReMirror( Point &rPoint ) const;
-SAL_DLLPRIVATE void ImplReMirror( Rectangle &rRect ) const;
-SAL_DLLPRIVATE void ImplReMirror( Region &rRegion ) const;
+SAL_DLLPRIVATE bool HasMirroredGraphics() const;
+SAL_DLLPRIVATE void ReMirror( Point &rPoint ) const;
+SAL_DLLPRIVATE void ReMirror( Rectangle &rRect ) const;
+SAL_DLLPRIVATE void ReMirror( Region &rRegion ) const;
 SAL_DLLPRIVATE SalLayout*   ImplLayout( const OUString&, sal_Int32 nIndex, 
sal_Int32 nLen,
 const Point& rLogicPos = 
Point(0,0), long nLogicWidth=0,
 const sal_Int32* 
pLogicDXArray=NULL, bool bFilter = false ) const;
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 4b07372..a3b6912 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3269,7 +3269,7 @@ void ImplListBoxFloatingWindow::StartFloat( sal_Bool 
bStartTracking )
 const OutputDevice *pGrandparentOutDev = pGrandparent->GetOutDev();
 
 if( pGrandparent->ImplIsAntiparallel() )
-pGrandparentOutDev->ImplReMirror( aRect );
+pGrandparentOutDev->ReMirror( aRect );
 
 StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN );
 
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 8174379..026b4b9 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -496,7 +496,7 @@ void OutputDevice::EnableRTL( sal_Bool bEnable )
 mpAlphaVDev->EnableRTL( bEnable );
 }
 
-bool OutputDevice::ImplHasMirroredGraphics() const
+bool OutputDevice::HasMirroredGraphics() const
 {
// HOTFIX for #i55719#
if( meOutDevType == OUTDEV_PRINTER )
@@ -507,11 +507,11 @@ bool OutputDevice::ImplHasMirroredGraphics() const
 
 // note: the coordiantes to be remirrored are in frame coordiantes !
 
-voidOutputDevice::ImplReMirror( Point &rPoint ) const
+voidOutputDevice::ReMirror( Point &rPoint ) const
 {
 rPoint.X() = mnOutOffX + mnOutWidth - 1 - rPoint.X() + mnOutOffX;
 }
-voidOutputDevice::ImplReMirror( Rectangle &rRect ) const
+voidOutputDevice::ReMirror( Rectangle &rRect ) const
 {
 long nWidth = rRect.Right() - rRect.Left();
 
@@ -522,7 +522,7 @@ voidOutputDevice::ImplReMirror( Rectangle &rRect ) const
 rRect.Left() = mnOutOffX + mnOutWidth - nWidth - 1 - rRect.Left() + 
mnOutOffX;
 rRect.Right() = rRect.Left() + nWidth;
 }
-voidOutputDevice::ImplReMirror( Region &rRegion ) const
+voidOutputDevice::ReMirror( Region &rRegion ) const
 {
 RectangleVector aRectangles;
 rRegion.GetRegionRectangles(aRectangles);
@@ -530,7 +530,7 @@ voidOutputDevice::ImplReMirror( Region &rRegion ) const
 
 for(RectangleVector::iterator aRectIter(aRectangles.begin()); aRectIter != 
aRectangles.end(); ++aRectIter)
 {
-ImplReMirror(*aRectIter);
+ReMirror(*aRectIter);
 aMirroredRegion.Union(*aRectIter);
 }
 
@@ -938,7 +938,7 @@ void OutputDevice::ImplInitClipRegion()
 // --- RTL -- only this region is in frame coordinates, so 
re-mirror it
 // the mpWindowImpl->mpPaintRegion above is already correct (see 
ImplCallPaint()) !
 if( ImplIsAntiparallel() )
-ImplR

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

[Kohei Yoshida]

 sc/qa/unit/ucalc.cxx|   37 +
 sc/qa/unit/ucalc.hxx|2 ++
 sc/source/core/data/dociter.cxx |2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit 738bd2cfd446debbc0e08fb554276fa28c7d
Author: Kohei Yoshida 
Date:   Fri Feb 7 11:52:16 2014 -0500

fdo#74507: Ensure that we have non-null pointer to ScColumn.

Else it would cause a null pointer dereferencing when "precision as shown"
option is set.

Change-Id: Ie8d2fdb916b575fff7e0217c45c18a2c799577cb

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 188a3fc..5bb9236 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -170,7 +170,7 @@ bool ScValueIterator::GetThis(double& rValue, sal_uInt16& 
rErr)
 bNextColumn = true;
 }
 
-ScColumn* pCol = NULL;
+ScColumn* pCol = &(pDoc->maTabs[mnTab])->aCol[mnCol];
 if (bNextColumn)
 {
 // Find the next available column.
commit 6437313bdba12836d9e472654ad402601af58077
Author: Kohei Yoshida 
Date:   Fri Feb 7 11:45:07 2014 -0500

fdo#74507: Write test for this to induce the crash during unit test run.

Change-Id: Ib25136c203f7da17a9b7f086916d870225bc729b

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 596bd92..275e4a0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -56,6 +56,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "formula/IFunctionDescription.hxx"
 
@@ -1189,6 +1190,42 @@ void Test::testHorizontalIterator()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testValueIterator()
+{
+m_pDoc->InsertTab(0, "Test");
+
+// Turn on "precision as shown" option.
+ScDocOptions aOpt = m_pDoc->GetDocOptions();
+aOpt.SetCalcAsShown(true);
+m_pDoc->SetDocOptions(aOpt);
+
+// Purely horizontal data layout with numeric data.
+for (SCCOL i = 1; i <= 3; ++i)
+m_pDoc->SetValue(ScAddress(i,2,0), i);
+
+double fVal;
+sal_uInt16 nErr;
+
+{
+const double aChecks[] = { 1.0, 2.0, 3.0 };
+size_t nCheckLen = SAL_N_ELEMENTS(aChecks);
+
+ScValueIterator aIter(m_pDoc, ScRange(1,2,0,3,2,0));
+bool bHas = false;
+
+size_t nCheckPos = 0;
+for (bHas = aIter.GetFirst(fVal, nErr); bHas; bHas = 
aIter.GetNext(fVal, nErr), ++nCheckPos)
+{
+CPPUNIT_ASSERT_MESSAGE("Iteration longer than expected.", 
nCheckPos < nCheckLen);
+CPPUNIT_ASSERT_EQUAL(aChecks[nCheckPos], fVal);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), nErr);
+}
+}
+
+
+m_pDoc->DeleteTab(0);
+}
+
 void Test::testFormulaDepTracking()
 {
 CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet", m_pDoc->InsertTab (0, 
"foo"));
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index dfa3a4b..74b79a3 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -137,6 +137,7 @@ public:
 void testVolatileFunc();
 
 void testHorizontalIterator();
+void testValueIterator();
 
 /**
  * Basic test for formula dependency tracking.
@@ -361,6 +362,7 @@ public:
 CPPUNIT_TEST(testSheetsFunc);
 CPPUNIT_TEST(testVolatileFunc);
 CPPUNIT_TEST(testHorizontalIterator);
+CPPUNIT_TEST(testValueIterator);
 CPPUNIT_TEST(testFormulaDepTracking);
 CPPUNIT_TEST(testFormulaDepTracking2);
 CPPUNIT_TEST(testCellBroadcaster);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GoogleAds API usage ?

[Stephan Bergmann]

On 02/07/2014 02:15 PM, Alex Thurgood wrote:

However, thanks to your suggestion, I'm wondering whether if a URL
browser connection is launched from within the built-in help, e.g. via a
link to an outside resource (e.g. the MS Access support which is hosted
on the AOO page), then that connection, which opens in Firefox, displays
its messages on the same console session as the one from which I start
LO-dev.


Yes; didn't bother to look into the code, but it's most likely that 
stdout/-err just get inherited there when LO spawns FF.


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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - apple_remote/RemoteControl.m vcl/aqua writerfilter/inc writerfilter/source

[Herbert Dürr]

 apple_remote/RemoteControl.m |2 
 vcl/aqua/source/app/salinst.cxx  |9 
 writerfilter/inc/resourcemodel/TableManager.hxx  |   97 -
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   31 ++-
 writerfilter/source/dmapper/DomainMapperTableHandler.hxx |   57 +++--
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |  155 +--
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |   30 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|9 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|2 
 writerfilter/source/dmapper/TablePropertiesHandler.cxx   |1 
 writerfilter/source/doctok/WW8ResourceModelImpl.cxx  |   12 -
 writerfilter/source/resourcemodel/resourcemodel.cxx  |6 
 12 files changed, 195 insertions(+), 216 deletions(-)

New commits:
commit f8eebff890810dc4cc507db875c3402ce073765d
Author: Herbert Dürr 
Date:   Fri Feb 7 14:35:43 2014 +

#i124201# re-enable the AppleRemote again

now that its nasty stability problems on 64bit AOO for OSX are fixed

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 42afa6e..46e367d 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -191,9 +191,7 @@ static void initNSApp()
 NSLog(@"Unable to obtain system version: %ld", (long)err);
 
 // Initialize Apple Remote
-#if 0 // disabled for now for stability problems
-GetSalData()->mpMainController = [[MainController alloc] init];
-#endif
+GetSalData()->mpMainController = [[MainController alloc] init]; // TODO: 
rename MainController to AppleRemoteController
 
 [[NSDistributedNotificationCenter defaultCenter] addObserver: NSApp
selector: 
@selector(applicationWillBecomeActive:)
commit 77a3b588293e8c86131158c21aede3cbebf0ff2d
Author: Herbert Dürr 
Date:   Fri Feb 7 14:34:14 2014 +

#i124201# prevent a NSException in AppleRemote's 
sendDistributedNotification method

the RemoteControl is already initialized anyway

diff --git a/apple_remote/RemoteControl.m b/apple_remote/RemoteControl.m
index d0812d3..b74decb 100644
--- a/apple_remote/RemoteControl.m
+++ b/apple_remote/RemoteControl.m
@@ -97,7 +97,6 @@ NSString* kTargetApplicationIdentifier = 
@"TargetBundleIdentifier";
 
 + (void) sendDistributedNotification: (NSString*) notificationName 
targetBundleIdentifier: (NSString*) targetIdentifier
 {
-if ( (self = [super init]) ) {
 NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys: 
[NSString stringWithCString:[self remoteControlDeviceName] 
encoding:NSASCIIStringEncoding],
 kRemoteControlDeviceName /* key = 
RemoteControlDeviceName  -> OK */,
 [[NSBundle mainBundle] bundleIdentifier] /* value 
= org.openoffice.script -> OK */,
@@ -123,7 +122,6 @@ NSString* kTargetApplicationIdentifier = 
@"TargetBundleIdentifier";

   object:nil

 userInfo:userInfo

   deliverImmediately:YES]; 
-}
 }
 
 + (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier {
commit 2d6f7c351fd53de62af5262778173538942aa4b1
Author: Herbert Dürr 
Date:   Fri Feb 7 14:29:20 2014 +

#i124201# fix frame-list handling with AppleRemote events

iterating beyond the end of a frame-list must be avoided

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 26cccd4..42afa6e 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -622,11 +622,10 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* 
pEvent )
 bool bIsFullScreenMode = false;
 
 std::list::iterator it = pSalData->maFrames.begin();
-while( (*it) &&  ( (it != pSalData->maFrames.end() ) || ( 
(*it)->mbFullScreen == false ) ) )
+for(; it != pSalData->maFrames.end(); ++it )
 {
 if( (*it)->mbFullScreen )
 bIsFullScreenMode = true;
-it++;
 }
 
 switch ([pEvent data1])
@@ -663,7 +662,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* 
pEvent )
 break;
 }
 AquaSalFrame* pFrame = pSalData->maFrames.front();
-Window * pWindow = pFrame->GetWindow() ? 
pSalData->maFrames.front()->GetWindow() : NULL;
+Window* pWindow = pFrame ? pFrame->GetWindow() : NULL;
 
 if( pWindow )
 {
commit f60d1e36194e2fe6d479b6f747e158efd4ba9e2b
Author: Oliver-Rainer Wittmann 
Date:   Fri Feb 7 14:22:16 2014 +

123345: import -

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

[Chris Sherlock]

 include/vcl/outdev.hxx |  279 -
 1 file changed, 164 insertions(+), 115 deletions(-)

New commits:
commit cd21e1ea69d1cf66e7b6c6488609c0b57c64e379
Author: Chris Sherlock 
Date:   Thu Feb 6 17:57:22 2014 +1100

Group like Impl* functions in outdev.hxx

Change-Id: Iede8395d9287a857601080e7a65dc3a3eea93c9e
Reviewed-on: https://gerrit.libreoffice.org/7890
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 38bf254..3a9bf86 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -355,36 +355,53 @@ private:
 mutable boolmbEnableRTL : 1;
 
 public:
-SAL_DLLPRIVATE sal_Int32ImplGetDPIX() const { return mnDPIX; }
-SAL_DLLPRIVATE sal_Int32ImplGetDPIY() const { return mnDPIY; }
+/** @name Initialization and accessor functions
+ */
+///@{
 SAL_DLLPRIVATE SalGraphics* ImplGetGraphics() const;
 SAL_DLLPRIVATE void ImplReleaseGraphics( sal_Bool bRelease = 
sal_True );
-SAL_DLLPRIVATE bool ImplHasMirroredGraphics() const;
-SAL_DLLPRIVATE void ImplReMirror( Point &rPoint ) const;
-SAL_DLLPRIVATE void ImplReMirror( Rectangle &rRect ) const;
-SAL_DLLPRIVATE void ImplReMirror( Region &rRegion ) const;
 SAL_DLLPRIVATE void ImplInitOutDevData();
 SAL_DLLPRIVATE void ImplDeInitOutDevData();
-SAL_DLLPRIVATE void ImplInitLineColor();
-SAL_DLLPRIVATE void ImplInitFillColor();
-SAL_DLLPRIVATE bool ImplNewFont() const;
-SAL_DLLPRIVATE void ImplInitFont() const;
-SAL_DLLPRIVATE void ImplInitTextColor();
+///@}
+
+/** @name Helper functions
+ */
+///@{
+SAL_DLLPRIVATE sal_Int32ImplGetDPIX() const { return mnDPIX; }
+SAL_DLLPRIVATE sal_Int32ImplGetDPIY() const { return mnDPIY; }
+SAL_DLLPRIVATE long ImplLogicXToDevicePixel( long nX ) const;
+SAL_DLLPRIVATE long ImplLogicYToDevicePixel( long nY ) const;
+SAL_DLLPRIVATE long ImplLogicWidthToDevicePixel( long nWidth ) 
const;
+SAL_DLLPRIVATE long ImplLogicHeightToDevicePixel( long nHeight ) 
const;
+SAL_DLLPRIVATE long ImplDevicePixelToLogicWidth( long nWidth ) 
const;
+SAL_DLLPRIVATE long ImplDevicePixelToLogicHeight( long nHeight ) 
const;
+SAL_DLLPRIVATE floatImplFloatLogicHeightToDevicePixel( float ) 
const;
+SAL_DLLPRIVATE PointImplLogicToDevicePixel( const Point& rLogicPt 
) const;
+SAL_DLLPRIVATE Size ImplLogicToDevicePixel( const Size& rLogicSize 
) const;
+SAL_DLLPRIVATE RectangleImplLogicToDevicePixel( const Rectangle& 
rLogicRect ) const;
+SAL_DLLPRIVATE ::basegfx::B2DPolygon ImplLogicToDevicePixel( const 
::basegfx::B2DPolygon&  ) const;
+SAL_DLLPRIVATE ::basegfx::B2DPolyPolygon ImplLogicToDevicePixel( const 
::basegfx::B2DPolyPolygon& ) const;
+SAL_DLLPRIVATE Polygon  ImplLogicToDevicePixel( const Polygon& 
rLogicPoly ) const;
+SAL_DLLPRIVATE PolyPolygon  ImplLogicToDevicePixel( const PolyPolygon& 
rLogicPolyPoly ) const;
+SAL_DLLPRIVATE LineInfo ImplLogicToDevicePixel( const LineInfo& 
rLineInfo ) const;
+SAL_DLLPRIVATE RectangleImplDevicePixelToLogic( const Rectangle& 
rLogicRect ) const;
+SAL_DLLPRIVATE Region   ImplPixelToDevicePixel( const Region& rRegion 
) const;
+SAL_DLLPRIVATE void ImplInvalidateViewTransform();
+SAL_DLLPRIVATE basegfx::B2DHomMatrix ImplGetDeviceTransformation() const;
+///@}
+
 SAL_DLLPRIVATE void ImplInitClipRegion();
 SAL_DLLPRIVATE bool ImplSelectClipRegion( const Region&, 
SalGraphics* pGraphics = NULL );
 SAL_DLLPRIVATE void ImplSetClipRegion( const Region* pRegion );
 
-SAL_DLLPRIVATE SalLayout*   ImplLayout( const OUString&, sal_Int32 nIndex, 
sal_Int32 nLen,
-const Point& rLogicPos = 
Point(0,0), long nLogicWidth=0,
-const sal_Int32* 
pLogicDXArray=NULL, bool bFilter = false ) const;
-SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const 
sal_Int32 nIndex, const sal_Int32 nLen,
-long nPixelWidth, const sal_Int32* 
pPixelDXArray ) const;
-SAL_DLLPRIVATE SalLayout*   ImplGlyphFallbackLayout( SalLayout*, 
ImplLayoutArgs& ) const;
+/** @name Text and font functions
+ */
+///@{
+SAL_DLLPRIVATE bool ImplNewFont() const;
+SAL_DLLPRIVATE void ImplInitFont() const;
+SAL_DLLPRIVATE void ImplInitTextColor();
 
 static
-SAL_DLLPRIVATE OUStringImplGetEllipsisString( const OutputDevice& 
rTargetDevice, const OUString& rStr,
-   long nMaxWidth, 
sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayou

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

[Chris Sherlock]

 include/vcl/outdev.hxx |  203 +++--
 1 file changed, 197 insertions(+), 6 deletions(-)

New commits:
commit 850d1b784de3cb575a3e12269651d36fce32dfd0
Author: Chris Sherlock 
Date:   Thu Feb 6 20:26:28 2014 +1100

Document OutputDevice class

As part of decoupling the OutputDevice class from the Window
class, I am going through and documenting what each public function
does first. This will give a clearer indication of what Window is
responsible for, and what OutputDevice is responsible for.

Also fixed ImplDevicePixelToLogic's parameter - should not be rLogicRect,
it should be rPixelRect in the header definition.

Change-Id: I0d0b977c3d432bd08cd6d7fddc7ed878b95506d1
Reviewed-on: https://gerrit.libreoffice.org/7892
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 3a9bf86..f492621 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -269,9 +269,9 @@ class VCL_DLLPUBLIC OutputDevice
 friend void ImplHandleResize( Window* pWindow, long nNewWidth, long 
nNewHeight );
 
 private:
-mutable SalGraphics*mpGraphics;
-mutable OutputDevice*   mpPrevGraphics;
-mutable OutputDevice*   mpNextGraphics;
+mutable SalGraphics*mpGraphics; ///< Graphics context to 
draw on
+mutable OutputDevice*   mpPrevGraphics; ///< Previous output 
device in list
+mutable OutputDevice*   mpNextGraphics; ///< Next output device in 
list
 GDIMetaFile*mpMetaFile;
 mutable ImplFontEntry*  mpFontEntry;
 mutable ImplFontCache*  mpFontCache;
@@ -358,42 +358,233 @@ public:
 /** @name Initialization and accessor functions
  */
 ///@{
+
+/** Get the graphic context that the output device uses to draw on.
+
+ @returns SalGraphics instance.
+ */
 SAL_DLLPRIVATE SalGraphics* ImplGetGraphics() const;
+
+/** Release the graphics device, and remove it from the graphics device
+ list.
+
+ @param bReleaseDetermines whether to release the fonts of the
+physically released graphics device.
+ */
 SAL_DLLPRIVATE void ImplReleaseGraphics( sal_Bool bRelease = 
sal_True );
+
+/** Initialize the graphics device's data structures.
+ */
 SAL_DLLPRIVATE void ImplInitOutDevData();
+
+/** De-initialize the graphics device's data structures.
+ */
 SAL_DLLPRIVATE void ImplDeInitOutDevData();
 ///@}
 
+
 /** @name Helper functions
  */
 ///@{
+
+/** Get the output device's DPI x-axis value.
+
+ @returns x-axis DPI value
+ */
 SAL_DLLPRIVATE sal_Int32ImplGetDPIX() const { return mnDPIX; }
+
+/** Get the output device's DPI y-axis value.
+
+ @returns y-axis DPI value
+ */
 SAL_DLLPRIVATE sal_Int32ImplGetDPIY() const { return mnDPIY; }
+
+/** Convert a logical X coordinate to a device pixel's X coordinate.
+
+ To get the device's X coordinate, it must calculate the mapping offset
+ coordinate X position (if there is one - if not then it just adds
+ the pseudo-window offset to the logical X coordinate), the X-DPI of
+ the device and the mapping's X scaling factor.
+
+ @param nX  Logical X coordinate
+
+ @returns Device's X pixel coordinate
+ */
 SAL_DLLPRIVATE long ImplLogicXToDevicePixel( long nX ) const;
+
+/** Convert a logical Y coordinate to a device pixel's Y coordinate.
+
+ To get the device's Y coordinate, it must calculate the mapping offset
+ coordinate Y position (if there is one - if not then it just adds
+ the pseudo-window offset to the logical Y coordinate), the Y-DPI of
+ the device and the mapping's Y scaling factor.
+
+ @param nY  Logical Y coordinate
+
+ @returns Device's Y pixel coordinate
+ */
 SAL_DLLPRIVATE long ImplLogicYToDevicePixel( long nY ) const;
+
+/** Convert a logical width to a width in units of device pixels.
+
+ To get the number of device pixels, it must calculate the X-DPI of the 
device and
+ the map scaling factor. If there is no mapping, then it just returns the
+ width as nothing more needs to be done.
+
+ @param nWidth  Logical width
+
+ @returns Width in units of device pixels.
+ */
 SAL_DLLPRIVATE long ImplLogicWidthToDevicePixel( long nWidth ) 
const;
+
+/** Convert a logical height to a height in units of device pixels.
+
+ To get the number of device pixels, it must calculate the Y-DPI of the 
device and
+ the map scaling factor. If there is no mapping, then it just returns the
+ height as nothing more needs to be done.
+
+ @param nHeight Logical height
+
+ @returns Height in units of device pixels.
+ */
 SAL_DLLPRIVATE long  

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

[Chris Sherlock]

 include/vcl/outdev.hxx |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 2fb860438c5e5224f367360e8a5c463ea1b8054b
Author: Chris Sherlock 
Date:   Thu Feb 6 16:10:44 2014 +1100

Change from com::sun::star and ::com::sun::star to css alias.

Change-Id: I704f45c156e8e70476409a0369c6b481707152a3
Reviewed-on: https://gerrit.libreoffice.org/7889
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 2c37b0b..38bf254 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -525,7 +525,7 @@ public:
 double fLineWidth = 0.0,
 double fTransparency = 0.0,
 basegfx::B2DLineJoin eLineJoin = 
basegfx::B2DLINEJOIN_NONE,
-com::sun::star::drawing::LineCap eLineCap 
= com::sun::star::drawing::LineCap_BUTT);
+css::drawing::LineCap eLineCap = 
css::drawing::LineCap_BUTT);
 
 // Helper for line geometry paint with support for graphic expansion 
(pattern and fat_to_area)
 voidimpPaintLineGeometryWithEvtlExpand(const 
LineInfo& rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon);
@@ -674,13 +674,13 @@ public:
 const basegfx::B2DPolygon&,
 double fLineWidth = 0.0,
 basegfx::B2DLineJoin = 
basegfx::B2DLINEJOIN_ROUND,
-com::sun::star::drawing::LineCap = 
com::sun::star::drawing::LineCap_BUTT);
+css::drawing::LineCap = 
css::drawing::LineCap_BUTT);
 boolTryDrawPolyLineDirect(
 const basegfx::B2DPolygon& rB2DPolygon,
 double fLineWidth = 0.0,
 double fTransparency = 0.0,
 basegfx::B2DLineJoin eLineJoin = 
basegfx::B2DLINEJOIN_NONE,
-com::sun::star::drawing::LineCap eLineCap 
= com::sun::star::drawing::LineCap_BUTT);
+css::drawing::LineCap eLineCap = 
css::drawing::LineCap_BUTT);
 
 /** Render the given polygon as a line stroke
 
@@ -932,7 +932,7 @@ public:
 const AllSettings&  GetSettings() const { return maSettings; }
 
 SystemGraphicsData  GetSystemGfxData() const;
-::com::sun::star::uno::Any  GetSystemGfxDataAny() const;
+css::uno::Any   GetSystemGfxDataAny() const;
 
 virtual voidSetMapMode();
 virtual voidSetMapMode( const MapMode& rNewMapMode );
@@ -1130,10 +1130,11 @@ public:
 sal_BoolHasAlpha();
 
 /// request XCanvas render interface for this OutputDevice
-::com::sun::star::uno::Reference<
-::com::sun::star::rendering::XCanvas > GetCanvas() const;
+css::uno::Reference< css::rendering::XCanvas >
+GetCanvas() const;
 
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >
CreateUnoGraphics();
+css::uno::Reference< css::awt::XGraphics >
+CreateUnoGraphics();
 VCLXGraphicsList_impl*  GetUnoGraphicsList() const  { return 
mpUnoGraphicsList; }
 VCLXGraphicsList_impl*  CreateUnoGraphicsList()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 sfx2/source/doc/templatedlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0565a99a7598197f5354914927827fc7addd95f5
Author: Joren De Cuyper 
Date:   Fri Feb 7 12:51:00 2014 +0100

fdo#60586 - [Template manager] Switching tabs does not update breadcrumbs

When applying a filter, lets go to the rootfolder of that filter

Change-Id: I7034584da65ec777aa3cc288e1423596312caeec
Reviewed-on: https://gerrit.libreoffice.org/7905
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 645c196..df996fc 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -369,6 +369,7 @@ FILTER_APPLICATION SfxTemplateManagerDlg::getCurrentFilter()
 IMPL_LINK_NOARG(SfxTemplateManagerDlg,ActivatePageHdl)
 {
 mpCurView->filterItems(ViewFilter_Application(getCurrentFilter()));
+mpCurView->showRootRegion(); // fdo#60586 show the root region of the 
applied filter
 
 if (mpSearchView->IsVisible())
 SearchUpdateHdl(NULL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 binaryurp/source/bridge.cxx |   16 
 binaryurp/source/reader.cxx |1 +
 binaryurp/source/writer.cxx |1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 5e161e9ee63377679fc57f33a216ca4707276700
Author: Stephan Bergmann 
Date:   Fri Feb 7 14:28:07 2014 +0100

fdo#56511 Don't unduly delay Bridge termination

When terminate is called from the Reader or Writer thread, the final 
terminate
was delayed until disposal of the BridgeFactory, as an unfortunate 
consequence
of always trying to join on the Reader and Writer.  Instead, forgo the join 
in
such a case and rely on the underlying osl::Thread becoming detached after
calling termiante.

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

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index cb69b0c..63cc9a7 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -255,10 +255,18 @@ void Bridge::terminate(bool final) {
 osl::MutexGuard g2(mutex_);
 tp = threadPool_;
 threadPool_ = 0;
-assert(!(reader_.is() && isThread(reader_.get(;
-std::swap(reader_, r);
-assert(!(writer_.is() && isThread(writer_.get(;
-std::swap(writer_, w);
+if (reader_.is()) {
+if (!isThread(reader_.get())) {
+r = reader_;
+}
+reader_.clear();
+}
+if (writer_.is()) {
+if (!isThread(writer_.get())) {
+w = writer_;
+}
+writer_.clear();
+}
 state_ = STATE_FINAL;
 }
 assert(!(r.is() && w.is()));
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 184f037..331e4b3 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -128,6 +128,7 @@ void Reader::execute() {
 SAL_WARN("binaryurp", "caught C++ exception '" << e.what() << '\'');
 }
 bridge_->terminate(false);
+bridge_.clear();
 }
 
 void Reader::readMessage(Unmarshal & unmarshal) {
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 3d5c199..edcb0f5 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -177,6 +177,7 @@ void Writer::execute() {
 OSL_TRACE(OSL_LOG_PREFIX "caught C++ exception '%s'", e.what());
 }
 bridge_->terminate(false);
+bridge_.clear();
 }
 
 void Writer::sendRequest(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 sfx2/source/doc/templatedlg.cxx |   22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

New commits:
commit a411bf38da3668094698c06c8424aa9d68c85702
Author: Joren De Cuyper 
Date:   Thu Feb 6 16:36:07 2014 +0100

fdo#74506 fdo#74291 -Template manager-store selection before calling dialog

It looks like calling a dialog/querybox result in a deselection of
the selected ThumbnailViewItem(s). Therefore lets save this selection
first, before calling such dialog.

Change-Id: I45a1da4307759ca6472f793fff29b1e2507fd5c9
Reviewed-on: https://gerrit.libreoffice.org/7902
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 6097b70..645c196 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -981,7 +981,7 @@ void SfxTemplateManagerDlg::OnTemplateExport()
 {
 sal_uInt16 i = 1;
 
-std::set::const_iterator pIter = 
maSelTemplates.begin();
+std::set::const_iterator pIter;
 for (pIter = maSelTemplates.begin(); pIter != 
maSelTemplates.end(); ++pIter, ++i)
 {
 const TemplateSearchViewItem *pItem = static_cast(*pIter);
@@ -1152,6 +1152,11 @@ void SfxTemplateManagerDlg::OnTemplateProperties ()
 
 void SfxTemplateManagerDlg::OnTemplateDelete ()
 {
+// Store selected templates before calling a dialog/QueryBox
+// which will result in a deselection of all ThumbnailViewItem.
+// Also avoid invalid iterators
+std::set aSelTemplates = 
maSelTemplates;
+
 QueryBox aQueryDlg(this, WB_YES_NO | WB_DEF_YES, 
SfxResId(STR_QMSG_SEL_TEMPLATE_DELETE).toString());
 
 if ( aQueryDlg.Execute() == RET_NO )
@@ -1161,8 +1166,6 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
 
 if (mpSearchView->IsVisible())
 {
-std::set aSelTemplates = 
maSelTemplates; //Avoids invalid iterators
-
 std::set::const_iterator 
pIter;
 for (pIter = aSelTemplates.begin(); pIter != aSelTemplates.end(); 
++pIter)
 {
@@ -1183,7 +1186,6 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
 else
 {
 sal_uInt16 nRegionItemId = mpLocalView->getCurRegionItemId();
-std::set aSelTemplates = 
maSelTemplates;  //Avoid invalid iterators
 
 std::set::const_iterator 
pIter;
 for (pIter = aSelTemplates.begin(); pIter != aSelTemplates.end(); 
++pIter)
@@ -1237,6 +1239,11 @@ void SfxTemplateManagerDlg::OnFolderNew()
 
 void SfxTemplateManagerDlg::OnFolderDelete()
 {
+// Store selected folders before calling a dialog/QueryBox
+// which will result in a deselection of all ThumbnailViewItem.
+// Also copy to avoid invalidating an iterator
+std::set aSelFolders = 
maSelFolders;
+
 QueryBox aQueryDlg(this, WB_YES_NO | WB_DEF_YES, 
SfxResId(STR_QMSG_SEL_FOLDER_DELETE).toString());
 
 if ( aQueryDlg.Execute() == RET_NO )
@@ -1245,7 +1252,6 @@ void SfxTemplateManagerDlg::OnFolderDelete()
 OUString aFolderList;
 
 std::set::const_iterator pIter;
-std::set aSelFolders = 
maSelFolders; //Copy to avoid invalidating an iterator
 
 for (pIter = aSelFolders.begin(); pIter != aSelFolders.end(); ++pIter)
 {
@@ -1280,6 +1286,10 @@ void SfxTemplateManagerDlg::OnRepositoryDelete()
 
 void SfxTemplateManagerDlg::OnTemplateSaveAs()
 {
+// Store selected folders before calling a dialog/QueryBox
+// which will result in a deselection of all ThumbnailViewItem
+std::set aSelFolders = 
maSelFolders;
+
 assert(m_xModel.is());
 
 if (!mpLocalView->isNonRootRegionVisible() && maSelFolders.empty())
@@ -1319,7 +1329,7 @@ void SfxTemplateManagerDlg::OnTemplateSaveAs()
 else
 {
 std::set::const_iterator pIter;
-for (pIter = maSelFolders.begin(); pIter != 
maSelFolders.end(); ++pIter)
+for (pIter = aSelFolders.begin(); pIter != aSelFolders.end(); 
++pIter)
 {
 TemplateContainerItem *pItem = 
(TemplateContainerItem*)(*pIter);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 sfx2/source/control/templatesearchview.cxx |   10 ++
 sfx2/source/doc/templatedlg.cxx|1 +
 sfx2/source/inc/templatesearchview.hxx |8 
 3 files changed, 19 insertions(+)

New commits:
commit 96e7225260aac0815643a4043f4ddb4e6b5764a1
Author: Joren De Cuyper 
Date:   Fri Feb 7 15:08:12 2014 +0100

fdo#65430 add OnItemDblClicked and setOpenTemplateHdl in templateSearchView

Currently only templateAbstractView had such handler, which are
templateLocalView and templateRemoteView are based on.

Change-Id: I6694d0804a8b7e58abc0ddc970e811d053394d6f
Reviewed-on: https://gerrit.libreoffice.org/7918
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/control/templatesearchview.cxx 
b/sfx2/source/control/templatesearchview.cxx
index 4fe956e..887dbf2 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -26,6 +26,16 @@ TemplateSearchView::~TemplateSearchView ()
 {
 }
 
+void TemplateSearchView::setOpenTemplateHdl(const Link &rLink)
+{
+maOpenTemplateHdl = rLink;
+}
+
+void TemplateSearchView::OnItemDblClicked (ThumbnailViewItem *pItem)
+{
+maOpenTemplateHdl.Call(pItem);
+}
+
 void TemplateSearchView::AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 
nRegionId, sal_uInt16 nIdx,
 const OUString &rTitle, const OUString 
&rSubtitle,
 const OUString &rPath,
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 16b023f..6097b70 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -267,6 +267,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(Window *parent)
 TEMPLATE_ITEM_PADDING);
 
 
mpSearchView->setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl));
+
mpSearchView->setOpenTemplateHdl(LINK(this,SfxTemplateManagerDlg,OpenTemplateHdl));
 
 mpTabControl->SetActivatePageHdl(LINK(this, SfxTemplateManagerDlg, 
ActivatePageHdl));
 
diff --git a/sfx2/source/inc/templatesearchview.hxx 
b/sfx2/source/inc/templatesearchview.hxx
index 2b35ded..f8c6e98 100644
--- a/sfx2/source/inc/templatesearchview.hxx
+++ b/sfx2/source/inc/templatesearchview.hxx
@@ -20,9 +20,17 @@ public:
 
 virtual ~TemplateSearchView();
 
+void setOpenTemplateHdl (const Link &rLink);
+
 void AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 
nIdx,
 const OUString &rTitle, const OUString &rSubtitle,
 const OUString &rPath, const BitmapEx &rImage );
+
+protected:
+virtual void OnItemDblClicked(ThumbnailViewItem *pItem);
+
+protected:
+Link maOpenTemplateHdl;
 };
 
 #endif // INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sven Wehner]

 sc/source/ui/dbgui/consdlg.cxx |   73 +-
 sc/source/ui/view/output.cxx   |  111 -
 2 files changed, 59 insertions(+), 125 deletions(-)

New commits:
commit 636b3203a7509ae025cb0f3cebbe0b0f766ea7aa
Author: Sven Wehner 
Date:   Fri Feb 7 15:39:38 2014 +0100

fdo#39468 Translate German comments

Also remove ASCII art.

Change-Id: I2e2aeb7a940fcebb0a08aa8906eb1f3e392b8d0f
Reviewed-on: https://gerrit.libreoffice.org/7921
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 7391fed..b4318c8 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -38,8 +38,6 @@
 
 #define INFOBOX(id) InfoBox(this, ScGlobal::GetRscString(id)).Execute()
 
-//
-//  class ScAreaData
 
 class ScAreaData
 {
@@ -60,17 +58,11 @@ public:
 };
 
 
-//
-//  class ScConsolidateDialog
-
-
 ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, 
Window* pParent,
 const SfxItemSet&   rArgSet )
 
 :   ScAnyRefDlg ( pB, pCW, pParent, "ConsolidateDialog" , 
"modules/scalc/ui/consolidatedialog.ui" ),
-//
 aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ),
-//
 theConsData ( ((const ScConsolidateItem&)
rArgSet.Get( rArgSet.GetPool()->
 GetWhich( SID_CONSOLIDATE ) )
@@ -110,18 +102,12 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, 
SfxChildWindow* pCW, Window
 Init();
 }
 
-
-//
-
 ScConsolidateDlg::~ScConsolidateDlg()
 {
 delete [] pAreaData;
 delete pRangeUtil;
 }
 
-
-//
-
 void ScConsolidateDlg::Init()
 {
 OSL_ENSURE( pViewData && pDoc && pRangeUtil, "Error in Ctor" );
@@ -164,7 +150,7 @@ void ScConsolidateDlg::Init()
 pLbConsAreas->set_width_request(pLbConsAreas->approximate_char_width() * 
16);
 pLbConsAreas->SetDropDownLineCount(5);
 
-// Einlesen der Konsolidierungsbereiche
+// read consolidation areas
 pLbConsAreas->Clear();
 const formula::FormulaGrammar::AddressConvention eConv = 
pDoc->GetAddressConvention();
 for ( i=0; iSetText(OUString());
 
-//--
 
-/*
- * Aus den RangeNames und Datenbankbereichen werden sich
- * in der Hilfsklasse ScAreaData die Bereichsnamen gemerkt,
- * die in den ListBoxen erscheinen.
- */
+// Use the ScAreaData helper class to save those range names from the
+// RangeNames and database ranges that appear in the ListBoxes.
 
 ScRangeName*pRangeNames  = pDoc->GetRangeName();
 ScDBCollection* pDbNames = pDoc->GetDBCollection();
@@ -227,12 +209,10 @@ void ScConsolidateDlg::Init()
 
 //aFlSep.SetStyle( aFlSep.GetStyle() | WB_VERT );
 
-//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
+//@BugID 54702 enable/disable only in base class
 //SFX_APPWINDOW->Enable();
 }
 
-
-//
 void ScConsolidateDlg::FillAreaLists()
 {
 pLbDataArea->Clear();
@@ -255,10 +235,8 @@ void ScConsolidateDlg::FillAreaLists()
 }
 
 
-//
-// Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als
-//  neue Selektion im Referenz-Fenster angezeigt wird.
-
+// Handover of a range within a table that has been selected by the mouse.
+// This range is then shown in the reference window as new selection.
 
 void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 {
@@ -268,7 +246,7 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, 
ScDocument* pDocP )
 RefInputStart( pRefInputEdit );
 
 OUString  aStr;
-sal_uInt16  nFmt = SCR_ABS_3D;   //!!! nCurTab fehlt noch
+sal_uInt16  nFmt = SCR_ABS_3D;   //!!! nCurTab is still missing
 const formula::FormulaGrammar::AddressConvention eConv = 
pDocP->GetAddressConvention();
 
 if ( rRef.aStart.Tab() != rRef.aEnd.Tab() )
@@ -285,16 +263,12 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, 
ScDocument* pDocP )
 }
 
 
-//
-
 sal_Bool ScConsolidateDlg::Close()
 {
 return DoClose( ScConsolidateDlgWrapper::GetChildWindowId() );
 }
 
 
-//
-
 void ScConsolidateDlg::SetActive()
 {
 if ( bDlgLostFocus )
@@ -314,16 +288,12 @@ void ScConsolid

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #102 from Commit Notification 
 ---
Sven Wehner committed a patch related to this issue.
It has been pushed to "master":

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

fdo#39468 Translate German comments



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

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

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

[Joren De Cuyper]

 vcl/osx/salnativewidgets.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 062b3a5def5ec25813cabae5d292b45a589d72e4
Author: Joren De Cuyper 
Date:   Thu Feb 6 22:08:14 2014 +0100

fdo#69358 only draw native style when toolbar is docked on top

Change-Id: I194a34881a6bd7cc14ef342d9305449094154696
Reviewed-on: https://gerrit.libreoffice.org/7920
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index c1ebdb2..6f33978 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -534,7 +534,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType 
nType,
 
 case CTRL_TOOLBAR:
 {
-if (nPart == PART_DRAW_BACKGROUND_HORZ || nPart == 
PART_DRAW_BACKGROUND_VERT)
+if (rControlRegion.Top() == 0 && nPart == 
PART_DRAW_BACKGROUND_HORZ)
 {
 BOOL isMain = [mpFrame->getNSWindow() isMainWindow];
 CGFloat unifiedHeight = rControlRegion.GetHeight();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |   12 +---
 svx/uiconfig/ui/sidebarparagraph.ui|   18 --
 2 files changed, 21 insertions(+), 9 deletions(-)

New commits:
commit 65a384eaa1d186868548f7d3d864229836332c84
Author: Caolán McNamara 
Date:   Fri Feb 7 15:00:45 2014 +

set smaller preferred width for sidebar para spinners

i.e. use a size that's big enough for sane values to
fit, rather than full range of legal values. Width
space is at a premium here.

Change-Id: I5d34048690729415deaabec431eb16e43c5b7a0a

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 393c92a..219d8fc 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -1493,14 +1493,20 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
 get(mpTBxBackColor, "backgroundcolor");
 //Paragraph spacing
 get(mpTopDist,  "aboveparaspacing");
+mpTopDist->set_width_request(mpTopDist->get_preferred_size().Width());
 get(mpBottomDist,   "belowparaspacing");
+
mpBottomDist->set_width_request(mpBottomDist->get_preferred_size().Width());
+get(mpLeftIndent,   "beforetextindent");
+
mpLeftIndent->set_width_request(mpLeftIndent->get_preferred_size().Width());
+get(mpRightIndent,  "aftertextindent");
+
mpRightIndent->set_width_request(mpRightIndent->get_preferred_size().Width());
+get(mpFLineIndent,  "firstlineindent");
+
mpFLineIndent->set_width_request(mpFLineIndent->get_preferred_size().Width());
+
 get(mpTbxIndent_IncDec, "indent");
 get(mpTbxProDemote, "promotedemote");
 get(mpLineSPTbx,"linespacing");
 get(mpTbxUL_IncDec, "paraspacing");
-get(mpLeftIndent,   "beforetextindent");
-get(mpRightIndent,  "aftertextindent");
-get(mpFLineIndent,  "firstlineindent");
 
 initial();
 }
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index 5aac47e..9c3125a 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -1,7 +1,13 @@
 
+
 
-  
+  
   
+  
+100
+1
+10
+  
   
 True
 False
@@ -338,7 +344,7 @@
 Above 
Paragraph Spacing
 True
 •
-True
+adjustment1
   
   
 False
@@ -380,7 +386,7 @@
 Below 
Paragraph Spacing
 True
 •
-True
+adjustment1
   
   
 False
@@ -419,7 +425,7 @@
 True
 True
 •
-True
+adjustment1
   
   
 False
@@ -458,7 +464,7 @@
 True
 True
 •
-True
+adjustment1
   
   
 False
@@ -497,7 +503,7 @@
 True
 True
 •
-True
+adjustment1
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 70284, which changed state.

Bug 70284 Summary: EDITING: "Assigned to" of Names change to "$#REF!"
https://bugs.freedesktop.org/show_bug.cgi?id=70284

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

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

[Libreoffice-commits] core.git: extras/source svx/Library_svx.mk svx/source svx/uiconfig

[Maxim Monastirsky]

 extras/source/glade/libreoffice-catalog.xml.in  |4 
 svx/Library_svx.mk  |1 
 svx/source/sidebar/text/SvxSBFontNameBox.cxx|  173 --
 svx/source/sidebar/text/SvxSBFontNameBox.hxx|   54 ---
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx |7 
 svx/source/sidebar/text/TextPropertyPanel.cxx   |  274 +---
 svx/source/sidebar/text/TextPropertyPanel.hxx   |   20 -
 svx/source/sidebar/text/TextUnderlineControl.cxx|3 
 svx/uiconfig/ui/sidebartextpanel.ui |   70 +++-
 9 files changed, 77 insertions(+), 529 deletions(-)

New commits:
commit 5024ce2a2c0c08dcd74b2410d088a9daf83d2f31
Author: Maxim Monastirsky 
Date:   Thu Feb 6 01:21:54 2014 +0200

sidebar: even more cleanup of text panel

Contains the following changes:
- Kill SvxSBFontNameBox.
- Remove ToolboxFontSelectHandler.
- Move .uno:Color to a separate toolbox. It allows to
  remove some hardcoded uno commands from the code, and
  also solves a redrawing issue.
- General cleanup.

Change-Id: I6fb797aa95d1a73dca0003ad1a40aee55e27e163
Reviewed-on: https://gerrit.libreoffice.org/7893
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index dc57481..71c7ac1 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -138,10 +138,6 @@
   
 
 
-
-
 
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 70cf3ef..74b1db5 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -178,7 +178,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 svx/source/sidebar/debug/ColorPanel \
 svx/source/sidebar/debug/ContextPanel \
 svx/source/sidebar/debug/NotYetImplementedPanel \
-svx/source/sidebar/text/SvxSBFontNameBox \
 svx/source/sidebar/text/TextCharacterSpacingControl \
 svx/source/sidebar/text/TextCharacterSpacingPopup \
 svx/source/sidebar/text/TextUnderlineControl \
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx 
b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
deleted file mode 100644
index c52ce7e..000
--- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "SvxSBFontNameBox.hxx"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-const static sal_uInt16 MAX_MRU_FONTNAME_ENTRIES = 5;
-
-
-namespace svx { namespace sidebar {
-
-namespace {
-bool GetDocFontList_Impl( const FontList** ppFontList, SvxSBFontNameBox* 
pBox )
-{
-bool bChanged = false;
-const SfxObjectShell* pDocSh = SfxObjectShell::Current();
-SvxFontListItem* pFontListItem = NULL;
-
-if ( pDocSh )
-pFontListItem =
-(SvxFontListItem*)pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST );
-
-if ( pFontListItem )
-{
-const FontList* pNewFontList = pFontListItem->GetFontList();
-DBG_ASSERT( pNewFontList, "Doc-FontList not available!" );
-
-if ( !*ppFontList )
-{
-*ppFontList = pNewFontList;
-bChanged = true;
-}
-else
-{
-bChanged = ( *ppFontList != pNewFontList );
-if( !bChanged && pBox!=NULL )
-bChanged = ( pBox->GetListCount() != 
pNewFontList->GetFontNameCount() );
-//HACK(vergleich ist unvollstaendig)
-if ( bChanged )
-*ppFontList = pNewFontList;
-}
-
-if ( pBox )
-pBox->Enable();
-}
-else if ( pBox )
-pBox->Disable();
-
-// in die FontBox ggf. auch die neue Liste f"ullen
-if ( pBox && bChanged )
-{
-if ( *ppFontList )
-pBox->Fill( *ppFontList );
-else
-pBox->Clear();
-}
-return bChanged;
-}
-}
-
-SvxSBFontNameBox::SvxS

[Libreoffice-commits] core.git: Changes to 'private/jmux/libreoffice-4-1+fixes'

[Jan-Marek Glogowski]

New branch 'private/jmux/libreoffice-4-1+fixes' available with the following 
commits:
commit 50b7eb974ebdfabafe33b5893eae1663843b10be
Author: Jan-Marek Glogowski 
Date:   Thu Feb 6 16:05:37 2014 +

fdo#72187 Implement KDE4 picker notifications

This notifies the XFilePickerListener of filter changes and file
selection changes.

(cherry picked from commit a8d102c2406b8c027afb32d61271e0a2c301f133)

Conflicts:

vcl/unx/kde4/KDE4FilePicker.cxx

Change-Id: I749c5f7420f020a3a2fbb764acb5c45d40972cf1

commit 9ae4ce3c8f057d042b2bb4cca6962424ecfc3cfd
Author: Jan-Marek Glogowski 
Date:   Thu Feb 6 15:32:42 2014 +

Simplify control item switch statements

Just check the dynamic_cast result to verify check boxes.

Change-Id: I5f370e337e12719eb7ef0dd3512a0f46c76a981e
(cherry picked from commit 24e8b90d8a2864cfb60d3a5046be39410efe5c51)

commit 981cfc5eedecdeaaabffa84bbd1073bb5a64a30f
Author: Jan-Marek Glogowski 
Date:   Tue Dec 24 19:47:30 2013 +0100

Rename some mail merge variables

Fixes the variable name typo pSourrceDocSh and renames bLoop to
bNoError to represent the variables function.

Reviewed-on: https://gerrit.libreoffice.org/7431
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 5da974369d01760b336de34e68c03d7268d2d330)

Conflicts:

sw/source/ui/dbui/dbmgr.cxx

Change-Id: Iba688ed0fb40c0c3947da1b21beb00c67a10ff09

commit 77be2cf7b0541b8747e7eabd217575ef11418d97
Author: Jan-Marek Glogowski 
Date:   Fri Jan 10 23:36:52 2014 +0100

Drop unused nMergeType from SwNewDBMgr

All code uses the nMergeType from the SwMergeDescriptor. Actually
there is just code setting the nMergeType in the SwNewDBMgr but
none reading or comparing it.

I don't know if the removed assignments actually should work on a
SwMergeDescriptor object, so some parts of mail merge may already
have been broken.

Reviewed-on: https://gerrit.libreoffice.org/7432
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit e3e6ad0e5c36531d8002c24c5e41a99ff597c095)

Conflicts:

sw/inc/dbmgr.hxx

Change-Id: Ic8c52e6171f122d3837d9f2de81053e30ac8f5b7

commit 1f10d10ddecade6b04657302ec230580ccce1df4
Author: Jan-Marek Glogowski 
Date:   Sun Dec 22 17:37:28 2013 +0100

Cleanup SwXMailMerge constructor.

Move all fixed initializers into constructor definition.

Reviewed-on: https://gerrit.libreoffice.org/7189
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit a5504e49dba07f7217ad3c0980d8c0f21f9f646c)

Conflicts:

sw/source/ui/uno/unomailmerge.cxx

Change-Id: I7317deae43abf6a9e865c66969cb39a4b69de826

commit 0be0802eb276c955030806dcd72ff39d4ec4d97a
Author: Ulrich Kitzinger 
Date:   Mon Jan 13 11:13:52 2014 +0100

Let the list of bookmarks in the 'Edit bookmarks' dialog be resizable

Change-Id: I09279f4d35238e6ab2d7b3e27e711dfe7fd74211
Reviewed-on: https://gerrit.libreoffice.org/7399
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 2f2d9e3799d041381565ac1ef6e7a8c8a065871b)

commit 019656ebc1f36d2d57b3b7997c5ba6ca2ad177c7
Author: Maxim Monastirsky 
Date:   Tue Jan 7 13:03:14 2014 +0200

fdo#72521 fdo#73103 Fix editable combo-boxes behavior under KDE4

Change-Id: I92a781a1e0f0adcb779155f8c477595e0dd762b1
Reviewed-on: https://gerrit.libreoffice.org/7287
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jan-Marek Glogowski 
(cherry picked from commit a62a80ac6cc0e337f4ff6d862bccc13c720d41ac)

commit b5eab40e1d710add882a7d54bca52bf962b0d001
Author: Michael Stahl 
Date:   Thu Jan 9 12:32:59 2014 +0100

librdf_Repository: make older compilers happy

Change-Id: Ide4df8f621f810b20be811db06d46edd5a9dc5f8
(cherry picked from commit d3aad81268298c05163136e2e953e1dfe0728d9e)

commit aa45103063f8a5c7edc70358c9c21e7311fa78b6
Author: Michael Stahl 
Date:   Thu Jan 9 00:10:02 2014 +0100

librdf_Repository: fix missing mutex lock in various destructors

Change-Id: I5756ab6ff6de0b2532bef9866063f361e330a009
(cherry picked from commit 62fd1aa382c75feaa72f8aa09af4d3fc0b387dcc)

commit 6a987d27dc339948d1be69e662b16e95b3954225
Author: Michael Stahl 
Date:   Wed Jan 8 23:43:03 2014 +0100

fdo#72928: fix deadlocks in librdf_Repository

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

(cherry picked from commit 7db6b2f7968d8063b12312737136f09cb7549805)

Conflicts:
unoxml/so

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

[Caolán McNamara]

 svx/source/tbxctrls/tbcontrl.cxx |5 -
 vcl/source/window/toolbox.cxx|   30 +-
 2 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit b6542ea43ac6141486d3d1f29bbab9b053c26b21
Author: Caolán McNamara 
Date:   Fri Feb 7 14:21:36 2014 +

for ToolBox Optimal Size use contents optimal sizes

Change-Id: I614c4fdb6478d1ca8e092dc742886190ec920b7d

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0a96bd0..d54ec9d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -805,7 +805,10 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, 
const Reference< XDis
 m_xFrame (_xFrame),
 mbEndPreview(false)
 {
-SetSizePixel(LogicToPixel( aLogicalSize, MAP_APPFONT ));
+Size aSize(LogicToPixel(aLogicalSize, MAP_APPFONT));
+set_width_request(aSize.Width());
+set_height_request(aSize.Height());
+SetSizePixel(aSize);
 EnableControls_Impl();
 GetSubEdit()->AddEventListener( LINK( this, SvxFontNameBox_Impl, 
CheckAndMarkUnknownFont ));
 }
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index e2799ca..9a54b3f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4854,7 +4854,35 @@ void ToolBox::Resizing( Size& rSize )
 
 Size ToolBox::GetOptimalSize() const
 {
-return ImplCalcSize( this, mnLines );
+// If we have any expandable entries, then force them to their
+// optimal sizes, then reset them afterwards
+std::map aExpandables;
+for (size_t i = 0; i < mpData->m_aItems.size(); ++i)
+{
+if (mpData->m_aItems[i].mbExpand)
+{
+Window *pWindow = mpData->m_aItems[i].mpWindow;
+SAL_WARN_IF(!pWindow, "vcl.layout", "only tabitems with window 
supported at the moment");
+if (!pWindow)
+continue;
+Size aWinSize(pWindow->GetSizePixel());
+aExpandables[pWindow] = aWinSize;
+Size aPrefSize(pWindow->get_preferred_size());
+aWinSize.Width() = aPrefSize.Width();
+pWindow->SetSizePixel(aWinSize);
+}
+}
+
+Size aSize(ImplCalcSize( this, mnLines ));
+
+for (std::map::iterator aI = aExpandables.begin(); aI != 
aExpandables.end(); ++aI)
+{
+Window *pWindow = aI->first;
+Size aWinSize = aI->second;
+pWindow->SetSizePixel(aWinSize);
+}
+
+return aSize;
 }
 
 Size ToolBox::CalcWindowSizePixel( sal_uInt16 nCalcLines ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/data/column2.cxx |  154 ---
 sc/source/core/data/column4.cxx |  155 
 2 files changed, 155 insertions(+), 154 deletions(-)

New commits:
commit c572b6cd9b7afe61c5cc01c569ab5ea87b67f5f1
Author: Kohei Yoshida 
Date:   Fri Feb 7 09:25:15 2014 -0500

Our own 100% original code goes here.

Change-Id: I25cae9f41d7986fa7886b7ce1f341d124b3f7c88

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index af06f1b..e601540 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1212,160 +1212,6 @@ bool ScColumn::IsNotesEmptyBlock(SCROW nStartRow, SCROW 
nEndRow) const
 return nEndRow < nNextRow;
 }
 
-ScPostIt* ScColumn::ReleaseNote( SCROW nRow )
-{
-if (!ValidRow(nRow))
-return NULL;
-
-ScPostIt* p = NULL;
-maCellNotes.release(nRow, p);
-return p;
-}
-
-size_t ScColumn::GetNoteCount() const
-{
-size_t nCount = 0;
-sc::CellNoteStoreType::const_iterator it = maCellNotes.begin(), itEnd = 
maCellNotes.end();
-for (; it != itEnd; ++it)
-{
-if (it->type != sc::element_type_cellnote)
-continue;
-
-nCount += it->size;
-}
-
-return nCount;
-}
-
-namespace {
-
-class NoteCaptionCreator
-{
-ScAddress maPos;
-public:
-NoteCaptionCreator( SCTAB nTab, SCCOL nCol ) : maPos(nCol,0,nTab) {}
-
-void operator() ( size_t nRow, ScPostIt* p )
-{
-maPos.SetRow(nRow);
-p->GetOrCreateCaption(maPos);
-}
-};
-
-struct NoteCaptionCleaner
-{
-void operator() ( size_t /*nRow*/, ScPostIt* p )
-{
-p->ForgetCaption();
-}
-};
-
-}
-
-void ScColumn::CreateAllNoteCaptions()
-{
-NoteCaptionCreator aFunc(nTab, nCol);
-sc::ProcessNote(maCellNotes, aFunc);
-}
-
-void ScColumn::ForgetNoteCaptions( SCROW nRow1, SCROW nRow2 )
-{
-if (!ValidRow(nRow1) || !ValidRow(nRow2))
-return;
-
-NoteCaptionCleaner aFunc;
-sc::CellNoteStoreType::iterator it = maCellNotes.begin();
-sc::ProcessNote(it, maCellNotes, nRow1, nRow2, aFunc);
-}
-
-SCROW ScColumn::GetNotePosition( size_t nIndex ) const
-{
-// Return the row position of the nth note in the column.
-
-sc::CellNoteStoreType::const_iterator it = maCellNotes.begin(), itEnd = 
maCellNotes.end();
-
-size_t nCount = 0; // Number of notes encountered so far.
-for (; it != itEnd; ++it)
-{
-if (it->type != sc::element_type_cellnote)
-// Skip the empty blocks.
-continue;
-
-if (nIndex < nCount + it->size)
-{
-// Index falls within this block.
-size_t nOffset = nIndex - nCount;
-return it->position + nOffset;
-}
-
-nCount += it->size;
-}
-
-return -1;
-}
-
-namespace {
-
-class NoteEntryCollector
-{
-std::vector& mrNotes;
-SCTAB mnTab;
-SCCOL mnCol;
-SCROW mnStartRow;
-SCROW mnEndRow;
-public:
-NoteEntryCollector( std::vector& rNotes, SCTAB nTab, SCCOL 
nCol,
-SCROW nStartRow = 0, SCROW nEndRow = MAXROW) :
-mrNotes(rNotes), mnTab(nTab), mnCol(nCol),
-mnStartRow(nStartRow), mnEndRow(nEndRow) {}
-
-void operator() (const sc::CellNoteStoreType::value_type& node) const
-{
-if (node.type != sc::element_type_cellnote)
-return;
-
-size_t nTopRow = node.position;
-sc::cellnote_block::const_iterator it = 
sc::cellnote_block::begin(*node.data);
-sc::cellnote_block::const_iterator itEnd = 
sc::cellnote_block::end(*node.data);
-size_t nOffset = 0;
-if(nTopRow < size_t(mnStartRow))
-{
-std::advance(it, mnStartRow - nTopRow);
-nOffset = mnStartRow - nTopRow;
-}
-
-for (; it != itEnd && nTopRow + nOffset <= size_t(mnEndRow);
-++it, ++nOffset)
-{
-ScAddress aPos(mnCol, nTopRow + nOffset, mnTab);
-mrNotes.push_back(sc::NoteEntry(aPos, *it));
-}
-}
-};
-
-}
-
-void ScColumn::GetAllNoteEntries( std::vector& rNotes ) const
-{
-std::for_each(maCellNotes.begin(), maCellNotes.end(), 
NoteEntryCollector(rNotes, nTab, nCol));
-}
-
-void ScColumn::GetNotesInRange(SCROW nStartRow, SCROW nEndRow,
-std::vector& rNotes ) const
-{
-std::pair aPos = 
maCellNotes.position(nStartRow);
-sc::CellNoteStoreType::const_iterator it = aPos.first;
-if (it == maCellNotes.end())
-// Invalid row number.
-return;
-
-std::pair aEndPos =
-maCellNotes.position(nEndRow);
-sc::CellNoteStoreType::const_iterator itEnd = aEndPos.first;
-
-std::for_each(it, itEnd, NoteEntryCollector(rNotes, nTab, nCol, nStartRow, 
nEndRow));
-}
-
 SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, 
ScDirection eDir ) const
 {
 // Given a range of rows, find a top or bottom empty segment.
diff --git a/sc/source/core/data/column4.cxx b/sc/sourc

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

[Caolán McNamara]

 include/vcl/builder.hxx|   10 +-
 include/vcl/toolbox.hxx|3 ++
 vcl/inc/toolbox.h  |7 ++--
 vcl/source/window/builder.cxx  |   24 
 vcl/source/window/toolbox.cxx  |   61 +
 vcl/source/window/toolbox2.cxx |   28 ++
 6 files changed, 116 insertions(+), 17 deletions(-)

New commits:
commit 3f1a97eda055f49f0fa5ba84dc4a122f222cc217
Author: Caolán McNamara 
Date:   Thu Feb 6 16:45:50 2014 +

implement expandable toolbox items

Change-Id: I64ace48ed6a72cea670ac2cdd774764b7c586648

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 9424306..b545df0 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -216,6 +216,12 @@ private:
 std::vector m_aMnemonicWidgetMaps;
 
 std::vector m_aExpanderWidgets;
+
+sal_uInt16 m_nLastToolbarId;
+
+ParserState()
+: m_nLastToolbarId(0)
+{}
 };
 
 void loadTranslations(const LanguageTag &rLanguageTag, const OUString 
&rUri);
@@ -340,8 +346,8 @@ private:
 
 void handleChild(::Window *pParent, xmlreader::XmlReader &reader);
 ::Window* handleObject(::Window *pParent, xmlreader::XmlReader &reader);
-void handlePacking(::Window *pCurrent, xmlreader::XmlReader &reader);
-void applyPackingProperty(::Window *pCurrent, xmlreader::XmlReader 
&reader);
+void handlePacking(::Window *pCurrent, ::Window *pParent, 
xmlreader::XmlReader &reader);
+void applyPackingProperty(::Window *pCurrent, ::Window *pParent, 
xmlreader::XmlReader &reader);
 void collectProperty(xmlreader::XmlReader &reader, const OString &rID, 
stringmap &rVec);
 void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
 void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 9c90abb..bcc444e 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -402,6 +402,9 @@ public:
 voidSetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits 
);
 ToolBoxItemBits GetItemBits( sal_uInt16 nItemId ) const;
 
+voidSetItemExpand( sal_uInt16 nItemId, bool bExpand );
+boolGetItemExpand( sal_uInt16 nItemId ) const;
+
 voidSetItemData( sal_uInt16 nItemId, void* pNewData );
 void*   GetItemData( sal_uInt16 nItemId ) const;
 voidSetItemImage( sal_uInt16 nItemId, const Image& rImage 
);
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index d2c2d17..8ea1cb1 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -69,13 +69,14 @@ struct ImplToolItem
 ToolBoxItemType meType;
 ToolBoxItemBits mnBits;
 TriStatemeState;
-sal_uInt16  mnId;
-sal_BoolmbEnabled:1,
+sal_uInt16  mnId;
+sal_BoolmbEnabled:1,
 mbVisible:1,
 mbEmptyBtn:1,
 mbShowWindow:1,
 mbBreak:1,
-mbVisibleText:1;// indicates if text will 
definitely be drawn, influences dropdown pos
+mbVisibleText:1,// indicates if text will 
definitely be drawn, influences dropdown pos
+mbExpand:1;
 
 ImplToolItem();
 ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7bf3afe..0bc7bc3 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1525,6 +1525,8 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
 if (!extractVisible(rMap))
 pToolBox->HideItem(nItemId);
 
+m_pParserState->m_nLastToolbarId = nItemId;
+
 return NULL; // no widget to be created
 }
 }
@@ -1917,7 +1919,7 @@ void VclBuilder::handleChild(Window *pParent, 
xmlreader::XmlReader &reader)
 }
 else if (name.equals("packing"))
 {
-handlePacking(pCurrentChild, reader);
+handlePacking(pCurrentChild, pParent, reader);
 }
 else
 ++nLevel;
@@ -2639,7 +2641,7 @@ Window* VclBuilder::handleObject(Window *pParent, 
xmlreader::XmlReader &reader)
 return pCurrentChild;
 }
 
-void VclBuilder::handlePacking(Window *pCurrent, xmlreader::XmlReader &reader)
+void VclBuilder::handlePacking(Window *pCurrent, Window *pParent, 
xmlreader::XmlReader &reader)
 {
 xmlreader::Span name;
 int nsId;
@@ -2658,7 +2660,7 @@ void VclBuilder::handlePacking(Window *pCurrent, 
xmlreader::XmlReader &reader)
 {
 ++nLevel;
 if (name.equals("property"))
-applyPackingProperty(pCurrent, reader);
+   

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 74553, which changed state.

Bug 74553 Summary: FILEOPEN: Contents of Several Cells Miss, if Spreadsheet is 
an XLS File
https://bugs.freedesktop.org/show_bug.cgi?id=74553

   What|Removed |Added

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

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

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

[Stephan Bergmann]

 binaryurp/source/bridge.cxx  |   16 
 binaryurp/source/reader.cxx  |1 +
 binaryurp/source/writer.cxx  |1 +
 sw/source/ui/dochdl/swdtflvr.cxx |4 ++--
 4 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit f6245d5bcb18dff2721d5975cd84711559cefe65
Author: Stephan Bergmann 
Date:   Fri Feb 7 14:28:07 2014 +0100

fdo#56511 Don't unduly delay Bridge termination

When terminate is called from the Reader or Writer thread, the final 
terminate
was delayed until disposal of the BridgeFactory, as an unfortunate 
consequence
of always trying to join on the Reader and Writer.  Instead, forgo the join 
in
such a case and rely on the underlying osl::Thread becoming detached after
calling termiante.

Change-Id: Ifba788c4d0d2e9b14b4f7f6b5f0f1380b712ce36

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index cb69b0c..63cc9a7 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -255,10 +255,18 @@ void Bridge::terminate(bool final) {
 osl::MutexGuard g2(mutex_);
 tp = threadPool_;
 threadPool_ = 0;
-assert(!(reader_.is() && isThread(reader_.get(;
-std::swap(reader_, r);
-assert(!(writer_.is() && isThread(writer_.get(;
-std::swap(writer_, w);
+if (reader_.is()) {
+if (!isThread(reader_.get())) {
+r = reader_;
+}
+reader_.clear();
+}
+if (writer_.is()) {
+if (!isThread(writer_.get())) {
+w = writer_;
+}
+writer_.clear();
+}
 state_ = STATE_FINAL;
 }
 assert(!(r.is() && w.is()));
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 17a8863..4402888 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -128,6 +128,7 @@ void Reader::execute() {
 SAL_WARN("binaryurp", "caught C++ exception '" << e.what() << '\'');
 }
 bridge_->terminate(false);
+bridge_.clear();
 }
 
 void Reader::readMessage(Unmarshal & unmarshal) {
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 3d5c199..edcb0f5 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -177,6 +177,7 @@ void Writer::execute() {
 OSL_TRACE(OSL_LOG_PREFIX "caught C++ exception '%s'", e.what());
 }
 bridge_->terminate(false);
+bridge_.clear();
 }
 
 void Writer::sendRequest(
commit d4b5a9ead177579c7d8091881da91d6766fd8ff1
Author: Stephan Bergmann 
Date:   Fri Feb 7 14:24:28 2014 +0100

sal_Bool -> bool

Change-Id: Ia4309b93518bc9625d02a728edc57606d6b715fb

diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index f0d7f9d..82e93fb 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -2356,7 +2356,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& 
rData, SwWrtShell& rSh,
 SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
 rSh.GetFlyFrmAttr( aSet );
 SwFmtURL aURL( (SwFmtURL&)aSet.Get( RES_URL ) );
-aURL.SetURL( aBkmk.GetURL(), sal_False );
+aURL.SetURL( aBkmk.GetURL(), false );
 aSet.Put( aURL );
 rSh.SetFlyFrmAttr( aSet );
 }
@@ -2380,7 +2380,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& 
rData, SwWrtShell& rSh,
 }
 default:
 {
-nRet = 0;
+nRet = false;
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 10 commits - sd/source starmath/source svx/source sw/source

[Noel Grandin]

 sd/source/ui/tools/IdleDetection.cxx |3 +--
 starmath/source/mathtype.cxx |5 ++---
 svx/source/accessibility/AccessibleFrameSelector.cxx |3 +--
 sw/source/core/crsr/crstrvl.cxx  |3 +--
 sw/source/core/edit/edtox.cxx|3 +--
 sw/source/core/fields/docufld.cxx|3 +--
 sw/source/core/layout/laycache.cxx   |   10 +-
 sw/source/core/layout/tabfrm.cxx |2 +-
 sw/source/filter/ww8/ww8graf.cxx |2 +-
 sw/source/filter/ww8/ww8par2.cxx |4 ++--
 10 files changed, 16 insertions(+), 22 deletions(-)

New commits:
commit 50fe91476fed74773f0f0d40261b8e2d4728ef26
Author: Noel Grandin 
Date:   Fri Feb 7 14:58:54 2014 +0200

coverity#708813 unused pointer value

Change-Id: I723757e470cb2b7e1a412a61a251be954e19d1e9

diff --git a/sd/source/ui/tools/IdleDetection.cxx 
b/sd/source/ui/tools/IdleDetection.cxx
index ddecd69..073a703 100644
--- a/sd/source/ui/tools/IdleDetection.cxx
+++ b/sd/source/ui/tools/IdleDetection.cxx
@@ -64,8 +64,7 @@ sal_Int32 IdleDetection::CheckSlideShowRunning (void)
 bool bIsSlideShowShowing = false;
 
 // Iterate over all view frames.
-SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst();
-for (pViewFrame = SfxViewFrame::GetFirst();
+for (SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst();
  pViewFrame!=NULL && !bIsSlideShowShowing;
  pViewFrame = SfxViewFrame::GetNext(*pViewFrame))
 {
commit 8d62cd21cba9f08e27f82713dc648341d27f91a3
Author: Noel Grandin 
Date:   Fri Feb 7 14:51:59 2014 +0200

coverity#708822 unused pointer value

Change-Id: I6797d11a09baa4f86826d8740301bb8d66bb247a

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 2adc2aa..688a914 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2239,8 +2239,6 @@ sal_uInt8 MathType::HandleCScript(SmNode *pNode,SmNode 
*pContent,int nLevel,
  */
 void MathType::HandleSubSupScript(SmNode *pNode,int nLevel)
 {
-SmNode *pTemp;
-
 sal_uInt8 nVariation=0xff;
 if (pNode->GetSubNode(LSUP+1))
 {
@@ -2248,9 +2246,10 @@ void MathType::HandleSubSupScript(SmNode *pNode,int 
nLevel)
 if (pNode->GetSubNode(LSUB+1))
 nVariation=2;
 }
-else if (NULL != (pTemp = pNode->GetSubNode(LSUB+1)))
+else if ( NULL != pNode->GetSubNode(LSUB+1) )
 nVariation=1;
 
+SmNode *pTemp;
 if (nVariation!=0xff)
 {
 pS->WriteUChar( sal_uInt8(TMPL) ); //Template
commit 2bfcb3c56c2b6ad97318cb722ddb92884c59e41d
Author: Noel Grandin 
Date:   Fri Feb 7 14:48:59 2014 +0200

coverity#708828 unused pointer value

Change-Id: Iba75551684d7ee51865a7063cba7458594e028da

diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx 
b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 9dee0d5..db52be3 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -475,8 +475,7 @@ Any AccFrameSelector::getAccessibleKeyBinding(  ) throw 
(RuntimeException)
 Any aRet;
 SolarMutexGuard aGuard;
 IsValid();
-utl::AccessibleRelationSetHelper* pHelper;
-Reference< XAccessibleRelationSet > xRet = pHelper = new 
utl::AccessibleRelationSetHelper;
+Reference< XAccessibleRelationSet > xRet = new 
utl::AccessibleRelationSetHelper;
 if(meBorder == FRAMEBORDER_NONE)
 {
 Window* pPrev = mpFrameSel->GetWindow( WINDOW_PREV );
commit 429dd477f102b51c4f3cf607dc21d0fe05b5889b
Author: Noel Grandin 
Date:   Fri Feb 7 14:46:36 2014 +0200

coverity#708838 unused pointer value

Change-Id: I5130f74f9c236b906282f79bde82f2f946b7781a

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 3b04e76..3b44ea2 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -258,10 +258,9 @@ sal_Bool SwCrsrShell::SetCrsrInHdFt( sal_uInt16 nDescNo, 
sal_Bool bInHeader )
 if( !pCNd )
 pCNd = pMyDoc->GetNodes().GoNext( &aIdx );
 
-const SwFrm* pFrm;
 Point aPt( m_pCurCrsr->GetPtPos() );
 
-if( pCNd && 0 != ( pFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 
0, sal_False ) ))
+if( pCNd && 0 != pCNd->getLayoutFrm( GetLayout(), &aPt, 0, 
sal_False ) )
 {
 // then we can set the cursor in here
 SwCallLink aLk( *this ); // watch Crsr-Moves
commit 2b8a32ae0af292f8fafbf30803c9d88495ec3048
Author: Noel Grandin 
Date:   Fri Feb 7 14:43:21 2014 +0200

coverity#708848 unused pointer value

Change-Id: Ia57203dc63c7b0c26c51b13f7323d5c1c218c267

diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 9282c94..04b0882 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -160,

[Libreoffice-commits] core.git: helpcontent2

[Miklos Vajna]

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

New commits:
commit eb7311886da0fcd9cc1f6a829417061d3c100791
Author: Miklos Vajna 
Date:   Fri Feb 7 14:30:30 2014 +0100

Updated core
Project: help  297543fff266d60698d32021757ad9b419a9862c

diff --git a/helpcontent2 b/helpcontent2
index 65d50af..297543f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 65d50af499ead0a578cca619e26354e447fa1794
+Subproject commit 297543fff266d60698d32021757ad9b419a9862c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 source/text/swriter/01/05060100.xhp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 297543fff266d60698d32021757ad9b419a9862c
Author: Miklos Vajna 
Date:   Fri Feb 7 14:30:30 2014 +0100

swpagerelsize: add documentation

Change-Id: I9ad7190895a93287497498367ece9439d262e6ff

diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index 0f6aa31..fb4f737 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -47,6 +47,9 @@
 
 Relative
 Calculates the 
width of the selected object as a percentage of the width of the page text 
area.
+
+Relative width relation
+Decides 
what 100% width means: either text area (excluding margins) or the entire page 
(including margins).
 
 
 Height
@@ -54,6 +57,9 @@
 
 Relative
 Calculates 
the height of the selected object as a percentage of the height of the page 
text area.
+
+Relative height relation
+Decides what 100% height 
means: either text area (excluding margins) or the entire page (including 
margins).
 
 
 Keep ratio
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 vcl/source/window/builder.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9863db7dc5509fc60c96e0db5e8c50e72a966bbd
Author: Jan Holesovsky 
Date:   Fri Feb 7 14:28:07 2014 +0100

Am I faster than the clang tinderboxes, or not?

Change-Id: Ie38066e8b3953c07f343bae69b6fec5b0ceb25b4

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index fd3e6a4..7bf3afe 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -726,7 +726,6 @@ namespace
 
 bool extractVisible(VclBuilder::stringmap &rMap)
 {
-OString sActionName;
 VclBuilder::stringmap::iterator aFind = rMap.find(OString("visible"));
 if (aFind != rMap.end())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 vcl/source/window/builder.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 6cc8693cb28ab7e2a7d6fa474e25c6b6bff36ff5
Author: Jan Holesovsky 
Date:   Fri Feb 7 14:24:19 2014 +0100

vclbuilder: Honor the "visible" flag of toolbar items.

Change-Id: Iaf58462cbc700b48f693ca60c0a4242a73b290eb

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index de88c5b..fd3e6a4 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -724,6 +724,17 @@ namespace
 return sActionName;
 }
 
+bool extractVisible(VclBuilder::stringmap &rMap)
+{
+OString sActionName;
+VclBuilder::stringmap::iterator aFind = rMap.find(OString("visible"));
+if (aFind != rMap.end())
+{
+return toBool(aFind->second);
+}
+return false;
+}
+
 Size extractSizeRequest(VclBuilder::stringmap &rMap)
 {
 OString sWidthRequest("0");
@@ -1512,6 +1523,9 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
 if (!sIconName.isEmpty())
 pToolBox->SetItemImage(nItemId, 
FixedImage::loadThemeImage(sIconName));
 
+if (!extractVisible(rMap))
+pToolBox->HideItem(nItemId);
+
 return NULL; // no widget to be created
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/edit/autofmt.cxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit edf597e0eb0baae81aab701af930400473e6d078
Author: Stephan Bergmann 
Date:   Fri Feb 7 14:23:26 2014 +0100

-Werror,-Wshadow

Change-Id: I503ee7c2d53507e878fbbccf562f44908c203c49

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 6993463d..84e3d99 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -132,7 +132,7 @@ class SwAutoFormat
 IS_END
 } eStat;
 
-bool bEnd : 1;
+bool m_bEnd : 1;
 bool bEmptyLine : 1;
 bool bMoreLines : 1;
 
@@ -205,7 +205,7 @@ class SwAutoFormat
 
 bool CanJoin( const SwTxtNode* pTxtNd ) const
 {
-return !bEnd && pTxtNd &&
+return !m_bEnd && pTxtNd &&
  !IsEmptyLine( *pTxtNd ) &&
  !IsNoAlphaLine( *pTxtNd) &&
  !IsEnumericChar( *pTxtNd ) &&
@@ -307,14 +307,14 @@ OUString SwAutoFormat::GoNextPara()
 // has to be checked twice before and after incrementation
 if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
 {
-bEnd = true;
+m_bEnd = true;
 return OUString();
 }
 
 aNdIdx++;
 if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
 {
-bEnd = true;
+m_bEnd = true;
 return OUString();
 }
 else
@@ -326,7 +326,7 @@ OUString SwAutoFormat::GoNextPara()
 //  EndNode : at the end, terminate
 if( pNewNd->IsEndNode() )
 {
-bEnd = true;
+m_bEnd = true;
 return OUString();
 }
 else if( pNewNd->IsTableNode() )
@@ -1267,7 +1267,7 @@ void SwAutoFormat::BuildIndent()
 {
 SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
 const SwTxtNode* pNxtNd = GetNextNode();
-if( pNxtNd && !bEnd )
+if( pNxtNd && !m_bEnd )
 {
 do {
 bBreak = !IsFastFullLine( *pNxtNd ) ||
@@ -2133,7 +2133,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 else
 bEmptyLine = true;  // at document beginning
 
-bEnd = false;
+m_bEnd = false;
 
 // set value for percentage display
 nEndNdIdx = aEndNdIdx.GetIndex();
@@ -2169,14 +2169,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 
 // This is the automat for autoformatting
 eStat = READ_NEXT_PARA;
-while( !bEnd )
+while( !m_bEnd )
 {
 switch( eStat )
 {
 case READ_NEXT_PARA:
 {
 GoNextPara();
-eStat = bEnd ? IS_END : TST_EMPTY_LINE;
+eStat = m_bEnd ? IS_END : TST_EMPTY_LINE;
 }
 break;
 
@@ -2422,7 +2422,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 BuildTextIndent();
 eStat = READ_NEXT_PARA;
 }
-else if( nLevel && pNxtNd && !bEnd &&
+else if( nLevel && pNxtNd && !m_bEnd &&
  !bNxtEmpty && !bNxtAlpha && !nNxtLevel &&
  !IsEnumericChar( *pNxtNd ) )
 {
@@ -2448,7 +2448,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 BuildText();
 eStat = READ_NEXT_PARA;
 }
-else if( !nLevel && pNxtNd && !bEnd &&
+else if( !nLevel && pNxtNd && !m_bEnd &&
  !bNxtEmpty && !bNxtAlpha && nNxtLevel &&
  !IsEnumericChar( *pNxtNd ) )
 {
@@ -2521,7 +2521,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 break;
 
 case IS_END:
-bEnd = true;
+m_bEnd = true;
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/view/sdview4.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8ed9bcb78452b0c30858f9ab8b0c4dac1cc25256
Author: Stephan Bergmann 
Date:   Fri Feb 7 14:18:41 2014 +0100

sal_Bool -> bool

Change-Id: Iee1a6736376edcf918e7b7fcb331cb2758595e4e

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 6a6b4e4..1d6dd3f 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -132,15 +132,15 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, 
sal_Int8& rAction,
 else
 {
 pNewGrafObj = new SdrGrafObj( rGraphic, pPickObj->GetLogicRect() );
-pNewGrafObj->SetEmptyPresObj(sal_True);
+pNewGrafObj->SetEmptyPresObj(true);
 }
 
 if ( pNewGrafObj->IsEmptyPresObj() )
 {
 Rectangle aRect( pNewGrafObj->GetLogicRect() );
-pNewGrafObj->AdjustToMaxRect( aRect, sal_False );
+pNewGrafObj->AdjustToMaxRect( aRect, false );
 pNewGrafObj->SetOutlinerParaObject(NULL);
-pNewGrafObj->SetEmptyPresObj(sal_False);
+pNewGrafObj->SetEmptyPresObj(false);
 }
 
 if (pPage && pPage->IsPresObj(pPickObj))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |8 

 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |8 

 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 43096d607ce3fc315685f7cbb37cdaafa8298f0f
Author: Andras Timar 
Date:   Fri Feb 7 14:22:26 2014 +0100

change support URL

Conflicts:
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt

Change-Id: Ie150588e6d930bd33cee935fa962a57ecf966a93

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index f094ebe..c6f32cd 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -8,10 +8,10 @@ ApplicationUsers  AllUsers
 ALLUSERS   1
 ARPCOMMENTSARPCOMMENTSTEMPLATE
 ARPCONTACT Collabora Productivity Ltd.
-ARPHELPLINKhttp://www.collabora.com/projects/libreoffice
-ARPHELPTELEPHONE   http://www.collabora.com/contact/
-ARPURLINFOABOUThttp://www.collabora.com/projects/libreoffice
-ARPURLUPDATEINFO   https://libreoffice.collabora.co.uk
+ARPHELPLINKhttps://libreoffice-from-collabora.com
+ARPHELPTELEPHONE   supp...@libreoffice.collabora.com
+ARPURLINFOABOUThttps://libreoffice-from-collabora.com
+ARPURLUPDATEINFO   https://libreoffice-from-collabora.com
 DefaultUIFont  Tahoma8
 DialogCaption  Windows Installer
 DiskPrompt [1]
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 614e96d..0777e85 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -8,10 +8,10 @@ ApplicationUsers  AllUsers
 ALLUSERS   1
 ARPCOMMENTSARPCOMMENTSTEMPLATE
 ARPCONTACT Collabora Productivity Ltd.
-ARPHELPLINKhttp://www.collabora.com/projects/libreoffice
-ARPHELPTELEPHONE   http://www.collabora.com/contact/
-ARPURLINFOABOUThttp://www.collabora.com/projects/libreoffice
-ARPURLUPDATEINFO   https://libreoffice.collabora.co.uk
+ARPHELPLINKhttps://libreoffice-from-collabora.com
+ARPHELPTELEPHONE   supp...@libreoffice.collabora.com
+ARPURLINFOABOUThttp://libreoffice-from-collabora.com
+ARPURLUPDATEINFO   https://libreoffice-from-collabora.com
 DefaultUIFont  Tahoma8
 DialogCaption  Windows Installer
 DiskPrompt [1]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GoogleAds API usage ?

[Alex Thurgood]

Le 07/02/2014 13:38, Eike Rathke a écrit :

Hi Eike,


> AFAIK that's a mozilla/firefox message, I presume you started your
> firefox from the same console.
> 

No I didn't.

However, thanks to your suggestion, I'm wondering whether if a URL
browser connection is launched from within the built-in help, e.g. via a
link to an outside resource (e.g. the MS Access support which is hosted
on the AOO page), then that connection, which opens in Firefox, displays
its messages on the same console session as the one from which I start
LO-dev.

Alex


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |6 
+++---
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |6 
+++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 245164a2462841908c8546633cb4cc4a4fd1dacf
Author: Andras Timar 
Date:   Fri Feb 7 14:22:26 2014 +0100

change support URL

Change-Id: Ie150588e6d930bd33cee935fa962a57ecf966a93

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index b4500d0..6410a87 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -8,10 +8,10 @@ ApplicationUsers  AllUsers
 ALLUSERS   1
 ARPCOMMENTSARPCOMMENTSTEMPLATE
 ARPCONTACT Collabora Productivity Ltd.
-ARPHELPLINKhttps://support.libreoffice.collabora.co.uk
+ARPHELPLINKhttps://libreoffice-from-collabora.com
 ARPHELPTELEPHONE   supp...@libreoffice.collabora.com
-ARPURLINFOABOUThttp://www.collabora.com/projects/libreoffice
-ARPURLUPDATEINFO   https://support.libreoffice.collabora.co.uk
+ARPURLINFOABOUThttps://libreoffice-from-collabora.com
+ARPURLUPDATEINFO   https://libreoffice-from-collabora.com
 DefaultUIFont  Tahoma8
 DialogCaption  Windows Installer
 DiskPrompt [1]
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 7db2d87..3c657d3 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -8,10 +8,10 @@ ApplicationUsers  AllUsers
 ALLUSERS   1
 ARPCOMMENTSARPCOMMENTSTEMPLATE
 ARPCONTACT Collabora Productivity Ltd.
-ARPHELPLINKhttps://support.libreoffice.collabora.co.uk
+ARPHELPLINKhttps://libreoffice-from-collabora.com
 ARPHELPTELEPHONE   supp...@libreoffice.collabora.com
-ARPURLINFOABOUThttp://www.collabora.com/projects/libreoffice
-ARPURLUPDATEINFO   https://support.libreoffice.collabora.co.uk
+ARPURLINFOABOUThttp://libreoffice-from-collabora.com
+ARPURLUPDATEINFO   https://libreoffice-from-collabora.com
 DefaultUIFont  Tahoma8
 DialogCaption  Windows Installer
 DiskPrompt [1]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 50763] HTML Import doesnt parse inline base64 images correctly

[bugzilla-daemon]

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

Thorsten Behrens  changed:

   What|Removed |Added

 CC||t...@libreoffice.org

--- Comment #6 from Thorsten Behrens  ---
For reference, there's a work-in-progress patch on gerrit now:

https://gerrit.libreoffice.org/#/c/7773/

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

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

[Jan Holesovsky]

 sfx2/inc/templatedlg.hxx|2 -
 sfx2/source/doc/objserv.cxx |2 -
 sfx2/source/doc/templatedlg.cxx |   47 +++-
 sfx2/uiconfig/ui/templatedlg.ui |5 
 4 files changed, 25 insertions(+), 31 deletions(-)

New commits:
commit 4af737df9fb1746a34d461770b5ec8b09664aea1
Author: Jan Holesovsky 
Date:   Fri Feb 7 13:55:32 2014 +0100

templatemanager: Fix empty dialog when saving templates.

We used to call just mpTabControl->Clear() in setSaveMode(); but that worked
only with .src dialogs, as the tab pages could have existed even without
TabControl containing them.  This is not possible with .ui definitions any
more (and rightly so!), so show just one tab here for now, until we do a
bigger Template manager rework.

Change-Id: I400dbcc326e883a1c1f526e94974162c3641f8ae

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 1464b14..16b023f 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -320,7 +320,14 @@ void SfxTemplateManagerDlg::setSaveMode()
 {
 mbIsSaveMode = true;
 
-mpTabControl->Clear();
+// FIXME We used to call just mpTabControl->Clear() here; but that worked
+// only with .src dialogs, as the tab pages could have existed even
+// without TabControl containing them.  This is not possible with .ui
+// definitions any more (and rightly so!), so leave just one tab here for
+// now, until we do a bigger Template manager rework.
+while (mpTabControl->GetPageCount() > 1)
+mpTabControl->RemovePage(mpTabControl->GetPageId(1));
+
 mpCurView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
 
 mpViewBar->ShowItem(VIEWBAR_SAVE);
commit 014c5761e2132ba65138f86f0fe0b42d4b858c26
Author: Jan Holesovsky 
Date:   Fri Feb 7 13:36:51 2014 +0100

templatemanager: Nobody calls setSaveMode(false).

Change-Id: Ia1844523c3ed5544b4e250c7607d2148f1c4d3cd

diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index d160053..8428590 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -49,7 +49,7 @@ public:
 
 ~SfxTemplateManagerDlg ();
 
-void setSaveMode (bool bMode);
+void setSaveMode();
 
 void setDocumentModel (const 
com::sun::star::uno::Reference &rModel);
 
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 988fc98..3aa0e93 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -881,7 +881,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 // save as document templates
 SfxTemplateManagerDlg aDlg;
 aDlg.setDocumentModel(GetModel());
-aDlg.setSaveMode(true);
+aDlg.setSaveMode();
 aDlg.Execute();
 
 break;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 3020d57..1464b14 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -316,33 +316,25 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
 mpSearchView->setItemStateHdl(Link());
 }
 
-void SfxTemplateManagerDlg::setSaveMode(bool bMode)
+void SfxTemplateManagerDlg::setSaveMode()
 {
-mbIsSaveMode = bMode;
+mbIsSaveMode = true;
+
 mpTabControl->Clear();
 mpCurView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
 
-if (bMode)
-{
-mpViewBar->ShowItem(VIEWBAR_SAVE);
-mpViewBar->HideItem(VIEWBAR_IMPORT);
-mpViewBar->HideItem(VIEWBAR_REPOSITORY);
-
-mpTemplateBar->ShowItem(TEMPLATEBAR_SAVE);
-mpTemplateBar->ShowItem(TEMPLATEBAR_PROPERTIES);
-mpTemplateBar->ShowItem(TEMPLATEBAR_DEFAULT);
-mpTemplateBar->HideItem(TEMPLATEBAR_OPEN);
-mpTemplateBar->HideItem(TEMPLATEBAR_EDIT);
-mpTemplateBar->HideItem(TEMPLATEBAR_MOVE);
-mpTemplateBar->HideItem(TEMPLATEBAR_EXPORT);
-mpTemplateBar->HideItem(TEMPLATEBAR_DELETE);
-}
-else
-{
-mpViewBar->HideItem(VIEWBAR_SAVE);
-mpViewBar->ShowItem(VIEWBAR_IMPORT);
-mpViewBar->ShowItem(VIEWBAR_REPOSITORY);
-}
+mpViewBar->ShowItem(VIEWBAR_SAVE);
+mpViewBar->HideItem(VIEWBAR_IMPORT);
+mpViewBar->HideItem(VIEWBAR_REPOSITORY);
+
+mpTemplateBar->ShowItem(TEMPLATEBAR_SAVE);
+mpTemplateBar->ShowItem(TEMPLATEBAR_PROPERTIES);
+mpTemplateBar->ShowItem(TEMPLATEBAR_DEFAULT);
+mpTemplateBar->HideItem(TEMPLATEBAR_OPEN);
+mpTemplateBar->HideItem(TEMPLATEBAR_EDIT);
+mpTemplateBar->HideItem(TEMPLATEBAR_MOVE);
+mpTemplateBar->HideItem(TEMPLATEBAR_EXPORT);
+mpTemplateBar->HideItem(TEMPLATEBAR_DELETE);
 }
 
 void SfxTemplateManagerDlg::setDocumentModel(const 
uno::Reference &rModel)
commit d05f9012572b6648f2be44e80686cc2573dd81f2
Author: Jan Holesovsky 
Date:   Fri Feb 7 13:36:10 2014 +0100

templatemanager: Some items were hidden by default.

Change-Id: Iec847eb2af74442d083153c5e1f307ed32

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

[Thomas Arnhold]

 sw/source/core/edit/autofmt.cxx  |  228 +++
 sw/source/core/edit/ednumber.cxx |   10 -
 vcl/source/filter/sgvmain.cxx|8 -
 3 files changed, 123 insertions(+), 123 deletions(-)

New commits:
commit 0a32624e6ce29ce06ee0763655a60403bba0142d
Author: Thomas Arnhold 
Date:   Fri Feb 7 13:53:14 2014 +0100

IS_ENDE -> IS_END

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 856d359..6993463d 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -129,7 +129,7 @@ class SwAutoFormat
 TST_NEG_IDENT,
 TST_TXT_BODY,
 HAS_FMTCOLL,
-IS_ENDE
+IS_END
 } eStat;
 
 bool bEnd : 1;
@@ -2176,7 +2176,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 case READ_NEXT_PARA:
 {
 GoNextPara();
-eStat = bEnd ? IS_ENDE : TST_EMPTY_LINE;
+eStat = bEnd ? IS_END : TST_EMPTY_LINE;
 }
 break;
 
@@ -2209,7 +2209,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 *pEdShell->GetCrsr() = aDelPam;
 pEdShell->Push();
 
-eStat = IS_ENDE;
+eStat = IS_END;
 break;
 }
 
@@ -2520,7 +2520,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 }
 break;
 
-case IS_ENDE:
+case IS_END:
 bEnd = true;
 break;
 }
commit 518d6411637e7dc2366ac7099f8fee4f43a899ed
Author: Thomas Arnhold 
Date:   Fri Feb 7 13:49:20 2014 +0100

remove germanism: bEnde -> bEnd

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 5f5c429..856d359 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -132,7 +132,7 @@ class SwAutoFormat
 IS_ENDE
 } eStat;
 
-bool bEnde : 1;
+bool bEnd : 1;
 bool bEmptyLine : 1;
 bool bMoreLines : 1;
 
@@ -205,7 +205,7 @@ class SwAutoFormat
 
 bool CanJoin( const SwTxtNode* pTxtNd ) const
 {
-return !bEnde && pTxtNd &&
+return !bEnd && pTxtNd &&
  !IsEmptyLine( *pTxtNd ) &&
  !IsNoAlphaLine( *pTxtNd) &&
  !IsEnumericChar( *pTxtNd ) &&
@@ -307,14 +307,14 @@ OUString SwAutoFormat::GoNextPara()
 // has to be checked twice before and after incrementation
 if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
 {
-bEnde = true;
+bEnd = true;
 return OUString();
 }
 
 aNdIdx++;
 if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
 {
-bEnde = true;
+bEnd = true;
 return OUString();
 }
 else
@@ -326,7 +326,7 @@ OUString SwAutoFormat::GoNextPara()
 //  EndNode : at the end, terminate
 if( pNewNd->IsEndNode() )
 {
-bEnde = true;
+bEnd = true;
 return OUString();
 }
 else if( pNewNd->IsTableNode() )
@@ -1267,7 +1267,7 @@ void SwAutoFormat::BuildIndent()
 {
 SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
 const SwTxtNode* pNxtNd = GetNextNode();
-if( pNxtNd && !bEnde )
+if( pNxtNd && !bEnd )
 {
 do {
 bBreak = !IsFastFullLine( *pNxtNd ) ||
@@ -2133,7 +2133,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 else
 bEmptyLine = true;  // at document beginning
 
-bEnde = false;
+bEnd = false;
 
 // set value for percentage display
 nEndNdIdx = aEndNdIdx.GetIndex();
@@ -2169,14 +2169,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 
 // This is the automat for autoformatting
 eStat = READ_NEXT_PARA;
-while( !bEnde )
+while( !bEnd )
 {
 switch( eStat )
 {
 case READ_NEXT_PARA:
 {
 GoNextPara();
-eStat = bEnde ? IS_ENDE : TST_EMPTY_LINE;
+eStat = bEnd ? IS_ENDE : TST_EMPTY_LINE;
 }
 break;
 
@@ -2422,7 +2422,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 BuildTextIndent();
 eStat = READ_NEXT_PARA;
 }
-else if( nLevel && pNxtNd && !bEnde &&
+else if( nLevel && pNxtNd && !bEnd &&
  !bNxtEmpty && !bNxtAlpha && !nNxtLevel &&
  !IsEnumericChar( *pNxtNd ) )
 {
@@ -2448,7 +2448,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFmtFlags& rFlags,
 BuildText();
 eStat = READ_NEXT_PARA;
 }
-else if( !nLevel && pNxtNd && !bEnde &&
+ 

Re: GoogleAds API usage ?

[Eike Rathke]

Hi Alex,

On Wednesday, 2014-02-05 08:53:48 +0100, Alex Thurgood wrote:

> In my own master 4.3 build (Linux 64bit Mint Petra) from yesterday I'm
> seeing the following on the console from which I run LO when consulting
> the built-in help:
> 
> No permission to use the keyboard API for http://googleads.g.doubleclick.net

AFAIK that's a mozilla/firefox message, I presume you started your
firefox from the same console.

  Eike

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


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

Re: [PATCH][PUSHED] Update French spelling dictionary

[Caolán McNamara]

On Tue, 2013-12-10 at 09:17 -0800, Olivier R. wrote:
> Hi *
> 
> Here is a patch to update the French spelling dictionary to version 5.0.1.
> 0001-Update-French-dictionary-v5.0.1.patch
> 
>   
> 
> For master, 4.2 and 4.1

Woops, seems we missed integrating this one. Done now in master, 4-2 and
4-1. Thanks for these.

C.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries

[Olivier R]

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

New commits:
commit 033241b9b678a5692eb0d60afed5812b8035d853
Author: Olivier R 
Date:   Tue Dec 10 17:46:53 2013 +0100

Updated core
Project: dictionaries  45b4fce2df346ca5f80560017485a40e9c2b977b

diff --git a/dictionaries b/dictionaries
index 0d96065..45b4fce 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 0d96065c26879bd36f779def78f13363bf24b420
+Subproject commit 45b4fce2df346ca5f80560017485a40e9c2b977b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier R]

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

New commits:
commit be3bba0ea08118b10ab0d42540c6ddb1c7b18b26
Author: Olivier R 
Date:   Tue Dec 10 17:46:53 2013 +0100

Updated core
Project: dictionaries  b09710ac64cd756f9341abf93fe993bd4b1c4f35

diff --git a/dictionaries b/dictionaries
index 7b8732d..b09710a 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 7b8732d1195ee67b84d98d568904a1d8f4402f1b
+Subproject commit b09710ac64cd756f9341abf93fe993bd4b1c4f35
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building LibreOffice on Mac failed...

[Christian Lohmaier]

Hi *,

On Fri, Feb 7, 2014 at 1:22 AM, yjw9012  wrote:
> https://wiki.documentfoundation.org/Development/BuildingOnMac
>
> I successfully followed step 1 - 12. In step 13, when I run ./autogen.sh, I
> get the following message:
>
> checking for ant... /opt/local/bin/ant

That path is an indication that you have installed ant using some of
the frameworks like darwinports/fink or similar.

This is known to break things.

> checking if /opt/local/share/java/apache-ant/bin/ant works... configure:
> WARNING: Ant does not work - Some Java projects will not build!

Ant chekc tries to compile a simple java-project. So that fails. your
ant cannot compile a simple java file using a just-as-simple
build.xml.

Check config.log why that fails.

> checking whether Ant is >= 1.6.0... ./configure: line 38564: test: not
> /System/Library/Frameworks/JavaVM: integer expression expected

whatever ant reports as its version string is not what configure
expects, so parsing/comparing the version fails.

> My Apache Ant version is 1.9.3. When I type 'ant -version' on terminal, I
> see this:
> "Apache Ant(TM) version 1.9.3 compiled on December 23 2013"

$ ./source/apache-ant-1.9.2/bin/ant -version
Apache Ant(TM) version 1.9.2 compiled on July 8 2013

is known to work/has the same basic output, so are you sure you're
running the same command as configure does? i.e. the one in
/opt/local/

The part of configure that extracts the version is awk - it prints the
fourth element of the ant -version output. So it could also be awk
that is not working as expected. (or that ant just isn't set at this
point and configure just doesn't take into account that there is
non-working ant and just continues..)

In any case: If you really have fink/macports/darwinports installed:
Disable it for building LibreOffice, or be prepared to run into more
of those.

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

[Libreoffice-commits] core.git: dictionaries

[Olivier R]

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

New commits:
commit f3d93434829d0e7c004679d000c30a934083b188
Author: Olivier R 
Date:   Tue Dec 10 17:46:53 2013 +0100

Updated core
Project: dictionaries  c8d2646557a10c41a4b441c97fb1205421a41c1a

diff --git a/dictionaries b/dictionaries
index 2c29ae2..c8d2646 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 2c29ae21dc3d2889812b456737474278e82c023b
+Subproject commit c8d2646557a10c41a4b441c97fb1205421a41c1a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 85/1fca590a9cf78e62448aa5a29e3aba5f5ae3f2

[Caolán McNamara]

 85/1fca590a9cf78e62448aa5a29e3aba5f5ae3f2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 09fb7bafe6d743cb5600e691691501770b4b7c7a
Author: Caolán McNamara 
Date:   Fri Feb 7 12:25:54 2014 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 08/0a23dfb836bac49d9496fa1460b9dda9138f65

[Caolán McNamara]

 08/0a23dfb836bac49d9496fa1460b9dda9138f65 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a67a1213aa6489806056cca0d8d21eed323737ad
Author: Caolán McNamara 
Date:   Fri Feb 7 12:25:06 2014 +

Notes added by 'git notes add'

diff --git a/08/0a23dfb836bac49d9496fa1460b9dda9138f65 
b/08/0a23dfb836bac49d9496fa1460b9dda9138f65
new file mode 100644
index 000..e18e317
--- /dev/null
+++ b/08/0a23dfb836bac49d9496fa1460b9dda9138f65
@@ -0,0 +1 @@
+merged as: 5c75cd95178e3d57e53fee64a9d64023c6d18acf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Font style and size dropdown widths

[Caolán McNamara]

On Thu, 2013-12-12 at 15:56 -0500, Keith Curtis wrote:
> One thing I'm looking at right now is changing the font style and size
> dropdown width.

FWIW, for the font size we ended up with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=780eb9f704e7a61f43624a2c03b4f6a15647a1a1
 to set the optimal width on it. Might be worth someone investigating is the 
style drop down would benefit from similar love.

C.


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

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

[Laurent Balland-Poirier]

 chart2/source/tools/PolynomialRegressionCurveCalculator.cxx |   15 +++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 9e67015be6e9e53e19466117d692de17c18463da
Author: Laurent Balland-Poirier 
Date:   Wed Jan 8 22:37:52 2014 +0100

fdo#73374 Trendline: correct R^2 for forced intercept

In case of forced intercept, R^2 must be calculated in a different way.
This patch calculates R^2 of trend line in the same way as LINEST
function.

Change-Id: I3ac361f014569261f05d513acb3428de5c7641ab
Reviewed-on: https://gerrit.libreoffice.org/7326
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx 
b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index 951c071..21b564d 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -167,6 +167,8 @@ void SAL_CALL 
PolynomialRegressionCurveCalculator::recalculateRegression(
 // Calculate correlation coeffitient
 double aSumError = 0.0;
 double aSumTotal = 0.0;
+double aSumYpred2 = 0.0;
+double aSumYactual2 = 0.0;
 
 for( sal_Int32 i = 0; i < aNoValues; i++ )
 {
@@ -175,9 +177,20 @@ void SAL_CALL 
PolynomialRegressionCurveCalculator::recalculateRegression(
 double yPredicted = getCurveValue( xValue );
 aSumTotal += (yActual - yAverage) * (yActual - yAverage);
 aSumError += (yActual - yPredicted) * (yActual - yPredicted);
+aSumYpred2 += yPredicted * yPredicted;
+aSumYactual2 += yActual * yActual;
 }
 
-double aRSquared = 1.0 - (aSumError / aSumTotal);
+double aRSquared = 0.0;
+if(mForceIntercept)
+{
+if(aSumYactual2 != 0.0)
+aRSquared = aSumYpred2 / aSumYactual2;
+}
+else
+{
+aRSquared = 1.0 - (aSumError / aSumTotal);
+}
 
 if (aRSquared > 0.0)
 m_fCorrelationCoeffitient = std::sqrt(aRSquared);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Cppcheck Same expression on both sides of '|' in PresenterPaneBorderManager.cxx (sdext)

[Caolán McNamara]

On Fri, 2014-01-31 at 06:49 -0800, julien2412 wrote:
> Hello,
> 
> Cppcheck reported this:
> sdext/source/presenter/PresenterPaneBorderManager.cxx
> 171   duplicateExpression style   Same expression on both sides of '|'

> 
> I thought about putting this:
> case mnOutside:
> case mnOutside | mnLeft:
> 
> Is it ok or do I miss something?

I think you should go ahead with that. Seems the sane thing to do.

C.

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

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

[Michael Stahl]

 sfx2/source/doc/templatedlg.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 69c487642143f5c77885ab674aa2aaae039b5bb7
Author: Michael Stahl 
Date:   Thu Feb 6 17:56:54 2014 +0100

fdo#74148: sfx2: fix crash when editing template

SfxTemplateManagerDlg::OnTemplateEdit() accesses invalid iterator
because during loadComponentFromURL() it happens that
ThumnailView::LoseFocus() is called and maSelTemplates is cleared.

Change-Id: I074a70e5ce8bc89a38b720ddd0325c69c1d2b9ff
(cherry picked from commit c8e206fdaab7490fb6e62bc7ab475888236179c2)
Reviewed-on: https://gerrit.libreoffice.org/7904
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index d61d6b5..ea35031 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1235,8 +1235,10 @@ void SfxTemplateManagerDlg::OnTemplateEdit ()
 aArgs[2].Value <<= UpdateDocMode::ACCORDING_TO_CONFIG;
 
 uno::Reference< XStorable > xStorable;
+std::set aSelTemplates(
+maSelTemplates); // Avoids invalid iterators from LoseFocus
 std::set::const_iterator pIter;
-for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end(); 
++pIter)
+for (pIter = aSelTemplates.begin(); pIter != aSelTemplates.end(); ++pIter)
 {
 const TemplateViewItem *pItem = static_cast(*pIter);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 tools/source/stream/strmunx.cxx |   89 ++--
 1 file changed, 32 insertions(+), 57 deletions(-)

New commits:
commit 436c0fc9f6ba9b9a7af2ec37554243f82449f4ef
Author: Stephan Bergmann 
Date:   Fri Feb 7 12:32:21 2014 +0100

Simplify InternalStreamLock instance handling

Change-Id: Id5bd445ad4f2397cbff01099ba3779736bb47e61

diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 89cc16c..6cfbca5 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -42,9 +42,11 @@ using namespace osl;
 
 // InternalLock 

 
-namespace { struct LockMutex : public rtl::Static< osl::Mutex, LockMutex > {}; 
}
+namespace {
 
-class InternalStreamLock
+struct LockMutex : public rtl::Static< osl::Mutex, LockMutex > {};
+
+struct InternalStreamLock
 {
 sal_Size   m_nStartPos;
 sal_Size   m_nEndPos;
@@ -53,14 +55,9 @@ class InternalStreamLock
 
 InternalStreamLock( sal_Size, sal_Size, SvFileStream* );
 ~InternalStreamLock();
-public:
-static bool LockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* );
-static void UnlockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* );
 };
 
-typedef ::std::vector< InternalStreamLock* > InternalStreamLockList;
-
-namespace { struct LockList : public rtl::Static< InternalStreamLockList, 
LockList > {}; }
+struct LockList : public rtl::Static< std::vector, 
LockList > {};
 
 InternalStreamLock::InternalStreamLock(
 sal_Size nStart,
@@ -71,7 +68,6 @@ InternalStreamLock::InternalStreamLock(
 m_pStream( pStream )
 {
 osl::DirectoryItem::get( m_pStream->GetFileName(), m_aItem );
-LockList::get().push_back( this );
 #if OSL_DEBUG_LEVEL > 1
 OString aFileName(OUStringToOString(m_pStream->GetFileName(),
   
osl_getThreadTextEncoding()));
@@ -84,15 +80,6 @@ InternalStreamLock::InternalStreamLock(
 
 InternalStreamLock::~InternalStreamLock()
 {
-for ( InternalStreamLockList::iterator it = LockList::get().begin();
-  it != LockList::get().end();
-  ++it
-) {
-if ( this == *it ) {
-LockList::get().erase( it );
-break;
-}
-}
 #if OSL_DEBUG_LEVEL > 1
 OString aFileName(OUStringToOString(m_pStream->GetFileName(),
   
osl_getThreadTextEncoding()));
@@ -103,9 +90,8 @@ InternalStreamLock::~InternalStreamLock()
 #endif
 }
 
-bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, 
SvFileStream* pStream )
+bool lockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* pStream )
 {
-osl::MutexGuard aGuard( LockMutex::get() );
 osl::DirectoryItem aItem;
 if (osl::DirectoryItem::get( pStream->GetFileName(), aItem) != 
osl::FileBase::E_None )
 {
@@ -122,15 +108,15 @@ bool InternalStreamLock::LockFile( sal_Size nStart, 
sal_Size nEnd, SvFileStream*
 if( aStatus.getFileType() == osl::FileStatus::Directory )
 return true;
 
-InternalStreamLock* pLock = NULL;
-InternalStreamLockList &rLockList = LockList::get();
-for( size_t i = 0; i < rLockList.size(); ++i )
+osl::MutexGuard aGuard( LockMutex::get() );
+std::vector &rLockList = LockList::get();
+for( std::vector::const_iterator i = rLockList.begin();
+ i != rLockList.end(); )
 {
-pLock = rLockList[ i ];
-if( aItem.isIdenticalTo( pLock->m_aItem ) )
+if( aItem.isIdenticalTo( i->m_aItem ) )
 {
 bool bDenyByOptions = false;
-StreamMode nLockMode = pLock->m_pStream->GetStreamMode();
+StreamMode nLockMode = i->m_pStream->GetStreamMode();
 StreamMode nNewMode = pStream->GetStreamMode();
 
 if( nLockMode & STREAM_SHARE_DENYALL )
@@ -144,54 +130,43 @@ bool InternalStreamLock::LockFile( sal_Size nStart, 
sal_Size nEnd, SvFileStream*
 
 if( bDenyByOptions )
 {
-if( pLock->m_nStartPos == 0 && pLock->m_nEndPos == 0 ) // 
whole file is already locked
+if( i->m_nStartPos == 0 && i->m_nEndPos == 0 ) // whole file 
is already locked
 return false;
 if( nStart == 0 && nEnd == 0) // cannot lock whole file
 return false;
 
-if( ( nStart < pLock->m_nStartPos && nEnd > pLock->m_nStartPos 
) ||
-( nStart < pLock->m_nEndPos && nEnd > pLock->m_nEndPos ) )
+if( ( nStart < i->m_nStartPos && nEnd > i->m_nStartPos ) ||
+( nStart < i->m_nEndPos && nEnd > i->m_nEndPos ) )
 return false;
 }
 }
 }
-// hint: new InternalStreamLock() adds the entry to the global list
-new InternalStreamLock( nStart, nEnd, pStream );
+rLockList.push_back( InternalStreamLock( nStart, nEnd, pStream ) );
 return true;
 }
 
-vo

[Libreoffice-commits] core.git: basctl/source basic/source include/cppuhelper javaunohelper/com stoc/source

[Stephan Bergmann]

 basctl/source/basicide/baside2b.cxx |8 +-
 basic/source/classes/sbunoobj.cxx   |   25 ---
 basic/source/comp/dim.cxx   |   17 -
 include/cppuhelper/propertysetmixin.hxx |6 -
 javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java |   32 
+-
 stoc/source/inspect/introspection.cxx   |   31 
+++--
 stoc/source/invocation/invocation.cxx   |   18 -
 7 files changed, 30 insertions(+), 107 deletions(-)

New commits:
commit bd20500cf3d88d0bd81d7e57df01b0130e7166f6
Author: Stephan Bergmann 
Date:   Fri Feb 7 12:03:03 2014 +0100

Simplify access to theCoreReflection singleton

Change-Id: I9901991a320b87895230a92095c9c7d3109380a6

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 10cfe47..4d8f0d9 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 namespace basctl
@@ -2895,10 +2896,9 @@ UnoTypeCodeCompletetor::UnoTypeCodeCompletetor( const 
std::vector< OUString >& a
 
 try
 {
-xFactory = Reference< lang::XMultiServiceFactory >( 
comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
-xRefl = Reference< reflection::XIdlReflection >( 
xFactory->createInstance("com.sun.star.reflection.CoreReflection"), 
UNO_QUERY_THROW );
-if( xRefl.is() )
-xClass = xRefl->forName( sVarType );//get the base class for 
reflection
+// Get the base class for reflection:
+xClass = css::reflection::theCoreReflection::get(
+comphelper::getProcessComponentContext())->forName(sVarType);
 }
 catch( const Exception& )
 {
diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 667d7ab..15d869f 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -61,6 +61,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -168,28 +169,8 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj )
 // save CoreReflection statically
 Reference< XIdlReflection > getCoreReflection_Impl( void )
 {
-static Reference< XIdlReflection > xCoreReflection;
-
-// Do we have already CoreReflection; if not obtain it
-if( !xCoreReflection.is() )
-{
-Reference< XComponentContext > xContext(
-comphelper::getProcessComponentContext() );
-if( xContext.is() )
-{
-xContext->getValueByName(
-OUString( 
"/singletons/com.sun.star.reflection.theCoreReflection" ) )
->>= xCoreReflection;
-OSL_ENSURE( xCoreReflection.is(), "### CoreReflection singleton 
not accessible!?" );
-}
-if( !xCoreReflection.is() )
-{
-throw DeploymentException(
-OUString( 
"/singletons/com.sun.star.reflection.theCoreReflection singleton not 
accessible" ),
-Reference< XInterface >() );
-}
-}
-return xCoreReflection;
+return css::reflection::theCoreReflection::get(
+comphelper::getProcessComponentContext());
 }
 
 // save CoreReflection statically
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index faa521a..1987e92 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -21,7 +21,7 @@
 #include "sbcomp.hxx"
 #include "sbunoobj.hxx"
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -1335,19 +1335,8 @@ bool SbiParser::IsUnoInterface(const OUString& sTypeName)
 {
 try
 {
-Reference< lang::XMultiServiceFactory > xFactory( 
comphelper::getProcessServiceFactory(), UNO_SET_THROW );
-Reference< reflection::XIdlReflection > xRefl( 
xFactory->createInstance("com.sun.star.reflection.CoreReflection"), 
UNO_QUERY_THROW );
-//DBG_ASSERT(xRefl.Is(), "No reflection class!"); ???
-if( !xRefl.is() )
-{
-return false;
-}
-Reference< reflection::XIdlClass > xClass = xRefl->forName(sTypeName);
-if( xClass != NULL )
-{
-return true;
-}
-return false;
+return css::reflection::theCoreReflection::get(
+comphelper::getProcessComponentContext())->forName(sTypeName).is();
 }
 catch(const Exception&)
 {
diff --git a/include/cppuhelper/propertysetmixin.hxx 
b/include/cppuhelper/propertysetmixin.hxx
index 8cdb0f3..b2faa5c 100644
--- a/include/cppuhelper/propertysetmixin.hxx
+++ b/include/cppuhelper/propertysetmixin.hxx
@@ -429,9 +429,9 @@ protected:
std::bad_alloc.
 
@param context  the component context used by this class template; must
-   not be null, and must supply the service
-   com.sun.star.reflection.CoreReflection and the singleton
-   com.sun.star.

FOSDEM travel and hotel refund

[Sophie]

Hi all,

To all FOSDEM participants, please send you travel and hotel refund
requests during next week so we can start refundings and group them.

You need to send :
- your hotel invoice
- your travel invoice
- the SPI form available here
https://wiki.documentfoundation.org/TDF/Policies/Refunding

Send all this to treasu...@documentfoundation.org

The link above will also give you the detailed rules.
Thanks in advance!
Kind regards
Sophie
-- 
Sophie Gautier 
Tel:+33683901545
Membership & Certification Committee Member - Co-founder
The Document Foundation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 oox/source/export/drawingml.cxx |   26 +-
 oox/source/export/shapes.cxx|   38 +++---
 2 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 41324964f5a2200fd5763a51204b20ff0fa1034b
Author: Miklos Vajna 
Date:   Fri Feb 7 10:57:55 2014 +0100

oox: make sure debug output appears on stderr

So that profiling unit tests (finding out the largets test documents
based on the CSV output on stdout) is possible again.

Change-Id: Ib870d6f424c3219f37715daef5400a0181867be7

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4571146..11fd26a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -570,7 +570,7 @@ void DrawingML::WriteOutline( Reference< XPropertySet > 
rXPropSet )
 if( aLineDash.Style == DashStyle_ROUND || aLineDash.Style == 
DashStyle_ROUNDRELATIVE )
 cap = "rnd";
 
-DBG(printf("dash dots: %d dashes: %d dotlen: %d dashlen: %d 
distance: %d\n",
+DBG(fprintf(stderr, "dash dots: %d dashes: %d dotlen: %d 
dashlen: %d distance: %d\n",
 int( aLineDash.Dots ), int( aLineDash.Dashes ), 
int( aLineDash.DotLen ), int( aLineDash.DashLen ), int( aLineDash.Distance )));
 }
 /* fallthru intended */
@@ -670,7 +670,7 @@ OUString DrawingML::WriteImage( const OUString& rURL )
 
 if ( index != -1 )
 {
-DBG(printf ("begin: %ld %s\n", long( sizeof( aURLBegin ) ), USS( rURL 
) + RTL_CONSTASCII_LENGTH( aURLBegin ) ));
+DBG(fprintf (stderr, "begin: %ld %s\n", long( sizeof( aURLBegin ) ), 
USS( rURL ) + RTL_CONSTASCII_LENGTH( aURLBegin ) ));
 Graphic aGraphic = GraphicObject( 
aURLBS.copy(RTL_CONSTASCII_LENGTH(aURLBegin)) ).GetTransformedGraphic ();
 
 return WriteImage( aGraphic );
@@ -821,7 +821,7 @@ void DrawingML::WriteBlipMode( Reference< XPropertySet > 
rXPropSet )
 if (GetProperty( rXPropSet, "FillBitmapMode" ) )
 mAny >>= eBitmapMode;
 
-DBG(printf("fill bitmap mode: %d\n", eBitmapMode));
+DBG(fprintf(stderr, "fill bitmap mode: %d\n", eBitmapMode));
 
 switch (eBitmapMode) {
 case BitmapMode_REPEAT:
@@ -848,7 +848,7 @@ void DrawingML::WriteBlipFill( Reference< XPropertySet > 
rXPropSet, OUString sUR
 OUString aURL;
 mAny >>= aURL;
 
-DBG(printf ("URL: %s\n", OUStringToOString( aURL, 
RTL_TEXTENCODING_UTF8 ).getStr() ));
+DBG(fprintf (stderr, "URL: %s\n", OUStringToOString( aURL, 
RTL_TEXTENCODING_UTF8 ).getStr() ));
 
 if( aURL.isEmpty() )
 return;
@@ -924,7 +924,7 @@ void DrawingML::WriteTransformation( const Rectangle& rRect,
 
 void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, 
sal_Int32 nXmlNamespace, sal_Bool bFlipH, sal_Bool bFlipV, sal_Bool 
bSuppressRotation  )
 {
-DBG(printf( "write shape transformation\n" ));
+DBG(fprintf(stderr,  "write shape transformation\n" ));
 
 sal_Int32 nRotation=0;
 awt::Point aPos = rXShape->getPosition();
@@ -1076,7 +1076,7 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, sal_Bool bIs
 // mso doesn't like text color to be placed after typeface
 if( GETAD( CharColor ) ) {
 sal_uInt32 color = *((sal_uInt32*) mAny.getValue());
-DBG(printf("run color: %x auto: %x\n", static_cast( 
color ), static_cast( COL_AUTO )));
+DBG(fprintf(stderr, "run color: %x auto: %x\n", static_cast( color ), static_cast( COL_AUTO )));
 
 if( color == COL_AUTO ) { // nCharColor depends to the background color
 sal_Bool bIsDark = sal_False;
@@ -1154,7 +1154,7 @@ const char* DrawingML::GetFieldType( 
::com::sun::star::uno::Reference< ::com::su
 
 if( GETA( TextPortionType ) ) {
 aFieldType = OUString( *(OUString*)mAny.getValue() );
-DBG(printf ("field type: %s\n", USS(aFieldType) ));
+DBG(fprintf (stderr, "field type: %s\n", USS(aFieldType) ));
 }
 
 if( aFieldType == "TextField" ) {
@@ -1165,7 +1165,7 @@ const char* DrawingML::GetFieldType( 
::com::sun::star::uno::Reference< ::com::su
 rXPropSet.set( rXTextField, UNO_QUERY );
 if( rXPropSet.is() ) {
 OUString aFieldKind( rXTextField->getPresentation( sal_True ) 
);
-DBG(printf ("field kind: %s\n", USS(aFieldKind) ));
+DBG(fprintf (stderr, "field kind: %s\n", USS(aFieldKind) ));
 if( aFieldKind == "Page" ) {
 return "slidenum";
 }
@@ -1308,7 +1308,7 @@ void DrawingML::WriteParagraphNumbering( Reference< 
XPropertySet > rXPropSet, sa
 
 if ( ( mAny >>= rXIndexAccess ) && nLevel < rXIndexAccess->getCount() )
 {
-DBG(printf ("numbering rules\n"));
+DBG(fprintf (stderr, "numbering rules\n"));
 
 Sequence< PropertyValue > aPropertySequence;
   

[Libreoffice-commits] core.git: 6 commits - cui/source sd/source sw/source tools/source

[Noel Grandin]

 cui/source/options/optdict.cxx   |2 --
 sd/source/filter/eppt/epptso.cxx |7 +++
 sw/source/core/doc/docnum.cxx|7 +++
 sw/source/ui/shells/frmsh.cxx|8 
 sw/source/ui/shells/tabsh.cxx|   12 ++--
 tools/source/stream/strmunx.cxx  |2 +-
 6 files changed, 17 insertions(+), 21 deletions(-)

New commits:
commit 160cc0f6a5718bb7267b4a214c10c34eb5e08ee7
Author: Noel Grandin 
Date:   Fri Feb 7 12:12:38 2014 +0200

4 related coverity issues, unused pointer value

coverity#708881, coverity#708882, coverity#708883,
coverity#708884

Change-Id: I8ddcb2f7b2b70dc92b8d0d5f66bf944edc57157e

diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 3b8deb3..5467a6f 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -1018,13 +1018,13 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
 aBoxItem = aNewBox;
 SvxBorderLine aDestBorderLine;
 
-if ((pBorderLine = aBoxItem.GetTop()) != NULL)
+if( aBoxItem.GetTop() != NULL )
 aBoxItem.SetLine(&aBorderLine, BOX_LINE_TOP);
-if ((pBorderLine = aBoxItem.GetBottom()) != NULL)
+if( aBoxItem.GetBottom() != NULL )
 aBoxItem.SetLine(&aBorderLine, BOX_LINE_BOTTOM);
-if ((pBorderLine = aBoxItem.GetLeft()) != NULL)
+if( aBoxItem.GetLeft() != NULL )
 aBoxItem.SetLine(&aBorderLine, BOX_LINE_LEFT);
-if ((pBorderLine = aBoxItem.GetRight()) != NULL)
+if( aBoxItem.GetRight() != NULL )
 aBoxItem.SetLine(&aBorderLine, BOX_LINE_RIGHT);
 }
 }
commit 7f2e336217ae98673dda5504a72891ad6834e81d
Author: Noel Grandin 
Date:   Fri Feb 7 12:07:53 2014 +0200

6 related coverity issues, unused pointer value

coverity#708890,coverity#708886,coverity#70,
coverity#708887,coverity#708885,coverity#708889

Change-Id: I4aeedea2d73614f4af935c58776605f49824374d

diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 3ac93a1..f94e044 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -521,17 +521,17 @@ void SwTableShell::Execute(SfxRequest &rReq)
 }
 
 sal_Bool bLine = sal_False;
-if ( (pBorderLine = aBox.GetTop()) != NULL)
+if( aBox.GetTop() != NULL )
 aBox.SetLine(&aBorderLine, BOX_LINE_TOP), bLine |= sal_True;
-if ((pBorderLine = aBox.GetBottom()) != NULL)
+if( aBox.GetBottom() != NULL )
 aBox.SetLine(&aBorderLine, BOX_LINE_BOTTOM), bLine |= sal_True;
-if ((pBorderLine = aBox.GetLeft()) != NULL)
+if( aBox.GetLeft() != NULL )
 aBox.SetLine(&aBorderLine, BOX_LINE_LEFT), bLine |= sal_True;
-if ((pBorderLine = aBox.GetRight()) != NULL)
+if( aBox.GetRight() != NULL )
 aBox.SetLine(&aBorderLine, BOX_LINE_RIGHT), bLine |= sal_True;
-if ((pBorderLine = aInfo.GetHori()) != NULL)
+if( aInfo.GetHori() != NULL )
 aInfo.SetLine(&aBorderLine, BOXINFO_LINE_HORI), bLine |= 
sal_True;
-if ((pBorderLine = aInfo.GetVert()) != NULL)
+if( aInfo.GetVert() != NULL )
 aInfo.SetLine(&aBorderLine, BOXINFO_LINE_VERT), bLine |= 
sal_True;
 
 aCoreSet.Put( aBox  );
commit e5dd09caafcc1e55797959a8b4373a39c42a3f18
Author: Noel Grandin 
Date:   Fri Feb 7 12:01:49 2014 +0200

coverity#708893 unused pointer value

Change-Id: Ib029e08f7dc29330b1a0b5d93c1c0a356dbd59dd

diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index cf9fa9d..89cc16c 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -156,7 +156,7 @@ bool InternalStreamLock::LockFile( sal_Size nStart, 
sal_Size nEnd, SvFileStream*
 }
 }
 // hint: new InternalStreamLock() adds the entry to the global list
-pLock  = new InternalStreamLock( nStart, nEnd, pStream );
+new InternalStreamLock( nStart, nEnd, pStream );
 return true;
 }
 
commit c668efa5d9a90b814778f267758c7d7d55960017
Author: Noel Grandin 
Date:   Fri Feb 7 11:58:35 2014 +0200

coverity#738955 unused pointer value

Change-Id: I5e17afe36422d546249dfc849a2d948a6ef5030b

diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index af00987..3f65a6b 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -184,8 +184,6 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
 //! dictionaries may have been added/removed elsewhere too.
 aDics = xDicList->getDictionaries();
 }
-pDic = aDics.getConstArray();
-nCount = (sal_uInt16) aDics.getLength();
 
 
  

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

[Stephan Bergmann]

 cppuhelper/source/servicemanager.cxx |  175 +--
 cppuhelper/source/servicemanager.hxx |   13 +-
 2 files changed, 76 insertions(+), 112 deletions(-)

New commits:
commit 874c481801434d4fac3c50f076bff0fe3a3988b6
Author: Stephan Bergmann 
Date:   Fri Feb 7 11:10:06 2014 +0100

Simplify service manager's tracking of singletons

It only tracks whether to dispose a singleton instance now, and (at least
conceptually) no longer remembers the single instance (apart from what is
necessary in order to call dispose on it), as the underlying implementation
already needs to keep track of that to support direct calls of constructor
functions.

Change-Id: I154bf05438e1db099c1c5ffb1c56377725c6bfc6

diff --git a/cppuhelper/source/servicemanager.cxx 
b/cppuhelper/source/servicemanager.cxx
index e6c31fc..973201d 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -701,43 +701,19 @@ 
cppuhelper::ServiceManager::Data::Implementation::createInstance(
 css::uno::Reference const & context,
 bool singletonRequest)
 {
-if (info->singletons.empty()) {
-assert(!singletonRequest);
-if (constructor != 0) {
-// the interface is already acquired, don't acquire here
-return css::uno::Reference(
-(*constructor)(context.get(),
-css::uno::Sequence()),
-SAL_NO_ACQUIRE);
-}
-if (factory1.is()) {
-return factory1->createInstanceWithContext(context);
-}
-assert(factory2.is());
-return factory2->createInstance();
+css::uno::Reference inst;
+if (constructor != 0) {
+inst.set(
+(*constructor)(context.get(), css::uno::Sequence()),
+SAL_NO_ACQUIRE);
+} else if (factory1.is()) {
+inst = factory1->createInstanceWithContext(context);
 } else {
-osl::MutexGuard g(mutex); //TODO: must be a non-recursive mutex
-if (singleton.is()) {
-if (singletonRequest) {
-dispose = false;
-}
-return singleton;
-}
-if (constructor != 0) {
-// the interface is already acquired, don't acquire here
-singleton.set(
-(*constructor)(context.get(),
-css::uno::Sequence()),
-SAL_NO_ACQUIRE);
-} else if (factory1.is()) {
-singleton = factory1->createInstanceWithContext(context);
-} else {
-assert(factory2.is());
-singleton = factory2->createInstance();
-}
-dispose = singleton.is() && !singletonRequest;
-return singleton;
+assert(factory2.is());
+inst = factory2->createInstance();
 }
+updateDisposeSingleton(singletonRequest, inst);
+return inst;
 }
 
 css::uno::Reference
@@ -745,65 +721,54 @@ 
cppuhelper::ServiceManager::Data::Implementation::createInstanceWithArguments(
 css::uno::Reference const & context,
 bool singletonRequest, css::uno::Sequence const & arguments)
 {
-if (info->singletons.empty()) {
-assert(!singletonRequest);
-if (constructor != 0) {
-// the interface is already acquired, don't acquire here
-css::uno::Reference inst(
-(*constructor)(context.get(), arguments), SAL_NO_ACQUIRE);
-
-// HACK: The service can implement XInitialization too.
-// It should be removed when converting to constructor-based
-// initialization, but in case somebody forgets, be safe, and
-// call it anyway for the moment.
-css::uno::Reference xinit(
-inst, css::uno::UNO_QUERY);
-if (xinit.is()) {
-xinit->initialize(arguments);
-}
-return inst;
-}
-if (factory1.is()) {
-return factory1->createInstanceWithArgumentsAndContext(
-arguments, context);
+css::uno::Reference inst;
+if (constructor != 0) {
+inst.set((*constructor)(context.get(), arguments), SAL_NO_ACQUIRE);
+//HACK: The constructor will either observe arguments and return inst
+// that does not implement XInitialization (or null), or ignore
+// arguments and return inst that implements XInitialization; this
+// should be removed again once XInitialization-based implementations
+// have become rare:
+css::uno::Reference init(
+inst, css::uno::UNO_QUERY);
+if (init.is()) {
+init->initialize(arguments);
 }
-assert(factory2.is());
-return factory2->createInstanceWithArguments(arguments);
+return inst;
+} else if (factory1.is()) {
+inst = factory1->createInstanceWithArgumentsAndContext(
+arguments, context);
 } else {
-osl::MutexGuard g(mutex); //TODO: must be 

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

[Tushar Bende]

 sw/qa/extras/ooxmlexport/data/testPageref.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   16 +++-
 sw/source/filter/ww8/docxattributeoutput.cxx   |   47 -
 sw/source/filter/ww8/docxattributeoutput.hxx   |3 +
 4 files changed, 63 insertions(+), 3 deletions(-)

New commits:
commit 138bd3d656c30911d5f45a8b6804e50857f6b30c
Author: Tushar Bende 
Date:   Wed Jan 22 20:00:17 2014 +0530

fdo#72563 : PAGEREF field tag not preserved during Roundtrip

There was a problem that in case of TOC,PAGEREF field tag was not preserved 
inside  during Roundtrip.
Reason found, there was no code support to handle PAGEREF in export.
Added code support in export code to handle PAGEREF.

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

Change-Id: I1785360684d8772b71c3f45fdd2c654f94777067

diff --git a/sw/qa/extras/ooxmlexport/data/testPageref.docx 
b/sw/qa/extras/ooxmlexport/data/testPageref.docx
new file mode 100644
index 000..65ca38a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/testPageref.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 3c1d9d8..a192a3d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2292,7 +2292,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
 if (!pXmlDoc)
 return;
-xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[21]/w:hyperlink/w:r[2]/w:t");
+xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[21]/w:hyperlink/w:r[5]/w:t");
 xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
 OUString contents = OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content));
 CPPUNIT_ASSERT(contents.match("15"));
@@ -2845,6 +2845,20 @@ DECLARE_OOXMLEXPORT_TEST(testGradientFillPreservation, 
"gradient-fill-preservati
 
"/w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:gradFill/a:gsLst/a:gs[@pos='5']/a:schemeClr/a:satMod",
 "val", "16");
 }
+
+DECLARE_OOXMLEXPORT_TEST(testPageref, "testPageref.docx")
+{
+// fdo#72563 : There was a problem that in case of TOC,PAGEREF field tag 
was not preserved during Roundtrip
+// This test case is to verify that PAGEREF tag is coming with proper 
values inside  tag.
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+xmlNodeSetPtr pXmlNodes = 
getXPathNode(pXmlDoc,"/w:document/w:body/w:p[2]/w:hyperlink/w:r[3]/w:instrText");
+xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
+OUString contents = OUString::createFromAscii((const 
char*)((pXmlNode->children[0]).content));
+CPPUNIT_ASSERT(contents.match("PAGEREF _Toc355095261 \\h"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6e0b428..46d862e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -685,10 +685,35 @@ void DocxAttributeOutput::EndRun()
 
 // write the run start + the run content
 m_pSerializer->mergeTopMarks(); // merges the "actual run start"
-
 // append the actual run end
 m_pSerializer->endElementNS( XML_w, XML_r );
 
+if(m_startedHyperlink && m_hyperLinkAnchor != "")
+{
+OUString sToken;
+m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+m_pSerializer->startElementNS( XML_w, XML_fldChar,
+FSNS( XML_w, XML_fldCharType ), "begin",
+FSEND );
+m_pSerializer->endElementNS( XML_w, XML_fldChar );
+m_pSerializer->endElementNS( XML_w, XML_r );
+
+
+m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+sToken = "PAGEREF " + m_hyperLinkAnchor + " \\h"; // '\h' Creates a 
hyperlink to the bookmarked paragraph.
+DoWriteCmd( sToken );
+m_pSerializer->endElementNS( XML_w, XML_r );
+
+
+// Write the Field separator
+m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+m_pSerializer->singleElementNS( XML_w, XML_fldChar,
+FSNS( XML_w, XML_fldCharType ), "separate",
+FSEND );
+m_pSerializer->endElementNS( XML_w, XML_r );
+
+}
+
 WritePostponedMath();
 WritePendingPlaceholder();
 
@@ -701,6 +726,17 @@ void DocxAttributeOutput::EndRun()
 {
 if ( m_startedHyperlink )
 {
+if( m_endPageRef )
+{
+// Hyperlink is started and fldchar "end" needs to be written 
for PAGEREF
+m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+m_pSerializer->singleElementNS( XML_w, XML_fldChar,
+ 

[Libreoffice-commits] core.git: 3 commits - comphelper/source filter/source i18npool/source include/comphelper sw/source

[Stephan Bergmann]

 comphelper/source/misc/docpasswordhelper.cxx |   16 ++--
 filter/source/msfilter/mscodec.cxx   |2 +-
 i18npool/source/localedata/LocaleNode.cxx|   14 --
 include/comphelper/docpasswordhelper.hxx |8 
 sw/source/core/doc/docbm.cxx |   13 -
 5 files changed, 35 insertions(+), 18 deletions(-)

New commits:
commit 0443d296720971697c48453912cc9ffb742f8640
Author: Stephan Bergmann 
Date:   Fri Feb 7 10:04:31 2014 +0100

Avoid generation of unused replaceFrom* variables

Change-Id: I2a65485b8dcaa7b6ed4a049f97d460878b8bb17d

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 69360de..05762c6 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -617,9 +617,14 @@ void LCFormatNode::generateCode (const OFileWriter &of) 
const
 
 ::std::vector< OUString > theDateAcceptancePatterns;
 
+OUString useLocale(getAttr().getValueByName("ref"));
+
 OUString str;
 OUString strFrom( getAttr().getValueByName("replaceFrom"));
-of.writeParameter("replaceFrom", strFrom, mnSection);
+if (useLocale.isEmpty())
+{
+of.writeParameter("replaceFrom", strFrom, mnSection);
+}
 str = getAttr().getValueByName("replaceTo");
 if (!strFrom.isEmpty() && str.isEmpty())
 incErrorStr("replaceFrom=\"%s\" replaceTo=\"\" is empty replacement.", 
strFrom);
@@ -640,9 +645,14 @@ void LCFormatNode::generateCode (const OFileWriter &of) 
const
 }
 }
 
-OUString useLocale =   getAttr().getValueByName("ref");
 if (!useLocale.isEmpty())
 {
+if (!strFrom.isEmpty() && strFrom != "[CURRENCY]") //???
+{
+incErrorStrStr(
+"non-empty replaceFrom=\"%s\" with non-empty ref=\"%s\".",
+strFrom, useLocale);
+}
 useLocale = useLocale.replace( '-', '_');
 switch (mnSection)
 {
commit 91fcdd5a8d5c71103220c97bc0bb48acf0a502ba
Author: Caolán McNamara 
Date:   Fri Feb 7 08:52:20 2014 +

fix debug=2 build

Change-Id: I9b5b2efc3b8fc3164264775b608348baa72d31b1

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index e4837a3..bf8ef76 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1073,19 +1073,6 @@ namespace sw { namespace mark
 sortSubsetMarks();
 }
 
-#if OSL_DEBUG_LEVEL > 1
-void MarkManager::dumpFieldmarks( ) const
-{
-const_iterator_t pIt = m_vFieldmarks.begin();
-for (; pIt != m_vFieldmarks.end( ); pIt++)
-{
-rtl::OUString str = (*pIt)->ToString();
-OSL_TRACE("%s\n",
-::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr());
-}
-}
-#endif
-
 bool MarkManager::hasMark(const OUString& rName) const
 {
 return (m_aMarkNamesSet.find(rName) != m_aMarkNamesSet.end());
commit 3ec9bccaabb4a2998c9bd29992af1d1880b284d8
Author: Caolán McNamara 
Date:   Thu Feb 6 21:07:19 2014 +

silence coverity#1027865 Out-of-bounds access

and coverity#1027864

Change-Id: Ic3d1b91ef77ab3510c7428b7135dd9f249d56b4b

diff --git a/comphelper/source/misc/docpasswordhelper.cxx 
b/comphelper/source/misc/docpasswordhelper.cxx
index 9d312a3..72b8636 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -284,7 +284,18 @@ Sequence< sal_Int8 > 
DocPasswordHelper::GetXLHashAsSequence(
 /*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( 
const sal_uInt16 pPassData[16], const uno::Sequence< sal_Int8 >& aDocId )
 {
 uno::Sequence< sal_Int8 > aResultKey;
-if ( pPassData[0] && aDocId.getLength() == 16 )
+
+if ( aDocId.getLength() == 16 )
+aResultKey = GenerateStd97Key(pPassData, (const 
sal_uInt8*)aDocId.getConstArray());
+
+return aResultKey;
+}
+
+// 
+/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( 
const sal_uInt16 pPassData[16], const sal_uInt8 pDocId[16] )
+{
+uno::Sequence< sal_Int8 > aResultKey;
+if ( pPassData[0] )
 {
 sal_uInt8 pKeyData[64];
 memset( pKeyData, 0, sizeof(pKeyData) );
@@ -312,7 +323,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
 for ( nInd = 0; nInd < 16; nInd++ )
 {
 rtl_digest_updateMD5( hDigest, pKeyData, 5 );
-rtl_digest_updateMD5( hDigest, (const 
sal_uInt8*)aDocId.getConstArray(), aDocId.getLength() );
+rtl_digest_updateMD5( hDigest, pDocId, 16 );
 }
 
 // Update digest with padding.
@@ -334,6 +345,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
 return aResultKey;
 }
 
+
 // 
 
 /*static*/ ::com

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

[Kohei Yoshida]

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

New commits:
commit a1c6bed17f373947ee41d395fb380b663fba5d64
Author: Kohei Yoshida 
Date:   Thu Feb 6 18:08:03 2014 -0500

fdo#74553: Use the shared formula column position Excel tells you...

Because sometimes this may be correct.

Change-Id: Id2c47bb4ad3f91b366a25306169de58bb38c1e81
(cherry picked from commit 16442998b8b6ac7e284ab2377013f36c28b2cb8c)
Reviewed-on: https://gerrit.libreoffice.org/7908
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index 0273ddd..644485f 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -124,7 +124,7 @@ void ImportExcel::Formula(
 SCROW nSharedRow;
 if (pFormConv->ReadSharedFormulaPosition(maStrm, nSharedCol, 
nSharedRow))
 {
-ScAddress aRefPos(aScPos.Col(), nSharedRow, GetCurrScTab());
+ScAddress aRefPos(nSharedCol, nSharedRow, GetCurrScTab());
 const ScTokenArray* pSharedCode = 
pFormConv->GetSharedFormula(aRefPos);
 if (pSharedCode)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sax/source/expatwrap/sax_expat.cxx |  112 +
 1 file changed, 54 insertions(+), 58 deletions(-)

New commits:
commit f1a09e08f2c4e19d0294737d7ff5c38147d1063c
Author: Stephan Bergmann 
Date:   Fri Feb 7 09:32:07 2014 +0100

Use rtl::Reference

Change-Id: Ia14ad80f13bffe4c1d0078da0198a3ae6eae581e

diff --git a/sax/source/expatwrap/sax_expat.cxx 
b/sax/source/expatwrap/sax_expat.cxx
index 994dc86..da11585 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -201,8 +201,7 @@ public: // module scope
 css::uno::Reference < XLocator >  rDocumentLocator;
 
 
-css::uno::Reference < XAttributeList >rAttrList;
-sax_expatwrap::AttributeList   *pAttrList;
+rtl::Reference < sax_expatwrap::AttributeList > rAttrList;
 
 // External entity stack
 vector   vecEntity;
@@ -227,7 +226,6 @@ public:
 SaxExpatParser_Impl()
 : sCDATA("CDATA")
 , m_bEnableDoS(false)
-, pAttrList(NULL)
 , bExceptionWasThrown(false)
 , bRTExceptionWasThrown(false)
 {
@@ -411,10 +409,9 @@ SaxExpatParser::SaxExpatParser(  )
 LocatorImpl *pLoc = new LocatorImpl( m_pImpl );
 m_pImpl->rDocumentLocator = css::uno::Reference< XLocator > ( pLoc );
 
-// performance-improvement. Reference is needed when calling the startTag 
callback.
-// Handing out the same object with every call is allowed (see 
sax-specification)
-m_pImpl->pAttrList = new sax_expatwrap::AttributeList;
-m_pImpl->rAttrList = css::uno::Reference< XAttributeList > ( 
m_pImpl->pAttrList );
+// Performance-improvement; handing out the same object with every call of
+// the startElement callback is allowed (see sax-specification):
+m_pImpl->rAttrList = new sax_expatwrap::AttributeList;
 
 m_pImpl->bExceptionWasThrown = false;
 m_pImpl->bRTExceptionWasThrown = false;
@@ -775,11 +772,11 @@ void SaxExpatParser_Impl::callbackStartElement( void 
*pvThis ,
 if( pImpl->rDocumentHandler.is() ) {
 
 int i = 0;
-pImpl->pAttrList->clear();
+pImpl->rAttrList->clear();
 
 while( awAttributes[i] ) {
 assert(awAttributes[i+1]);
-pImpl->pAttrList->addAttribute(
+pImpl->rAttrList->addAttribute(
 XML_CHAR_TO_OUSTRING( awAttributes[i] ) ,
 pImpl->sCDATA,  // expat doesn't know types
 XML_CHAR_TO_OUSTRING( awAttributes[i+1] ) );
@@ -789,7 +786,7 @@ void SaxExpatParser_Impl::callbackStartElement( void 
*pvThis ,
 CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(
 pImpl ,
 rDocumentHandler->startElement( XML_CHAR_TO_OUSTRING( pwName ) ,
-pImpl->rAttrList ) );
+pImpl->rAttrList.get() ) );
 }
 }
 
commit 922f44344e832d6b4ffaa8a4d8b3d3dfb2c892aa
Author: Stephan Bergmann 
Date:   Fri Feb 7 09:29:21 2014 +0100

Avoid css::uno using directives (Reference ambiguities)

Change-Id: Ia702572bef47738531b526addeecd86e7b39aad2

diff --git a/sax/source/expatwrap/sax_expat.cxx 
b/sax/source/expatwrap/sax_expat.cxx
index 6608a4d..994dc86 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -41,7 +41,6 @@
 using namespace ::std;
 using namespace ::osl;
 using namespace ::cppu;
-using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::io;
@@ -145,29 +144,29 @@ public:
 ~SaxExpatParser();
 
 // ::com::sun::star::lang::XInitialization:
-virtual void SAL_CALL initialize(Sequence const& rArguments)
-throw (RuntimeException, Exception);
+virtual void SAL_CALL initialize(css::uno::Sequence const& 
rArguments)
+throw (css::uno::RuntimeException, css::uno::Exception);
 
 // The SAX-Parser-Interface
 virtual void SAL_CALL parseStream(  const InputSource& structSource)
 throw ( SAXException,
 IOException,
-RuntimeException);
-virtual void SAL_CALL setDocumentHandler(const Reference< XDocumentHandler 
> & xHandler)
-throw (RuntimeException);
+css::uno::RuntimeException);
+virtual void SAL_CALL setDocumentHandler(const css::uno::Reference< 
XDocumentHandler > & xHandler)
+throw (css::uno::RuntimeException);
 
-virtual void SAL_CALL setErrorHandler(const Reference< XErrorHandler > & 
xHandler)
-throw (RuntimeException);
-virtual void SAL_CALL setDTDHandler(const Reference < XDTDHandler > & 
xHandler)
-throw (RuntimeException);
-virtual void SAL_CALL setEntityResolver(const Reference<  XEntityResolver 
>& xResolver)
-throw (RuntimeException);
+virtual void SAL_CALL setErrorHandler(const css::uno::Reference< 
XErrorHandler > & xHandler)
+throw (css::uno::RuntimeException);
+virtual void 

Re: Building LibreOffice on Mac failed...

[Alex Thurgood]

Le 07/02/2014 01:22, yjw9012 a écrit :

Hi,

> WARNING: Ant does not work - Some Java projects will not build!
> checking whether Ant is >= 1.6.0... ./configure: line 38564: test: not
> /System/Library/Frameworks/JavaVM: integer expression expected
> ./configure: line 38567: test: framework/Versions/CurrentJDK/Home/bin/java:
> integer expression expected
> configure: error: no, you need at least Ant >= 1.6.0
> Error running configure at ./autogen.sh line 209.
> 

I've encountered this error before, but don't remember how it got solved
unfortunately. Which version of JDK/JVM are you using ?

More to the point, which version of OSX, and XCode are you using ?

Alex


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