LibreOffice Gerrit News for core on 2014-05-27
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + RID_DLG_UPDATEINSTALL conversion to .ui in https://gerrit.libreoffice.org/9464 from Szymon Kłos about module desktop, extras + Remove ASCII art and useless comments from sw module in https://gerrit.libreoffice.org/9494 from Chris Laplante about module sw + Remove unnecessary semicolons in https://gerrit.libreoffice.org/9493 from Peter Senna Tschudin about module chart2, crashrep, cui, dbaccess, editeng, extensions, filter, forms, framework, hwpfilter, i18npool, idl, l10ntools, lotuswordpro, oox, registry, rsc, sal, sc, sd, sdext, sfx2, soltools, starmath, svl, svx, sw, test, toolkit, vcl, winaccessibility, xmloff End of freshness + fdo#78920: Number %NUMBERSTRING in tooltip in https://gerrit.libreoffice.org/9492 from Jason Hulme about module svx * Merged changes on master for project core changed in the last 25 hours: + rebase all import libs in https://gerrit.libreoffice.org/9481 from David Tardon + fdo#79062 File having Footnote with Text Effect got corrupted after RT in https://gerrit.libreoffice.org/9439 from Ravindra Vidhate * Abandoned changes on master for project core changed in the last 25 hours: + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT in https://gerrit.libreoffice.org/9400 from Mukhiddin Yusupov * Open changes needing tweaks, but being untouched for more than a week: + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for submodules on 2014-05-27
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: + correct name of command adding separator in customize dialog in https://gerrit.libreoffice.org/9491 from Stanislav Horáček + rename print range command Remove to Clear in https://gerrit.libreoffice.org/9490 from Stanislav Horáček * Merged changes on master for project help changed in the last 25 hours: None * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65583] Elements Dock window needs scroll bar.
https://bugs.freedesktop.org/show_bug.cgi?id=65583 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added CC||frap...@gmail.com --- Comment #10 from Adolfo Jayme f...@libreoffice.org --- *** Bug 79215 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 78920] Number %NUMBERINGSAMPLE in tooltip
https://bugs.freedesktop.org/show_bug.cgi?id=78920 --- Comment #5 from Andras Timar tima...@gmail.com --- Maybe the current code is a bit overcomplicated. %NUMBERINGSAMPLE is supposed to be replaced by the setting in the Options tab on the Bullets and Numbering dialog. But it does not make much sense... So please go ahead with your patch. Thanks. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 78920] Number %NUMBERINGSAMPLE in tooltip
https://bugs.freedesktop.org/show_bug.cgi?id=78920 --- Comment #4 from Andras Timar tima...@gmail.com --- Maybe the current code is a bit overcomplicated. %NUMBERINGSAMPLE is supposed to be replaced by the setting in the Options tab on the Bullets and Numbering dialog. But it does not make much sense... So please go ahead with you patch. Thanks. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source sw/inc sw/source xmloff/source
svx/source/svdraw/svdograf.cxx |8 +---
sw/inc/ndgrf.hxx|9 ++---
sw/source/core/graphic/ndgrf.cxx| 18 +-
sw/source/core/unocore/unoframe.cxx |1 -
sw/source/filter/xml/xmltexte.cxx | 10 ++
xmloff/source/draw/shapeexport.cxx | 11 +++
6 files changed, 37 insertions(+), 20 deletions(-)
New commits:
commit 5a48cf8d01454ea6539d6bdc3c8ad7588c50701c
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon May 19 11:37:11 2014 +
various situations where graphic go missing on save
Resolves: #i114361# provide and accept changed URL...
of embedded graphic file during save (ODF export)
(cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f)
Conflicts:
sw/inc/ndgrf.hxx
sw/source/core/graphic/ndgrf.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/filter/xml/xmltexte.cxx
xmloff/source/draw/shapeexport2.cxx
(cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d)
Conflicts:
sw/inc/ndgrf.hxx
Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986
Resolves: #i124946# only apply new embedded stream name...
for a graphic, if is already has one.
- needed correction for the fix made for issue #i114361#
(cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9)
Conflicts:
sw/inc/ndgrf.hxx
sw/source/core/graphic/ndgrf.cxx
sw/source/filter/xml/xmltexte.cxx
(cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d)
Conflicts:
sw/inc/ndgrf.hxx
sw/source/core/graphic/ndgrf.cxx
Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8
Resolves: #i124966# keep picture format information
- GfxLink instance - also for the reading of preview picture data
in order to avoid trouble on save in case that the preview data equals the
picture data
(cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366)
Conflicts:
svx/source/svdraw/svdograf.cxx
(cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72)
Conflicts:
svx/source/svdraw/svdograf.cxx
Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d
Reviewed-on: https://gerrit.libreoffice.org/9456
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 30e51f0..0a672d3 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1389,9 +1389,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
{
pFilterData = new com::sun::star::uno::Sequence
com::sun::star::beans::PropertyValue ( 3 );
-com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
-sal_Bool bAllowPartialStreamRead = true;
-sal_Bool bCreateNativeLink = false;
+const com::sun::star::awt::Size aPreviewSizeHint( 64,
64 );
+const sal_Bool bAllowPartialStreamRead = true;
+// create GfxLink instance also for previews in
order to avoid that its corresponding
+// data is cleared in the graphic cache entry in case
that the preview data equals the complete graphic data
+const sal_Bool bCreateNativeLink = true;
(*pFilterData)[ 0 ].Name = PreviewSizeHint;
(*pFilterData)[ 0 ].Value = aPreviewSizeHint;
(*pFilterData)[ 1 ].Name = AllowPartialStreamRead;
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index a2687d6..599b6d4 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -74,7 +74,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
void InsertLink( const OUString rGrfName, const OUString rFltName );
sal_Bool ImportGraphic( SvStream rStrm );
-sal_Bool HasStreamName() const { return maGrfObj.HasUserData(); }
/** adjust return type and rename method to
indicate that its an private one. */
@@ -172,8 +171,12 @@ public:
short SwapIn( sal_Bool bWaitForData = sal_False );
/// Remove graphic in order to free memory.
short SwapOut();
-/// Access to storage stream-name.
-void SetStreamName( const OUString r ) { maGrfObj.SetUserData( r ); }
+bool HasEmbeddedStreamName() const { return maGrfObj.HasUserData(); }
+/// applying new stream name for embedded graphic - needed as saving the
document might change this stream name
+void ApplyNewEmbeddedStreamName(const OUString r)
+{
+maGrfObj.SetUserData(r);
+}
/// Is this node selected by any shell?
sal_Bool IsSelected() const;
diff --git
[Libreoffice-commits] core.git: 15 commits - sw/inc sw/Library_sw.mk sw/source
sw/Library_sw.mk |1
sw/inc/cmdid.h |1
sw/inc/doc.hxx |4
sw/inc/textboxhelper.hxx | 53 ++
sw/inc/unoprnms.hxx|1
sw/source/core/doc/docfly.cxx | 23 ++
sw/source/core/doc/textboxhelper.cxx | 279 +
sw/source/core/unocore/unocoll.cxx | 12 +
sw/source/core/unocore/unodraw.cxx | 40
sw/source/core/unocore/unomap.cxx |1
sw/source/core/unocore/unoobj2.cxx |9 +
sw/source/core/unocore/unoportenum.cxx | 14 +
12 files changed, 426 insertions(+), 12 deletions(-)
New commits:
commit 73e4257ec8eb2079052e2a7d9aef1949c989fb2a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue May 27 09:08:33 2014 +0200
SwXTextPortionEnumeration: do not expose inline anchored textboxes
Change-Id: Id4aecd49e29f6aa8347be4d9e3e8f0e73f7c5a21
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index c6a7bc4..887b84f 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -28,6 +28,7 @@
#include ndtxt.hxx
#include unocrsr.hxx
#include docary.hxx
+#include textboxhelper.hxx
#include tox.hxx
#include unomid.h
#include unoparaframeenum.hxx
@@ -43,6 +44,7 @@
#include fmtanchr.hxx
#include fmtrfmrk.hxx
#include frmfmt.hxx
+#include fmtflcnt.hxx
#include unoidx.hxx
#include unocoll.hxx
#include redline.hxx
@@ -687,7 +689,8 @@ lcl_ExportHints(
const sal_Int32 nCurrentIndex,
const bool bRightMoveForbidden,
bool o_rbCursorMoved,
-sal_Int32 o_rNextAttrPosition )
+sal_Int32 o_rNextAttrPosition,
+std::listSwFrmFmt* rTextBoxes)
{
// if the attribute has a dummy character, then xRef is set (except META)
// otherwise, the portion for the attribute is inserted into rPortions!
@@ -856,6 +859,11 @@ lcl_ExportHints(
pUnoCrsr-Right(1,CRSR_SKIP_CHARS,false,false);
if( *pUnoCrsr-GetMark() == *pUnoCrsr-GetPoint() )
break; // Robust #i81708 content in covered cells
+
+// Do not expose inline anchored textboxes.
+if (std::find(rTextBoxes.begin(), rTextBoxes.end(),
pAttr-GetFlyCnt().GetFrmFmt()) != rTextBoxes.end())
+break;
+
pUnoCrsr-Exchange();
xRef = new SwXTextPortion( pUnoCrsr, xParent,
PORTION_FRAME);
}
@@ -1234,6 +1242,8 @@ static void lcl_CreatePortions(
PortionStack_t PortionStack;
PortionStack.push( PortionList_t(i_rPortions, (const SwTxtAttr *)0) );
+std::listSwFrmFmt* aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+
bool bAtEnd( false );
while (!bAtEnd) // every iteration consumes at least current character!
{
@@ -1284,7 +1294,7 @@ static void lcl_CreatePortions(
// N.B.: side-effects nNextAttrIndex, bCursorMoved; may move cursor
xRef = lcl_ExportHints(PortionStack, i_xParentText, pUnoCrsr,
pHints, i_nStartPos, i_nEndPos, nCurrentIndex, bAtEnd,
-bCursorMoved, nNextAttrIndex);
+bCursorMoved, nNextAttrIndex, aTextBoxes);
if (PortionStack.empty())
{
OSL_FAIL(CreatePortions: stack underflow);
commit d2aa5fc49a5c7669aac5afa05ac99bb29c78971f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue May 27 09:08:16 2014 +0200
SwXFrameEnumeration: ignore textboxes
Change-Id: I6b37e904898c8b57e619443035ca271b411f5f00
diff --git a/sw/source/core/unocore/unocoll.cxx
b/sw/source/core/unocore/unocoll.cxx
index 3ecae22..a6e2831 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -49,6 +49,7 @@
#include unofield.hxx
#include unoidx.hxx
#include unoframe.hxx
+#include textboxhelper.hxx
#include unofootnote.hxx
#include vcl/svapp.hxx
#include fmtcntnt.hxx
@@ -1087,12 +1088,15 @@ SwXFrameEnumerationT::SwXFrameEnumeration(const
SwDoc* const pDoc)
::std::insert_iteratorfrmcontainer_t pInserter =
::std::insert_iteratorfrmcontainer_t(m_aFrames, m_aFrames.begin());
// #i104937#
SwFrmFmt* pFmt( 0 );
+
+std::listSwFrmFmt* aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+
for( sal_uInt16 i = 0; i nSize; ++i )
//for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt pFmtsEnd; ++pFmt)
{
// #i104937#
pFmt = (*pFmts)[i];
-if(pFmt-Which() != RES_FLYFRMFMT)
+if(pFmt-Which() != RES_FLYFRMFMT || std::find(aTextBoxes.begin(),
aTextBoxes.end(), pFmt) != aTextBoxes.end())
continue;
const SwNodeIndex* pIdx = pFmt-GetCntnt().GetCntntIdx();
if(!pIdx || !pIdx-GetNodes().IsDocNodes())
commit b12bb0fb2e8db6e0f2092163d9fe46dc990132dd
Author: Miklos Vajna vmik...@collabora.co.uk
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - icon-themes/galaxy
icon-themes/galaxy/brand/flat_logo.svg | 85 - 1 file changed, 43 insertions(+), 42 deletions(-) New commits: commit 7bf812bc1e976c895dcd65b0c01d46bc39e348fc Author: Caolán McNamara caol...@redhat.com Date: Mon May 26 12:34:07 2014 +0100 Resolves: fdo#79181 drop hidden shape and drop negative clip rect and just resize bg to the desired size. The negative clip is getting applied against an assumed 0,0 origin and so we're missing the bottom of the unclipped image. Change-Id: I9d7c5d17de15176d103690898281c6b875b560ca (cherry picked from commit f5251d35043cab1117e12677f0c40f3e849f3e1c) (cherry picked from commit e71fccd0729340c666e2b32dc09cdc9eff246568) Reviewed-on: https://gerrit.libreoffice.org/9486 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/icon-themes/galaxy/brand/flat_logo.svg b/icon-themes/galaxy/brand/flat_logo.svg index 3a9051c..b16b755 100644 --- a/icon-themes/galaxy/brand/flat_logo.svg +++ b/icon-themes/galaxy/brand/flat_logo.svg @@ -7,23 +7,34 @@ xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; xmlns:svg=http://www.w3.org/2000/svg; xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; version=1.1 width=486 height=80 - id=svg1205 - defs - id=defs1207 -clipPath - id=clipPath11479-0 - rect - width=530 - height=87.272736 - x=6.6086682e-06 - y=-18.11 - id=rect11481-5 - style=opacity:0.6;fill:#530260;fill-opacity:1;stroke:none / -/clipPath - /defs + id=svg1205 + inkscape:version=0.48.4 r9939 + sodipodi:docname=flat_logo.svg + sodipodi:namedview + pagecolor=#ff + bordercolor=#66 + borderopacity=1 + objecttolerance=10 + gridtolerance=10 + guidetolerance=10 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:window-width=993 + inkscape:window-height=709 + id=namedview3134 + showgrid=false + inkscape:zoom=1.5843621 + inkscape:cx=267.37384 + inkscape:cy=-38.823705 + inkscape:window-x=0 + inkscape:window-y=27 + inkscape:window-maximized=0 + inkscape:current-layer=svg1205 / metadata id=metadata1210 rdf:RDF @@ -32,37 +43,27 @@ dc:formatimage/svg+xml/dc:format dc:type rdf:resource=http://purl.org/dc/dcmitype/StillImage; / -dc:title/dc:title +dc:title / /cc:Work /rdf:RDF /metadata - g - transform=matrix(0.91698112,0,0,0.9157,-6e-6,16.50001) - clip-path=url(#clipPath11479-0) - id=g10412-3 - style=fill:#71a752;fill-opacity:1 -text - x=-287.35712 - y=233.28569 - id=text2985-8 - xml:space=preserve - style=font-size:40px;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#71a752;fill-opacity:1;stroke:nonetspan - x=-287.35712 - y=233.28569 - id=tspan2987-8 - style=fill:#71a752;fill-opacity:1 //text -path - d=m 530,-18.11 0,300.31 -530,0 0,-300.31 z - id=rect3983-6 - style=fill:#71a752;fill-opacity:1;stroke:none / -rect - width=530 - height=300 - x=5.4150391e-06 - y=-18 - id=rect13441-6 - style=fill:#71a752;fill-opacity:1;stroke:none / - /g + text + sodipodi:linespacing=125% + style=font-size:36.67295456px;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#71a752;fill-opacity:1;stroke:none + xml:space=preserve + id=text2985-8 + y=230.38472 + x=-263.45587 + transform=scale(1.0001716,0.99982847)tspan + style=fill:#71a752;fill-opacity:1 + id=tspan2987-8 + y=230.38472 + x=-263.45587 //text + path + inkscape:connector-curvature=0 + style=fill:#71a752;fill-opacity:1;stroke:none + id=rect3983-6 + d=m 485.9,0 0,80 L -6e-6,80 l 0,-80 z / g transform=matrix(0.62747746,0,0,0.62747746,-228.72288,-1457.0571) id=g4122 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 78920] Number %NUMBERINGSAMPLE in tooltip
https://bugs.freedesktop.org/show_bug.cgi?id=78920 Andras Timar tima...@gmail.com changed: What|Removed |Added Status|NEW |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: svx/source
svx/source/dialog/svxbmpnumvalueset.src |4 +--
svx/source/sidebar/nbdtmg.cxx | 37
2 files changed, 3 insertions(+), 38 deletions(-)
New commits:
commit ceb7ea5091bd9b862f92e853fd9f8f2542fb8b41
Author: Jason Hulme jsnhu...@gmail.com
Date: Mon May 26 12:30:36 2014 -0500
fdo#78920: Number %NUMBERSTRING in tooltip
Fixed string in Bullets and Numbering and changed sidebar to use the same
set of strings.
Change-Id: Ib8a103e203cf66c979216175d4047bca518290ce
Reviewed-on: https://gerrit.libreoffice.org/9492
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/svx/source/dialog/svxbmpnumvalueset.src
b/svx/source/dialog/svxbmpnumvalueset.src
index 8665a0b..93fb4f7 100644
--- a/svx/source/dialog/svxbmpnumvalueset.src
+++ b/svx/source/dialog/svxbmpnumvalueset.src
@@ -53,8 +53,8 @@ String RID_SVXSTR_BULLET_DESCRIPTION_7
};
String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
{
-//Text [en-US] = Number 1) 2) 3);
-Text [en-US] = Number %NUMBERINGSAMPLE;
+Text [en-US] = Number 1) 2) 3);
+//Text [en-US] = Number %NUMBERINGSAMPLE;
};
String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 5c32139..60ec2b3 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1351,42 +1351,7 @@ void NumberingTypeMgr::Init()
pNumEntry-nIndex = i + 1;
pNumEntry-nIndexDefault = i;
pNumEntry-pNumSetting = pNew;
-//SetItemText( i + 1, SVX_RESSTR(
RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ));
-{
-OUString sText;
-//const OUString sValue(C2U(Value));
-ReferenceXNumberingFormatter xFormatter(xDefNum, UNO_QUERY);
-if(xFormatter.is() aNumberings.getLength() i)
-{
-
-for (sal_uInt16 j=0;j3;j++)
-{
-SequencePropertyValue aLevel =
aNumberings.getConstArray()[i];
-try
-{
-aLevel.realloc(aLevel.getLength() + 1);
-PropertyValue rValue =
aLevel.getArray()[aLevel.getLength() - 1];
-rValue.Name = Value;
-rValue.Value = (sal_Int32)(j + 1);
-
-if (j!=0)
-sText += ;
-
-sText += xFormatter-makeNumberingString( aLevel,
aLocale );
-}
-catch (const Exception)
-{
-OSL_ENSURE(false, Exception in
DefaultNumberingProvider::makeNumberingString);
-}
-}
-}
-OUString aStrFromRES(SVX_RESSTR(
RID_SVXSTR_SINGLENUM_DESCRIPTIONS));
-aStrFromRES =
aStrFromRES.replaceFirst(%NUMBERINGSAMPLE,sText);
-pNumEntry-sDescription = aStrFromRES;
-}
-//End modification
-
-//pNumEntry-sDescription = SVX_RESSTR(
RID_SVXSTR_SINGLENUM_DESCRIPTION_0 + i );
+pNumEntry-sDescription = SVX_RESSTR(
RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
pNumberSettingsArr-push_back(boost::shared_ptrNumberSettings_Impl(pNumEntry));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 78920] Number %NUMBERINGSAMPLE in tooltip
https://bugs.freedesktop.org/show_bug.cgi?id=78920 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack|EasyHack |DifficultyBeginner TopicUI |DifficultyBeginner TopicUI ||target:4.3.0 --- Comment #6 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Jason Hulme committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=ceb7ea5091bd9b862f92e853fd9f8f2542fb8b41 fdo#78920: Number %NUMBERSTRING in tooltip The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/svg/svgexport.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 10a2c2e9026b587a47532865901ea6d5ae9c536a Author: László Németh nem...@numbertext.org Date: Fri May 23 01:11:07 2014 +0200 fdo#79078 restore transparency in SVG export Change-Id: I5bdf6c3b313a73126cb692e5101836f424a2fc08 Reviewed-on: https://gerrit.libreoffice.org/9442 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 065310f..59b8ae4 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -349,8 +349,8 @@ SVGExport::SVGExport( // Native Decoration mbIsUseNativeTextDecoration = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_NATIVEDECORATION, sal_False); -// Tiny Opacity -mbIsUseOpacity = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, sal_True); +// Tiny Opacity (supported from SVG Tiny 1.2) +mbIsUseOpacity = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, sal_True); // Positioned Characters(Seems to be experimental, as it was always initialized with false) mbIsUsePositionedCharacters = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_POSITIONED_CHARACTERS, sal_False); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - svx/source vcl/qa
svx/source/dialog/svxbmpnumvalueset.src |4
svx/source/sidebar/nbdtmg.cxx | 37 ---
vcl/qa/cppunit/builder/demo.ui | 160
3 files changed, 83 insertions(+), 118 deletions(-)
New commits:
commit 05086b3449eeb8354fe287989122ead626268fff
Author: Jason Hulme jsnhu...@gmail.com
Date: Mon May 26 12:30:36 2014 -0500
fdo#78920: Number %NUMBERSTRING in tooltip
Fixed string in Bullets and Numbering and changed sidebar to use the same
set of strings.
Change-Id: Ib8a103e203cf66c979216175d4047bca518290ce
Reviewed-on: https://gerrit.libreoffice.org/9492
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit ceb7ea5091bd9b862f92e853fd9f8f2542fb8b41)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/svx/source/dialog/svxbmpnumvalueset.src
b/svx/source/dialog/svxbmpnumvalueset.src
index 8665a0b..93fb4f7 100644
--- a/svx/source/dialog/svxbmpnumvalueset.src
+++ b/svx/source/dialog/svxbmpnumvalueset.src
@@ -53,8 +53,8 @@ String RID_SVXSTR_BULLET_DESCRIPTION_7
};
String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
{
-//Text [en-US] = Number 1) 2) 3);
-Text [en-US] = Number %NUMBERINGSAMPLE;
+Text [en-US] = Number 1) 2) 3);
+//Text [en-US] = Number %NUMBERINGSAMPLE;
};
String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 567e3ea..d052708 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1351,42 +1351,7 @@ void NumberingTypeMgr::Init()
pNumEntry-nIndex = i + 1;
pNumEntry-nIndexDefault = i;
pNumEntry-pNumSetting = pNew;
-//SetItemText( i + 1, SVX_RESSTR(
RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ));
-{
-OUString sText;
-//const OUString sValue(C2U(Value));
-ReferenceXNumberingFormatter xFormatter(xDefNum, UNO_QUERY);
-if(xFormatter.is() aNumberings.getLength() i)
-{
-
-for (sal_uInt16 j=0;j3;j++)
-{
-SequencePropertyValue aLevel =
aNumberings.getConstArray()[i];
-try
-{
-aLevel.realloc(aLevel.getLength() + 1);
-PropertyValue rValue =
aLevel.getArray()[aLevel.getLength() - 1];
-rValue.Name = Value;
-rValue.Value = (sal_Int32)(j + 1);
-
-if (j!=0)
-sText += ;
-
-sText += xFormatter-makeNumberingString( aLevel,
aLocale );
-}
-catch (const Exception)
-{
-OSL_ENSURE(false, Exception in
DefaultNumberingProvider::makeNumberingString);
-}
-}
-}
-OUString aStrFromRES(SVX_RESSTR(
RID_SVXSTR_SINGLENUM_DESCRIPTIONS));
-aStrFromRES =
aStrFromRES.replaceFirst(%NUMBERINGSAMPLE,sText);
-pNumEntry-sDescription = aStrFromRES;
-}
-//End modification
-
-//pNumEntry-sDescription = SVX_RESSTR(
RID_SVXSTR_SINGLENUM_DESCRIPTION_0 + i );
+pNumEntry-sDescription = SVX_RESSTR(
RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
pNumberSettingsArr-push_back(boost::shared_ptrNumberSettings_Impl(pNumEntry));
}
}
commit 0aa2889eeb9c6b43f6b583d194eb23aef780ac78
Author: Andras Timar andras.ti...@collabora.com
Date: Tue May 27 09:50:38 2014 +0200
mark QA file non-translatable
Change-Id: I19f10c40151ebfea9b02bfe5df7c31b157188351
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 1b31adc..a75f5dd 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -75,7 +75,7 @@
object class=GtkLabel id=labelfoo
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=label translatable=yescell
1.1/property
+property name=label translatable=nocell
1.1/property
/object
packing
property name=left_attach0/property
@@ -89,7 +89,7 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=xalign1/property
-property name=label translatable=yescell
3.3/property
+property name=label translatable=nocell
3.3/property
/object
packing
[Bug 78920] Number %NUMBERINGSAMPLE in tooltip
https://bugs.freedesktop.org/show_bug.cgi?id=78920 --- Comment #7 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Jason Hulme committed a patch related to this issue. It has been pushed to libreoffice-4-3: http://cgit.freedesktop.org/libreoffice/core/commit/?id=05086b3449eeb8354fe287989122ead626268fffh=libreoffice-4-3 fdo#78920: Number %NUMBERSTRING in tooltip It will be available in LibreOffice 4.3. 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/qa
vcl/qa/cppunit/builder/demo.ui | 160 - 1 file changed, 80 insertions(+), 80 deletions(-) New commits: commit 3bb1051a27e6d37b5c8ebbaacb9de49b140b4909 Author: Andras Timar andras.ti...@collabora.com Date: Tue May 27 09:50:38 2014 +0200 mark QA file non-translatable Change-Id: I19f10c40151ebfea9b02bfe5df7c31b157188351 diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui index 1b31adc..a75f5dd 100644 --- a/vcl/qa/cppunit/builder/demo.ui +++ b/vcl/qa/cppunit/builder/demo.ui @@ -75,7 +75,7 @@ object class=GtkLabel id=labelfoo property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yescell 1.1/property +property name=label translatable=nocell 1.1/property /object packing property name=left_attach0/property @@ -89,7 +89,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign1/property -property name=label translatable=yescell 3.3/property +property name=label translatable=nocell 3.3/property /object packing property name=left_attach2/property @@ -102,7 +102,7 @@ object class=GtkLabel id=label5 property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesA label that spans three rows/property +property name=label translatable=noA label that spans three rows/property /object packing property name=left_attach0/property @@ -172,12 +172,12 @@ property name=can_focusFalse/property child object class=GtkButton id=button4 -property name=label translatable=yesEXPAND/property +property name=label translatable=noEXPAND/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=tooltip_text translatable=yesA tooltip example/property +property name=tooltip_text translatable=noA tooltip example/property property name=use_action_appearanceFalse/property /object packing @@ -188,7 +188,7 @@ /child child object class=GtkButton id=button5 -property name=label translatable=yesFILL/property +property name=label translatable=noFILL/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property @@ -214,7 +214,7 @@ property name=can_focusFalse/property child object class=GtkButton id=button3 -property name=label translatable=yesbutton/property +property name=label translatable=nobutton/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property @@ -229,7 +229,7 @@ /child child object class=GtkRadioButton id=radiobutton1 -property name=label translatable=yesradiobutton/property +property name=label translatable=noradiobutton/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property @@ -247,7 +247,7 @@ /child child object class=GtkCheckButton id=checkbutton1 -property name=label translatable=yescheckbutton/property +property name=label translatable=nocheckbutton/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property @@ -292,7 +292,7 @@
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 --- Comment #17 from Thomas Arnhold thomas-l...@arnhold.org --- If we decide to remove the translations, one questions comes up for me: Looking at the current translation list inside the translations repo (e.g. for omega): git grep -A1 'msgid omega' -- 'source/*/starmath/*' It's not quite often translated. But, there are many Russian and Asian languages. Are they able to input Latin characters as easy as with an qwerty keyboard? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svx/source sw/inc sw/source vcl/source xmloff/source
svx/source/svdraw/svdograf.cxx |8 +---
sw/inc/ndgrf.hxx|9 ++---
sw/source/core/graphic/ndgrf.cxx| 18 +-
sw/source/core/unocore/unoframe.cxx |1 -
sw/source/filter/xml/xmltexte.cxx | 10 ++
vcl/source/filter/graphicfilter.cxx |2 +-
xmloff/source/draw/shapeexport.cxx | 11 +++
7 files changed, 38 insertions(+), 21 deletions(-)
New commits:
commit 51bc76f170c8fc71bc37c058c5e6cd1f14b773fb
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon May 19 11:37:11 2014 +
various situations where graphic go missing on save
Resolves: #i114361# provide and accept changed URL...
of embedded graphic file during save (ODF export)
(cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f)
Conflicts:
sw/inc/ndgrf.hxx
sw/source/core/graphic/ndgrf.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/filter/xml/xmltexte.cxx
xmloff/source/draw/shapeexport2.cxx
Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986
(cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d)
Resolves: #i124717# do not mark *.svm graphic files as *.bmp graphic files
(cherry picked from commit a5cfb91f3dc4b38055fb920f65101cc45d52f8de)
Conflicts:
svtools/source/filter/filter.cxx
Change-Id: I43f62a453bfa17254cebc07bde95f07f16a329c2
(cherry picked from commit 12dd68e3d20ad36ebe7cb40a600215f6d2b7b6ec)
Resolves: #i124946# only apply new embedded stream name...
for a graphic, if is already has one.
- needed correction for the fix made for issue #i114361#
(cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9)
Conflicts:
sw/inc/ndgrf.hxx
sw/source/core/graphic/ndgrf.cxx
sw/source/filter/xml/xmltexte.cxx
Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8
(cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d)
Resolves: #i124966# keep picture format information
- GfxLink instance - also for the reading of preview picture data
in order to avoid trouble on save in case that the preview data equals the
picture data
(cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366)
Conflicts:
svx/source/svdraw/svdograf.cxx
Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d
(cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72)
Reviewed-on: https://gerrit.libreoffice.org/9455
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index df6189d..5a9496f 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1352,9 +1352,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
{
pFilterData = new com::sun::star::uno::Sequence
com::sun::star::beans::PropertyValue ( 3 );
-com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
-bool bAllowPartialStreamRead = true;
-bool bCreateNativeLink = false;
+const com::sun::star::awt::Size aPreviewSizeHint( 64,
64 );
+const bool bAllowPartialStreamRead = true;
+// create GfxLink instance also for previews in
order to avoid that its corresponding
+// data is cleared in the graphic cache entry in case
that the preview data equals the complete graphic data
+const bool bCreateNativeLink = true;
(*pFilterData)[ 0 ].Name = PreviewSizeHint;
(*pFilterData)[ 0 ].Value = aPreviewSizeHint;
(*pFilterData)[ 1 ].Name = AllowPartialStreamRead;
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index d5e3ddd..4d97b6a 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -72,7 +72,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
void InsertLink( const OUString rGrfName, const OUString rFltName );
bool ImportGraphic( SvStream rStrm );
-bool HasStreamName() const { return maGrfObj.HasUserData(); }
/** adjust return type and rename method to
indicate that its an private one. */
@@ -174,8 +173,12 @@ public:
bool SwapIn( bool bWaitForData = false );
/// Remove graphic in order to free memory.
bool SwapOut();
-/// Access to storage stream-name.
-void SetStreamName( const OUString r ) { maGrfObj.SetUserData( r ); }
+bool HasEmbeddedStreamName() const { return maGrfObj.HasUserData(); }
+/// applying new stream name for embedded graphic - needed as saving the
document might change this stream name
+void ApplyNewEmbeddedStreamName(const OUString r)
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/source
sw/source/filter/ww8/ww8par5.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f58522d989b17552f739c1fe63fe5ba483c662e3 Author: Andras Timar andras.ti...@collabora.com Date: Tue May 27 10:11:19 2014 +0200 build fix Change-Id: If249946cb33d984dbe9eeec3889ea80246df3a52 diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index d55cb57..1c40271 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2546,7 +2546,7 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, String rStr ) pSBase-WW8ReadString( *pStrm, aResult, pPlcxMan-GetCpOfs()+ pF-nSRes, pF-nLRes, eTextCharSet ); -aResult = aResult.replace( '\xb', '\n' ); +aResult.SearchAndReplaceAll( '\xb', '\n' ); aFld.InitContent(aResult); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/iras/iras.cxx | 32 +-
1 file changed, 14 insertions(+), 18 deletions(-)
New commits:
commit ba00f596cfbb78046e705f1d45264951bf03a9a1
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 27 10:30:05 2014 +0200
Fix memory leak (as observed with CppunitTest_filter_ras_test)
Change-Id: Id3fa526f01ab7dae72beb311fe0774ba1f77d8a0
diff --git a/filter/source/graphicfilter/iras/iras.cxx
b/filter/source/graphicfilter/iras/iras.cxx
index 9f71ab7..4b76245 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -20,6 +20,7 @@
#include vcl/graph.hxx
#include vcl/bmpacc.hxx
+#include vcl/scopedbitmapaccess.hxx
class FilterConfigItem;
@@ -44,7 +45,6 @@ private:
boolmbStatus;
Bitmap maBmp;
-BitmapWriteAccess* mpAcc;
sal_uInt32 mnWidth, mnHeight; // Bildausmass in Pixeln
sal_uInt16 mnDstBitsPerPix;
sal_uInt16 mnDstColors;
@@ -53,7 +53,7 @@ private:
sal_uInt8 mnRepCount, mnRepVal; // RLE Decoding
boolmbPalette;
-boolImplReadBody();
+boolImplReadBody(BitmapWriteAccess * pAcc);
boolImplReadHeader();
sal_uInt8 ImplGetByte();
@@ -68,7 +68,6 @@ public:
RASReader::RASReader(SvStream rRAS)
: m_rRAS(rRAS)
, mbStatus(true)
-, mpAcc(NULL)
, mnWidth(0)
, mnHeight(0)
, mnDstBitsPerPix(0)
@@ -108,7 +107,8 @@ bool RASReader::ReadRAS(Graphic rGraphic)
return false;
maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix );
-if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
+Bitmap::ScopedWriteAccess pAcc(maBmp);
+if ( pAcc == 0 )
return false;
if ( mnDstBitsPerPix = 8 ) // paletten bildchen
@@ -127,7 +127,7 @@ bool RASReader::ReadRAS(Graphic rGraphic)
if ( ( mnDstColors = 2 ) ( ( mnColorMapSize % 3 ) == 0 ) )
{
-mpAcc-SetPaletteEntryCount( mnDstColors );
+pAcc-SetPaletteEntryCount( mnDstColors );
sal_uInt16 i;
sal_uInt8 nRed[256], nGreen[256], nBlue[256];
for ( i = 0; i mnDstColors; i++ ) m_rRAS.ReadUChar( nRed[ i
] );
@@ -135,7 +135,7 @@ bool RASReader::ReadRAS(Graphic rGraphic)
for ( i = 0; i mnDstColors; i++ ) m_rRAS.ReadUChar( nBlue[ i
] );
for ( i = 0; i mnDstColors; i++ )
{
-mpAcc-SetPaletteColor( i, BitmapColor( nRed[ i ], nGreen[
i ], nBlue[ i ] ) );
+pAcc-SetPaletteColor( i, BitmapColor( nRed[ i ], nGreen[
i ], nBlue[ i ] ) );
}
mbPalette = true;
}
@@ -149,11 +149,11 @@ bool RASReader::ReadRAS(Graphic rGraphic)
if ( !mbPalette )
{
mnDstColors = 1 mnDstBitsPerPix;
-mpAcc-SetPaletteEntryCount( mnDstColors );
+pAcc-SetPaletteEntryCount( mnDstColors );
for ( sal_uInt16 i = 0; i mnDstColors; i++ )
{
sal_uLong nCount = 255 - ( 255 * i / ( mnDstColors - 1 ) );
-mpAcc-SetPaletteColor( i, BitmapColor( (sal_uInt8)nCount,
(sal_uInt8)nCount, (sal_uInt8)nCount ) );
+pAcc-SetPaletteColor( i, BitmapColor( (sal_uInt8)nCount,
(sal_uInt8)nCount, (sal_uInt8)nCount ) );
}
}
}
@@ -167,12 +167,8 @@ bool RASReader::ReadRAS(Graphic rGraphic)
}
// Bitmap-Daten einlesen
-mbStatus = ImplReadBody();
+mbStatus = ImplReadBody(pAcc.get());
-if ( mpAcc )
-{
-maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
-}
if ( mbStatus )
rGraphic = maBmp;
@@ -219,7 +215,7 @@ bool RASReader::ImplReadHeader()
-bool RASReader::ImplReadBody()
+bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc)
{
sal_uLong x, y;
sal_uInt8 nDat = 0;
@@ -233,7 +229,7 @@ bool RASReader::ImplReadBody()
{
if (!(x 7))
nDat = ImplGetByte();
-mpAcc-SetPixelIndex( y, x,
+pAcc-SetPixelIndex( y, x,
sal::static_int_cast sal_uInt8 (
nDat ( ( x 7 ) ^ 7 )) );
}
@@ -247,7 +243,7 @@ bool RASReader::ImplReadBody()
for ( x = 0; x mnWidth; x++ )
{
nDat = ImplGetByte();
-mpAcc-SetPixelIndex( y, x, nDat );
+pAcc-SetPixelIndex( y, x, nDat );
}
if ( x 1 ) ImplGetByte(); // WORD
ALIGNMENT ???
}
@@ -274,7 +270,7 @@ bool RASReader::ImplReadBody()
nGreen = ImplGetByte();
nRed =
[Libreoffice-commits] core.git: 25 commits - include/svx include/vbahelper sc/source sd/source sfx2/source starmath/inc starmath/source svx/source sw/inc sw/source
include/svx/unopool.hxx |2 +-
include/svx/unoshape.hxx| 10 +-
include/vbahelper/vbacollectionimpl.hxx |2 +-
sc/source/ui/vba/vbaformatcondition.cxx | 11 ++-
sc/source/ui/vba/vbaformatcondition.hxx |7 ++-
sc/source/ui/vba/vbahyperlink.cxx |2 +-
sc/source/ui/vba/vbahyperlink.hxx |2 +-
sc/source/ui/vba/vbarange.cxx |2 +-
sc/source/ui/vba/vbarange.hxx |2 +-
sc/source/ui/vba/vbastyle.cxx |2 +-
sc/source/ui/vba/vbastyle.hxx |2 +-
sc/source/ui/vba/vbaworksheet.cxx |2 +-
sc/source/ui/vba/vbaworksheet.hxx |2 +-
sc/source/ui/vba/vbaworksheets.cxx |2 +-
sc/source/ui/vba/vbaworksheets.hxx |2 +-
sd/source/ui/unoidl/unoobj.cxx |2 +-
sd/source/ui/unoidl/unoobj.hxx |3 ++-
sd/source/ui/unoidl/unopool.cxx |5 +++--
sfx2/source/appl/macroloader.cxx|2 +-
sfx2/source/inc/macroloader.hxx |3 ++-
starmath/inc/unomodel.hxx |4 ++--
starmath/source/unomodel.cxx|4 ++--
svx/source/table/cell.cxx |2 +-
svx/source/table/cell.hxx |2 +-
svx/source/unodraw/XPropertyTable.cxx | 16
svx/source/unodraw/shapeimpl.hxx|2 +-
svx/source/unodraw/unopool.cxx |2 +-
svx/source/unodraw/unoshap2.cxx |4 ++--
svx/source/unodraw/unoshap4.cxx |2 +-
svx/source/unodraw/unoshape.cxx |6 +++---
sw/inc/unocrsrhelper.hxx|5 +++--
sw/source/core/unocore/unoobj.cxx |4 ++--
32 files changed, 69 insertions(+), 51 deletions(-)
New commits:
commit 76032655c3a2c763e27f5fb57da4b1214c284aab
Author: Noel Grandin n...@peralex.com
Date: Tue May 27 10:48:51 2014 +0200
cid#706962 Uncaught exception
Change-Id: I29a28a13f7cd8f9965db97247bbf377f9937213c
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx
b/sc/source/ui/vba/vbaformatcondition.cxx
index 160e255..28e5e30 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -31,7 +31,16 @@ lcl_getScVbaFormatConditionsPtr( const uno::Reference
excel::XFormatConditions
DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
return pFormatConditions;
}
-ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference
XHelperInterface xParent, const uno::Reference uno::XComponentContext
xContext, const uno::Reference sheet::XSheetConditionalEntry
_xSheetConditionalEntry, const uno::Reference excel::XStyle _xStyle, const
uno::Reference excel::XFormatConditions _xFormatConditions, const
uno::Reference css::beans::XPropertySet _xPropertySet ) throw (
css::uno::RuntimeException ) : ScVbaFormatCondition_BASE( xParent, xContext,
uno::Reference sheet::XSheetCondition ( _xSheetConditionalEntry,
css::uno::UNO_QUERY_THROW ) ), moFormatConditions( _xFormatConditions ),
mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet )
+
+ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference
XHelperInterface xParent,
+const uno::Reference
uno::XComponentContext xContext,
+const uno::Reference
sheet::XSheetConditionalEntry _xSheetConditionalEntry,
+const uno::Reference
excel::XStyle _xStyle,
+const uno::Reference
excel::XFormatConditions _xFormatConditions,
+const uno::Reference
css::beans::XPropertySet _xPropertySet ) throw ( css::uno::RuntimeException,
css::script::BasicErrorException )
+: ScVbaFormatCondition_BASE( xParent, xContext,
+ uno::Reference sheet::XSheetCondition (
_xSheetConditionalEntry, css::uno::UNO_QUERY_THROW ) ),
+ moFormatConditions( _xFormatConditions ),
mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet )
{
mxSheetConditionalEntries = lcl_getScVbaFormatConditionsPtr(
moFormatConditions )-getSheetConditionalEntries();
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx
b/sc/source/ui/vba/vbaformatcondition.hxx
index db96d65..8110606 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -39,7 +39,12 @@ protected:
css::uno::Reference ov::excel::XStyle mxStyle;
css::uno::Reference css::beans::XPropertySet mxParentRangePropertySet;
public:
-ScVbaFormatCondition( const css::uno::Reference ov::XHelperInterface
xParent, const css::uno::Reference css::uno::XComponentContext xContext,
const css::uno::Reference css::sheet::XSheetConditionalEntry
_xSheetConditionalEntry, const css::uno::Reference ov::excel::XStyle ,
const css::uno::Reference ov::excel::XFormatConditions
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - avmedia/source external/libgltf
avmedia/source/opengl/oglplayer.cxx | 10 +++
external/libgltf/UnpackedTarball_libgltf.mk |1
external/libgltf/patches/free_file_buffers.patch | 58 ---
3 files changed, 10 insertions(+), 59 deletions(-)
New commits:
commit f8436baa2267695455973a6fa42916f9ffc5c9da
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue May 27 10:48:43 2014 +0200
libgltf: solve this memory leak problem on a better way
Change-Id: I6e6fbf47c216bf9151e92d5e2a5b4eee57f52989
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index 2536b68..7831f6b 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -195,6 +195,14 @@ awt::Size SAL_CALL
OGLPlayer::getPreferredPlayerWindowSize() throw ( uno::Runtim
return awt::Size( 480, 360 );
}
+static void lcl_ReleaseFiles(glTFHandle* pHandle)
+{
+for( int i = 0; i pHandle-size; ++i )
+{
+delete [] pHandle-files[i].buffer;
+}
+}
+
uno::Reference media::XPlayerWindow SAL_CALL OGLPlayer::createPlayerWindow(
const uno::Sequence uno::Any rArguments )
throw ( uno::RuntimeException, std::exception )
{
@@ -219,6 +227,7 @@ uno::Reference media::XPlayerWindow SAL_CALL
OGLPlayer::createPlayerWindow( c
m_pHandle-viewport.width = aSize.Width();
m_pHandle-viewport.height = aSize.Height();
gltf_renderer_set_content(m_pHandle);
+lcl_ReleaseFiles(m_pHandle);
m_pOGLWindow = new OGLWindow(m_pHandle, m_aContext, pChildWindow);
return uno::Reference media::XPlayerWindow ( m_pOGLWindow );
}
@@ -239,6 +248,7 @@ uno::Reference media::XFrameGrabber SAL_CALL
OGLPlayer::createFrameGrabber()
m_pHandle-viewport.width = getPreferredPlayerWindowSize().Width;
m_pHandle-viewport.height = getPreferredPlayerWindowSize().Height;
gltf_renderer_set_content(m_pHandle);
+lcl_ReleaseFiles(m_pHandle);
return uno::Reference media::XFrameGrabber ();
OGLFrameGrabber *pFrameGrabber = new OGLFrameGrabber( m_pHandle );
return uno::Reference media::XFrameGrabber ( pFrameGrabber );
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk
b/external/libgltf/UnpackedTarball_libgltf.mk
index acfbab0..d8434b6 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
$(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/include_path_glew.patch \
external/libgltf/patches/include_path_freetype.patch \
- external/libgltf/patches/free_file_buffers.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/free_file_buffers.patch
b/external/libgltf/patches/free_file_buffers.patch
deleted file mode 100644
index 9f92da3..000
--- a/external/libgltf/patches/free_file_buffers.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp
libgltf.org/src/LoadScene.cpp 2014-05-26 21:46:51.986986538 +0200
-+++ libgltf/src/LoadScene.cpp 2014-05-26 21:47:28.206985004 +0200
-@@ -127,7 +127,7 @@
- return gHandle;
- }
-
--bool Parser::releaseFileName()
-+bool Parser::releaseFiles()
- {
- glTFHandle* gHandle = pScene-getGltfHandle();
- for (int i = (int)gHandle-size - 1 ; i = 0 ; i--)
-@@ -137,6 +137,7 @@
- free(gHandle-files[i].filename);
- gHandle-files[i].filename = NULL;
- }
-+delete [] gHandle-files[i].buffer;
- }
-
- if (gHandle-files != NULL)
-diff -ur libgltf.org/src/LoadScene.h libgltf/src/LoadScene.h
libgltf.org/src/LoadScene.h2014-05-26 21:46:51.986986538 +0200
-+++ libgltf/src/LoadScene.h2014-05-26 21:47:33.170984793 +0200
-@@ -26,7 +26,7 @@
- {
- public:
- glTFHandle* getFileNameInJson(const std::string jsonFile);
--bool releaseFileName();
-+bool releaseFiles();
- int parseScene(Scene* pscene);
- bool parseJsonFile();
- void setJsonInfo(const std::string sbuffer);
-@@ -81,4 +81,4 @@
- bool is_json_in_buffer;
- };
-
--#endif
-\ No newline at end of file
-+#endif
-diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
libgltf.org/src/RenderScene.cpp2014-05-26 21:46:51.986986538 +0200
-+++ libgltf/src/RenderScene.cpp2014-05-26 21:47:39.358984531 +0200
-@@ -1426,7 +1426,7 @@
-
- void RenderScene::releaseRender()
- {
--mLoadJson.releaseFileName();
-+mLoadJson.releaseFiles();
- fbo.releaseFbo();
- return;
- }
-@@ -1543,4 +1543,4 @@
- int RenderScene::isAnimPlay()
- {
- return this-mAnimationPlay ? 1 : 0;
--}
-\ No newline at end of file
-+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
El 22/05/14 17:57, Michael Meeks escribió: * Present + Christian, Stephan, Bjoern, Norbert, Eike, Andras, Fridrich, Miklos, Michael M, Jacobo, Robinson, Eilidh, Markus, Caolan, Tor, Adam, Michael S, Norbert, Kendy * Completed Action Items + send address sanitiser example (Markus) + http://lists.freedesktop.org/archives/libreoffice/2014-May/061142.html + chasing build / test intermittency: [ seem to have vanished ] + Add StarOffice OOoXML export removal to 4.2 release notes (Cloph) + Add students to the commiter group (Norbert) + Avoiding big binary checkins (update git hook) (Miklos) [ assuming good faith - chatty message to help people ] + walk through old gerrit changes, nag people, abandon changes (Bjoern) [ done before branch-off, some will be abandoned in a week cf. note, could expire these automatically - auto-abandon ? ] + fix git importing service (Kendy) * Pending Action Items: + crashtest box - more research (Moggi/Cloph) [ ongoing ] + encourage icon authors to put them into git (Astron) + fix the Java bridge for MSVC2012 for 4.3 (Michael S.) [ current plan to do before the branch-off ... (bit late) ] + create easy hack to find an auto-abandon config/setting for a gerrit (Bjoern) + schedule a new coverity build (moggi) [ tried during the weekend, coverity analysis takes longer than 24hours etc. (Caolan) + may change the timeout to 36 hours ? + have enabled debugging so coverity can see asserts + not the problem still timing out ... ] * GSOC Update (Fridrich) + started on Monday. + poke Fridrich / Cedric if no sign of students. + should have sent telephone contacts already. + please give them a welcome help to get spun up. + all going well. * FISL Brazil Update (Fridrich) + huge event, FOSDEM but in Latin America, and no dev-rooms. + several big halls for keynotes + LibreOffice well represented: several talks + Document Liberation Flat ODF promoted by Fridrich + FISL release of LibreOffice etc. + great work there, huge community. * Release Engineering update (Christian) + 4.3.0 Beta 1 status + tagged yesterday. + branch libreoffice-4-3 created + Windows build delayed, will be tonight / tomorrow + MacOS 10.6 needed a patch, not exactly the tag + only Beta1 - no need for a separate tag. + investigating Windows test failures (spellchecking) + a python issue related to UI mode - not seen when running from the terminal; different return value internally; around stdout/in etc. + now patched. http://cgit.freedesktop.org/libreoffice/core/tree/external/python3/python-3.3.3-py17797.patch.1 + will run on XP and later without crashing. + currently a problem with Java runtime on Windows XP + problems with Tools-Macros-Python ... tries to init Java VM. AI: + create / promote a 4.3 MAB for WinXP/Java (Cloph) + 4.2.5 RC1 status ... + deadline next Monday: get fixes into gerrit so on the radar ... + ... Now Feature Frozen ... + tripple approval needed for new features. + bug bug fixes welcome on the branch with no review. + Late features ? + libreofficekit bits / rename etc. + OpenGL pieces / status + experimentalising 3D chart bits. + impress work as well. + some changes in language listbox (Eike) + switching to a combo-box, so can enter an arbitrary lang_tag + due today. + preserving rendering OOXML Artistic Effects (Jacobo) -- Jacobo Aragunde Software Engineer at Igalia ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Sorry for the previous email, I mistakenly pressed the keyboard shortcut to send... O:-) El 22/05/14 17:57, Michael Meeks escribió: + Late features ? + preserving rendering OOXML Artistic Effects (Jacobo) Picked the relevant patches and pushed to gerrit for review: https://gerrit.libreoffice.org/9495 Thanks! -- Jacobo Aragunde Software Engineer at Igalia ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/ipcx/ipcx.cxx | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit c77c39056847d23a109172ff53bfac0ba4c21b39
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 27 11:12:37 2014 +0200
Fix memory leak (as observed with CppunitTest_filter_pcx_test)
Change-Id: Ic00653cad7f15f60a8f2613938def25820d7e9ae
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx
b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 2d941b8..32dc0d9 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -32,7 +32,6 @@ private:
SvStream m_rPCX; // the PCX file to read
Bitmap aBmp;
-BitmapWriteAccess* pAcc;
sal_uInt8 nVersion; // PCX-Version
sal_uInt8 nEncoding; // compression type
sal_uLong nBitsPerPlanePix; // bits per plane per pixel
@@ -48,7 +47,7 @@ private:
boolCallback( sal_uInt16 nPercent );
-voidImplReadBody();
+voidImplReadBody(BitmapWriteAccess * pAcc);
voidImplReadPalette( sal_uLong nCol );
voidImplReadHeader();
@@ -63,7 +62,6 @@ public:
PCXReader::PCXReader(SvStream rStream)
: m_rPCX(rStream)
-, pAcc(NULL)
, nVersion(0)
, nEncoding(0)
, nBitsPerPlanePix(0)
@@ -112,7 +110,8 @@ bool PCXReader::ReadPCX(Graphic rGraphic)
if ( nStatus )
{
aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel );
-if ( ( pAcc = aBmp.AcquireWriteAccess() ) == 0 )
+Bitmap::ScopedWriteAccess pAcc(aBmp);
+if ( pAcc == 0 )
return false;
if ( nDestBitsPerPixel = 8 )
@@ -126,7 +125,7 @@ bool PCXReader::ReadPCX(Graphic rGraphic)
}
}
// read bitmap data
-ImplReadBody();
+ImplReadBody(pAcc.get());
// If an extended color palette exists at the end of the file, then
read it and
// and write again in palette:
@@ -148,9 +147,8 @@ bool PCXReader::ReadPCX(Graphic rGraphic)
rBitmap.SetPrefMapMode(aMapMode);
rBitmap.SetPrefSize(Size(nWidth,nHeight));
}
-*/ if ( nStatus pAcc )
+*/ if ( nStatus )
{
-aBmp.ReleaseAccess( pAcc ), pAcc = NULL;
rGraphic = aBmp;
return true;
}
@@ -217,7 +215,7 @@ void PCXReader::ImplReadHeader()
}
}
-void PCXReader::ImplReadBody()
+void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
{
sal_uInt8 *pPlane[ 4 ], * pDest, * pSource1, * pSource2, * pSource3,
*pSource4;
sal_uLong i, nx, ny, np, nCount, nPercent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 79236, which changed state. Bug 79236 Summary: CRASH: Undoing font style crashes LibO https://bugs.freedesktop.org/show_bug.cgi?id=79236 What|Removed |Added Status|NEW |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] help.git: 2 commits - source/text
source/text/scalc/00/0405.xhp |2 +- source/text/scalc/01/05080200.xhp |4 ++-- source/text/shared/01/06140100.xhp |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 1c2805c0bc819a94bf5754e7838db134c1cdb62f Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Mon May 26 18:46:31 2014 +0200 rename print range command Remove to Clear Change-Id: I8c787b7caadfe52a93532596e5b404781712dba5 Reviewed-on: https://gerrit.libreoffice.org/9490 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/scalc/00/0405.xhp b/source/text/scalc/00/0405.xhp index f4a6b3a..0faa72a 100644 --- a/source/text/scalc/00/0405.xhp +++ b/source/text/scalc/00/0405.xhp @@ -77,7 +77,7 @@ /variable/paragraph paragraph role=paragraph id=par_id3156290 xml-lang=en-US l10n=U oldref=35variable id=fodrhinChoose emphFormat - Print Ranges - Add/emph /variable/paragraph -paragraph role=paragraph id=par_id3155812 xml-lang=en-US l10n=U oldref=28variable id=fodbahChoose emphFormat - Print Ranges - Remove/emph +paragraph role=paragraph id=par_id3155812 xml-lang=en-US l10n=U oldref=28variable id=fodbahChoose emphFormat - Print Ranges - Clear/emph /variable/paragraph paragraph role=paragraph id=par_id3153307 xml-lang=en-US l10n=U oldref=29variable id=fodbbeChoose emphFormat - Print Ranges - Edit/emph /variable/paragraph diff --git a/source/text/scalc/01/05080200.xhp b/source/text/scalc/01/05080200.xhp index ab8a29a..105f871 100644 --- a/source/text/scalc/01/05080200.xhp +++ b/source/text/scalc/01/05080200.xhp @@ -22,7 +22,7 @@ helpdocument version=1.0 meta topic id=textscalc0105080200xml indexer=include status=PUBLISH -title id=tit xml-lang=en-USRemove/title +title id=tit xml-lang=en-USClear/title filename/text/scalc/01/05080200.xhp/filename /topic history @@ -34,7 +34,7 @@ section id=aufheben bookmark xml-lang=en-US branch=hid/.uno:DeletePrintArea id=bm_id7204561 localize=false/!-- HID added by script -- bookmark xml-lang=en-US branch=hid/.uno:DeletePrintArea id=bm_id3150275 localize=false/ -paragraph role=heading id=hd_id3153562 xml-lang=en-US level=1 l10n=U oldref=1link href=text/scalc/01/05080200.xhp name=RemoveRemove/link/paragraph +paragraph role=heading id=hd_id3153562 xml-lang=en-US level=1 l10n=U oldref=1link href=text/scalc/01/05080200.xhp name=ClearClear/link/paragraph paragraph role=paragraph id=par_id3148550 xml-lang=en-US l10n=U oldref=2ahelp hid=.uno:DeletePrintAreaRemoves the defined print area./ahelp/paragraph /section section id=howtoget commit ab67f805e692888fd0c89157b54e9c41c9d405b0 Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Mon May 26 18:52:49 2014 +0200 correct name of command adding separator in customize dialog Change-Id: Ia57602ccfa957918b44390c4db9b17b4bbe33e15 Reviewed-on: https://gerrit.libreoffice.org/9491 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/shared/01/06140100.xhp b/source/text/shared/01/06140100.xhp index 7319c23..3ef25cb 100644 --- a/source/text/shared/01/06140100.xhp +++ b/source/text/shared/01/06140100.xhp @@ -123,7 +123,7 @@ paragraph role=paragraph id=par_idN107FD xml-lang=en-US l10n=NEWahelp hid=cui/ui/menuassignpage/modifyOpens a menu that contains additional commands./ahelp/paragraph paragraph role=heading id=par_idN10800 xml-lang=en-US level=3 l10n=NEWAdd Submenu/paragraph paragraph role=paragraph id=par_idN10804 xml-lang=en-US l10n=NEWOpens the Add Submenu dialog, where you enter the name of a submenu./paragraph -paragraph role=heading id=par_idN10807 xml-lang=en-US level=3 l10n=NEWBegin Group/paragraph +paragraph role=heading id=par_idN10807 xml-lang=en-US level=3 l10n=NEWAdd Separator/paragraph paragraph role=paragraph id=par_idN1080B xml-lang=en-US l10n=NEWInserts a separator line under the current menu entry./paragraph paragraph role=heading id=par_idN1080E xml-lang=en-US level=3 l10n=NEWRename/paragraph paragraph role=paragraph id=par_idN10812 xml-lang=en-US l10n=NEWOpens the emphRename/emph dialog, where you enter a new name for the selected command./paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1b8e1099e3b97875f7d2a0026e2592719508b12 Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Mon May 26 18:46:31 2014 +0200 Updated core Project: help 1c2805c0bc819a94bf5754e7838db134c1cdb62f rename print range command Remove to Clear Change-Id: I8c787b7caadfe52a93532596e5b404781712dba5 Reviewed-on: https://gerrit.libreoffice.org/9490 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index ab67f80..1c2805c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ab67f805e692888fd0c89157b54e9c41c9d405b0 +Subproject commit 1c2805c0bc819a94bf5754e7838db134c1cdb62f commit 23f4f77b472c91d91d48ae026c3443a0f4c6adda Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Mon May 26 18:52:49 2014 +0200 Updated core Project: help ab67f805e692888fd0c89157b54e9c41c9d405b0 correct name of command adding separator in customize dialog Change-Id: Ia57602ccfa957918b44390c4db9b17b4bbe33e15 Reviewed-on: https://gerrit.libreoffice.org/9491 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index e45140e..ab67f80 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e45140e4062722a349b61fc7d4a4b0dea7c86127 +Subproject commit ab67f805e692888fd0c89157b54e9c41c9d405b0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/source
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit dc17b03f29e206c4d06b047934a2d6d68a288b06 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue May 27 11:10:59 2014 +0200 fdo#78348 DOCX import: end progressbar after parsing is done Change-Id: Id3db99a7ea341bcfc9bf2cd2b718e70a17d41f76 (cherry picked from commit cd1abdce1eafa7f2225e4050d1a075154b5e7d67) diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index edc53ff..35773d7 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -523,6 +523,9 @@ void OOXMLDocumentImpl::resolve(Stream rStream) } } +if (mxStatusIndicator.is()) +mxStatusIndicator-end(); + #ifdef DEBUG_RESOLVE debug_logger-endElement(); #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/doc/docfly.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 9428ec8dc7f44d465a5b9744b9ed95ce02adf104
Author: Michael Stahl mst...@redhat.com
Date: Tue May 27 11:00:14 2014 +0200
fdo#79236: sw: Undo of changing style crashes on invalid item (-1)
Change-Id: Ie0b0791722a0ca8d75b7981362661be0c9706c6d
(cherry picked from commit 732eee2de4d0579eda69fe0ebfa361180fa35456)
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index e306eb8..cd5162c 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -431,6 +431,8 @@ void
SwDoc::CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet rSet)
for(const SfxPoolItem* pItem = aIter.FirstItem(); pItem; pItem =
aIter.NextItem())
{
+if (IsInvalidItem(pItem))
+continue;
const SfxPoolItem* pResult = pItem;
switch(pItem-Which())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - avmedia/source external/libgltf
avmedia/source/opengl/oglplayer.cxx | 10 ---
external/libgltf/UnpackedTarball_libgltf.mk |1
external/libgltf/patches/free_file_buffers.patch | 58 +++
3 files changed, 59 insertions(+), 10 deletions(-)
New commits:
commit eb86aabb0b0ab291b935c14fc7dcb14c6b1cd745
Author: Jan Holesovsky ke...@collabora.com
Date: Tue May 27 11:54:40 2014 +0200
Revert libgltf: solve this memory leak problem on a better way
Unfortunately crashes subsequent starts of the slideshow.
This reverts commit f8436baa2267695455973a6fa42916f9ffc5c9da.
Change-Id: I141cf16a11b4f5e20fa05a5243049dd5cc5095b4
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index 7831f6b..2536b68 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -195,14 +195,6 @@ awt::Size SAL_CALL
OGLPlayer::getPreferredPlayerWindowSize() throw ( uno::Runtim
return awt::Size( 480, 360 );
}
-static void lcl_ReleaseFiles(glTFHandle* pHandle)
-{
-for( int i = 0; i pHandle-size; ++i )
-{
-delete [] pHandle-files[i].buffer;
-}
-}
-
uno::Reference media::XPlayerWindow SAL_CALL OGLPlayer::createPlayerWindow(
const uno::Sequence uno::Any rArguments )
throw ( uno::RuntimeException, std::exception )
{
@@ -227,7 +219,6 @@ uno::Reference media::XPlayerWindow SAL_CALL
OGLPlayer::createPlayerWindow( c
m_pHandle-viewport.width = aSize.Width();
m_pHandle-viewport.height = aSize.Height();
gltf_renderer_set_content(m_pHandle);
-lcl_ReleaseFiles(m_pHandle);
m_pOGLWindow = new OGLWindow(m_pHandle, m_aContext, pChildWindow);
return uno::Reference media::XPlayerWindow ( m_pOGLWindow );
}
@@ -248,7 +239,6 @@ uno::Reference media::XFrameGrabber SAL_CALL
OGLPlayer::createFrameGrabber()
m_pHandle-viewport.width = getPreferredPlayerWindowSize().Width;
m_pHandle-viewport.height = getPreferredPlayerWindowSize().Height;
gltf_renderer_set_content(m_pHandle);
-lcl_ReleaseFiles(m_pHandle);
return uno::Reference media::XFrameGrabber ();
OGLFrameGrabber *pFrameGrabber = new OGLFrameGrabber( m_pHandle );
return uno::Reference media::XFrameGrabber ( pFrameGrabber );
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk
b/external/libgltf/UnpackedTarball_libgltf.mk
index d8434b6..acfbab0 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
$(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/include_path_glew.patch \
external/libgltf/patches/include_path_freetype.patch \
+ external/libgltf/patches/free_file_buffers.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/free_file_buffers.patch
b/external/libgltf/patches/free_file_buffers.patch
new file mode 100644
index 000..9f92da3
--- /dev/null
+++ b/external/libgltf/patches/free_file_buffers.patch
@@ -0,0 +1,58 @@
+diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp
+--- libgltf.org/src/LoadScene.cpp 2014-05-26 21:46:51.986986538 +0200
libgltf/src/LoadScene.cpp 2014-05-26 21:47:28.206985004 +0200
+@@ -127,7 +127,7 @@
+ return gHandle;
+ }
+
+-bool Parser::releaseFileName()
++bool Parser::releaseFiles()
+ {
+ glTFHandle* gHandle = pScene-getGltfHandle();
+ for (int i = (int)gHandle-size - 1 ; i = 0 ; i--)
+@@ -137,6 +137,7 @@
+ free(gHandle-files[i].filename);
+ gHandle-files[i].filename = NULL;
+ }
++delete [] gHandle-files[i].buffer;
+ }
+
+ if (gHandle-files != NULL)
+diff -ur libgltf.org/src/LoadScene.h libgltf/src/LoadScene.h
+--- libgltf.org/src/LoadScene.h2014-05-26 21:46:51.986986538 +0200
libgltf/src/LoadScene.h2014-05-26 21:47:33.170984793 +0200
+@@ -26,7 +26,7 @@
+ {
+ public:
+ glTFHandle* getFileNameInJson(const std::string jsonFile);
+-bool releaseFileName();
++bool releaseFiles();
+ int parseScene(Scene* pscene);
+ bool parseJsonFile();
+ void setJsonInfo(const std::string sbuffer);
+@@ -81,4 +81,4 @@
+ bool is_json_in_buffer;
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
+--- libgltf.org/src/RenderScene.cpp2014-05-26 21:46:51.986986538 +0200
libgltf/src/RenderScene.cpp2014-05-26 21:47:39.358984531 +0200
+@@ -1426,7 +1426,7 @@
+
+ void RenderScene::releaseRender()
+ {
+-mLoadJson.releaseFileName();
++mLoadJson.releaseFiles();
+ fbo.releaseFbo();
+ return;
+ }
+@@ -1543,4 +1543,4 @@
+ int RenderScene::isAnimPlay()
+ {
+ return this-mAnimationPlay ? 1 : 0;
+-}
+\ No newline at end of file
++}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - sc/source
sc/source/core/data/formulacell.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1ab702a1ec9e06a13ea98a55bc6dad62fdb61568 Author: Michael Meeks michael.me...@collabora.com Date: Tue May 27 11:14:54 2014 +0100 ODS load perf: fix FMR. Change-Id: I671c9a441d1c598fbf5fdb5706ab0ed6e1bcf9a8 diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 1e63308..35518bc 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -1212,6 +1212,7 @@ void ScFormulaCell::CompileXML( sc::CompileFormulaContext rCxt, ScProgress rPr SetCellGroup( xGroup ); bSkipCompile = true; +pCode = pPreviousCell-pCode; SAL_INFO( sc, merged ' aFormula ' == ' aShouldBe ' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/qa starmath/source
starmath/qa/cppunit/test_nodetotextvisitors.cxx |1 +
starmath/source/parse.cxx |8 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 501e5b98ad39156cac465a161709ad38b89e3d63
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 27 11:26:54 2014 +0100
Resolves: fdo#77831 use classic token rules for user-defined char (%foo)
Change-Id: Iebae064986ad722d445c8d654e39e338e104f021
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index e5c8626..09d1d6c 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -232,6 +232,7 @@ void Test::SimpleOperators()
parseandparseagain(llint a, Double curved integral);
parseandparseagain(lllint a, Triple curved integral);
parseandparseagain(prod from {i=1} to {n} {(i+1)}, Product with range);
+ParseAndCheck(%Ux2135, %Ux2135, fdo#77831);
}
void Test::SimpleAttributes()
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index a1338e9..2a3fba1 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -375,6 +375,12 @@ const sal_Int32 coContFlags =
(coStartFlags ~KParseTokens::IGNORE_LEADING_WS)
| KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING;
+// user-defined char continuing characters may be any alphanumeric or dot.
+const sal_Int32 coUserDefinedCharContFlags =
+((KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::IGNORE_LEADING_WS |
KParseTokens::ASC_DOT)
+ ~KParseTokens::IGNORE_LEADING_WS)
+| KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING;
+
// First character for numbers, may be any numeric or dot
const sal_Int32 coNumStartFlags =
KParseTokens::ASC_DIGIT |
@@ -644,7 +650,7 @@ void SmParser::NextToken()
m_aBufferString, rnEndPos,
KParseTokens::ANY_LETTER,
aEmptyStr,
-coContFlags,
+coUserDefinedCharContFlags,
aEmptyStr );
sal_Int32 nTmpStart = rnEndPos +
aTmpRes.LeadingWhiteSpace;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - starmath/qa starmath/source
starmath/qa/cppunit/test_nodetotextvisitors.cxx |1 +
starmath/source/parse.cxx |8 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 9b1378387a0e67e8196e46ee56f7c82b1e08f40a
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 27 11:26:54 2014 +0100
Resolves: fdo#77831 use classic token rules for user-defined char (%foo)
Change-Id: Iebae064986ad722d445c8d654e39e338e104f021
(cherry picked from commit 501e5b98ad39156cac465a161709ad38b89e3d63)
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index e5c8626..09d1d6c 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -232,6 +232,7 @@ void Test::SimpleOperators()
parseandparseagain(llint a, Double curved integral);
parseandparseagain(lllint a, Triple curved integral);
parseandparseagain(prod from {i=1} to {n} {(i+1)}, Product with range);
+ParseAndCheck(%Ux2135, %Ux2135, fdo#77831);
}
void Test::SimpleAttributes()
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index a1338e9..2a3fba1 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -375,6 +375,12 @@ const sal_Int32 coContFlags =
(coStartFlags ~KParseTokens::IGNORE_LEADING_WS)
| KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING;
+// user-defined char continuing characters may be any alphanumeric or dot.
+const sal_Int32 coUserDefinedCharContFlags =
+((KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::IGNORE_LEADING_WS |
KParseTokens::ASC_DOT)
+ ~KParseTokens::IGNORE_LEADING_WS)
+| KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING;
+
// First character for numbers, may be any numeric or dot
const sal_Int32 coNumStartFlags =
KParseTokens::ASC_DIGIT |
@@ -644,7 +650,7 @@ void SmParser::NextToken()
m_aBufferString, rnEndPos,
KParseTokens::ANY_LETTER,
aEmptyStr,
-coContFlags,
+coUserDefinedCharContFlags,
aEmptyStr );
sal_Int32 nTmpStart = rnEndPos +
aTmpRes.LeadingWhiteSpace;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source cui/source framework/source
basic/source/classes/eventatt.cxx | 18 ++
cui/source/customize/cfgutil.cxx |8 +++-
framework/source/uielement/popuptoolbarcontroller.cxx |8 ++--
3 files changed, 11 insertions(+), 23 deletions(-)
New commits:
commit ea491d056d301b8b4507a2a2772cd09342284e56
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue May 27 12:31:13 2014 +0200
OSL_TRACE - SAL_INFO
Change-Id: Ib9e1ed6119b5286871ac10136f7fcbefffe7aebe
diff --git a/basic/source/classes/eventatt.cxx
b/basic/source/classes/eventatt.cxx
index 16fc4bd..ee75d0f 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -75,9 +75,7 @@ using namespace ::osl;
void SFURL_firing_impl( const ScriptEvent aScriptEvent, Any* pRet, const
Reference frame::XModel xModel )
{
-OSL_TRACE(SFURL_firing_impl() processing script url %s,
-OUStringToOString( aScriptEvent.ScriptCode,
-RTL_TEXTENCODING_ASCII_US ).pData-buffer );
+SAL_INFO(basic, Processing script url aScriptEvent.ScriptCode);
try
{
Reference provider::XScriptProvider xScriptProvider;
@@ -102,7 +100,7 @@ void SFURL_firing_impl( const ScriptEvent aScriptEvent,
Any* pRet, const Refere
if ( !xScriptProvider.is() )
{
-OSL_TRACE(SFURL_firing_impl() Failed to create msp);
+SAL_INFO(basic, Failed to create msp);
return;
}
Sequence Any inArgs( 0 );
@@ -116,7 +114,7 @@ void SFURL_firing_impl( const ScriptEvent aScriptEvent,
Any* pRet, const Refere
if ( !xScript.is() )
{
-OSL_TRACE(SFURL_firing_impl() Failed to obtain XScript);
+SAL_INFO(basic, Failed to Failed to obtain XScript);
return;
}
@@ -128,15 +126,11 @@ void SFURL_firing_impl( const ScriptEvent aScriptEvent,
Any* pRet, const Refere
}
catch ( const RuntimeException re )
{
-OSL_TRACE(SFURL_firing_impl() Caught RuntimeException reason %s.,
-OUStringToOString( re.Message,
-RTL_TEXTENCODING_ASCII_US ).pData-buffer );
+SAL_INFO(basic, Caught RuntimeException reason re.Message);
}
catch ( const Exception e )
{
-OSL_TRACE(SFURL_firing_impl() Caught Exception reason %s.,
-OUStringToOString( e.Message,
-RTL_TEXTENCODING_ASCII_US ).pData-buffer );
+SAL_INFO(basic, Caught Exception reason e.Message);
}
}
@@ -491,7 +485,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray
rPar, bool bWrite )
css::uno::Reference css::container::XNameContainer aDlgLib;
bool bDocDialog = false;
StarBASIC* pFoundBasic = NULL;
-OSL_TRACE(About to try get a hold of ThisComponent);
+SAL_INFO(basic, About to try get a hold of ThisComponent);
Reference frame::XModel xModel = StarBASIC::GetModelFromBasic(
GetSbData()-pInst-GetBasic() ) ;
aDlgLib = implFindDialogLibForDialogBasic( aAnyISP,
GetSbData()-pInst-GetBasic(), pFoundBasic );
// If we found the dialog then it belongs to the Search basic
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 5e33fa6..787534a 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -582,7 +582,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference
css::uno::XComponent
InitStyles();
}
-OSL_TRACE(** ** About to initialise SF Scripts);
+SAL_INFO(cui.customize, ** ** About to initialise SF Scripts);
// Add Scripting Framework entries
Reference browse::XBrowseNode rootNode;
Reference XComponentContext xCtx(
@@ -594,8 +594,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference
css::uno::XComponent
}
catch( Exception e )
{
-OSL_TRACE( Caught some exception whilst retrieving browse nodes from
factory... Exception: %s,
-OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US
).pData-buffer );
+SAL_INFO(cui.customize, Caught some exception whilst retrieving
browse nodes from factory... Exception: e.Message);
// TODO exception handling
}
@@ -770,8 +769,7 @@ Image SfxConfigGroupListBox::GetImage(
if ( pmoduleDescr[ pos ].Name ==
ooSetupFactoryEmptyDocumentURL )
{
pmoduleDescr[ pos ].Value = factoryURL;
-OSL_TRACE(factory url for doc images is %s,
-OUStringToOString( factoryURL ,
RTL_TEXTENCODING_ASCII_US ).pData-buffer );
+SAL_INFO(cui.customize, factory url for doc images
is factoryURL);
break;
}
}
diff --git
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/document.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 17979abf4fde202cae231be19a218be3fe27d04c
Author: Eike Rathke er...@redhat.com
Date: Tue May 27 12:31:30 2014 +0200
resolved rhbz#1101224 do not attempt to obtain names for NULL tabs
This happened when the HTML export via clipboard tried to resolve
conditional formats, where we have a temporary instance of a document
containing only the sheet to be exported.
Change-Id: Ic7498a1cab3eabede74773868287a2cc3edef052
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 32b6ba4..87451de 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -268,9 +268,14 @@ std::vectorOUString ScDocument::GetAllTableNames() const
TableContainer::const_iterator it = maTabs.begin(), itEnd = maTabs.end();
for (; it != itEnd; ++it)
{
+// Positions need to be preserved for ScCompiler and address convention
+// context, so still push an empty string for NULL tabs.
OUString aName;
-const ScTable rTab = **it;
-rTab.GetName(aName);
+if (*it)
+{
+const ScTable rTab = **it;
+rTab.GetName(aName);
+}
aNames.push_back(aName);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/data/document.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 1c567ffed15e2223e91e4e4855ee0a425eea9df6
Author: Eike Rathke er...@redhat.com
Date: Tue May 27 12:31:30 2014 +0200
resolved rhbz#1101224 do not attempt to obtain names for NULL tabs
This happened when the HTML export via clipboard tried to resolve
conditional formats, where we have a temporary instance of a document
containing only the sheet to be exported.
Change-Id: Ic7498a1cab3eabede74773868287a2cc3edef052
(cherry picked from commit 17979abf4fde202cae231be19a218be3fe27d04c)
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 97c10ca..95894d2 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -268,9 +268,14 @@ std::vectorOUString ScDocument::GetAllTableNames() const
TableContainer::const_iterator it = maTabs.begin(), itEnd = maTabs.end();
for (; it != itEnd; ++it)
{
+// Positions need to be preserved for ScCompiler and address convention
+// context, so still push an empty string for NULL tabs.
OUString aName;
-const ScTable rTab = **it;
-rTab.GetName(aName);
+if (*it)
+{
+const ScTable rTab = **it;
+rTab.GetName(aName);
+}
aNames.push_back(aName);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source desktop/uiconfig desktop/UIConfig_deployment.mk extras/source
desktop/UIConfig_deployment.mk |1
desktop/source/deployment/gui/dp_gui.hrc | 29 -
desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx | 10
desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx |2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 65 +---
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 16
desktop/source/deployment/gui/dp_gui_updateinstalldialog.src | 178 +--
desktop/uiconfig/ui/updateinstalldialog.ui | 175 ++
extras/source/glade/libreoffice-catalog.xml.in |3
9 files changed, 257 insertions(+), 222 deletions(-)
New commits:
commit 5249cf49edda23f3e051444959ac32d7069850a7
Author: sk94 eszka...@gmail.com
Date: Sat May 24 13:25:03 2014 +0200
RID_DLG_UPDATEINSTALL conversion to .ui
Change-Id: I02ead5dc934d0f9ae9e958cbe6592250f1aaf1a4
Reviewed-on: https://gerrit.libreoffice.org/9464
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/desktop/UIConfig_deployment.mk b/desktop/UIConfig_deployment.mk
index fc1c48a..208876c 100644
--- a/desktop/UIConfig_deployment.mk
+++ b/desktop/UIConfig_deployment.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UIConfig_add_uifiles,desktop,\
desktop/uiconfig/ui/licensedialog \
desktop/uiconfig/ui/showlicensedialog \
desktop/uiconfig/ui/updatedialog \
+desktop/uiconfig/ui/updateinstalldialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/source/deployment/gui/dp_gui.hrc
b/desktop/source/deployment/gui/dp_gui.hrc
index b6a8ca5..71b25df 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -33,26 +33,6 @@
#define RID_EM_FT_PROGRESS 14
#define RID_EM_FT_MSG 15
-// local RIDs for Download and Install dialog
-
-#define RID_DLG_UPDATE_INSTALL_ABORT 2
-#define RID_DLG_UPDATE_INSTALL_OK 3
-#define RID_DLG_UPDATE_INSTALL_DOWNLOADING 4
-#define RID_DLG_UPDATE_INSTALL_INSTALLING 5
-#define RID_DLG_UPDATE_INSTALL_FINISHED 6
-#define RID_DLG_UPDATE_INSTALL_LINE 7
-#define RID_DLG_UPDATE_INSTALL_HELP 8
-#define RID_DLG_UPDATE_INSTALL_STATUSBAR 9
-#define RID_DLG_UPDATE_INSTALL_EXTENSION_NAME 10
-#define RID_DLG_UPDATE_INSTALL_RESULTS 11
-#define RID_DLG_UPDATE_INSTALL_INFO 12
-#define RID_DLG_UPDATE_INSTALL_NO_ERRORS 13
-#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED 14
-#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD 15
-#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION 16
-#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED 17
-#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL 18
-
#define RID_DLG_DEPENDENCIES (RID_DEPLOYMENT_GUI_START + 1)
#define RID_DLG_DEPENDENCIES_TEXT 1
#define RID_DLG_DEPENDENCIES_LIST 2
@@ -84,7 +64,14 @@
#define RID_DLG_UPDATE_IGNORE_ALL (RID_DEPLOYMENT_GUI_START + 25)
#define RID_DLG_UPDATE_IGNORED_UPDATE (RID_DEPLOYMENT_GUI_START + 36)
-#define RID_DLG_UPDATEINSTALL (RID_DEPLOYMENT_GUI_START + 37)
+#define RID_DLG_UPDATE_INSTALL_INSTALLING (RID_DEPLOYMENT_GUI_START + 37)
+#define RID_DLG_UPDATE_INSTALL_FINISHED (RID_DEPLOYMENT_GUI_START + 38)
+#define RID_DLG_UPDATE_INSTALL_NO_ERRORS (RID_DEPLOYMENT_GUI_START + 39)
+#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED (RID_DEPLOYMENT_GUI_START +
40)
+#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD (RID_DEPLOYMENT_GUI_START + 41)
+#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION (RID_DEPLOYMENT_GUI_START +
42)
+#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED (RID_DEPLOYMENT_GUI_START +
43)
+#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL (RID_DEPLOYMENT_GUI_START +
44)
#define RID_IMG_WARNING(RID_DEPLOYMENT_GUI_START+56)
#define RID_IMG_LOCKED (RID_DEPLOYMENT_GUI_START+58)
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index d3a76d9..2292472 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -21,6 +21,7 @@
#include svl/lstner.hxx
#include vcl/xtextedt.hxx
#include vcl/scrbar.hxx
+#include vcl/builder.hxx
#include dp_gui_autoscrolledit.hxx
@@ -28,8 +29,8 @@
namespace dp_gui {
-AutoScrollEdit::AutoScrollEdit( Window* pParent, const ResId rResId )
-: ExtMultiLineEdit( pParent, rResId )
+AutoScrollEdit::AutoScrollEdit( Window* pParent, WinBits nWinStyle )
+: ExtMultiLineEdit( pParent, nWinStyle )
{
ScrollBar* pScroll = GetVScrollBar();
if (pScroll)
@@ -59,4 +60,9 @@ void AutoScrollEdit::Notify( SfxBroadcaster, const SfxHint
rHint )
} // namespace dp_gui
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoScrollEdit(Window
*pParent, VclBuilder::stringmap )
+{
+return new dp_gui::AutoScrollEdit(pParent, WB_BORDER);
+}
+
/*
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/filter/xml/xmlSubDocument.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 3a99c2f91e7d58d38a57d8cc16eb52f422dd9116
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue May 27 12:37:54 2014 +0200
OXMLSubDocument: copy PrintWhenGroupChange, too
Change-Id: If6a5d9a50f5d600b96faebc51b9798a8e63eec49
Reviewed-on: https://gerrit.libreoffice.org/9501
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx
b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index ab74e20..c94b762 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -118,6 +118,7 @@ void OXMLSubDocument::EndElement()
uno::Reference report::XReportControlModel
xComponentModel(m_xComponent,uno::UNO_QUERY);
if ( xComponentModel.is() xFakeModel.is() )
{
+
xComponentModel-setPrintWhenGroupChange(xFakeModel-getPrintWhenGroupChange());
const sal_Int32 nCount = xFakeModel-getCount();
try
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - reportbuilder/java reportdesign/source
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
| 25 ++
reportdesign/source/filter/xml/xmlExport.cxx
|4 -
2 files changed, 9 insertions(+), 20 deletions(-)
New commits:
commit aa48af57531851a16204381854f1ee19ebb63a6a
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue May 27 12:09:37 2014 +0200
fdo#67935 print on group change acted as print in first group instance
The parent group changed iff this is the first iteration of *this*
group *or* *detail* *section*.
The parent group's first iteration means that we are in the first
value of the parent group (in other words, the *grand*-*parent* group
changed).
Change-Id: Ia4a798cb37db2f17e7deef1058b25795bfc02648
Reviewed-on: https://gerrit.libreoffice.org/9503
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index eca94e6..b4c5180 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -44,6 +44,7 @@ import
org.jfree.report.flow.layoutprocessor.LayoutControllerUtil;
import org.jfree.report.flow.layoutprocessor.SectionLayoutController;
import org.jfree.report.structure.Element;
import org.jfree.report.structure.Group;
+import org.jfree.report.structure.DetailSection;
import org.pentaho.reporting.libraries.formula.lvalues.ContextLookup;
import org.pentaho.reporting.libraries.formula.lvalues.LValue;
@@ -257,14 +258,14 @@ public class FormatValueUtility
return true;
}
-public static boolean isGroupChanged(LayoutController ref)
+private static boolean isGroupChanged(LayoutController ref)
{
// search the group.
-final SectionLayoutController slc = findGroup(ref);
+final SectionLayoutController slc = findGroupOrDetail(ref);
if (slc == null)
{
-// Always print the content of the report header and footer and
-// the page header and footer.
+// {Page, Report} Ã {Header, Footer} have no usable iteration
count
+// err on the side of showing them rather than not showing them
return true;
}
@@ -272,10 +273,9 @@ public class FormatValueUtility
return slc.getIterationCount() == 0;
}
-public static SectionLayoutController findGroup(LayoutController ref)
+private static SectionLayoutController findGroupOrDetail(LayoutController
ref)
{
LayoutController parent = ref.getParent();
-boolean skipNext = false;
while (parent != null)
{
if (!(parent instanceof SectionLayoutController))
@@ -286,19 +286,8 @@ public class FormatValueUtility
{
final SectionLayoutController slc = (SectionLayoutController)
parent;
final Element element = slc.getElement();
-if (element instanceof OfficeGroupSection)
+if (!(element instanceof Group || element instanceof
DetailSection))
{
-// This is a header or footer. So we take the next group
instead.
-skipNext = true;
-parent = parent.getParent();
-}
-else if (!(element instanceof Group))
-{
-parent = parent.getParent();
-}
-else if (skipNext)
-{
-skipNext = false;
parent = parent.getParent();
}
else
commit 7b8e9ea4f9645599f45f7e2f708bab2837dafd0d
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue May 27 12:36:53 2014 +0200
fdo#67937 print on group change defaults to TRUE
Thus it needs to be saved when it is *false*.
Change-Id: I01bae547afe71ede12fb852c1a9040b7e45bf7b9
Reviewed-on: https://gerrit.libreoffice.org/9502
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index a43e13f..9eb4f80 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -454,8 +454,8 @@ void ORptExport::exportFormatConditions(const
ReferenceXReportControlModel _x
void ORptExport::exportReportElement(const ReferenceXReportControlModel
_xReportElement)
{
OSL_ENSURE(_xReportElement.is(),_xReportElement is NULL - GPF);
-if ( _xReportElement-getPrintWhenGroupChange() )
-AddAttribute(XML_NAMESPACE_REPORT,
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/itiff/itiff.cxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit a58518e35596999f03298a76b2344bbb8279ae9a Author: Stephan Bergmann sberg...@redhat.com Date: Tue May 27 12:46:50 2014 +0200 Fix (small) memory leak (as observed with CppunitTest_filter_tiff_test) Change-Id: Ib840d66882faeca01d07a8764957a1c7c4075ec0 diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 061592b..6ece188 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1368,15 +1368,15 @@ bool TIFFReader::ReadTIFF(SvStream rTIFF, Graphic rGraphic ) aAnimation.Insert( aAnimationBitmap ); } } -// Aufraeumen: -for ( i = 0; i 4; i++ ) -delete[] pMap[ i ]; - -delete[] pColorMap; -delete[] pStripOffsets; -delete[] pStripByteCounts; } } + +// Clean up: +for ( i = 0; i 4; i++ ) +delete[] pMap[ i ]; +delete[] pColorMap; +delete[] pStripOffsets; +delete[] pStripByteCounts; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |1 - source/text/shared/01/extensionupdate.xhp |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 5916c2b39f6aa68c6d47f266be84085a84d9a8c7 Author: Caolán McNamara caol...@redhat.com Date: Tue May 27 11:47:37 2014 +0100 update help ids for update extension progress dialog Change-Id: Iced0717584f8b9343062c8428664bc2fff1128f0 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 9523de0..ab0b737 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -972,7 +972,6 @@ HID_DBWIZ_FINISH,39058, HID_DBWIZ_NEXT,39056, HID_DBWIZ_PREVIOUS,39055, HID_DB_SELECTION_TLB,54845, -HID_DEPLOYMENT_GUI_UPDATEINSTALL,42787, HID_DIALOG_HANGULHANJA,39883, HID_DID_SAVE_PACKED_XML,33368, HID_DLGCONVERT_CBBACK,34675, diff --git a/source/text/shared/01/extensionupdate.xhp b/source/text/shared/01/extensionupdate.xhp index a34d16b..e0374da 100644 --- a/source/text/shared/01/extensionupdate.xhp +++ b/source/text/shared/01/extensionupdate.xhp @@ -25,7 +25,7 @@ /meta body bookmark xml-lang=en-US branch=hid/desktop/ui/updatedialog/UpdateDialog id=bm_id5684377 localize=false/ -bookmark xml-lang=en-US branch=hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL id=bm_id7576525 localize=false/ +bookmark xml-lang=en-US branch=hid/desktop/ui/updateinstalldialog/UpdateInstallDialog id=bm_id7576525 localize=false/ paragraph id=hd_id9688100 role=heading xml-lang=en-US level=1Extension Update/paragraph paragraph id=par_id5084688 role=paragraph xml-lang=en-USahelp hid=.Click the emphCheck for Updates/emph button in the link href=text/shared/01/packagemanager.xhpExtension Manager/link to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose emphUpdate/emph./ahelp/paragraph section id=howtogetembed href=text/shared/00/0406.xhp#packagemanager_eu/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2472eedb55e179941f35e2f5a4ae3e95c3b500b6 Author: Caolán McNamara caol...@redhat.com Date: Tue May 27 11:47:37 2014 +0100 Updated core Project: help 5916c2b39f6aa68c6d47f266be84085a84d9a8c7 diff --git a/helpcontent2 b/helpcontent2 index 1c2805c..5916c2b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1c2805c0bc819a94bf5754e7838db134c1cdb62f +Subproject commit 5916c2b39f6aa68c6d47f266be84085a84d9a8c7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/inc/helpid.hrc |2 -- 1 file changed, 2 deletions(-) New commits: commit e7fa9b167900ed270d0d4e8661e145e63cdbb627 Author: Caolán McNamara caol...@redhat.com Date: Tue May 27 11:47:53 2014 +0100 newly unused helpid Change-Id: I977e6df72fcb06a192af539559f79b2f146495f7 diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 8efa1fe..6d14ab5 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -20,8 +20,6 @@ #ifndef INCLUDED_DESKTOP_HELPID_HRC #define INCLUDED_DESKTOP_HELPID_HRC -#define HID_DEPLOYMENT_GUI_UPDATEINSTALL DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL - #define HID_EXTENSION_MANAGER_LISTBOX DESKTOP_HID_EXTENSION_MANAGER_LISTBOX #define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS #define HID_EXTENSION_MANAGER_LISTBOX_ENABLE DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/Application.xba |2 +- wizards/source/access2base/DoCmd.xba |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 4916efd5c69684f12fa062f734345627291b49e4 Author: Jean-Pierre Ledure j...@ledure.be Date: Fri May 23 17:42:39 2014 +0200 Access2Base - Bug when event triggered by toolbar button Argument given by LO to macro triggered by toolbar button is an integer, not an object. This should not cause a visible error for the end-user from within the Events() Sub Change-Id: I4a307270b0d5cf2992b3bb304deb8cd30222dd95 Reviewed-on: https://gerrit.libreoffice.org/9452 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba index 1350464..04dceb0 100644 --- a/wizards/source/access2base/Application.xba +++ b/wizards/source/access2base/Application.xba @@ -641,7 +641,7 @@ Const cstThisSub = quot;Eventsquot; If IsMissing(poEvent) Then Goto Exit_Function If IsNull(poEvent) Then Goto Exit_Function - If Not Utils._CheckArgument(poEvent, 1, vbObject) Then Goto Exit_Function + If Not Utils._CheckArgument(poEvent, 1, vbObject, , False) Then Goto Exit_Function apos; No error handling in CheckArgument If Not Utils._hasUNOProperty(poEvent, quot;Sourcequot;) Then Goto Trace_Error Set vEvent = New Event vEvent._Initialize(poEvent) diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba index 2ece700..54249ef 100644 --- a/wizards/source/access2base/DoCmd.xba +++ b/wizards/source/access2base/DoCmd.xba @@ -1297,7 +1297,7 @@ Error_Function: Set OpenForm = Nothing GoTo Exit_Function Error_NotApplicable: - TraceError(TRACEFATAL, ERRMETHOD, Utils._CalledSub(), 0, 1, cstThisSub) + TraceError(TRACEFATAL, ERRACTION, Utils._CalledSub(), 0, 1, cstThisSub) Goto Exit_Function End Function apos; QuitV1.1.0 @@ -1792,7 +1792,7 @@ Exit_Function: Utils._ResetCalledSub(cstThisSub) Exit Function Error_NotApplicable: - TraceError(TRACEFATAL, ERRMETHOD, Utils._CalledSub(), 0, 1, cstThisSub) + TraceError(TRACEFATAL, ERRACTION, Utils._CalledSub(), 0, 1, cstThisSub) Goto Exit_Function Error_Function: TraceError(TRACEABORT, Err, cstThisSub, Erl) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/DataDef.xba |9 + wizards/source/access2base/Field.xba |9 + wizards/source/access2base/Recordset.xba |9 + 3 files changed, 27 insertions(+) New commits: commit c3fe2934ffc1d3c14c19bcb758d125a5d6df783f Author: Jean-Pierre Ledure j...@ledure.be Date: Sun May 25 18:46:57 2014 +0200 Access2Base - setProperty erroneously omitted Change-Id: I5d2a1b37d80137e6b8fd080d8c2d73372ad0512c Reviewed-on: https://gerrit.libreoffice.org/9479 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/wizards/source/access2base/DataDef.xba b/wizards/source/access2base/DataDef.xba index 4236548..061a7c7 100644 --- a/wizards/source/access2base/DataDef.xba +++ b/wizards/source/access2base/DataDef.xba @@ -419,6 +419,15 @@ Exit_Function: Exit Function End Function apos; Properties +REM --- +Public Function setProperty(ByVal Optional psProperty As String, ByVal Optional pvValue As Variant) As Boolean +apos; Return True if property setting OK +Dim cstThisSub As String + cstThisSub = Utils._PCase(_Type) amp; quot;.getPropertyquot; + Utils._SetCalledSub(cstThisSub) + setProperty = _PropertySet(psProperty, pvValue) + Utils._ResetCalledSub(cstThisSub) +End Function REM --- REM --- PRIVATE FUNCTIONS --- diff --git a/wizards/source/access2base/Field.xba b/wizards/source/access2base/Field.xba index 4819e83..871133f 100644 --- a/wizards/source/access2base/Field.xba +++ b/wizards/source/access2base/Field.xba @@ -199,6 +199,15 @@ Exit_Function: End Function apos; ReadAllText REM --- +Public Function setProperty(ByVal Optional psProperty As String, ByVal Optional pvValue As Variant) As Boolean +apos; Return True if property setting OK +Const cstThisSub = quot;Field.setPropertyquot; + Utils._SetCalledSub(cstThisSub) + setProperty = _PropertySet(psProperty, pvValue) + Utils._ResetCalledSub(cstThisSub) +End Function + +REM --- Public Function WriteAllBytes(ByVal Optional pvFile As Variant) As Boolean apos; Write the whole content of a Long Binary Field object to a file diff --git a/wizards/source/access2base/Recordset.xba b/wizards/source/access2base/Recordset.xba index 16fc3a2..1a25e36 100644 --- a/wizards/source/access2base/Recordset.xba +++ b/wizards/source/access2base/Recordset.xba @@ -727,6 +727,15 @@ Exit_Function: End Function apos; Properties REM --- +Public Function setProperty(ByVal Optional psProperty As String, ByVal Optional pvValue As Variant) As Boolean +apos; Return True if property setting OK +Const cstThisSub = quot;Recordset.setPropertyquot; + Utils._SetCalledSub(cstThisSub) + setProperty = _PropertySet(psProperty, pvValue) + Utils._ResetCalledSub(cstThisSub) +End Function + +REM --- Public Function Update() As Boolean apos; Finalize the updates of the current record ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/gui/dp_gui_updateinstalldialog.src |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 1908f27da839e481c277ab08e3013eb06be04890
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue May 27 12:55:25 2014 +0200
desktop: further src file cleanup
Change-Id: I37f83084203fcc4e2f7d68f7c21774573b9281e8
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
index 19ffa0d..e8d5276 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
@@ -17,15 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include svtools/controldims.hrc
-
#include dp_gui.hrc
-#define LOCAL_WIDTH (60 * RSC_BS_CHARWIDTH)
-#define LOCAL_LIST_HEIGHT (7 * RSC_BS_CHARHEIGHT)
-#define LOCAL_BUTTON_WIDTH 80
-
-
String RID_DLG_UPDATE_INSTALL_INSTALLING {
Text[en-US] = Installing extensions...;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/Library_deploymentgui.mk desktop/source desktop/uiconfig extras/source
desktop/Library_deploymentgui.mk |1
desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx | 68 ---
desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx | 45 ---
desktop/source/deployment/gui/dp_gui_updatedialog.cxx|4
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 19 +--
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx |8 -
desktop/uiconfig/ui/updateinstalldialog.ui | 31 +
extras/source/glade/libreoffice-catalog.xml.in |3
8 files changed, 25 insertions(+), 154 deletions(-)
New commits:
commit 9172ee72938a42f9f792b627c47f42f02ce468df
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 27 11:51:52 2014 +0100
the stock multilineedit is sufficient IMO
Change-Id: I374c17fcda80c4f821271bf665a41beae100cccf
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index ec0a836..cdf8bcd 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -56,7 +56,6 @@ endif
$(eval $(call
gb_Library_set_componentfile,deploymentgui,desktop/source/deployment/gui/deploymentgui))
$(eval $(call gb_Library_add_exception_objects,deploymentgui,\
-desktop/source/deployment/gui/dp_gui_autoscrolledit \
desktop/source/deployment/gui/dp_gui_dependencydialog \
desktop/source/deployment/gui/dp_gui_dialog2 \
desktop/source/deployment/gui/dp_gui_extensioncmdqueue \
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
deleted file mode 100644
index 2292472..000
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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 svtools/svmedit2.hxx
-#include svl/lstner.hxx
-#include vcl/xtextedt.hxx
-#include vcl/scrbar.hxx
-#include vcl/builder.hxx
-
-#include dp_gui_autoscrolledit.hxx
-
-
-namespace dp_gui {
-
-
-AutoScrollEdit::AutoScrollEdit( Window* pParent, WinBits nWinStyle )
-: ExtMultiLineEdit( pParent, nWinStyle )
-{
-ScrollBar* pScroll = GetVScrollBar();
-if (pScroll)
-pScroll-Hide();
-StartListening( *GetTextEngine() );
-}
-
-AutoScrollEdit::~AutoScrollEdit()
-{
-EndListeningAll();
-}
-
-void AutoScrollEdit::Notify( SfxBroadcaster, const SfxHint rHint )
-{
-if ( rHint.IsA( TYPE(TextHint) ) )
-{
-sal_uLong nId = ((const TextHint)rHint).GetId();
-if ( nId == TEXT_HINT_VIEWSCROLLED )
-{
-ScrollBar* pScroll = GetVScrollBar();
-if ( pScroll )
-pScroll-Show();
-}
-}
-}
-
-
-} // namespace dp_gui
-
-extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoScrollEdit(Window
*pParent, VclBuilder::stringmap )
-{
-return new dp_gui::AutoScrollEdit(pParent, WB_BORDER);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
deleted file mode 100644
index 8707bfa..000
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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
About removing Browser Plugin
Hello, Following https://bugs.freedesktop.org/show_bug.cgi?id=45071, it seems Browser plugin can be removed from 4.4 To do this, I thought git removing core/extensions/source/plugin/, + tune some mk file in core/extensions and finally core/configure.ac should be ok. 1) Is it ok? Am I forgetting something? 2) Should this be removed from 4.3 too? 3) In a second time, I thought about putting all Browser plugin bugtrackers at WONTFIX, ok for this? Julien -- View this message in context: http://nabble.documentfoundation.org/About-removing-Browser-Plugin-tp4110455.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
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/documentinfopage.ui | 186 --- 1 file changed, 87 insertions(+), 99 deletions(-) New commits: commit 9b47595a34c0b687cc02290b0a9cbf8508407082 Author: Caolán McNamara caol...@redhat.com Date: Tue May 27 12:28:33 2014 +0100 Resolves: fdo#79275 File Properties dialogâs layout is subpar Change-Id: I594d93c0630528841a1f243e6b6e9eda67b6138d diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui index d11de2e..fdf6a87 100644 --- a/sfx2/uiconfig/ui/documentinfopage.ui +++ b/sfx2/uiconfig/ui/documentinfopage.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkGrid id=DocumentInfoPage property name=visibleTrue/property property name=can_focusFalse/property @@ -52,7 +53,7 @@ /object packing property name=left_attach0/property -property name=top_attach9/property +property name=top_attach10/property property name=width1/property property name=height1/property /packing @@ -68,7 +69,7 @@ /object packing property name=left_attach0/property -property name=top_attach10/property +property name=top_attach11/property property name=width1/property property name=height1/property /packing @@ -84,7 +85,7 @@ /object packing property name=left_attach0/property -property name=top_attach11/property +property name=top_attach12/property property name=width1/property property name=height1/property /packing @@ -100,7 +101,7 @@ /object packing property name=left_attach0/property -property name=top_attach12/property +property name=top_attach13/property property name=width1/property property name=height1/property /packing @@ -146,7 +147,7 @@ /object packing property name=left_attach1/property -property name=top_attach9/property +property name=top_attach10/property property name=width1/property property name=height1/property /packing @@ -161,7 +162,7 @@ /object packing property name=left_attach1/property -property name=top_attach10/property +property name=top_attach11/property property name=width1/property property name=height1/property /packing @@ -176,7 +177,7 @@ /object packing property name=left_attach1/property -property name=top_attach11/property +property name=top_attach12/property property name=width1/property property name=height1/property /packing @@ -191,18 +192,6 @@ /object packing property name=left_attach1/property -property name=top_attach12/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkLabel id=label26 -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property property name=top_attach13/property property name=width1/property property name=height1/property @@ -215,15 +204,14 @@ property name=can_focusTrue/property property name=receives_defaultFalse/property property name=no_show_allTrue/property -property name=use_action_appearanceFalse/property property name=use_underlineTrue/property property name=xalign0/property property name=draw_indicatorTrue/property /object packing property name=left_attach0/property -property name=top_attach13/property -property name=width1/property +property name=top_attach14/property +property name=width2/property property name=height1/property /packing /child @@ -238,7 +226,7 @@ /object packing property name=left_attach2/property -property name=top_attach13/property +property name=top_attach14/property property name=width1/property property name=height1/property /packing @@ -255,38 +243,7 @@ /object packing property name=left_attach2/property -property name=top_attach9/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkLabel id=templateft -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yesTemplate:/property -property name=use_underlineTrue/property -property
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/uiconfig
sfx2/uiconfig/ui/documentinfopage.ui | 186 --- 1 file changed, 87 insertions(+), 99 deletions(-) New commits: commit c9a0c51d74d1169e5ce6eef1edd7499dc7e998d0 Author: Caolán McNamara caol...@redhat.com Date: Tue May 27 12:28:33 2014 +0100 Resolves: fdo#79275 File Properties dialogâs layout is subpar Change-Id: I594d93c0630528841a1f243e6b6e9eda67b6138d (cherry picked from commit 9b47595a34c0b687cc02290b0a9cbf8508407082) diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui index d11de2e..fdf6a87 100644 --- a/sfx2/uiconfig/ui/documentinfopage.ui +++ b/sfx2/uiconfig/ui/documentinfopage.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkGrid id=DocumentInfoPage property name=visibleTrue/property property name=can_focusFalse/property @@ -52,7 +53,7 @@ /object packing property name=left_attach0/property -property name=top_attach9/property +property name=top_attach10/property property name=width1/property property name=height1/property /packing @@ -68,7 +69,7 @@ /object packing property name=left_attach0/property -property name=top_attach10/property +property name=top_attach11/property property name=width1/property property name=height1/property /packing @@ -84,7 +85,7 @@ /object packing property name=left_attach0/property -property name=top_attach11/property +property name=top_attach12/property property name=width1/property property name=height1/property /packing @@ -100,7 +101,7 @@ /object packing property name=left_attach0/property -property name=top_attach12/property +property name=top_attach13/property property name=width1/property property name=height1/property /packing @@ -146,7 +147,7 @@ /object packing property name=left_attach1/property -property name=top_attach9/property +property name=top_attach10/property property name=width1/property property name=height1/property /packing @@ -161,7 +162,7 @@ /object packing property name=left_attach1/property -property name=top_attach10/property +property name=top_attach11/property property name=width1/property property name=height1/property /packing @@ -176,7 +177,7 @@ /object packing property name=left_attach1/property -property name=top_attach11/property +property name=top_attach12/property property name=width1/property property name=height1/property /packing @@ -191,18 +192,6 @@ /object packing property name=left_attach1/property -property name=top_attach12/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkLabel id=label26 -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property property name=top_attach13/property property name=width1/property property name=height1/property @@ -215,15 +204,14 @@ property name=can_focusTrue/property property name=receives_defaultFalse/property property name=no_show_allTrue/property -property name=use_action_appearanceFalse/property property name=use_underlineTrue/property property name=xalign0/property property name=draw_indicatorTrue/property /object packing property name=left_attach0/property -property name=top_attach13/property -property name=width1/property +property name=top_attach14/property +property name=width2/property property name=height1/property /packing /child @@ -238,7 +226,7 @@ /object packing property name=left_attach2/property -property name=top_attach13/property +property name=top_attach14/property property name=width1/property property name=height1/property /packing @@ -255,38 +243,7 @@ /object packing property name=left_attach2/property -property name=top_attach9/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkLabel id=templateft -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yesTemplate:/property -
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/popuptoolbarcontroller.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 898b7643e49514cb14dfecc396e326e63672b6d5
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 27 13:29:25 2014 +0200
loplugin:sallogareas
Change-Id: I7fe1350e55bea2eead2c7fedf432da594aa6bd9c
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx
b/framework/source/uielement/popuptoolbarcontroller.cxx
index e17a86b..2667884 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -142,7 +142,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException,
std::exception )
}
catch (const css::uno::Exception e)
{
-SAL_INFO( framework.uielement, Caught an exception: e.Message
);
+SAL_INFO( fwk.uielement, Caught an exception: e.Message );
}
SolarMutexGuard aSolarLock;
@@ -242,7 +242,7 @@ void PopupMenuToolbarController::createPopupMenuController()
catch ( const css::uno::Exception e )
{
m_xPopupMenu.clear();
-SAL_INFO( framework.uielement, Caught an exception:
e.Message );
+SAL_INFO( fwk.uielement, Caught an exception: e.Message );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8graf.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 7e91dd0a3885ac561aee9cf7907632677b9886c1
Author: Michael Stahl mst...@redhat.com
Date: Tue May 27 13:27:37 2014 +0200
fdo#77454: sw: ww8 import: add heuristic to ignore mangled crop values
Older versions of OOo/LO would mangle negative crop values on round-trip
of WW8, which now (since the drawing-layer does not ignore them) causes
the images to be rendered invisible; probably large factors don't make
sense anyway, so ignore the crop if it's 50x the image size, which
happens to work for the bugdoc.
Change-Id: I9f36d37e3be27234554bc91e80bfe719b1ce86af
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index ec4bf38..e03811f 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1975,8 +1975,14 @@ void
SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord,
static sal_Int32 lcl_ConvertCrop(sal_uInt32 const nCrop, sal_Int32 const nSize)
{
// cast to sal_Int32 to handle negative crop properly
-return ((static_castsal_Int32(nCrop) 16) * nSize)
- + (((nCrop 0x) * nSize) 16) ;
+sal_Int32 const nIntegral(static_castsal_Int32(nCrop) 16);
+// fdo#77454: heuristic to detect mangled values written by old OOo/LO
+if (abs(nIntegral) = 50) // FIXME: what's a good cut-off?
+{
+SAL_INFO(sw.ww8, ignoring suspiciously large crop: nIntegral);
+return 0;
+}
+return (nIntegral * nSize) + (((nCrop 0x) * nSize) 16);
}
void
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/filter/ww8/ww8graf.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 5f80a1059b19355753ce7950f7f900f51b13c2f0
Author: Michael Stahl mst...@redhat.com
Date: Tue May 27 13:27:37 2014 +0200
fdo#77454: sw: ww8 import: add heuristic to ignore mangled crop values
Older versions of OOo/LO would mangle negative crop values on round-trip
of WW8, which now (since the drawing-layer does not ignore them) causes
the images to be rendered invisible; probably large factors don't make
sense anyway, so ignore the crop if it's 50x the image size, which
happens to work for the bugdoc.
Change-Id: I9f36d37e3be27234554bc91e80bfe719b1ce86af
(cherry picked from commit 7e91dd0a3885ac561aee9cf7907632677b9886c1)
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index ec4bf38..e03811f 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1975,8 +1975,14 @@ void
SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord,
static sal_Int32 lcl_ConvertCrop(sal_uInt32 const nCrop, sal_Int32 const nSize)
{
// cast to sal_Int32 to handle negative crop properly
-return ((static_castsal_Int32(nCrop) 16) * nSize)
- + (((nCrop 0x) * nSize) 16) ;
+sal_Int32 const nIntegral(static_castsal_Int32(nCrop) 16);
+// fdo#77454: heuristic to detect mangled values written by old OOo/LO
+if (abs(nIntegral) = 50) // FIXME: what's a good cut-off?
+{
+SAL_INFO(sw.ww8, ignoring suspiciously large crop: nIntegral);
+return 0;
+}
+return (nIntegral * nSize) + (((nCrop 0x) * nSize) 16);
}
void
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/print.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3041269ff285685d660a049bfef43f3dab6f8946
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 27 12:37:00 2014 +0100
Resolves: fdo#77206 CRASH printing with all applications on windows
Change-Id: I5d5066413508a115f6b4c63b8b3dd19268f66574
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index dcbe378..e6e1e36 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -648,7 +648,7 @@ bool Printer::AcquireGraphics() const
void Printer::ImplReleaseFonts()
{
-#ifndef UNX
+#ifdef UNX
// HACK to fix an urgent P1 printing issue fast
// WinSalPrinter does not respect GetGraphics/ReleaseGraphics conventions
// so Printer::mpGraphics often points to a dead WinSalGraphics
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/source
vcl/source/gdi/print.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5970bfd278052d59c560c6f8bd33b3f7cf4cae75
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 27 12:37:00 2014 +0100
Resolves: fdo#77206 CRASH printing with all applications on windows
Change-Id: I5d5066413508a115f6b4c63b8b3dd19268f66574
(cherry picked from commit 3041269ff285685d660a049bfef43f3dab6f8946)
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index dcbe378..e6e1e36 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -648,7 +648,7 @@ bool Printer::AcquireGraphics() const
void Printer::ImplReleaseFonts()
{
-#ifndef UNX
+#ifdef UNX
// HACK to fix an urgent P1 printing issue fast
// WinSalPrinter does not respect GetGraphics/ReleaseGraphics conventions
// so Printer::mpGraphics often points to a dead WinSalGraphics
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 77206, which changed state. Bug 77206 Summary: CRASH printing with all applications https://bugs.freedesktop.org/show_bug.cgi?id=77206 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About removing Browser Plugin
On 05/27/2014 01:23 PM, julien2412 wrote: Following https://bugs.freedesktop.org/show_bug.cgi?id=45071, it seems Browser plugin can be removed from 4.4 What makes it seem so? I personally don't really care much either for keeping or removing that feature, but I think the conclusions in that bug that lead some to advocate removal are bogus. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - accessibility/source basctl/source chart2/source cui/source cui/uiconfig framework/source include/sax include/sfx2 include/svtools include/svx sax/source sc
accessibility/source/extended/textwindowaccessibility.cxx | 116 +++---
basctl/source/basicide/baside2.hxx|6
chart2/source/model/main/FormattedString.hxx | 48 ++---
chart2/source/model/template/ChartTypeTemplate.cxx|2
chart2/source/model/template/ChartTypeTemplate.hxx|2
chart2/source/model/template/GL3DBarChartTypeTemplate.cxx |4
chart2/source/model/template/GL3DBarChartTypeTemplate.hxx |4
cui/source/options/optaboutconfig.cxx |2
cui/source/options/optaboutconfig.hxx |2
cui/uiconfig/ui/aboutconfigdialog.ui |1
framework/source/services/frame.cxx |2
framework/source/services/pathsettings.cxx|6
include/sax/fastattribs.hxx |4
include/sfx2/sfxbasecontroller.hxx|2
include/svtools/colorcfg.hxx |2
include/svx/fmgridif.hxx | 12 -
include/svx/fmsrccfg.hxx |2
sax/source/tools/fastattribs.cxx |2
sc/inc/document.hxx |2
sc/source/filter/inc/formulabuffer.hxx|8
sc/source/ui/app/scdll.cxx|8
sfx2/source/view/sfxbasecontroller.cxx|2
sw/inc/dbmgr.hxx | 10 -
sw/inc/splargs.hxx|6
tools/source/fsys/urlobj.cxx |4
ucb/source/ucp/webdav/webdavdatasupplier.cxx |2
ucb/source/ucp/webdav/webdavresultset.cxx |2
uui/source/requeststringresolver.cxx | 36 ++--
uui/source/sslwarndlg.cxx |4
uui/source/unknownauthdlg.cxx |6
vcl/source/window/accessibility.cxx |1
vcl/source/window/stacking.cxx|1
winaccessibility/source/service/msaaservice_impl.cxx |4
writerfilter/source/dmapper/GraphicImport.cxx |2
xmlhelp/source/cxxhelp/provider/contentcaps.cxx | 23 +-
35 files changed, 163 insertions(+), 177 deletions(-)
New commits:
commit 65a54a19adcaa2271c5a502a752eb7e6191d08da
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue May 27 13:42:17 2014 +0200
Export Config: Use ModelessDialog
The huge size of this dialog calls for a maximize button...
Change-Id: I68706669ac4e10ea9d5cba5526e9f1b0eb3628b6
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index ff39661..5392ff6 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -130,7 +130,7 @@ Size CuiAboutConfigTabPage::GetOptimalSize() const
}
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent/*, const
SfxItemSet rItemSet*/ ) :
-ModalDialog( pParent, AboutConfig, cui/ui/aboutconfigdialog.ui),
+ModelessDialog( pParent, AboutConfig, cui/ui/aboutconfigdialog.ui),
m_pPrefCtrl( getSvSimpleTableContainer(preferences) ),
m_pResetBtn( getPushButton(reset) ),
m_pEditBtn( getPushButton(edit) ),
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 6761e3c..ee42492 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -40,7 +40,7 @@ public:
//void setBehaviour( bool bNumeric, int nLengthLimit);
};
-class CuiAboutConfigTabPage : public ModalDialog
+class CuiAboutConfigTabPage : public ModelessDialog
{
private:
SvSimpleTableContainer* m_pPrefCtrl;
diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui
b/cui/uiconfig/ui/aboutconfigdialog.ui
index 495b0eab..9bd4bbd 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -5,6 +5,7 @@
object class=GtkDialog id=AboutConfig
property name=can_focusFalse/property
property name=border_width5/property
+property name=title translatable=yesExpert Configuration/property
property name=type_hintdialog/property
child internal-child=vbox
object class=GtkBox id=dialog-vbox1
commit bab0c4fc0c8b1213869f42a5ed3029f901323828
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue May 27 11:47:06 2014 +0200
bin obsolete CLOOK comments
Change-Id: I34f37587284893927463e214f0d7d1c3e914c7b2
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e1aabf4..259d119 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2094,7 +2094,7 @@ public:
void SetCalcConfig( const ScCalcConfig rConfig );
const ScCalcConfig GetCalcConfig() const;
-private: // CLOOK-Impl-methods
+private:
/**
* Use this class as a locale
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a9b339b7486398fae4463427d39c3b229b8e1f10
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Tue May 27 14:02:24 2014 +0200
fix build-break on windows
ae95cdd2a1708a8e9e114dd9bcf577f57f1f5af3 introduced a check, and did put
it outside of a #if !defined(WNT) block...
Change-Id: Id200c6f3161d0c6c611e0b1c293adbd060579cd7
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f6c3591..ef0fa56 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2055,7 +2055,6 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78384,fdo78384.docx)
return;
assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w:rFonts,ascii,Wingdings);
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testfdo79008, fdo79008.docx)
{
@@ -2067,6 +2066,8 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79008, fdo79008.docx)
return;
}
+#endif
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c3e7cca8ecb383ba981899ee525d32a73be4ec1 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 27 14:05:59 2014 +0200 update dictionaries manual push of 0a68bdc3b29237ab76bce445f3cdc535b1482307 didn't trigger an automatic update.. Change-Id: I5dd94c32208d88ccf3069d55fe21428a98fd3211 diff --git a/dictionaries b/dictionaries index 246dddb..0a68bdc 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 246dddb6ce55587bdbdbf05163b294bb72fa +Subproject commit 0a68bdc3b29237ab76bce445f3cdc535b1482307 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source offapi/com
desktop/source/deployment/registry/dp_backend.cxx | 12 +
desktop/source/deployment/registry/help/dp_help.cxx |6 +++-
desktop/source/deployment/registry/inc/dp_backend.h |6 +++-
desktop/source/deployment/registry/package/dp_package.cxx |8 --
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 18 +-
offapi/com/sun/star/deployment/XPackage.idl |5 ++-
6 files changed, 36 insertions(+), 19 deletions(-)
New commits:
commit 42119194fd5f66e393b9b53692d2330016d144d6
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 27 13:12:02 2014 +0100
coverity#706499 Uncaught exception
also coverity#706500 and coverity#706502 and coverity#706503
Change-Id: If8c76f9fea669f3397a3db65fefaabe101bf9c35
diff --git a/desktop/source/deployment/registry/dp_backend.cxx
b/desktop/source/deployment/registry/dp_backend.cxx
index fb5c05d..69b918b 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -515,8 +515,10 @@ OUString Package::getDescription() throw (
}
-OUString Package::getLicenseText() throw (
-deployment::ExtensionRemovedException,RuntimeException, std::exception)
+OUString Package::getLicenseText()throw (
+deployment::DeploymentException,
+deployment::ExtensionRemovedException,
+RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -751,6 +753,7 @@ PackageRegistryBackend * Package::getMyBackend() const
}
return pBackend;
}
+
OUString Package::getRepositoryName()
throw (RuntimeException, std::exception)
{
@@ -759,7 +762,8 @@ OUString Package::getRepositoryName()
}
beans::Optional OUString Package::getRegistrationDataURL()
-throw (deployment::ExtensionRemovedException,
+throw (deployment::DeploymentException,
+ deployment::ExtensionRemovedException,
css::uno::RuntimeException, std::exception)
{
if (m_bRemoved)
@@ -773,8 +777,6 @@ sal_Bool Package::isRemoved()
return m_bRemoved;
}
-
-
Package::TypeInfo::~TypeInfo()
{
}
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index c3ecbd4..74259ae 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -84,7 +84,8 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
//XPackage
virtual css::beans::Optional OUString SAL_CALL
getRegistrationDataURL()
-throw (deployment::ExtensionRemovedException,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+throw (deployment::DeploymentException,
deployment::ExtensionRemovedException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
friend class PackageImpl;
@@ -356,7 +357,8 @@ void BackendImpl::PackageImpl::processPackage_(
}
beans::Optional OUString BackendImpl::PackageImpl::getRegistrationDataURL()
-throw (deployment::ExtensionRemovedException,
+throw (deployment::DeploymentException,
+ deployment::ExtensionRemovedException,
css::uno::RuntimeException, std::exception)
{
if (m_bRemoved)
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h
b/desktop/source/deployment/registry/inc/dp_backend.h
index 618fc46..8e1a75e 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -227,7 +227,8 @@ public:
throw (css::deployment::ExtensionRemovedException,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getLicenseText()
-throw (css::deployment::ExtensionRemovedException,
+throw (css::deployment::DeploymentException,
+ css::deployment::ExtensionRemovedException,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence OUString SAL_CALL
getUpdateInformationURLs()
@@ -253,7 +254,8 @@ public:
virtual OUString SAL_CALL getRepositoryName()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::beans::Optional OUString SAL_CALL getRegistrationDataURL()
-throw (css::deployment::ExtensionRemovedException,
+throw (css::deployment::DeploymentException,
+ css::deployment::ExtensionRemovedException,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isRemoved()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
index a852f23..875d423 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b66df278e35512bb7782dc5decf45020cbbada24 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 27 14:47:35 2014 +0200 Updated core Project: translations 939713e6d30880089c0399c267fd998fa1954419 diff --git a/translations b/translations index 0369496..939713e 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 0369496336360265d6c29deb2f65b39acf1b1165 +Subproject commit 939713e6d30880089c0399c267fd998fa1954419 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: libcdr.pc.in
libcdr.pc.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e973b9db65df3c367e09e0d4623be59a91074515
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue May 27 15:21:25 2014 +0200
The library strictly speaking does not need the stream implementations
Change-Id: I2787a6fa4b1d934c0ecd96d4e4ebb71cfc742511
diff --git a/libcdr.pc.in b/libcdr.pc.in
index e1bbab4..a1aa43d 100644
--- a/libcdr.pc.in
+++ b/libcdr.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
Description: Library for parsing the Corel Draw file format structure
Version: @VERSION@
-Requires: librevenge-0.0 librevenge-stream-0.0
+Requires: librevenge-0.0
Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
Cflags: -I${includedir}/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: libvisio.pc.in
libvisio.pc.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e6c0de7c26fb295bb13beea08d5a95eacd812f1d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue May 27 15:22:00 2014 +0200
The library strictly speaking does not need the stream implementations
Change-Id: I8139e35f1cc9bcc036fe28ba3e61447906587919
diff --git a/libvisio.pc.in b/libvisio.pc.in
index d45aef5..ce68e6f 100644
--- a/libvisio.pc.in
+++ b/libvisio.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
Description: Library for parsing the visio file format structure
Version: @VERSION@
-Requires: librevenge-0.0 librevenge-stream-0.0
+Requires: librevenge-0.0
Libs: -L${libdir} -lvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
Cflags: -I${includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About removing Browser Plugin
Hi Julien Em 27-05-2014 08:23, julien2412 escreveu: Hello, Following https://bugs.freedesktop.org/show_bug.cgi?id=45071, it seems Browser plugin can be removed from 4.4 To do this, I thought git removing core/extensions/source/plugin/, + tune some mk file in core/extensions and finally core/configure.ac should be ok. 1) Is it ok? Am I forgetting something? 2) Should this be removed from 4.3 too? 3) In a second time, I thought about putting all Browser plugin bugtrackers at WONTFIX, ok for this? Julien I put some comments in the bug. -- Olivier Hallot Comunidade LibreOffice http://ask.libreoffice.org/pt-br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - chart2/source reportdesign/source svx/source
chart2/source/controller/main/ShapeToolbarController.cxx |8
chart2/source/controller/main/ShapeToolbarController.hxx |1 +
reportdesign/source/ui/inc/toolboxcontroller.hxx |1 +
reportdesign/source/ui/misc/toolboxcontroller.cxx|6 ++
reportdesign/source/ui/report/ReportController.cxx |2 ++
svx/source/customshapes/tbxcustomshapes.cxx |6 --
6 files changed, 22 insertions(+), 2 deletions(-)
New commits:
commit 426033250db0b9b6344980655ca0be59efe6a6a5
Author: Maxim Monastirsky momonas...@gmail.com
Date: Mon May 26 11:32:25 2014 +0300
reportdesign: Fix applying the last used color
The last used color is stored inside
SvxColorToolBoxControl, so we must call its Select method
to do that. (This also fixes using the last shape, See
commit ce842113ae728e8995c7c5398204a20d0707e843 for a
fix of exactly the same problem in chart2.)
For the font color, there was also another problem:
The SID used for that button is SID_ATTR_CHAR_COLOR2.
The problem is that SvxColorToolBoxControl::Select
actually calls for that SID the .uno:CharColorExt
command instead of .uno:FontColor (which activates
in writer the format paintbrush mode). Given that since
commit 584b415924bba22db23a4258062e54973de0ed7c this
command also receives the last used color as argument,
the easiest solution is to register .uno:CharColorExt
here as well.
Change-Id: I2db25a7fb537ce10dfec7b1c2d049dd77d9f8f6b
diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx
b/reportdesign/source/ui/inc/toolboxcontroller.hxx
index a4a668c..b005b42 100644
--- a/reportdesign/source/ui/inc/toolboxcontroller.hxx
+++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx
@@ -71,6 +71,7 @@ namespace rptui
virtual void SAL_CALL statusChanged( const
::com::sun::star::frame::FeatureStateEvent Event ) throw (
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XToolbarController
virtual ::com::sun::star::uno::Reference
::com::sun::star::awt::XWindow SAL_CALL createPopupWindow() throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSubToolbarController
virtual sal_Bool SAL_CALL opensSubToolbar( ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx
b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 2bdbd25..66335da 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -276,6 +276,12 @@ Reference awt::XWindow SAL_CALL
OToolboxController::createPopupWindow() throw
return xRet;
}
+void SAL_CALL OToolboxController::execute( sal_Int16 KeyModifier ) throw
(uno::RuntimeException, std::exception)
+{
+if ( m_pToolbarController.is() )
+m_pToolbarController.getRef()-execute( KeyModifier );
+}
+
sal_Bool SAL_CALL OToolboxController::opensSubToolbar() throw
(uno::RuntimeException, std::exception)
{
return ( m_nSlotId == SID_DRAWTBX_CS_BASIC ||
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index c4f709a..1b39181 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1462,6 +1462,7 @@ void OReportController::Execute(sal_uInt16 _nId, const
Sequence PropertyValue
break;
case SID_ATTR_CHAR_COLOR:
case SID_ATTR_CHAR_COLOR2:
+case SID_ATTR_CHAR_COLOR_EXT:
{
const SequenceAsHashMap aMap(aArgs);
const util::Color aColor =
aMap.getUnpackedValueOrDefault(PROPERTY_FONTCOLOR,util::Color());
@@ -1857,6 +1858,7 @@ void OReportController::describeSupportedFeatures()
implDescribeSupportedFeature( .uno:Underline,
SID_ATTR_CHAR_UNDERLINE,CommandGroup::FORMAT );
implDescribeSupportedFeature( .uno:BackColor,
SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT );
implDescribeSupportedFeature( .uno:BackgroundColor,
SID_BACKGROUND_COLOR, CommandGroup::FORMAT );
+implDescribeSupportedFeature( .uno:CharColorExt,
SID_ATTR_CHAR_COLOR_EXT);
implDescribeSupportedFeature( .uno:Color,
SID_ATTR_CHAR_COLOR);
implDescribeSupportedFeature( .uno:FontColor,
SID_ATTR_CHAR_COLOR2, CommandGroup::FORMAT );
implDescribeSupportedFeature( .uno:FontDialog,
SID_CHAR_DLG, CommandGroup::FORMAT );
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx
b/svx/source/customshapes/tbxcustomshapes.cxx
index f91d2e3..4a8fff2
Re: Patch to huge memory consumption in LO Calc
Hello William, On Sat, 2014-05-24 at 14:47 +0200, William Bonnet wrote: I attach to this bug entry a proposal for a patch which solve this problem. A call to shrink_to_fit has been added in the resize_block method. In order to limit the number of call to this method, and wasting too much time releasing memory, i only call it when its current size is half of its capacity (real number of element vs number of element allocated). So, I would look at this from 2 angles. One is from the angle of the container itself, which is what you already did. It's a great analysis and, while we still need to adjust your change to not require C++11 (as Stephan already pointed out) as well as the non-binding nature of shrink_to_fit(), the main idea is sound and we should incorporate it into multi_type_vector's low-level array management. Another angle is the code that handles subtotals to see if we could do it differently in a way that would avoid shrinking of the raw level arrays. Many existing call cites that accesses multi_type_vector are still optimized for the old, ScBaseCell-based cell storage which may not work well with the new array-based storage. And the subtotal code may be just one of those. But this can be done another time. We are slowly migrating the call sites to have them perform optimally for the new storage, and it takes some time. I'll look into incorporating your change to mdds sometime soon. Thanks again! Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drviewsf.cxx | 11 +--
sd/source/ui/view/outlnvs2.cxx | 39 +++
sd/source/ui/view/outlnvsh.cxx |4 +---
sd/source/ui/view/sdview.cxx | 11 ---
sd/source/ui/view/sdview2.cxx |7 +++
sd/source/ui/view/sdview3.cxx | 22 ++
6 files changed, 42 insertions(+), 52 deletions(-)
New commits:
commit f46d9c7d4d5e46a793d9e3dd9211c42007b11c0d
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue May 27 23:11:57 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: Id75c459cfa59fe2adfc0f748dc33d0bc9e271507
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index ea10bdf..6c74365 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -64,6 +64,7 @@
#include editeng/adjustitem.hxx
#include svx/nbdtmgfact.hxx
#include svx/nbdtmg.hxx
+#include boost/scoped_ptr.hpp
using namespace svx::sidebar;
using namespace ::com::sun::star;
@@ -562,7 +563,7 @@ void DrawViewShell::GetAttrState( SfxItemSet rSet )
aNewAttr.Put( aEditAttr, false );
-SvxNumRule* pNumRule = NULL;
+boost::scoped_ptrSvxNumRule pNumRule;
const SfxPoolItem* pTmpItem=NULL;
sal_uInt16 nNumItemId = SID_ATTR_NUMBERING_RULE;
@@ -572,7 +573,7 @@ void DrawViewShell::GetAttrState( SfxItemSet rSet )
pTmpItem=GetNumBulletItem(aNewAttr, nNumItemId);
if (pTmpItem)
-pNumRule = new
SvxNumRule(*((SvxNumBulletItem*)pTmpItem)-GetNumRule());
+pNumRule.reset(new
SvxNumRule(*((SvxNumBulletItem*)pTmpItem)-GetNumRule()));
if ( pNumRule )
{
@@ -626,7 +627,6 @@ void DrawViewShell::GetAttrState( SfxItemSet rSet )
}
}
}
- delete pNumRule;
}
}
break;
@@ -666,11 +666,11 @@ void DrawViewShell::GetAttrState( SfxItemSet rSet )
nWhich = aIter.NextWhich();
}
-SfxItemSet* pSet = NULL;
+boost::scoped_ptrSfxItemSet pSet;
if( bAttr )
{
-pSet = new SfxItemSet( GetDoc()-GetPool() );
+pSet.reset(new SfxItemSet( GetDoc()-GetPool() ));
mpDrawView-GetAttributes( *pSet );
rSet.Put( *pSet, false );
}
@@ -733,7 +733,6 @@ void DrawViewShell::GetAttrState( SfxItemSet rSet )
rSet.InvalidateItem(EE_CHAR_KERNING);
rSet.InvalidateItem(SID_ATTR_CHAR_KERNING);
}
-delete pSet;
}
}
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 9b88288..0f3812b 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -297,14 +297,14 @@ void OutlineViewShell::FuTemporary(SfxRequest rReq)
case SID_PHOTOALBUM:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-VclAbstractDialog* pDlg = pFact ? pFact-CreateSdPhotoAlbumDialog(
+boost::scoped_ptrVclAbstractDialog pDlg(pFact ?
pFact-CreateSdPhotoAlbumDialog(
GetActiveWindow(),
-GetDoc()) : 0;
+GetDoc()) : 0);
if (pDlg)
{
pDlg-Execute();
-delete pDlg;
+pDlg.reset();
}
Cancel();
rReq.Ignore ();
@@ -472,44 +472,44 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest rReq)
case SID_INSERT_FLD_PAGES:
case SID_INSERT_FLD_FILE:
{
-SvxFieldItem* pFieldItem = 0;
+boost::scoped_ptrSvxFieldItem pFieldItem;
switch( nSId )
{
case SID_INSERT_FLD_DATE_FIX:
-pFieldItem = new SvxFieldItem(
-SvxDateField( Date( Date::SYSTEM ), SVXDATETYPE_FIX ),
EE_FEATURE_FIELD );
+pFieldItem.reset(new SvxFieldItem(
+SvxDateField( Date( Date::SYSTEM ), SVXDATETYPE_FIX ),
EE_FEATURE_FIELD ));
break;
case SID_INSERT_FLD_DATE_VAR:
-pFieldItem = new SvxFieldItem( SvxDateField(),
EE_FEATURE_FIELD );
+pFieldItem.reset(new SvxFieldItem( SvxDateField(),
EE_FEATURE_FIELD ));
break;
case SID_INSERT_FLD_TIME_FIX:
-pFieldItem = new SvxFieldItem(
-SvxExtTimeField( Time( Time::SYSTEM ), SVXTIMETYPE_FIX
), EE_FEATURE_FIELD );
+pFieldItem.reset(new SvxFieldItem(
+SvxExtTimeField( Time( Time::SYSTEM ), SVXTIMETYPE_FIX
), EE_FEATURE_FIELD ));
break;
case SID_INSERT_FLD_TIME_VAR:
-pFieldItem = new SvxFieldItem( SvxExtTimeField(),
EE_FEATURE_FIELD
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - external/libgltf
external/libgltf/UnpackedTarball_libgltf.mk |1 +
external/libgltf/patches/rgba_textures.patch | 12
2 files changed, 13 insertions(+)
New commits:
commit 777c7360f77adf833878a83cbd464bda3374da11
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue May 27 16:48:30 2014 +0200
Patching libgltf: the passed texture bitmaps are RGBA buffers
Change-Id: I53f6a97820da12e89d567e1bc10226fa27cafd84
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk
b/external/libgltf/UnpackedTarball_libgltf.mk
index acfbab0..7a0d91a 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/include_path_glew.patch \
external/libgltf/patches/include_path_freetype.patch \
external/libgltf/patches/free_file_buffers.patch \
+ external/libgltf/patches/rgba_textures.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/rgba_textures.patch
b/external/libgltf/patches/rgba_textures.patch
new file mode 100644
index 000..b220894
--- /dev/null
+++ b/external/libgltf/patches/rgba_textures.patch
@@ -0,0 +1,12 @@
+diff -ur libgltf.org/src/Texture.cpp libgltf/src/Texture.cpp
+--- libgltf.org/src/Texture.cpp2014-05-27 16:40:18.625920865 +0200
libgltf/src/Texture.cpp2014-05-27 16:41:45.601917179 +0200
+@@ -60,7 +60,7 @@
+ bool Texture::loadTexture2DFromBuffer(unsigned char* buffer, int width,
+ int height)
+ {
+-GLenum format = GL_BGRA;
++GLenum format = GL_RGBA;
+
+ createFromData(buffer, width, height, format, false);
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |3 ++-
chart2/source/view/inc/3DChartObjects.hxx | 19 +++
chart2/source/view/inc/GL3DRenderer.hxx| 13 +++--
chart2/source/view/main/3DChartObjects.cxx | 24 +++-
chart2/source/view/main/GL3DRenderer.cxx | 21 +
chart2/source/view/main/OpenGLRender.cxx | 21 -
chart2/source/view/main/OpenGLRender.hxx | 11 +--
7 files changed, 81 insertions(+), 31 deletions(-)
New commits:
commit ed24ae433bc280100c18b00d6083b6730ac35ecc
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue May 27 16:32:25 2014 +0200
prevent that early return prevents further user interaction
Change-Id: I24f814a402d2b8af3ddf888719b78d3158c2a38f
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 455b9e4..8f70d05 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -293,7 +293,6 @@ void GL3DBarChart::clickedAt(const Point /*rPos*/,
sal_uInt16 nButtons)
if(nButtons != MOUSE_LEFT)
return;
-mbBlockUserInput = true;
sal_uInt32 nId = 5;
/*
{
@@ -309,6 +308,8 @@ void GL3DBarChart::clickedAt(const Point /*rPos*/,
sal_uInt16 nButtons)
if(itr == maBarMap.end())
return;
+mbBlockUserInput = true;
+
const BarInformation rBarInfo = itr-second;
mnStepsTotal = 100;
mnStep = 0;
commit 8c9b3cdccef118cbb0115a84c62e90633fc0d8e3
Author: Michael Meeks michael.me...@collabora.com
Date: Mon May 26 20:34:44 2014 +0100
cache the bitmap converted to flat RGBA pixels.
Conflicts:
chart2/source/view/inc/3DChartObjects.hxx
chart2/source/view/main/3DChartObjects.cxx
Change-Id: Ied38d4457fbc04ded42fe4fb55a8ec654cefa259
diff --git a/chart2/source/view/inc/3DChartObjects.hxx
b/chart2/source/view/inc/3DChartObjects.hxx
index 31e64f2..fb7147c 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -15,17 +15,28 @@
#include GL3DRenderer.hxx
#include boost/ptr_container/ptr_map.hpp
+#include boost/shared_array.hpp
namespace chart {
namespace opengl3D {
+struct TextCacheItem
+{
+TextCacheItem(sal_uInt8 *pPixels, ::Size aSize)
+: maSize(aSize), maPixels(pPixels)
+{
+}
+::Size maSize;
+boost::shared_arraysal_uInt8 maPixels;
+};
+
class TextCache
{
public:
-const BitmapEx getText(OUString const rText);
+const TextCacheItem getText(OUString const rText);
private:
-typedef boost::ptr_mapOUString const, BitmapEx TextCacheType;
+typedef boost::ptr_mapOUString const, TextCacheItem TextCacheType;
TextCacheType maTextCache;
};
@@ -85,7 +96,7 @@ public:
void setPosition(const glm::vec3 rTopLeft, const glm::vec3 rTopRight,
const glm::vec3 rBottomRight);
private:
-const BitmapEx mrText;
+TextCacheItem maText;
glm::vec3 maTopLeft;
glm::vec3 maTopRight;
glm::vec3 maBottomRight;
@@ -100,7 +111,7 @@ public:
void setPosition(const glm::vec2 rTopLeft, const glm::vec2 rBottomRight);
private:
-const BitmapEx mrText;
+TextCacheItem maText;
glm::vec2 maTopLeft;
glm::vec2 maBottomRight;
};
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx
b/chart2/source/view/inc/GL3DRenderer.hxx
index 8b2b9a5..4cba423 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -16,6 +16,7 @@
#include glm/gtx/quaternion.hpp
#include com/sun/star/awt/Point.hpp
+#include boost/shared_array.hpp
#include tools/gen.hxx
#include vcl/bitmapex.hxx
@@ -161,8 +162,16 @@ public:
void EndAddShape3DExtrudeObject();
void SetSize(const Size rSize);
void SetCameraInfo(glm::vec3 pos, glm::vec3 direction, glm::vec3 up);
-void CreateTextTexture(const BitmapEx rBitmapEx, glm::vec3
vTopLeft,glm::vec3 vTopRight, glm::vec3 vBottomRight, glm::vec3 vBottomLeft,
sal_uInt32 nUniqueId);
-void CreateScreenTextTexture(const BitmapEx rBitmapEx, glm::vec2
vTopLeft, glm::vec2 vBottomRight, sal_uInt32 nUniqueId);
+void CreateTextTexture(const boost::shared_arraysal_uInt8 bitmapBuf,
+ ::Size maSizePixels,
+ glm::vec3 vTopLeft,glm::vec3 vTopRight,
+ glm::vec3 vBottomRight, glm::vec3 vBottomLeft,
+ sal_uInt32 nUniqueId);
+void CreateScreenTextTexture(const boost::shared_arraysal_uInt8
bitmapBuf,
+ ::Size maSizePixels,
+
+ glm::vec2 vTopLeft, glm::vec2 vBottomRight,
+ sal_uInt32 nUniqueId);
void ProcessUnrenderedShape();
void SetPickingMode(bool bPickingMode);
diff --git a/chart2/source/view/main/3DChartObjects.cxx
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5836a29b9045b8abdaadff35848b287dee37effc
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue May 27 16:32:25 2014 +0200
prevent that early return prevents further user interaction
Change-Id: I24f814a402d2b8af3ddf888719b78d3158c2a38f
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 263bf50..c2b29c3 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -315,7 +315,6 @@ void GL3DBarChart::clickedAt(const Point /*rPos*/,
sal_uInt16 nButtons)
if(nButtons != MOUSE_LEFT)
return;
-mbBlockUserInput = true;
sal_uInt32 nId = 5;
/*
{
@@ -331,6 +330,8 @@ void GL3DBarChart::clickedAt(const Point /*rPos*/,
sal_uInt16 nButtons)
if(itr == maBarMap.end())
return;
+mbBlockUserInput = true;
+
const BarInformation rBarInfo = itr-second;
mnStepsTotal = 100;
mnStep = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - extras/source
extras/source/glade/libreoffice-catalog.xml.in |4 1 file changed, 4 insertions(+) New commits: commit 7396f2486eb6be22951d36448f12fcf24d785fc1 Author: Eike Rathke er...@redhat.com Date: Tue May 27 17:21:13 2014 +0200 add SvxLanguageComboBox Change-Id: Idd97331669ff204efb568ef1c17ba7444db4abf4 (cherry picked from commit 13975eb35917c0152eab9ce05c4e7a9c9657b6a3) diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index fb120fa..861dd56b 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -582,6 +582,10 @@ generic-name=LanguageBox parent=VclComboBoxText icon-name=widget-gtk-combobox/ +glade-widget-class title=Language ComboBox name=svxcorelo-SvxLanguageComboBox +generic-name=LanguageComboBox parent=VclComboBoxText +icon-name=widget-gtk-comboboxtext/ + glade-widget-class title=Reference Button name=foruilo-RefButton generic-name=Reference Button parent=GtkButton icon-name=widget-gtk-button/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/glade/libreoffice-catalog.xml.in |4 1 file changed, 4 insertions(+) New commits: commit 13975eb35917c0152eab9ce05c4e7a9c9657b6a3 Author: Eike Rathke er...@redhat.com Date: Tue May 27 17:21:13 2014 +0200 add SvxLanguageComboBox Change-Id: Idd97331669ff204efb568ef1c17ba7444db4abf4 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index fb120fa..861dd56b 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -582,6 +582,10 @@ generic-name=LanguageBox parent=VclComboBoxText icon-name=widget-gtk-combobox/ +glade-widget-class title=Language ComboBox name=svxcorelo-SvxLanguageComboBox +generic-name=LanguageComboBox parent=VclComboBoxText +icon-name=widget-gtk-comboboxtext/ + glade-widget-class title=Reference Button name=foruilo-RefButton generic-name=Reference Button parent=GtkButton icon-name=widget-gtk-button/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 13 +++--
sc/source/ui/inc/PivotLayoutDialog.hxx |8
sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |8
3 files changed, 15 insertions(+), 14 deletions(-)
New commits:
commit 345d6dd9d938a88722fb6d1f1963047a9761412d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 27 11:25:16 2014 -0400
Actually OK and Cancel is better here than Apply and Close.
Because the same dialog is used when creating a new pivot table, where
the Apply and Close semantic feels a bit weird. Also, some features of
the dialog were designed with Ok / Cancel in mind (like the destination
location).
Change-Id: I9ac889bca9f967cb97b34ab45ea563547b58d422
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 8c667dd..dd9ca8a 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -93,8 +93,8 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
get(mpCheckTotalRows, check-total-rows);
get(mpCheckDrillToDetail, check-drill-to-details);
-get(mpButtonApply, apply);
-get(mpButtonClose, close);
+get(mpBtnOK, ok);
+get(mpBtnCancel, cancel);
get(mpSourceRadioNamedRange, source-radio-named-range);
get(mpSourceRadioSelection, source-radio-selection);
@@ -146,8 +146,8 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
mpDestinationButton-SetLoseFocusHdl(aLink);
// Buttons
-mpButtonClose-SetClickHdl(LINK(this, ScPivotLayoutDialog, CloseClicked));
-mpButtonApply-SetClickHdl(LINK(this, ScPivotLayoutDialog, ApplyClicked));
+mpBtnCancel-SetClickHdl(LINK(this, ScPivotLayoutDialog, CancelClicked));
+mpBtnOK-SetClickHdl(LINK(this, ScPivotLayoutDialog, OKClicked));
// Initialize Data
maPivotTableObject.FillOldParam(maPivotParameters);
@@ -606,13 +606,14 @@ void
ScPivotLayoutDialog::PushDataFieldNames(std::vectorScDPName rDataFieldNa
return mpListBoxData-PushDataFieldNames(rDataFieldNames);
}
-IMPL_LINK( ScPivotLayoutDialog, ApplyClicked, PushButton*, /*pButton*/ )
+IMPL_LINK( ScPivotLayoutDialog, OKClicked, PushButton*, /*pButton*/ )
{
ApplyChanges();
+DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
return 0;
}
-IMPL_LINK( ScPivotLayoutDialog, CloseClicked, PushButton*, /*pButton*/ )
+IMPL_LINK( ScPivotLayoutDialog, CancelClicked, PushButton*, /*pButton*/ )
{
DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
return 0;
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index 71c9666..ace1ed5 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -81,15 +81,15 @@ private:
formula::RefEdit* mpDestinationEdit;
formula::RefButton* mpDestinationButton;
-PushButton* mpButtonApply;
-CloseButton* mpButtonClose;
+PushButton* mpBtnOK;
+CloseButton* mpBtnCancel;
formula::RefEdit* mpActiveEdit;
ScAddress::Details maAddressDetails;
boolmbDialogLostFocus;
-DECL_LINK(CloseClicked, PushButton*);
-DECL_LINK(ApplyClicked, PushButton*);
+DECL_LINK(CancelClicked, PushButton*);
+DECL_LINK(OKClicked, PushButton*);
DECL_LINK(GetFocusHandler,Control*);
DECL_LINK(LoseFocusHandler, void*);
DECL_LINK(ToggleSource, void*);
diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 565e627..ad42d3f 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -18,8 +18,8 @@
property name=can_focusFalse/property
property name=layout_styleend/property
child
- object class=GtkButton id=apply
-property name=labelgtk-apply/property
+ object class=GtkButton id=ok
+property name=labelgtk-ok/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
@@ -32,8 +32,8 @@
/packing
/child
child
- object class=GtkButton id=close
-property name=labelgtk-close/property
+ object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source sc/uiconfig
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 13 +++--
sc/source/ui/inc/PivotLayoutDialog.hxx |8
sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |8
3 files changed, 15 insertions(+), 14 deletions(-)
New commits:
commit 245670a5e75d24a2ba0fa48d30bddd42767f70cb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 27 11:25:16 2014 -0400
Actually OK and Cancel is better here than Apply and Close.
Because the same dialog is used when creating a new pivot table, where
the Apply and Close semantic feels a bit weird. Also, some features of
the dialog were designed with Ok / Cancel in mind (like the destination
location).
Change-Id: I9ac889bca9f967cb97b34ab45ea563547b58d422
(cherry picked from commit 345d6dd9d938a88722fb6d1f1963047a9761412d)
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 8c667dd..dd9ca8a 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -93,8 +93,8 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
get(mpCheckTotalRows, check-total-rows);
get(mpCheckDrillToDetail, check-drill-to-details);
-get(mpButtonApply, apply);
-get(mpButtonClose, close);
+get(mpBtnOK, ok);
+get(mpBtnCancel, cancel);
get(mpSourceRadioNamedRange, source-radio-named-range);
get(mpSourceRadioSelection, source-radio-selection);
@@ -146,8 +146,8 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
mpDestinationButton-SetLoseFocusHdl(aLink);
// Buttons
-mpButtonClose-SetClickHdl(LINK(this, ScPivotLayoutDialog, CloseClicked));
-mpButtonApply-SetClickHdl(LINK(this, ScPivotLayoutDialog, ApplyClicked));
+mpBtnCancel-SetClickHdl(LINK(this, ScPivotLayoutDialog, CancelClicked));
+mpBtnOK-SetClickHdl(LINK(this, ScPivotLayoutDialog, OKClicked));
// Initialize Data
maPivotTableObject.FillOldParam(maPivotParameters);
@@ -606,13 +606,14 @@ void
ScPivotLayoutDialog::PushDataFieldNames(std::vectorScDPName rDataFieldNa
return mpListBoxData-PushDataFieldNames(rDataFieldNames);
}
-IMPL_LINK( ScPivotLayoutDialog, ApplyClicked, PushButton*, /*pButton*/ )
+IMPL_LINK( ScPivotLayoutDialog, OKClicked, PushButton*, /*pButton*/ )
{
ApplyChanges();
+DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
return 0;
}
-IMPL_LINK( ScPivotLayoutDialog, CloseClicked, PushButton*, /*pButton*/ )
+IMPL_LINK( ScPivotLayoutDialog, CancelClicked, PushButton*, /*pButton*/ )
{
DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
return 0;
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index 71c9666..ace1ed5 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -81,15 +81,15 @@ private:
formula::RefEdit* mpDestinationEdit;
formula::RefButton* mpDestinationButton;
-PushButton* mpButtonApply;
-CloseButton* mpButtonClose;
+PushButton* mpBtnOK;
+CloseButton* mpBtnCancel;
formula::RefEdit* mpActiveEdit;
ScAddress::Details maAddressDetails;
boolmbDialogLostFocus;
-DECL_LINK(CloseClicked, PushButton*);
-DECL_LINK(ApplyClicked, PushButton*);
+DECL_LINK(CancelClicked, PushButton*);
+DECL_LINK(OKClicked, PushButton*);
DECL_LINK(GetFocusHandler,Control*);
DECL_LINK(LoseFocusHandler, void*);
DECL_LINK(ToggleSource, void*);
diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 565e627..ad42d3f 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -18,8 +18,8 @@
property name=can_focusFalse/property
property name=layout_styleend/property
child
- object class=GtkButton id=apply
-property name=labelgtk-apply/property
+ object class=GtkButton id=ok
+property name=labelgtk-ok/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
@@ -32,8 +32,8 @@
/packing
/child
child
- object class=GtkButton id=close
-property name=labelgtk-close/property
+ object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - vcl/source
vcl/source/outdev/text.cxx | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 6ec2a1a6922d22fa5efb25982b0b51cef7a97499
Author: matteocam matteo.campane...@gmail.com
Date: Tue May 27 11:35:40 2014 -0400
Transparency by replacing DrawRect
Change-Id: I5ba220df841cbe650c910c1c7bc1815900f13c53
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 70d53b3..ef7f7e6 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -149,7 +149,12 @@ void OutputDevice::ImplDrawTextRect( long nBaseX, long
nBaseY,
nX += nBaseX;
nY += nBaseY;
-mpGraphics-DrawRect( nX, nY, nWidth, nHeight, this );
+//mpGraphics-DrawRect( nX, nY, nWidth, nHeight, this ); // original code
+Rectangle aRect( Point( nX, nY ), Size( nWidth+1, nHeight+1 ) );
+Polygon aPoly( aRect );
+PolyPolygon aPolyPoly(aPoly);
+DrawTransparent(aPolyPoly, 50);
+
}
void OutputDevice::ImplDrawTextBackground( const SalLayout rSalLayout )
@@ -474,12 +479,12 @@ void OutputDevice::ImplDrawText( SalLayout rSalLayout )
rSalLayout.DrawBase() += Point( mnTextOffX, mnTextOffY );
/*
- if the text has some background get it (XXX: now getting fixed color)
+ if the text has some background get it
and the set it as the new filling color
*/
if (mbTextBackground) {
-// set right background
-Color aColor = COL_BLUE;
+// set right background // (XXX: now getting fixed color)
+Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF); // blue-ish
// SetBackground does not work
SetTextFillColor(aColor);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit cb0d44a05b62c8f3a27aa82fce8d558d302538d9 Author: Eike Rathke er...@redhat.com Date: Tue May 27 17:48:45 2014 +0200 update language-subtag-registry as of 2014-04-10 Change-Id: I99deaf80f559e28de106b639663b262544cdf60c diff --git a/download.lst b/download.lst index f9ce689..80f4ca8 100644 --- a/download.lst +++ b/download.lst @@ -77,8 +77,8 @@ export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7 export JPEG_TARBALL := jpegsrc.v9a.tar.gz -export LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97 -export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2 +export LANGTAGREG_MD5SUM := 49c94710f7858b1969d74ff72e6aac84 +export LANGTAGREG_TARBALL := language-subtag-registry-2014-04-10.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_MD5SUM := f4c08d38ceade4a664ebff7228910a33 export LCMS2_TARBALL := lcms2-2.6.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 85e07666a64165610630b71b866c5f96709d7480 Author: Eike Rathke er...@redhat.com Date: Tue May 27 17:48:45 2014 +0200 update language-subtag-registry as of 2014-04-10 Change-Id: I99deaf80f559e28de106b639663b262544cdf60c (cherry picked from commit cb0d44a05b62c8f3a27aa82fce8d558d302538d9) diff --git a/download.lst b/download.lst index 02268c2..3e2893c 100644 --- a/download.lst +++ b/download.lst @@ -78,8 +78,8 @@ export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7 export JPEG_TARBALL := jpegsrc.v9a.tar.gz -export LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97 -export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2 +export LANGTAGREG_MD5SUM := 49c94710f7858b1969d74ff72e6aac84 +export LANGTAGREG_TARBALL := language-subtag-registry-2014-04-10.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_MD5SUM := f4c08d38ceade4a664ebff7228910a33 export LCMS2_TARBALL := lcms2-2.6.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - vcl/source
vcl/source/outdev/text.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 2f8660008ddd32c8f24825d5ba3e751bc65d6d3e Author: matteocam matteo.campane...@gmail.com Date: Tue May 27 12:04:10 2014 -0400 Transparency with DrawTransparent in addition to DrawRect Change-Id: I9e8221652b74a3004857ef4b12c6b45563a373b5 diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index ef7f7e6..effb27a 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -149,11 +149,14 @@ void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY, nX += nBaseX; nY += nBaseY; -//mpGraphics-DrawRect( nX, nY, nWidth, nHeight, this ); // original code +mpGraphics-DrawRect( nX, nY, nWidth, nHeight, this ); // original code + Rectangle aRect( Point( nX, nY ), Size( nWidth+1, nHeight+1 ) ); Polygon aPoly( aRect ); PolyPolygon aPolyPoly(aPoly); DrawTransparent(aPolyPoly, 50); +// Code above is wrong: it just messes up. + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-2-5'
New branch 'libreoffice-4-2-5' available with the following commits: commit 406327a908ebc52f11058a14803ae0516b3f0008 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 27 19:31:37 2014 +0200 Branch libreoffice-4-2-5 This is 'libreoffice-4-2-5' - the stable branch for the 4.2.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I4c8e6dba7db88d7ae468fbfe9c5e06a8635b2bcf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-2-5'
New branch 'libreoffice-4-2-5' available with the following commits: commit 0b459b3ed75a4a82c95ec9a8ce1546d2bbc8bed1 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 27 19:31:36 2014 +0200 Branch libreoffice-4-2-5 This is 'libreoffice-4-2-5' - the stable branch for the 4.2.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Idaf99decbf709cdb99baebb70a855f9d223e0045 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-4-2-5'
New branch 'libreoffice-4-2-5' available with the following commits: commit b82358ba0b4024c4867170accc3b9ae838285e60 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 27 19:31:36 2014 +0200 Branch libreoffice-4-2-5 This is 'libreoffice-4-2-5' - the stable branch for the 4.2.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I4074d50d9928b6f62ee18229ef2300ed68e3be55 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-4-2-5'
New branch 'libreoffice-4-2-5' available with the following commits: commit 7d317b02c957311e4a17d7f95a8e64c1014bfcf1 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 27 19:31:51 2014 +0200 Branch libreoffice-4-2-5 This is 'libreoffice-4-2-5' - the stable branch for the 4.2.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I4c7de4535d77eb454c1156c8924605eb61092d5a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 221cd0323a6e80d607eaa323a2367a10108a94f1 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 27 19:33:43 2014 +0200 bump product version to 4.2.6.0.0+ Change-Id: Ifb7359efee0f5cefe41a8299c7e3e1db6bc57981 diff --git a/configure.ac b/configure.ac index 98e2a0e..aa6f483 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.5.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.6.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/formulacell.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit f68eed1518fe689fe8a535bebc8d2b6c9f257b9c
Author: Eike Rathke er...@redhat.com
Date: Tue May 27 19:28:36 2014 +0200
do not replace a General format with a General format
Found when investigating fdo#79228 which was caused by the ScPatternAttr
change due to the number format being applied.
Change-Id: Ieada557f5e194401a9ce255f26d71d36e0704f35
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index dedba62..afa969d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1682,10 +1682,21 @@ void ScFormulaCell::InterpretTail(
ScInterpretTailParameter eTailParam )
nFormatIndex =
ScGlobal::GetStandardFormat(*pDocument-GetFormatTable(),
nFormatIndex, nFormatType);
-// set number format explicitly
-pDocument-SetNumberFormat( aPos, nFormatIndex );
+// Do not replace a General format (which was the reason why
+// mbNeedsNumberFormat was set) with a General format.
+// 1. setting a format has quite some overhead in the
+// ScPatternAttr/ScAttrArray handling, even if identical.
+// 2. the General formats may be of different locales.
+// XXX if mbNeedsNumberFormat was set even if the current format
+// was not General then we'd have to obtain the current format here
+// and check at least the types.
+if ((nFormatIndex % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
+{
+// set number format explicitly
+pDocument-SetNumberFormat( aPos, nFormatIndex );
+bChanged = true;
+}
-bChanged = true;
mbNeedsNumberFormat = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/data/formulacell.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 5ec34ef8f76cd5a790946c245d712de2f70ffa7c
Author: Eike Rathke er...@redhat.com
Date: Tue May 27 19:28:36 2014 +0200
do not replace a General format with a General format
Found when investigating fdo#79228 which was caused by the ScPatternAttr
change due to the number format being applied.
Change-Id: Ieada557f5e194401a9ce255f26d71d36e0704f35
(cherry picked from commit f68eed1518fe689fe8a535bebc8d2b6c9f257b9c)
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index ec07bde..af6aed4 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1682,10 +1682,21 @@ void ScFormulaCell::InterpretTail(
ScInterpretTailParameter eTailParam )
nFormatIndex =
ScGlobal::GetStandardFormat(*pDocument-GetFormatTable(),
nFormatIndex, nFormatType);
-// set number format explicitly
-pDocument-SetNumberFormat( aPos, nFormatIndex );
+// Do not replace a General format (which was the reason why
+// mbNeedsNumberFormat was set) with a General format.
+// 1. setting a format has quite some overhead in the
+// ScPatternAttr/ScAttrArray handling, even if identical.
+// 2. the General formats may be of different locales.
+// XXX if mbNeedsNumberFormat was set even if the current format
+// was not General then we'd have to obtain the current format here
+// and check at least the types.
+if ((nFormatIndex % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
+{
+// set number format explicitly
+pDocument-SetNumberFormat( aPos, nFormatIndex );
+bChanged = true;
+}
-bChanged = true;
mbNeedsNumberFormat = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - svx/source vcl/inc vcl/source
svx/source/table/cell.cxx | 14 +-
svx/source/table/cell.hxx |1 +
vcl/inc/outdev.h |2 +-
vcl/source/outdev/font.cxx | 12 +++-
4 files changed, 18 insertions(+), 11 deletions(-)
New commits:
commit a6b00d16eb27a5e7e31c721671001a909ecef960
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue May 27 16:37:30 2014 +0200
Related bnc#822625: Cache FontEntry with the original FontSelectPattern.
Otherwise we never hit cache directly, only after expensive call to
ImplFindByFont.
Change-Id: If15b368feeba94c8fff8ee7cbe049fc4a2069768
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index dcde57c..e468ae2 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -149,7 +149,7 @@ public:
ImplFontEntry* GetFontEntry( PhysicalFontCollection*,
const Font, const Size rPixelSize, float
fExactHeight);
-ImplFontEntry* GetFontEntry( PhysicalFontCollection*,
FontSelectPattern );
+ImplFontEntry* GetFontEntry( PhysicalFontCollection*, const
FontSelectPattern );
ImplFontEntry* GetGlyphFallbackFont( PhysicalFontCollection*,
FontSelectPattern,
int nFallbackLevel, OUString rMissingCodes );
voidRelease( ImplFontEntry* );
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 9e40712..d8b77db 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1227,22 +1227,23 @@ ImplFontEntry* ImplFontCache::GetFontEntry(
PhysicalFontCollection* pFontList,
}
ImplFontEntry* ImplFontCache::GetFontEntry( PhysicalFontCollection* pFontList,
-FontSelectPattern aFontSelData )
+const FontSelectPattern rFontSelData )
{
// check if a directly matching logical font instance is already cached,
// the most recently used font usually has a hit rate of 50%
ImplFontEntry *pEntry = NULL;
PhysicalFontFamily* pFontFamily = NULL;
IFSD_Equal aIFSD_Equal;
-if( mpFirstEntry aIFSD_Equal( aFontSelData, mpFirstEntry-maFontSelData
) )
+if( mpFirstEntry aIFSD_Equal( rFontSelData, mpFirstEntry-maFontSelData
) )
pEntry = mpFirstEntry;
else
{
-FontInstanceList::iterator it = maFontInstanceList.find( aFontSelData
);
+FontInstanceList::iterator it = maFontInstanceList.find( rFontSelData
);
if( it != maFontInstanceList.end() )
pEntry = (*it).second;
}
+FontSelectPattern aFontSelData(rFontSelData);
if( !pEntry ) // no direct cache hit
{
// find the best matching logical font family and update font selector
accordingly
@@ -1315,8 +1316,9 @@ ImplFontEntry* ImplFontCache::GetFontEntry(
PhysicalFontCollection* pFontList,
}
#endif
-// add the new entry to the cache
-maFontInstanceList[ aFontSelData ] = pEntry;
+// Add the new entry to the cache with the original FontSelectPattern,
+// so that we can find it next time as a direct cache hit.
+maFontInstanceList[ rFontSelData ] = pEntry;
}
mpFirstEntry = pEntry;
commit 5792e76cb5beb630c135f57b74f57d74dd2dc2b0
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue May 27 10:39:45 2014 +0200
Related bnc#822625: Cache minimum height for table cells.
Change-Id: I35e295347a046376289f5d4fd5468860d0b8f0ae
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index d26d70c..20d676d 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -359,6 +359,7 @@ Cell::Cell( SdrTableObj rTableObj, OutlinerParaObject*
pOutlinerParaObject ) th
, mbMerged( false )
, mnRowSpan( 1 )
, mnColSpan( 1 )
+, mnCachedMinHeight( -1 )
, mxTable( rTableObj.getTable() )
{
if( rTableObj.GetModel() )
@@ -525,6 +526,7 @@ void Cell::setMerged()
void Cell::notifyModified()
{
+mnCachedMinHeight = -1;
if( mxTable.is() )
mxTable-setModified( sal_True );
}
@@ -681,8 +683,10 @@ sal_Int32 Cell::getMinimumHeight()
if( !mpProperties )
return 0;
+if( mnCachedMinHeight != -1 )
+return mnCachedMinHeight;
+
SdrTableObj rTableObj = dynamic_cast SdrTableObj ( GetObject() );
-sal_Int32 nMinimumHeight = 0;
Rectangle aTextRect;
TakeTextAnchorRect( aTextRect );
@@ -693,7 +697,7 @@ sal_Int32 Cell::getMinimumHeight()
if(pEditOutliner)
{
pEditOutliner-SetMaxAutoPaperSize(aSize);
-nMinimumHeight = pEditOutliner-GetTextHeight()+1;
+mnCachedMinHeight = pEditOutliner-GetTextHeight()+1;
}
else /*if ( hasText() )*/
{
@@ -706,12 +710,12 @@ sal_Int32 Cell::getMinimumHeight()
{
rOutliner.SetText(*GetOutlinerParaObject());
}
-nMinimumHeight=rOutliner.GetTextHeight()+1;
+mnCachedMinHeight=rOutliner.GetTextHeight()+1;
rOutliner.Clear();
}
-nMinimumHeight += GetTextUpperDistance() + GetTextLowerDistance();
-return
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - avmedia/source
avmedia/source/opengl/oglplayer.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit d55b93da476499a991463a9416a97addea549669 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Tue May 27 20:12:59 2014 +0200 glTF rendering: fix texture problems It seems we need mirroring. Change-Id: Id9ad7041eb09ec773e4174cb68d34a65a2c473fe diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 2536b68..af3707f 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -87,7 +87,8 @@ bool OGLPlayer::create( const OUString rURL ) GraphicFilter aFilter; Graphic aGraphic; aFilter.ImportGraphic(aGraphic, INetURLObject(sFilesURL)); -const BitmapEx aBitmapEx = aGraphic.GetBitmapEx(); +BitmapEx aBitmapEx = aGraphic.GetBitmapEx(); +aBitmapEx.Mirror(BMP_MIRROR_VERT); rFile.buffer = (char*)OpenGLHelper::ConvertBitmapExToRGBABuffer(aBitmapEx); rFile.imagewidth = aBitmapEx.GetSizePixel().Width(); rFile.imageheight = aBitmapEx.GetSizePixel().Height(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Text Background Color in Draw - Report 24/05/2013
Noel Grandin wrote: [background color anti-aliasing] Hopefully LO doesn't have this problem, but just in case, I thought you should know. Don't think so. Glyphs are cached with alpha info in all font subsystems that I know of. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.5.1'
Tag 'libreoffice-4.2.5.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-05-27 18:36 -0700 Tag libreoffice-4.2.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJThM0WAAoJEPQ0oe+v7q6j7fEP/0sxvyhzQGZoJCAIiWwfKM0s ZZ5fyctQudzNK5W3jBoton1emey2eo5zX1HEZdc2Id5l80i8EH0cIs+ZAh9JmBsE i/Q0ZF9YwmzxQUfIe9mCN0i3zGe8fgXXarr436ITIcs0kS42j1IcqczoYxtanx5K hqVeoj+N0SaHg+Yipqb5X+c7xQj8Q0dbXZlf6gkJCp8u5KumhU5wTkP75/v+qXWf pGHtvHT0LReItZuPYfPmhQFkbAjcyakuH/V8CMj7kLoog3EM8eWw8sOJzkcVdpF4 AaOSWTLlkaBiQcyKJqFywPk/e4ilkj7atgAAVP9gCQiwCSEBwTC2RDsjllxJKe/Y sRTVtbAqDX/8nIKkUg2RvGekfLiCVH/gbFqIm2WZu10HMd7DgCLnNd9HxQhY8Kdt O3mz/Zjb4Wfgxan+P1cvLDE3hPI3104kiHHF4onoHCNiCLmJfQz6PDmTjXgMU9U5 WjgRNDGKYos0BWtvq5o4xN4DU94ziwAsWJpHW5tE5WLE5Gv4rhfHKU1uLSLXS64j m7H3cN4P6x86jmL5YBGfleIWj9Vq2oZ/zGLMGrvEDJE3r3Gy8sLlphmxhwnKj6dY F6yU3aSlpzt7dt27IBw1mwcnEsMrWF00/67Iwrkv4y0YqrpoE9gO+vMo3+NyA+/3 BmYkgae0mvAmTdLqxlCY =6JNh -END PGP SIGNATURE- Changes since cp-4.2-2-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.5.1'
Tag 'libreoffice-4.2.5.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-05-27 18:36 -0700 Tag libreoffice-4.2.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJThM0iAAoJEPQ0oe+v7q6jcKUP/Rn6jTzmwNs3JjK03L/g42Wy 21Kjcyn6gnFjEgoHx8cuKXTC+7qX4urOMc9+eQzhsP3zUInRqt449BzU4zSsbyUE If8zSGBDvcu08hthWfTUJBReSdl+TF3FP6ujTiNpxz2YV7f/CiPIKtsGraZDUlUy uUXDamoF53FWaAMzw/lHzEAN14meh3SKIE5VfBEIZy6Yc285Gyg35d+43lJtRDBl EYlyPkp9KymfKo3wq/hDXzTjaE2GXJD0UNkbn7BOOOAp0kwI0ZLUTlLW300U5+GZ SYIYfZ7QqQg86u6HmVhH5elzrLGU6K2g3IQsRkKBDAB/2XAA9Bg6uxBYlwEuCLWz +yrI4k216HNTqftGPljlXOLMdDr4ieQHvBoIJmZNeRWW1CYgClNb8iglG2VJPxTd hrcXJgQKm19weNzoyHKHdGgYQ1ffuasGsQEfvdHheW3shhaZA5p1ygeoQCIJkzK0 UAo39qMIeY93MBUJt12/1eFE09pXfMT+snQauap6btgIMSqb4OixyT/Qrgam/F8I jO5TwlcUQ1I0acpYPtS/XhaQ53ivQc9nlphudCEUpniKYdSwbadZxD8+nmG2aKiy ahCGlzc2IrFIRnHmw2d8oQzeP48tbeuzP1tnqKWeehjdT61vJDPDBWLMGB9ub6bU HC5efwTgHHtYuuEQ5Cyf =mYy+ -END PGP SIGNATURE- Changes since cp-4.2-branch-point-408: --- 0 files changed --- ___ 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-5' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2c197d252ff8da0ff3e0f4bf03b5f3ed47d02837 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 27 20:36:59 2014 +0200 bump product version to 4.2.5.1.0+ Change-Id: I4cdd9d9692df9ea6bfa35bda3fb1ad074928271a diff --git a/configure.ac b/configure.ac index 98e2a0e..bb011dd 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.5.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.5.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.5.1'
Tag 'libreoffice-4.2.5.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-05-27 18:36 -0700 Tag libreoffice-4.2.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJThM0bAAoJEPQ0oe+v7q6jgLYQAJoaHJp2ZLiBwlZkm0xlbU9r p7uCJ94jgp7Hd5wJwp6GAv4dUGXRK9Z+7kiw7rVOVKdDCz+/L7rHxkUyVVy0yDEq 4mHPwnCWAXR/kBW6yMabNGTp1li5Z+JBnHUtmX6nYYf2PK9z7FLSoxV42XMfBObg dXW1sdtCRYyexhwYWB947KsT2ebmQ5wJtiSIJIRvH7UlNNOBRwGunqs6bJndqnd6 YjL4MLWySXpZykVRCx5Z05dQtTb89pHcTvaEvHzMyKtMb4Zjtc//PuUnnKVHeJi3 wPyG2iJrGgJWuUTUVA/S/VVPhSRQxTyphnQ9MiAihrTJF3cCu1chlZjnwDqwOlNQ ZgxkXhBOnK2QgbxlaqYa+8cvRBjFnXdNXLL9GZhDV8T1oUFTih1nD+eu2ncMBTp2 l6hT2UFeLrbMkrB8Pt0L1e/WB8dWilSyXJtTLUjcDOUjmCi3kpoxNZyskLgHJyl6 4FjpdD3zI2rKsUFdWnSNlMVxYXhqFlwUjE9OszYQpe+FPC3lrTGfpvOjY00VrZmg Mt6R0BxE1JdXfTHuniujALpFwP22Lz+VGnbL7Fq8G4Gl7PddmoZmHTiHwEHDPLEO Wap/OFJUrY0nr5TzUyL7XzSXsMvFnrJVQsKd6/UFGIw9GNEVlDhm9Bb1aG0qfKrr q3SgY259eWyTlKXbOolu =rwuJ -END PGP SIGNATURE- Changes since cp-4.2-4-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.5.1'
Tag 'libreoffice-4.2.5.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-05-27 18:36 -0700 Tag libreoffice-4.2.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJThM0fAAoJEPQ0oe+v7q6j41kP/20pMFzi7/7WrcGkic2CH6mP ZiNsLaZ1Z/+5CyEqG7h0JLs1nkFfkw5pdqACSLsK9kT80DhqeAjO1PhEFZiVfaMh /tMwgFwbn5hn2vCGvJWda9DzmXoS4vAjd5sh3nrqD8Di/1Q5s9o8yUaEhkdNyiN2 JX4nNhaSS7YTTEjUYFiTUi6zeCPt9EE08YchG0OCxxDv/7Od/t8shZUd3tebhNnF oi566hsqEHfiDBhBkMSzQnIwEaeMplwdresQ3hsswE9us95i1gaJwvwQAr7ql4Js gwRIm6fJMtAt4e9Jxf3Cd4nloqy+bo0vIUQNze5Ofj79tOsX9IvyGfKAKrvlII1G 7DIT3MEipko1YBZ78GYTbjdHjeIsuK8xjniUfvqteiZuQWf74I5TT998jlwZAvj/ tPAGV5D7dbrGgdn0w+frDz+m2CLMxp5lIjzCKIF7f+pT915D3laz9jzQqXk4nmFA BhSS8GJbX0+bR6H94QfDmbUPhoVUQdnxp4CX9HrlvTQ+MNKV4TcWQXtSBDggH4EN o8Kv2p/sdEEFVzkxCa+ShEIgUA4d2fuqDiLLNikUNC8GkTn9OKj+t0VR14agVoo/ OmuhzdmmQJG/9kHGbMtUWSL41Skv3wooHTEhcKouxBTENem0DL4174SAuuqExHvm pT+C5iNFXs731bJHlFRu =QvC6 -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-20: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/data/column.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bfb16892305f14ad9f6d5ed3724fe52a4e88ce62 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue May 27 14:47:24 2014 -0400 fdo#78976: Correct way to determine the end position for matrix check. Change-Id: Ifd6acd85a9bf33742cb62327a3b8a4320f35d0f3 (cherry picked from commit 054213e86b8f3b1084474b0447cc7ffaf82178c5) diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 485f5e8..7d6ebb1 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -154,7 +154,7 @@ sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 n } size_t nRowsToRead = nRow2 - nRow + 1; -size_t nEnd = std::min(it-size, nRowsToRead); +size_t nEnd = std::min(it-size, nOffset+nRowsToRead); // last row + 1 sc::formula_block::const_iterator itCell = sc::formula_block::begin(*it-data); std::advance(itCell, nOffset); for (size_t i = nOffset; i nEnd; ++itCell, ++i) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 43 +
sc/qa/unit/ucalc.hxx |2 +
sc/source/core/data/column.cxx |2 -
3 files changed, 46 insertions(+), 1 deletion(-)
New commits:
commit 054213e86b8f3b1084474b0447cc7ffaf82178c5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 27 14:47:24 2014 -0400
fdo#78976: Correct way to determine the end position for matrix check.
Change-Id: Ifd6acd85a9bf33742cb62327a3b8a4320f35d0f3
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 485f5e8..7d6ebb1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -154,7 +154,7 @@ sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1,
SCROW nRow2, sal_uInt16 n
}
size_t nRowsToRead = nRow2 - nRow + 1;
-size_t nEnd = std::min(it-size, nRowsToRead);
+size_t nEnd = std::min(it-size, nOffset+nRowsToRead); // last row + 1
sc::formula_block::const_iterator itCell =
sc::formula_block::begin(*it-data);
std::advance(itCell, nOffset);
for (size_t i = nOffset; i nEnd; ++itCell, ++i)
commit 175519643daa87ba3e65eb4b52df3c8a2f60ac64
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 27 14:47:05 2014 -0400
fdo#78976: Test for this.
Change-Id: I454e29c2cdf0857d329d84000d79973489cebb41
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index aa7ac1a..3396446 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -64,6 +64,8 @@
#include globalnames.hxx
#include inputopt.hxx
+#include editable.hxx
+
#include formula/IFunctionDescription.hxx
#include basegfx/polygon/b2dpolygon.hxx
@@ -2196,6 +2198,47 @@ void Test::testEnterMixedMatrix()
m_pDoc-DeleteTab(0);
}
+void Test::testMatrixEditable()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+
+m_pDoc-InsertTab(0, Test);
+
+// Values in A1:B1.
+m_pDoc-SetValue(ScAddress(0,0,0), 1.0);
+m_pDoc-SetValue(ScAddress(1,0,0), 2.0);
+
+// A2 is a normal formula.
+m_pDoc-SetString(ScAddress(0,1,0), =5);
+
+// A3:A4 is a matrix.
+ScRange aMatRange(0,2,0,0,3,0);
+ScMarkData aMark;
+aMark.SetMarkArea(aMatRange);
+m_pDoc-InsertMatrixFormula(0, 2, 0, 3, aMark, =TRANSPOSE(A1:B1), NULL);
+
+// Check their values.
+CPPUNIT_ASSERT_EQUAL(5.0, m_pDoc-GetValue(ScAddress(0,1,0)));
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc-GetValue(ScAddress(0,2,0)));
+CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc-GetValue(ScAddress(0,3,0)));
+
+// Make sure A3:A4 is a matrix.
+ScFormulaCell* pFC = m_pDoc-GetFormulaCell(ScAddress(0,2,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT_MESSAGE(A3 should be matrix origin., pFC-GetMatrixFlag()
== MM_FORMULA);
+
+pFC = m_pDoc-GetFormulaCell(ScAddress(0,3,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT_MESSAGE(A4 should be matrix reference.,
pFC-GetMatrixFlag() == MM_REFERENCE);
+
+// Check to make sure A3:A4 combined is editable.
+ScEditableTester aTester;
+aTester.TestSelection(m_pDoc, aMark);
+CPPUNIT_ASSERT(aTester.IsEditable());
+
+m_pDoc-DeleteTab(0);
+}
+
void Test::testCellCopy()
{
m_pDoc-InsertTab(0, TestTab);
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 39862ee..73181ee 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -195,6 +195,7 @@ public:
void testCSV();
void testMatrix();
void testEnterMixedMatrix();
+void testMatrixEditable();
/**
* Basic test for pivot tables.
@@ -442,6 +443,7 @@ public:
CPPUNIT_TEST(testCSV);
CPPUNIT_TEST(testMatrix);
CPPUNIT_TEST(testEnterMixedMatrix);
+CPPUNIT_TEST(testMatrixEditable);
CPPUNIT_TEST(testPivotTable);
CPPUNIT_TEST(testPivotTableLabels);
CPPUNIT_TEST(testPivotTableDateLabels);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac sw/source
configure.ac |4 +++-
sw/source/core/fields/ddefld.cxx |3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 3935ff3b33404bb859335b2bdbea42e583546bcd
Author: Michael Stahl mst...@redhat.com
Date: Tue May 27 20:52:17 2014 +0200
configure: don't check JVM bit-ness when cross compiling
Change-Id: Icf3a58257c8c8e90d7e9d38f167a9b9f80d4bf32
diff --git a/configure.ac b/configure.ac
index 4130928..c5508a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6836,7 +6836,9 @@ if test $ENABLE_JAVA != ; then
else
AC_MSG_RESULT([no])
fi
-else # ? not sure if it's valid for all OS, and all JVMs?
+elif test $cross_compiling != yes; then
+# at least 2 reasons to check: officebean needs to link -ljawt,
+# and libjpipe.so needs to be loaded by java to run JunitTests.
case $CPUNAME in
AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64)
if test -f $JAVAINTERPRETER -a `$JAVAINTERPRETER -version
21 | $GREP -i 64-bit` = /dev/null; then
commit 747bcdc14386978f2a98a452e52c8dcc2459d319
Author: Michael Stahl mst...@redhat.com
Date: Tue May 27 20:30:19 2014 +0200
fdo#78332: sw: fix separators in SwDDEFieldType::PutValue()
Setting 3 separators instead of 2 does not work.
(regression from 263153842741d7ce21cc0bf1c5296a55a1138024)
Change-Id: Id0b4649404b8a49a7f89a237c46106bce4e146ff
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index f6dbf1b..d947ceb 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -366,7 +366,8 @@ bool SwDDEFieldType::PutValue( const uno::Any rVal,
sal_uInt16 nWhichId )
{
rVal = sToken;
}
-sNewCmd += sToken + OUString(sfx2::cTokenSeparator);
+sNewCmd += (i 2)
+? sToken + OUString(sfx2::cTokenSeparator) : sToken;
}
SetCmd( sNewCmd );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/fields/ddefld.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9e7ed9d9c4f09e5549b1519a8547432fac5dfff5
Author: Michael Stahl mst...@redhat.com
Date: Tue May 27 20:30:19 2014 +0200
fdo#78332: sw: fix separators in SwDDEFieldType::PutValue()
Setting 3 separators instead of 2 does not work.
(regression from 263153842741d7ce21cc0bf1c5296a55a1138024)
Change-Id: Id0b4649404b8a49a7f89a237c46106bce4e146ff
(cherry picked from commit 747bcdc14386978f2a98a452e52c8dcc2459d319)
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index f6dbf1b..d947ceb 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -366,7 +366,8 @@ bool SwDDEFieldType::PutValue( const uno::Any rVal,
sal_uInt16 nWhichId )
{
rVal = sToken;
}
-sNewCmd += sToken + OUString(sfx2::cTokenSeparator);
+sNewCmd += (i 2)
+? sToken + OUString(sfx2::cTokenSeparator) : sToken;
}
SetCmd( sNewCmd );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla.pl
ciabot/libreoffice-bugzilla.pl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 19dc1e3645a84986e1fed92d0aaf2b0d25bbdcfc Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue May 27 21:36:39 2014 +0200 master target is now 4.4.0 diff --git a/ciabot/libreoffice-bugzilla.pl b/ciabot/libreoffice-bugzilla.pl index 5e93464..9df77fb 100755 --- a/ciabot/libreoffice-bugzilla.pl +++ b/ciabot/libreoffice-bugzilla.pl @@ -33,7 +33,7 @@ my $bug_regex = 'fdo#(\d+)'; # This contains the target version for all commits to master # Adjust it if a new version branch has been created -my $master_target = '4.3.0'; +my $master_target = '4.4.0'; # End user configurable section ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - vcl/source
vcl/source/outdev/text.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit ebc7be61df384120f1d0420d3e4dc5e3ac5599f4
Author: matteocam matteo.campane...@gmail.com
Date: Tue May 27 16:05:44 2014 -0400
SetTextFillColor immediately before DrawTransparent. DrawTextRect commented
Change-Id: Id283624484dfcda91546fd4965bc0b6b92614f55
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index effb27a..a8b5709 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -149,14 +149,14 @@ void OutputDevice::ImplDrawTextRect( long nBaseX, long
nBaseY,
nX += nBaseX;
nY += nBaseY;
-mpGraphics-DrawRect( nX, nY, nWidth, nHeight, this ); // original code
+//mpGraphics-DrawRect( nX, nY, nWidth, nHeight, this ); // original code
Rectangle aRect( Point( nX, nY ), Size( nWidth+1, nHeight+1 ) );
Polygon aPoly( aRect );
PolyPolygon aPolyPoly(aPoly);
-DrawTransparent(aPolyPoly, 50);
-// Code above is wrong: it just messes up.
-
+Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF);
+SetTextFillColor(aColor);
+DrawTransparent(aPolyPoly, 70);
}
@@ -486,6 +486,7 @@ void OutputDevice::ImplDrawText( SalLayout rSalLayout )
and the set it as the new filling color
*/
if (mbTextBackground) {
+// FIXME(matteocam)
// set right background // (XXX: now getting fixed color)
Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF); // blue-ish
// SetBackground does not work
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
