LibreOffice Gerrit News for core on 2014-07-14
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + OS X: SDK configuration in https://gerrit.libreoffice.org/9952 from Robert Antoni Buj i Gelonch about module build + fdo#80839: Different first page footer property is not preserved for foot in https://gerrit.libreoffice.org/10232 from Yogesh Bharate about module sw + ExternalProject_python3.mk: MACOSX in https://gerrit.libreoffice.org/10249 from Robert Antoni Buj i Gelonch about module external End of freshness * Merged changes on master for project core changed in the last 25 hours: + fdo#81102: fix .doc import of blank even page header in https://gerrit.libreoffice.org/10191 from Luke Deller * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + attempt in https://gerrit.libreoffice.org/9939 from Michael Stahl + fdo#78947 : The File gets corrupted when saved in LO in https://gerrit.libreoffice.org/9775 from BisalNayal + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + 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-commits] core.git: include/tools
include/tools/ref.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c05cecbe76f914236addbd29393be1071f221dd4
Author: Noel Grandin n...@peralex.com
Date: Thu Jul 10 12:06:30 2014 +0200
fix spelling in comment
Change-Id: Id0b3792b037b2e1a9357c7f26f554cc4222fed0b
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index a87d099..32d7604 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -189,7 +189,7 @@ class SvCompatWeakBase
public:
SvCompatWeakHdl* GetHdl() { return _xHdl; }
-// does not use initalizer due to compiler warnings
+// does not use initializer due to compiler warnings
SvCompatWeakBase( void* pObj ) { _xHdl = new SvCompatWeakHdl( pObj ); }
~SvCompatWeakBase() { _xHdl-ResetWeakBase(); }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools
include/tools/ref.hxx | 50 +++---
1 file changed, 35 insertions(+), 15 deletions(-)
New commits:
commit c6c5789ae894847d12c5d12a6d8aafc2849cb36e
Author: Noel Grandin n...@peralex.com
Date: Thu Jul 10 12:12:55 2014 +0200
include/tools/ref.hxx - cleanup formatting
Change-Id: I1f7f566ea80723b188aab9c2f65437ca902ce9b9
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 32d7604..a6782f0 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -33,13 +33,22 @@ public:
SvRef(): pObj(0) {}
SvRef(SvRef const rObj): pObj(rObj.pObj)
-{ if (pObj != 0) pObj-AddNextRef(); }
+{
+if (pObj != 0) pObj-AddNextRef();
+}
-SvRef(T * pObjP): pObj(pObjP) { if (pObj != 0) pObj-AddRef(); }
+SvRef(T * pObjP): pObj(pObjP)
+{
+if (pObj != 0) pObj-AddRef();
+}
-~SvRef() { if (pObj != 0) pObj-ReleaseRef(); }
+~SvRef()
+{
+if (pObj != 0) pObj-ReleaseRef();
+}
-void Clear() {
+void Clear()
+{
if (pObj != 0) {
T * pRefObj = pObj;
pObj = 0;
@@ -47,7 +56,8 @@ public:
}
}
-SvRef operator =(SvRef const rObj) {
+SvRef operator =(SvRef const rObj)
+{
if (rObj.pObj != 0) {
rObj.pObj-AddNextRef();
}
@@ -59,15 +69,15 @@ public:
return *this;
}
-bool Is() const { return pObj != 0; }
+bool Is() const { return pObj != 0; }
-T * operator () const { return pObj; }
+T * operator () const { return pObj; }
T * operator -() const { assert(pObj != 0); return pObj; }
-T operator *() const { assert(pObj != 0); return *pObj; }
+T operator *() const { assert(pObj != 0); return *pObj; }
-operator T *() const { return pObj; }
+operator T *()const { return pObj; }
protected:
T * pObj;
@@ -131,10 +141,10 @@ public:
}
};
-#define SV_NO_DELETE_REFCOUNT 0x8000
class TOOLS_DLLPUBLIC SvRefBase
{
+static const sal_uIntPtr SV_NO_DELETE_REFCOUNT = 0x8000;
sal_uIntPtr nRefCount;
protected:
@@ -142,29 +152,39 @@ protected:
virtual voidQueryDelete();
public:
-SvRefBase() { nRefCount = SV_NO_DELETE_REFCOUNT; }
+SvRefBase()
+{ nRefCount = SV_NO_DELETE_REFCOUNT; }
+
SvRefBase( const SvRefBase /* rObj */ )
{ nRefCount = SV_NO_DELETE_REFCOUNT; }
-SvRefBase operator = ( const SvRefBase ) { return *this; }
+
+SvRefBase operator = ( const SvRefBase )
+{ return *this; }
voidRestoreNoDelete()
{
if( nRefCount SV_NO_DELETE_REFCOUNT )
nRefCount += SV_NO_DELETE_REFCOUNT;
}
-sal_uIntPtr AddNextRef() { return ++nRefCount; }
+
+sal_uIntPtr AddNextRef()
+{ return ++nRefCount; }
+
sal_uIntPtr AddRef()
{
if( nRefCount = SV_NO_DELETE_REFCOUNT )
nRefCount -= SV_NO_DELETE_REFCOUNT;
return ++nRefCount;
}
+
voidReleaseRef()
{
if( !--nRefCount )
QueryDelete();
}
-sal_uIntPtr GetRefCount() const { return nRefCount; }
+
+sal_uIntPtr GetRefCount() const
+{ return nRefCount; }
};
typedef tools::SvRefSvRefBase SvRefBaseRef;
@@ -177,7 +197,7 @@ class SvCompatWeakHdl : public SvRefBase
public:
void ResetWeakBase( ) { _pObj = 0; }
-void* GetObj() { return _pObj; }
+void* GetObj(){ return _pObj; }
};
typedef tools::SvRefSvCompatWeakHdl SvCompatWeakHdlRef;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk
writerfilter/Library_writerfilter.mk |5 - 1 file changed, 5 deletions(-) New commits: commit e723ee8622447300a1aaeca24df3f35f3dcc9368 Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Jul 9 15:20:18 2014 +0200 unused WRITERFILTER_*_DLLIMPLEMENTATION defines Change-Id: Iac50932b60331e73c5fae1491731506b07576184 diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 7a14d3a..793d810 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -28,11 +28,6 @@ $(eval $(call gb_Library_use_sdk_api,writerfilter)) $(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter)) $(eval $(call gb_Library_add_defs,writerfilter,\ - -DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION \ - -DWRITERFILTER_OOXML_DLLIMPLEMENTATION \ - -DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \ - -DWRITERFILTER_RTFTOK_DLLIMPLEMENTATION \ - -DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \ $(if $(filter-out 0 1,$(gb_DEBUGLEVEL)), \ -DDEBUG_DOMAINMAPPER \ ) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 67576, which changed state. Bug 67576 Summary: setting printing page size in File-Print requires clicking new Use only paper size from printer preferences checkbox https://bugs.freedesktop.org/show_bug.cgi?id=67576 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdotextdecomposition.cxx | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 28ef5f3f2d70d1ffd32a7fc7dd2bdd653edf8c95
Author: matteocam matteo.campane...@gmail.com
Date: Mon Jul 14 10:02:04 2014 +0200
Moved code to impHandleTruncatedPortion
Change-Id: Ib6a8367f6e350856fc19f72a9316bfb510b2f614
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 510652a..0c53ea3 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -523,8 +523,8 @@ namespace
bool bTruncateText = rInfo.mbEndOfParagraph; // arbitrary property
-// truncate text
-if ( bTruncateText )
+
+if ( bTruncateText ) // truncate text
impHandleTruncatedPortion(rInfo)
else // no chaining or truncating
impCreateTextPortionPrimitive(rInfo);
@@ -542,11 +542,19 @@ namespace
void impTextBreakupHandler::impHandleTruncatedPortion(const
DrawPortionInfo rInfo)
{
-// truncate it at 4
+// truncate portion at 4
int nTruncationPoint = 4;
-DrawPortionInfo rInfoNonConst = rInfo;
-rInfoNonConst.mnTextLen = std::min( rInfo.mnTextLen, nTruncationPoint
);
-impCreateTextPortionPrimitive(rInfoNonConst);
+
+// make truncated DrawPortionInfo
+DrawPortionInfo rTruncatedPortionInfo = rInfo;
+rTruncatedPortionInfo.mnTextLen =
+std::min( rInfo.mnTextLen, nTruncationPoint );
+
+// make text portion primitive with the first part of the portion
+impCreateTextPortionPrimitive(rTruncatedPortionInfo);
+
+// if text is left in original portion send it back to editeng
+// FIXME(matteocam)
}
void impTextBreakupHandler::impHandleDrawBulletInfo(const DrawBulletInfo
rInfo)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
sfx2/source/appl/impldde.cxx | 72 ++-
1 file changed, 11 insertions(+), 61 deletions(-)
New commits:
commit e0bfdb26cef87c8d3b3435293116a33cf99c11f0
Author: Herbert Dürr h...@apache.org
Date: Mon Jul 14 07:17:59 2014 +
#i125226# expect DDE servers to be already up
soffice is always up anyway and other DDE apps should be started manually
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 3fbcaa7..8add5c2 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -209,9 +209,6 @@ sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any
rData /*out param*/,
sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
{
-#if defined(WNT)
-static sal_Bool bInWinExec = sal_False;
-#endif
sal_uInt16 nLinkType = pSvLink-GetUpdateMode();
if( pConnection ) // Verbindung steht ja schon
{
@@ -238,69 +235,22 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
pConnection = new DdeConnection( sServer, sTopic );
if( pConnection-GetError() )
{
-// kann man denn das System-Topic ansprechen ?
-// dann ist der Server oben, kennt nur nicht das Topic!
-if( sTopic.EqualsIgnoreCaseAscii( SYSTEM ) )
+// check if the DDE server knows the SYSTEM topic
+bool bSysTopic = false;
+if( !sTopic.EqualsIgnoreCaseAscii( SYSTEM ))
{
-sal_Bool bSysTopic;
-{
-DdeConnection aTmp( sServer, String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( SYSTEM ) ) );
-bSysTopic = !aTmp.GetError();
-}
-
-if( bSysTopic )
-{
-nError = DDELINK_ERROR_DATA;
-return sal_False;
-}
-// ansonsten unter Win/WinNT die Applikation direkt starten
+DdeConnection aTmp( sServer, String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( SYSTEM ) ) );
+bSysTopic = !aTmp.GetError();
}
-#if defined(WNT)
-// check the suitability of starting the DDE server
-const SvtSecurityOptions aSecOpts;
-bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
-bForbidden |= (sServer.SearchChar( L:./%\\) != STRING_NOTFOUND);
-static const char* aBadServers[] = { cmd, rundll32 };
-for( int i = 0; i sizeof(aBadServers)/sizeof(*aBadServers); ++i)
-bForbidden |= (sServer.CompareIgnoreCaseToAscii( aBadServers[i])
== COMPARE_EQUAL);
-
-// try to start the DDE server if it is not there already
-bForbidden |= (bInWinExec != sal_False);
-if( !bForbidden )
+if( bSysTopic )
{
-ByteString aCmdLine( sServer, RTL_TEXTENCODING_ASCII_US );
-aCmdLine.Append( .exe );
-aCmdLine.Append( ByteString( sTopic, RTL_TEXTENCODING_ASCII_US ) );
-
-if( WinExec( aCmdLine.GetBuffer(), SW_SHOWMINIMIZED ) 32 ) //
TODO: use CreateProcess() instead
-nError = DDELINK_ERROR_APP;
-else
-{
-sal_uInt16 i;
-for( i=0; i5; i++ )
-{
-bInWinExec = sal_True;
-Application::Reschedule();
-bInWinExec = sal_False;
-
-delete pConnection;
-pConnection = new DdeConnection( sServer, sTopic );
-if( !pConnection-GetError() )
-break;
-}
-
-if( i == 5 )
-{
-nError = DDELINK_ERROR_APP;
-}
-}
-}
-else
-#endif // WNT
-{
-nError = DDELINK_ERROR_APP;
+// if the system topic works then the server is up but just
doesn't know the original topic
+nError = DDELINK_ERROR_DATA;
+return sal_False;
}
+
+nError = DDELINK_ERROR_APP;
}
if( LINKUPDATE_ALWAYS == nLinkType !pLink !pConnection-GetError() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - bin/findunusedcode framework/inc framework/source include/cppuhelper oovbaapi/ooo package/source sc/source svtools/source sw/source vcl/source
bin/findunusedcode| 36 +++---
framework/inc/services/desktop.hxx|2 -
framework/source/services/desktop.cxx |2 -
include/cppuhelper/propshlp.hxx |3 +-
oovbaapi/ooo/vba/excel/XWorkbook.idl |2 -
oovbaapi/ooo/vba/word/XDocument.idl |2 -
package/source/xstor/owriteablestream.cxx | 29
package/source/xstor/xstorage.cxx | 14 ---
sc/source/ui/vba/vbaworkbook.cxx |2 -
sc/source/ui/vba/vbaworkbook.hxx |2 -
svtools/source/graphic/descriptor.cxx | 13 --
svtools/source/graphic/descriptor.hxx |6 ++---
sw/source/filter/ww8/ww8scan.cxx |8 +-
sw/source/ui/vba/vbacolumns.cxx |2 -
sw/source/ui/vba/vbacolumns.hxx |2 -
sw/source/ui/vba/vbarows.cxx |2 -
sw/source/ui/vba/vbarows.hxx |2 -
vcl/source/edit/vclmedit.cxx | 11 -
18 files changed, 75 insertions(+), 65 deletions(-)
New commits:
commit e477175eee9ec206d409d0ebcc732100049d1aaa
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 14 08:50:22 2014 +0100
coverity#704062 Unchecked return value
Change-Id: I6f9b9a2a4d5a6bf92428645df1226d9354f47210
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index a8bd5fe..bbf74a0 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3250,7 +3250,13 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
*/
WW8_CP nCpStart, nCpEnd;
void* pData=NULL;
-pPieceIter-Get(nCpStart, nCpEnd, pData);
+bool bOk = pPieceIter-Get(nCpStart, nCpEnd, pData);
+
+if (!bOk)
+{
+pPieceIter-SetIdx(nOldPos);
+return;
+}
WW8_FC nLimitFC = SVBT32ToUInt32( ((WW8_PCD*)pData)-fc );
WW8_FC nBeginLimitFC = nLimitFC;
commit c4d33c5f8f9fe55d5891c4fbbf8295b3aad8987f
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 14 08:42:51 2014 +0100
coverity#738457 Uncaught exception
Change-Id: I152f105e7bd363528d9fa4e365d32d12c00b0a44
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index aedad5b..6b27ccf 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -315,7 +315,7 @@ void SAL_CALL SwVbaRows::Select( ) throw
(uno::RuntimeException, std::exception
return ( mnEndRowIndex - mnStartRowIndex + 1 );
}
-uno::Any SAL_CALL SwVbaRows::Item( const uno::Any Index1, const uno::Any
/*not processed in this base class*/ ) throw (uno::RuntimeException)
+uno::Any SAL_CALL SwVbaRows::Item( const uno::Any Index1, const uno::Any
/*not processed in this base class*/ ) throw (lang::IndexOutOfBoundsException,
uno::RuntimeException)
{
sal_Int32 nIndex = 0;
if( ( Index1 = nIndex ) )
diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx
index 6a14a89..80cb70f 100644
--- a/sw/source/ui/vba/vbarows.hxx
+++ b/sw/source/ui/vba/vbarows.hxx
@@ -62,7 +62,7 @@ public:
//XCollection
virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException)
SAL_OVERRIDE;
-virtual css::uno::Any SAL_CALL Item( const css::uno::Any Index1, const
css::uno::Any /*not processed in this base class*/ ) throw (
css::uno::RuntimeException ) SAL_OVERRIDE;
+virtual css::uno::Any SAL_CALL Item( const css::uno::Any Index1, const
css::uno::Any /*not processed in this base class*/ ) throw
(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) SAL_OVERRIDE;
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw
(css::uno::RuntimeException) SAL_OVERRIDE;
virtual css::uno::Reference css::container::XEnumeration SAL_CALL
createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE;
commit 346419a018dd7f6d7d6945412eda8fa54f3c2271
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 14 08:41:03 2014 +0100
coverity#738452 Uncaught exception
Change-Id: I25f63c07103f55066f634fdd99411523425a9de1
diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index ac78b08..edf01b0 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -97,7 +97,7 @@ void SAL_CALL SwVbaColumns::Select( ) throw
(uno::RuntimeException, std::except
return ( mnEndColumnIndex - mnStartColumnIndex + 1 );
}
-uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any Index1, const uno::Any
/*not processed in this base class*/ ) throw (uno::RuntimeException)
+uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any Index1, const uno::Any
/*not processed in this base class*/ ) throw (lang::IndexOutOfBoundsException,
uno::RuntimeException)
{
sal_Int32 nIndex = 0;
if( ( Index1 = nIndex ) )
[GSoC] Chained Text Boxes in Draw - Report 13/07/2014
Hi all, on last week: - managed to truncate arbitrary portion of text in a box; - formulated a general model of what the flow should look like: a) editeng (ImpEditEngine::FormatDoc?) realizes there is an overflow in text box with a successor; b) [still editeng] the overflowing point in the overflowing text portion (possibly empty) is marked; c) [svx] the first part of the overflowing portion is rendered, the rest of it is sent to the successor text box in the chain. Both this second part of the first overflowing portion as well as all the remaining following overflowing portions are sent back to editeng for new layouting. Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - sc/source
sc/source/core/tool/interpr1.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 85ad903b57d1d1362f0d9a64ca3de37606645dee
Author: Eike Rathke er...@redhat.com
Date: Thu Jul 10 16:13:40 2014 +0200
resolved fdo#80195 act on implicitly propagated error, if any
Change-Id: I1d5a55a14fc3e25edc2cddec5b53ed2afa96bd3e
(cherry picked from commit 1093b900b43d819c9a730ef6435fed0f3687a085)
Reviewed-on: https://gerrit.libreoffice.org/10195
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8c86e56..493080a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -255,6 +255,11 @@ void ScInterpreter::ScIfError( bool bNAonly )
{
default:
Pop();
+// Act on implicitly propagated error, if any.
+if (nOldGlobalError)
+nGlobalError = nOldGlobalError;
+if (nGlobalError)
+bError = true;
break;
case svError:
PopError();
___
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-chained-text-boxes' - include/svx
include/svx/svdotext.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 52b7ff2432043c4bd95424596ebb3e4dcf22971e Author: matteocam matteo.campane...@gmail.com Date: Mon Jul 14 10:31:06 2014 +0200 SdrTextObj with explicit successor Change-Id: I9b18ab72847e1419612b8c506bc8e3e9f408c825 diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 709646f..ce46947 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -216,8 +216,8 @@ public: protected: //FIXME(matteocam) -// whether the text object has a successor in a chain -bool mbChained; +// the successor in a chain +SdrTextObj *pNextInChain = NULL; // Fuer beschriftete Zeichenobjekte ist bTextFrame=FALSE. Der Textblock // wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/impldde.cxx | 72 ++-
1 file changed, 11 insertions(+), 61 deletions(-)
New commits:
commit f4a8d7cd10cda57143b22519e16cdf8d5f19e759
Author: Herbert Dürr h...@apache.org
Date: Mon Jul 14 07:17:59 2014 +
Related: #i125226# expect DDE servers to be already up
soffice is always up anyway and other DDE apps should be started manually
(cherry picked from commit e0bfdb26cef87c8d3b3435293116a33cf99c11f0)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I52ebb26528952a4abf33ac95cb67c598f08b2790
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 1035241..cf34acc 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -186,9 +186,6 @@ bool SvDDEObject::GetData( ::com::sun::star::uno::Any
rData /*out param*/,
bool SvDDEObject::Connect( SvBaseLink * pSvLink )
{
-#if defined(WNT)
-static sal_Bool bInWinExec = sal_False;
-#endif
sal_uInt16 nLinkType = pSvLink-GetUpdateMode();
if( pConnection ) // Connection is already made
{
@@ -215,69 +212,22 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
pConnection = new DdeConnection( sServer, sTopic );
if( pConnection-GetError() )
{
- // Is it possible to address the system-Topic?
- // then the server is up, it just does not know the topic!
-if( sTopic.equalsIgnoreAsciiCase( SYSTEM ) )
+// check if the DDE server knows the SYSTEM topic
+bool bSysTopic = false;
+if (!sTopic.equalsIgnoreAsciiCase(SYSTEM))
{
-bool bSysTopic;
-{
-DdeConnection aTmp(sServer, OUString(SYSTEM));
-bSysTopic = !aTmp.GetError();
-}
-
-if( bSysTopic )
-{
-nError = DDELINK_ERROR_DATA;
-return false;
-}
-// otherwise in Win/WinNT, start the Application directly
+DdeConnection aTmp(sServer, OUString(SYSTEM));
+bSysTopic = !aTmp.GetError();
}
-#if defined(WNT)
-// check the suitability of starting the DDE server
-const SvtSecurityOptions aSecOpts;
-bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
-bForbidden |= (comphelper::string::indexOfAny(sServer, L:./%\\) !=
-1);
-static const char* aBadServers[] = { cmd, rundll32 };
-for (size_t i = 0; i sizeof(aBadServers)/sizeof(*aBadServers); ++i)
-bForbidden |= sServer.equalsAscii(aBadServers[i]);
-
-// try to start the DDE server if it is not there already
-bForbidden |= (bInWinExec != false);
-if( !bForbidden )
+if( bSysTopic )
{
-OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
-aCmdLine.append(.exe );
-aCmdLine.append(OUStringToOString(sTopic,
RTL_TEXTENCODING_ASCII_US));
-
-if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) 32 ) // TODO:
use CreateProcess() instead
-nError = DDELINK_ERROR_APP;
-else
-{
-sal_uInt16 i;
-for( i=0; i5; i++ )
-{
-bInWinExec = sal_True;
-Application::Reschedule();
-bInWinExec = sal_False;
-
-delete pConnection;
-pConnection = new DdeConnection( sServer, sTopic );
-if( !pConnection-GetError() )
-break;
-}
-
-if( i == 5 )
-{
-nError = DDELINK_ERROR_APP;
-}
-}
-}
-else
-#endif // WNT
-{
-nError = DDELINK_ERROR_APP;
+// if the system topic works then the server is up but just
doesn't know the original topic
+nError = DDELINK_ERROR_DATA;
+return false;
}
+
+nError = DDELINK_ERROR_APP;
}
if( LINKUPDATE_ALWAYS == nLinkType !pLink !pConnection-GetError() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e0/bfdb26cef87c8d3b3435293116a33cf99c11f0
e0/bfdb26cef87c8d3b3435293116a33cf99c11f0 |1 + 1 file changed, 1 insertion(+) New commits: commit fd7af1fde1529635b9f8f411cb1b6bcb7c090773 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 14 09:42:01 2014 +0100 Notes added by 'git notes add' diff --git a/e0/bfdb26cef87c8d3b3435293116a33cf99c11f0 b/e0/bfdb26cef87c8d3b3435293116a33cf99c11f0 new file mode 100644 index 000..0f99b1a --- /dev/null +++ b/e0/bfdb26cef87c8d3b3435293116a33cf99c11f0 @@ -0,0 +1 @@ +merged as: f4a8d7cd10cda57143b22519e16cdf8d5f19e759 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - avmedia/source download.lst external/libgltf
avmedia/source/opengl/oglframegrabber.cxx |7 avmedia/source/opengl/oglwindow.cxx |7 download.lst |2 external/libgltf/UnpackedTarball_libgltf.mk | 17 -- external/libgltf/patches/comma_at_end_of_enumerator_list.patch | 51 -- external/libgltf/patches/compiler_error_fixes.patch | 41 - external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch | 76 - external/libgltf/patches/extra_semicolon.patch | 18 -- external/libgltf/patches/fix_package_file.patch | 13 - external/libgltf/patches/init_scene_set_handle.patch | 80 -- external/libgltf/patches/libgltf_configure.patch | 61 --- external/libgltf/patches/move_fps_closer_to_the_corner.patch | 12 - external/libgltf/patches/no_animation_in_orbit_mode.patch | 43 - external/libgltf/patches/no_effect_of_set_looping.patch | 14 - external/libgltf/patches/remove_config_h_in_dependencies.patch | 12 - external/libgltf/patches/stop_a_potential_memory_leak.patch | 27 --- external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch | 12 - external/libgltf/patches/wrong_animation_state_when_set_time_to_null.patch | 12 - external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch | 13 - external/libgltf/patches/wrong_media_time_at_first_run_caused_by_uninitilized_member.patch | 11 - external/libgltf/patches/wrong_media_time_caused_by_missing_fmod.patch | 14 - 21 files changed, 13 insertions(+), 530 deletions(-) New commits: commit fc40081993d29c422fd19bb80f4d9db06b4dce0d Author: Zolnai Tamás tamas.zol...@collabora.com Date: Mon Jul 14 10:15:32 2014 +0200 Update libgltf: various fixes, memory usage optimization Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Change-Id: Iba90d43e13dac7792072877d83d17fb1bcbfaae4 diff --git a/download.lst b/download.lst index 61ef420..917d275 100644 --- a/download.lst +++ b/download.lst @@ -87,7 +87,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 -export LIBGLTF_TARBALL := 9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2 +export LIBGLTF_TARBALL := 2d18f7cf2d9268400179d3a6ae5dedd2-libgltf-0.0.0.tar.bz2 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index f1e618c..176c1d1 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -16,23 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary)) $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1)) $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ - external/libgltf/patches/libgltf_configure.patch \ - external/libgltf/patches/remove_config_h_in_dependencies.patch \ - external/libgltf/patches/init_scene_set_handle.patch \ - external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch \ - external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch \ - external/libgltf/patches/wrong_media_time_caused_by_missing_fmod.patch \ - external/libgltf/patches/wrong_animation_state_when_set_time_to_null.patch \ - external/libgltf/patches/no_effect_of_set_looping.patch \ - external/libgltf/patches/wrong_media_time_at_first_run_caused_by_uninitilized_member.patch \ - external/libgltf/patches/no_animation_in_orbit_mode.patch \ -
Re: [Libreoffice-qa] Whiteboard Consistency
On Mon, Jul 14, 2014 at 01:58:56AM +0400, Jay Philips philip...@hotmail.com wrote: I have been using ww8 to cover all the doc/xls/etc. as i saw Stahl use it in one of his comments. I saw Joren using odf, so i've been using that sometimes. I dont see much benefit in breaking odf down into individual odf extensions as we can already limit queries by application. WW8 is just WinWord 8, i.e. what Microsoft calls [MS-DOC], using ww8 to refer to xls/ppt is misleading. Maybe just use the extension for all the cases? That's easy to understand for everyone, unlike WW8, OOXML, ODF, and others. BTW, Joel: I have no problem with whiteboard renames, though if you could please: 1) Send a mail to this list when you did rename them and 2) Do it with a script, so for the casual developer the rename is more or less atomic That would be excellent and make our lives much easier. :-) signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Text Background Color in Draw - Report 22/06/2014
On Fri, Jul 11, 2014 at 04:20:26PM +0200, Matteo Campanelli matteo.campane...@gmail.com wrote: This patch is for fixing the crash and generate an inadmissible data type dialog. I think that's a clear improvement, please push to master. Having a crash while inspecting a form control is as annoying as gdb crashing during LO debugging. :-) signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca13d1f6988bc1671000a30af483b00eb15bcdb8 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Mon Jul 14 10:53:11 2014 +0200 libgltf: download from libgltf subfolder Change-Id: If535d4c8075adf610575a5a5adf0dcad0b8f182a diff --git a/Makefile.fetch b/Makefile.fetch index 1c0d53e..e42ea40 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -156,7 +156,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ $(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \ - $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \ $(call fetch_Optional,LIBPNG,PNG_TARBALL) \ @@ -236,6 +235,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \ ,$(call fetch_Download_item_unchecked,http://dev-www.libreoffice.org/mozilla,$(item))) + $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL)) @mkdir -p $(dir $@) touch $@ # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - download.lst external/libgltf Makefile.fetch
Makefile.fetch |2 download.lst |2 external/libgltf/UnpackedTarball_libgltf.mk | 17 ++ external/libgltf/patches/comma_at_end_of_enumerator_list.patch | 51 ++ external/libgltf/patches/compiler_error_fixes.patch | 41 + external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch | 76 + external/libgltf/patches/extra_semicolon.patch | 18 ++ external/libgltf/patches/fix_package_file.patch | 13 + external/libgltf/patches/init_scene_set_handle.patch | 80 ++ external/libgltf/patches/libgltf_configure.patch | 61 +++ external/libgltf/patches/move_fps_closer_to_the_corner.patch | 12 + external/libgltf/patches/no_animation_in_orbit_mode.patch | 43 + external/libgltf/patches/no_effect_of_set_looping.patch | 14 + external/libgltf/patches/remove_config_h_in_dependencies.patch | 12 + external/libgltf/patches/stop_a_potential_memory_leak.patch | 27 +++ external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch | 12 + external/libgltf/patches/wrong_animation_state_when_set_time_to_null.patch | 12 + external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch | 13 + external/libgltf/patches/wrong_media_time_at_first_run_caused_by_uninitilized_member.patch | 11 + external/libgltf/patches/wrong_media_time_caused_by_missing_fmod.patch | 14 + 20 files changed, 529 insertions(+), 2 deletions(-) New commits: commit ae4004548adcdcbaa5979d58f7a3324674ae21cf Author: Zolnai Tamás tamas.zol...@collabora.com Date: Mon Jul 14 11:04:51 2014 +0200 Revert Update libgltf: various fixes, memory usage optimization This reverts commit fc40081993d29c422fd19bb80f4d9db06b4dce0d. Some files are missing from the new tarball, so revert this until this is fixed. diff --git a/download.lst b/download.lst index 917d275..61ef420 100644 --- a/download.lst +++ b/download.lst @@ -87,7 +87,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 -export LIBGLTF_TARBALL := 2d18f7cf2d9268400179d3a6ae5dedd2-libgltf-0.0.0.tar.bz2 +export LIBGLTF_TARBALL := 9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index 176c1d1..f1e618c 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -16,6 +16,23 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary)) $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1)) $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ + external/libgltf/patches/libgltf_configure.patch \ + external/libgltf/patches/remove_config_h_in_dependencies.patch \ + external/libgltf/patches/init_scene_set_handle.patch \ + external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch \ + external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch \ + external/libgltf/patches/wrong_media_time_caused_by_missing_fmod.patch \ + external/libgltf/patches/wrong_animation_state_when_set_time_to_null.patch \ + external/libgltf/patches/no_effect_of_set_looping.patch \ + external/libgltf/patches/wrong_media_time_at_first_run_caused_by_uninitilized_member.patch \ + external/libgltf/patches/no_animation_in_orbit_mode.patch \ + external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch \ + external/libgltf/patches/move_fps_closer_to_the_corner.patch \ + external/libgltf/patches/compiler_error_fixes.patch \ + external/libgltf/patches/fix_package_file.patch \ + external/libgltf/patches/comma_at_end_of_enumerator_list.patch \ + external/libgltf/patches/extra_semicolon.patch \ + external/libgltf/patches/stop_a_potential_memory_leak.patch \ ))
[Libreoffice-commits] core.git: 8 commits - dbaccess/source include/rtl include/salhelper sal/osl sc/inc sc/source svtools/source sw/source
dbaccess/source/core/dataaccess/ModelImpl.cxx |8 +++-
dbaccess/source/core/dataaccess/ModelImpl.hxx | 11 +++
include/rtl/ref.hxx | 23 +--
include/salhelper/refobj.hxx | 17 ++---
sal/osl/unx/mutex.c |7 ++-
sc/inc/undosort.hxx |6 +++---
sc/source/core/data/table3.cxx|1 -
svtools/source/control/roadmap.cxx|5 -
svtools/source/uno/unoiface.cxx |2 +-
sw/source/core/doc/docbm.cxx |2 +-
10 files changed, 28 insertions(+), 54 deletions(-)
New commits:
commit 33fd0d8ae6a6b4e5226991e39fe755d84cb78280
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 14 10:14:52 2014 +0200
loplugin:unreffun
Change-Id: Ia1b49091c91e257e4c9e1ef328c412ea3f1a451d
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index f500582..032daa8 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1798,7 +1798,7 @@ namespace
long int m_nIdx;
bool m_bOther;
sal_Int32 m_nCntnt;
-#if OSL_DEBUG_LEVEL 0
+#if 0
void Dump()
{
SAL_INFO(sw.core, Index: m_nIdx \tOther: m_bOther
\tContent: m_nCntnt);
commit 0b34104ca19cf37cb18409bfddf868866e358b14
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 14 09:55:20 2014 +0200
loplugin:saloverride
Change-Id: Ia9a02ea6dfa3e59ff5e8bc7da229793e97f3567e
diff --git a/sc/inc/undosort.hxx b/sc/inc/undosort.hxx
index 388fcfa..283b99f 100644
--- a/sc/inc/undosort.hxx
+++ b/sc/inc/undosort.hxx
@@ -22,9 +22,9 @@ class UndoSort : public ScSimpleUndo
public:
UndoSort( ScDocShell* pDocSh, const ReorderParam rParam );
-virtual OUString GetComment() const;
-virtual void Undo();
-virtual void Redo();
+virtual OUString GetComment() const SAL_OVERRIDE;
+virtual void Undo() SAL_OVERRIDE;
+virtual void Redo() SAL_OVERRIDE;
private:
void Execute( bool bUndo );
commit ea73e43ac5696bea5b37ed010101168fd2cb60c1
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 14 09:47:47 2014 +0200
loplugin:unreffun
Change-Id: Iaee48db2736a7fd2855e3a0ad7a39ea7d21a2d3d
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 64f0ef5..6306f6a 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -388,7 +388,6 @@ public:
SCCOLROWGetStart() const { return nStart; }
SCCOLROW GetLast() const { return mnLastIndex; }
-SCSIZE GetCount() const { return nCount; }
const std::vectorSCCOLROW GetOrderIndices() const { return
maOrderIndices; }
commit c14a3c1de2a093a8cfcb454a5d32c9810820cbd1
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 14 09:03:06 2014 +0200
workaround hack that trips up externandnotdefined clang plugin
Change-Id: I2f458cbd582c3e7cfe433915483c0b0489467471
diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index a8eb99d..1ee4418 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -25,7 +25,12 @@
#include pthread.h
#include stdlib.h
-#if defined LINUX /* bad hack */
+/* Bad hack. This function has two problems - on older systems it has a
different name,
+ and on some older systems it is not defined in the header file.
+ Unfortunately there is no completely foolproof test, so we're just working
around
+ the issue here. The __clang__ test prevents this hack from triggering the
check
+ in the externandnotdefined clang plugin. */
+#if defined LINUX ! defined __clang__
int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
#define pthread_mutexattr_settype pthread_mutexattr_setkind_np
#define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
commit 24f28634fa60ed5860edd1728567b7c3e7fa9573
Author: Noel Grandin n...@peralex.com
Date: Fri Jul 11 16:33:39 2014 +0200
Todo - TODO
Change-Id: I13e2351c182065be1a849b944e892f0072ce358a
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index bcd9083..2c3ea4d 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1470,7 +1470,7 @@ void SVTXRoadmap::propertyChange( const
::com::sun::star::beans::PropertyChangeE
pField-ChangeRoadmapItemID( (RoadmapTypes::ItemId)nID,
(RoadmapTypes::ItemId)nNewID );
}
//else
-// Todo: handle Interactive appropriately
+// TODO handle Interactive appropriately
}
}
commit b43fdc54e534b9fae1d0e4deb45a4357120f8af4
Author: Noel Grandin n...@peralex.com
Date: Fri Jul 11 16:33:02 2014 +0200
cid#1194925 Resource leak
add an assert so that coverity knows the leak can't happen
Change-Id: I0109309ccc53b1b22420cbf9ac497d8d677a4ea7
diff --git a/svtools/source/control/roadmap.cxx
b/svtools/source/control/roadmap.cxx
index
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/ui/docshell/dbdocfun.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit ee5895488c43954b25b26076ec9241e7c741cffd Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Sat Jul 12 21:46:13 2014 -0400 fdo#80462: Don't always increment the start row position. Sometimes someone might attempt to sort only a single row. Change-Id: Ie29d4cf7ec0bd3a5c945997083368b6ef6074268 (cherry picked from commit 5902dcf0995cdd0a6c1dbd1f9c21b0b2b3f5609f) Reviewed-on: https://gerrit.libreoffice.org/10259 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index deaf244..8238b9a 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -490,7 +490,9 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam rSortParam, WaitObject aWait( rDocShell.GetActiveDialogParent() ); -SCROW nStartRow = aLocalParam.nRow1 + (aLocalParam.bHasHeader ? 1 : 0); +SCROW nStartRow = aLocalParam.nRow1; +if (aLocalParam.bByRow aLocalParam.bHasHeader nStartRow aLocalParam.nRow2) +++nStartRow; // Calculate the script types for all cells in the sort range beforehand. // This will speed up the row height adjustment that takes place after the ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Dialog Widget Conversion - Week 8
Hello, In the last week I converted 6 dialogs. -RID_SCDLG_RETYPEPASS, -RID_CUI_DIALOG_COLORPICKER -DLG_TEMPLATE_INFORMATION -RID_DLG_LISTCOMBOWIZARD -RID_DLG_GROUPBOXWIZARD -RID_DLG_GRIDWIZARD Best regards, Mihály ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/docshell/dbdocfun.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit f97d25b66e88742e4cb4011cc4cc0bc682c1ee1c Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Sat Jul 12 21:46:13 2014 -0400 fdo#80462: Don't always increment the start row position. Sometimes someone might attempt to sort only a single row. Change-Id: Ie29d4cf7ec0bd3a5c945997083368b6ef6074268 (cherry picked from commit 5902dcf0995cdd0a6c1dbd1f9c21b0b2b3f5609f) Reviewed-on: https://gerrit.libreoffice.org/10260 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 1e7cbdb..d9d5550 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -493,7 +493,9 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam rSortParam, WaitObject aWait( rDocShell.GetActiveDialogParent() ); -SCROW nStartRow = aLocalParam.nRow1 + (aLocalParam.bHasHeader ? 1 : 0); +SCROW nStartRow = aLocalParam.nRow1; +if (aLocalParam.bByRow aLocalParam.bHasHeader nStartRow aLocalParam.nRow2) +++nStartRow; // Calculate the script types for all cells in the sort range beforehand. // This will speed up the row height adjustment that takes place after the ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Call for testing: Writer paragraph splits/joins
Hi all, I recently pushed a few canges that try to unwind one of the smaller Gordian Knots in Writer(*), to get rid of a horrible old implementation that nobody dared to touch. The new implementation isnt fancy at all (yet), but at least should pave the way for further cleaning up the code, which I plan to do as we go. For the time being however, as this is pretty low-level stuff, I ask those who are testing master/dailies to please also have a look at the behaviour of: - bookmarks - redlines (change tracking) - cursors (admittedly hardly testable in the UI) - paragraph- and character-bound objects esp. when splitting or joining a paragraph (read: insert a newline in the middle, or e.g. press backspace at the start of a paragraph. Thanks! Best, Bjoern (*) https://gerrit.libreoffice.org/gitweb?p=core.git;a=history;f=sw/source/core/doc/docbm.cxx;h=032daa849bdb282f55a1d30279f4ba464c720a34;hb=33fd0d8ae6a6b4e5226991e39fe755d84cb78280 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source
chart2/source/inc/macros.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b1043b565530309ecadba4d135bccb2773c49d67 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Jul 13 07:26:24 2014 +0200 disable 3D OpenGL chart feature is not ready for the release Change-Id: Ibca7d1db4f8eb4e7130e2b05fb86706135a41b1c Reviewed-on: https://gerrit.libreoffice.org/10261 Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx index 2319afe..21e5911 100644 --- a/chart2/source/inc/macros.hxx +++ b/chart2/source/inc/macros.hxx @@ -30,7 +30,7 @@ typeid( ex ).name() , Message: \ ex.Message ) -#define ENABLE_GL3D_BARCHART 1 +#define ENABLE_GL3D_BARCHART 0 #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-0' - include/osl sal/osl sal/util
include/osl/process.h|5 +
sal/osl/unx/process_impl.cxx |5 +
sal/osl/w32/process.cxx |6 ++
sal/util/sal.map |1 +
4 files changed, 17 insertions(+)
New commits:
commit 8ab5d9ccb68e3785cdcfdfe0bc6abc774d91bc55
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Jul 10 12:17:05 2014 +0200
Introduce osl_areCommandArgsSet.
We cannot call osl_setCommandArgs twice, however there is currently
no way to determine whether or not this has already been done. This is
necessary e.g. for LibreOfficeKit where we may also be using UNO
separately (and also for unit tests where LO is already set-up prior
to the unit test running, and therefore we can't set up osl again
from within LOK).
Change-Id: Id1f357ef604eb2b6b7814c9a04ac6933a39fd3eb
Signed-off-by: Michael Meeks michael.me...@collabora.com
Reviewed-on: https://gerrit.libreoffice.org/10225
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/include/osl/process.h b/include/osl/process.h
index 7d0960e..7fb619f 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -366,6 +366,11 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL
osl_getCommandArgCount(void);
SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getCommandArg(
sal_uInt32 nArg, rtl_uString **strCommandArg);
+/** Determine whether or not the command args have already been set.
+@return The command args are already set, and may not be set again.
+*/
+SAL_DLLPUBLIC int SAL_CALL osl_areCommandArgsSet (void);
+
/** Set the command-line arguments as passed to the main-function of this
process.
Deprecated: This function is only for internal use. Passing the args from
main will
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index d28f46d..b63f222 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -191,6 +191,11 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32
nArg, rtl_uString ** strC
return (result);
}
+int SAL_CALL osl_areCommandArgsSet (void)
+{
+return (g_command_args.m_nCount 0);
+}
+
/***
osl_setCommandArgs().
**/
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 3dd0e77..25f4e58 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -374,6 +374,12 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32
nArg, rtl_uString **strCo
/***/
+int SAL_CALL osl_areCommandArgsSet(void)
+{
+return (g_command_args.m_nCount 0);
+}
+
+
void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
{
osl_acquireMutex (*osl_getGlobalMutex());
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 1d7d491..6acd9c4 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -675,6 +675,7 @@ LIBO_UDK_4.3 { # symbols available in = LibO 4.3
osl_createDirectoryWithFlags;
rtl_allocateAlignedMemory;
rtl_freeAlignedMemory;
+osl_areCommandArgsSet;
} LIBO_UDK_4.2;
PRIVATE_1.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-0' - avmedia/source
avmedia/source/opengl/oglplayer.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 099a7f3039607eb56c433e8eebf8be02eb229c54 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Jul 11 11:23:29 2014 +0200 glTF: Removing one model breaks an other model Reproduce: - Insert two models - Play first model - Delete second model Result: crash (windows) or first model disappear from the opengl window (linux). Change-Id: I940960754f42a2e4faf5b9f37c0d4a3c155e4650 (cherry picked from commit 30fcee6ce56ec4e50ee86c308ca5621746d817d5) Reviewed-on: https://gerrit.libreoffice.org/10219 Reviewed-by: Caolán McNamara caol...@redhat.com Reviewed-by: Michael Meeks michael.me...@collabora.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index b481943..85daa8d 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -44,6 +44,7 @@ OGLPlayer::~OGLPlayer() delete [] m_pHandle-files[i].buffer; } } +m_aContext.makeCurrent(); gltf_renderer_release(m_pHandle); } } ___ 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/docxattributeoutput.cxx | 18 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 28 ++-
sw/source/filter/ww8/wrtww8gr.cxx|2 -
3 files changed, 37 insertions(+), 11 deletions(-)
New commits:
commit 9dd5caac62083f7162d83319284df68ee83e3777
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 14 11:36:32 2014 +0100
Resolves: fdo#52226 swap in graphics on .docx and .rtf export
Change-Id: Ie818b382c0b17760c720ff2f2c73a3697989f97e
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b6d64af..30179bb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3883,7 +3883,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
// inline, we also have to write the image itself
const Graphic* pGraphic = 0;
if (pGrfNode)
-pGraphic = const_cast Graphic ( pGrfNode-GetGrf() );
+pGraphic = pGrfNode-GetGrf();
else
pGraphic = pOLENode-GetGraphic();
@@ -3894,8 +3894,24 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
{
// Not in cache, then need to write it.
m_rDrawingML.SetFS( m_pSerializer ); // to be sure that we write
to the right stream
+
+bool bSwapped = pGraphic-IsSwapOut();
+if (bSwapped)
+{
+if (pGrfNode)
+{
+// always swapin via the Node
+const_castSwGrfNode*(pGrfNode)-SwapIn();
+}
+else
+const_castGraphic*(pGraphic)-SwapIn();
+}
+
OUString aImageId = m_rDrawingML.WriteImage( *pGraphic );
+if (bSwapped)
+const_castGraphic*(pGraphic)-SwapOut();
+
aRelId = OUStringToOString( aImageId, RTL_TEXTENCODING_UTF8 );
m_aRelIdCache[pGraphic] = aRelId;
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 3ac3a87..482569d 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3582,17 +3582,24 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
const sal_uInt8* pGraphicAry = 0;
sal_uInt32 nSize = 0;
-Graphic aGraphic(pGrfNode-GetGrf());
+const Graphic rGraphic(pGrfNode-GetGrf());
// If there is no graphic there is not much point in parsing it
-if (aGraphic.GetType()==GRAPHIC_NONE)
+if (rGraphic.GetType()==GRAPHIC_NONE)
return;
+bool bSwapped = rGraphic.IsSwapOut();
+if (bSwapped)
+{
+// always swapin via the Node
+const_castSwGrfNode*(pGrfNode)-SwapIn();
+}
+
GfxLink aGraphicLink;
const sal_Char* pBLIPType = 0;
-if (aGraphic.IsLink())
+if (rGraphic.IsLink())
{
-aGraphicLink = aGraphic.GetLink();
+aGraphicLink = rGraphic.GetLink();
nSize = aGraphicLink.GetDataSize();
pGraphicAry = aGraphicLink.GetData();
switch (aGraphicLink.GetType())
@@ -3625,10 +3632,10 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
}
}
-GraphicType eGraphicType = aGraphic.GetType();
+GraphicType eGraphicType = rGraphic.GetType();
if (!pGraphicAry)
{
-if (ERRCODE_NONE == GraphicConverter::Export(aStream, aGraphic,
+if (ERRCODE_NONE == GraphicConverter::Export(aStream, rGraphic,
(eGraphicType == GRAPHIC_BITMAP) ? CVT_PNG : CVT_WMF))
{
pBLIPType = (eGraphicType == GRAPHIC_BITMAP) ?
@@ -3639,7 +3646,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
}
}
-Size aMapped(eGraphicType == GRAPHIC_BITMAP ? aGraphic.GetSizePixel() :
aGraphic.GetPrefSize());
+Size aMapped(eGraphicType == GRAPHIC_BITMAP ? rGraphic.GetSizePixel() :
rGraphic.GetPrefSize());
const SwCropGrf rCr = (const
SwCropGrf)pGrfNode-GetAttr(RES_GRFATR_CROPGRF);
@@ -3668,7 +3675,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
else
{
aStream.Seek(0);
-GraphicConverter::Export(aStream, aGraphic, CVT_WMF);
+GraphicConverter::Export(aStream, rGraphic, CVT_WMF);
pBLIPType = OOO_STRING_SVTOOLS_RTF_WMETAFILE;
aStream.Seek(STREAM_SEEK_TO_END);
nSize = aStream.Tell();
@@ -3682,7 +3689,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
m_rExport.Strm().WriteCharPtr(} {
OOO_STRING_SVTOOLS_RTF_NONSHPPICT);
aStream.Seek(0);
-GraphicConverter::Export(aStream, aGraphic, CVT_WMF);
+GraphicConverter::Export(aStream, rGraphic,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - avmedia/source
avmedia/source/opengl/oglplayer.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit dbf566f4ede06935fa321427a780072c94c588d7 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Jul 11 07:53:19 2014 +0200 glTF: crash after starting a model without an OpenGL window Change-Id: I726f4d62ab062fbd41376183f60c26d8e6cfe33e (cherry picked from commit 6174152cfffd8e31b9eda238990a161c8c2b9a71) Reviewed-on: https://gerrit.libreoffice.org/10220 Reviewed-by: Caolán McNamara caol...@redhat.com Reviewed-by: Michael Meeks michael.me...@collabora.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 85daa8d..f39f847 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -144,6 +144,9 @@ void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception ) osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); +if(!m_pOGLWindow) +return; + // gltf_animation_start play animation from the time 0.0, // but OGLPlayer::start used as play from that time where it was stopped before double fTime = gltf_animation_get_time(m_pHandle); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Improved Color Selection, Week 8
Hi All! Last week I did a lot of refactoring, added color picking, and tweaked the UI to use a drop down menu. This is how it looks like right now: http://i.imgur.com/4XAbRaH.png This week I want to try converting the palette popup to use the new widget layout system. If anyone has any insights, please share them! Thank you! All the best, Krisztian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - chart2/source
chart2/source/inc/macros.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b09a4f01f5188ac726f7aad803990fb9439e0e6 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Jul 13 07:26:24 2014 +0200 disable 3D OpenGL chart feature is not ready for the release Change-Id: Ibca7d1db4f8eb4e7130e2b05fb86706135a41b1c Reviewed-on: https://gerrit.libreoffice.org/10280 Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com Reviewed-by: Michael Meeks michael.me...@collabora.com Reviewed-by: Matúš Kukan matus.ku...@collabora.com Tested-by: Matúš Kukan matus.ku...@collabora.com diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx index 2319afe..21e5911 100644 --- a/chart2/source/inc/macros.hxx +++ b/chart2/source/inc/macros.hxx @@ -30,7 +30,7 @@ typeid( ex ).name() , Message: \ ex.Message ) -#define ENABLE_GL3D_BARCHART 1 +#define ENABLE_GL3D_BARCHART 0 #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Depends on||81336 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #181 from Alex Thurgood ipla...@yahoo.co.uk --- Nominating 81336 - IS NULL SQL query no longer executes, returns STATEMENT TOO COMPLEX error message - regresion -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 80384, which changed state. Bug 80384 Summary: Chart Legend name lost on saving https://bugs.freedesktop.org/show_bug.cgi?id=80384 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: libreofficekit/qa
libreofficekit/qa/unit/tiledrendering.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 44e19aa6c62c3f04239f1f096f0ec99457380019
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 14 13:12:56 2014 +0200
LOK tiled rendering test: add some debug output.
Change-Id: I0da29204809b6a1de42d5f0fc37705497a060493
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index 1cc93f7..d48e304 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -47,9 +47,17 @@ void TiledRenderingTest::testOverlay()
scoped_ptr Office pOffice( lok_cpp_init(
sLOPath.c_str() ) );
+assert( pOffice.get() );
+
scoped_ptr Document pDocument( pOffice-documentLoad(
sDocPath.c_str() ) );
+if ( !pDocument.get() )
+{
+fprintf( stderr, documentLoad failed: %s\n, pOffice-getError() );
+CPPUNIT_FAIL( Document could not be loaded -- tiled rendering not
possible. );
+}
+
// We render one large tile, then subdivide it into 4 and render those
parts, and finally
// iterate over each smaller tile and check whether their contents match
the large
// tile.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 47800] Most of the predefined autotexts are missing in most languages
https://bugs.freedesktop.org/show_bug.cgi?id=47800 David Tardon dtar...@redhat.com changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #16 from David Tardon dtar...@redhat.com --- (In reply to comment #15) I checked the folder /share/autotext/ and all the language subdirs there are empty. Also I am missing the en-US/ subfolder, which suggests that the installation file is missing the /share/autotext/en-US/ folder. Which means it is a different bug. Closing again. -- 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 47800] Most of the predefined autotexts are missing in czech language
https://bugs.freedesktop.org/show_bug.cgi?id=47800 David Tardon dtar...@redhat.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |hora...@gmail.com |desktop.org | Summary|Most of the predefined |Most of the predefined |autotexts are missing in|autotexts are missing in |most languages |czech language -- 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-6' - sw/qa sw/source
sw/qa/extras/ww8import/data/fdo80333.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |9 +
sw/source/filter/ww8/ww8par6.cxx | 24 ++--
3 files changed, 23 insertions(+), 10 deletions(-)
New commits:
commit aea934f29fcc435c3cca8cc3feabcf5c9d7f44d6
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sat Jul 12 12:44:28 2014 +0200
fdo#80333: .doc has large black rectangles between paragraphs
These black rectangles are character border shadows, because checking
whether there is a border at all was missing. In Word there
is no shadow without a border.
Regression from aa2faee4b3954b57a613963b501ecf611b3a14ca
(cherry picked from commit c2e708d61746a259888c0e5fb1d3e9a43e3ca696)
Change-Id: Ib3cb4e904fdd33f215c81d7c02762a196f484b1b
Reviewed-on: https://gerrit.libreoffice.org/10251
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ww8import/data/fdo80333.doc
b/sw/qa/extras/ww8import/data/fdo80333.doc
new file mode 100644
index 000..773a922
Binary files /dev/null and b/sw/qa/extras/ww8import/data/fdo80333.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 0d360d8..6a48abf 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -15,6 +15,7 @@
#include com/sun/star/text/XDependentTextField.hpp
#include com/sun/star/text/XTextFramesSupplier.hpp
#include com/sun/star/text/XTextTablesSupplier.hpp
+#include com/sun/star/table/ShadowFormat.hpp
#include vcl/svapp.hxx
@@ -325,6 +326,14 @@ DECLARE_WW8IMPORT_TEST(testFdo77844, fdo77844.doc)
#endif
}
+DECLARE_WW8IMPORT_TEST(testFdp80333, fdo80333.doc)
+{
+// Despite there is no character border, border shadow was imported
+uno::Referencebeans::XPropertySet xRun(getRun(getParagraph(1),1),
uno::UNO_QUERY);
+const table::ShadowFormat aShadow = getPropertytable::ShadowFormat(xRun,
CharShadowFormat);
+CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_NONE, aShadow.Location);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 066b8db..0324552 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4778,16 +4778,20 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16
/*nId*/, const sal_uInt8* pData
WW8_BRC aBrc;
_SetWW8_BRC(bVer67, aBrc, pData);
-Set1Border(bVer67, aBoxItem, aBrc, BOX_LINE_TOP, 0, 0, true);
-Set1Border(bVer67, aBoxItem, aBrc, BOX_LINE_BOTTOM, 0, 0, true);
-Set1Border(bVer67, aBoxItem, aBrc, BOX_LINE_LEFT, 0, 0, true);
-Set1Border(bVer67, aBoxItem, aBrc, BOX_LINE_RIGHT, 0, 0, true);
-NewAttr( aBoxItem );
-
-short aSizeArray[WW8_RIGHT+1]={0}; aSizeArray[WW8_RIGHT] = 1;
-SvxShadowItem aShadowItem(RES_CHRATR_SHADOW);
-if( SetShadow( aShadowItem, aSizeArray[0], aBrc ) )
-NewAttr( aShadowItem );
+// WW8_BRC is empty - no border, no shadow
+if( !aBrc.IsEmpty(bVer67) )
+{
+Set1Border(bVer67, aBoxItem, aBrc, BOX_LINE_TOP, 0, 0, true);
+Set1Border(bVer67, aBoxItem, aBrc, BOX_LINE_BOTTOM, 0, 0,
true);
+Set1Border(bVer67, aBoxItem, aBrc, BOX_LINE_LEFT, 0, 0, true);
+Set1Border(bVer67, aBoxItem, aBrc, BOX_LINE_RIGHT, 0, 0, true);
+NewAttr( aBoxItem );
+
+short aSizeArray[WW8_RIGHT+1]={0}; aSizeArray[WW8_RIGHT] = 1;
+SvxShadowItem aShadowItem(RES_CHRATR_SHADOW);
+if( SetShadow( aShadowItem, aSizeArray[0], aBrc ) )
+NewAttr( aShadowItem );
+}
}
}
___
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-0' - sw/qa sw/source
sw/qa/extras/ww8import/data/fdo80333.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |9 +
sw/source/filter/ww8/ww8par6.cxx | 24 ++--
3 files changed, 23 insertions(+), 10 deletions(-)
New commits:
commit 553fc0770ede2d5a95f72fb28d21a92bfdb3a38a
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sun Jul 13 19:29:29 2014 +0200
fdo#80333: .doc has large black rectangles between paragraphs
These black rectangles are character border shadows, because checking
whether there is a border at all was missing. In Word there
is no shadow without a border.
Regression from aa2faee4b3954b57a613963b501ecf611b3a14ca
(cherry picked from commit c2e708d61746a259888c0e5fb1d3e9a43e3ca696)
Conflicts:
sw/qa/extras/ww8import/ww8import.cxx
Change-Id: Ib3cb4e904fdd33f215c81d7c02762a196f484b1b
Reviewed-on: https://gerrit.libreoffice.org/10268
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ww8import/data/fdo80333.doc
b/sw/qa/extras/ww8import/data/fdo80333.doc
new file mode 100644
index 000..773a922
Binary files /dev/null and b/sw/qa/extras/ww8import/data/fdo80333.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 147fb88..7cd6153 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -18,6 +18,7 @@
#include com/sun/star/text/XDependentTextField.hpp
#include com/sun/star/text/XTextFramesSupplier.hpp
#include com/sun/star/text/XTextTablesSupplier.hpp
+#include com/sun/star/table/ShadowFormat.hpp
#include vcl/svapp.hxx
@@ -462,6 +463,14 @@ DECLARE_WW8IMPORT_TEST(testFdo77844, fdo77844.doc)
#endif
}
+DECLARE_WW8IMPORT_TEST(testFdp80333, fdo80333.doc)
+{
+// Despite there is no character border, border shadow was imported
+uno::Referencebeans::XPropertySet xRun(getRun(getParagraph(1),1),
uno::UNO_QUERY);
+const table::ShadowFormat aShadow = getPropertytable::ShadowFormat(xRun,
CharShadowFormat);
+CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_NONE, aShadow.Location);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 1ab57d5..e0100ae 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4761,16 +4761,20 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId,
const sal_uInt8* pData, sh
_SetWW8_BRC(nBrcVer, aBrc, pData);
-Set1Border(aBoxItem, aBrc, BOX_LINE_TOP, 0, 0, true);
-Set1Border(aBoxItem, aBrc, BOX_LINE_BOTTOM, 0, 0, true);
-Set1Border(aBoxItem, aBrc, BOX_LINE_LEFT, 0, 0, true);
-Set1Border(aBoxItem, aBrc, BOX_LINE_RIGHT, 0, 0, true);
-NewAttr( aBoxItem );
-
-short aSizeArray[WW8_RIGHT+1]={0}; aSizeArray[WW8_RIGHT] = 1;
-SvxShadowItem aShadowItem(RES_CHRATR_SHADOW);
-if( SetShadow( aShadowItem, aSizeArray[0], aBrc ) )
-NewAttr( aShadowItem );
+// Border style is none - no border, no shadow
+if( editeng::ConvertBorderStyleFromWord(aBrc.brcType()) !=
table::BorderLineStyle::NONE )
+{
+Set1Border(aBoxItem, aBrc, BOX_LINE_TOP, 0, 0, true);
+Set1Border(aBoxItem, aBrc, BOX_LINE_BOTTOM, 0, 0, true);
+Set1Border(aBoxItem, aBrc, BOX_LINE_LEFT, 0, 0, true);
+Set1Border(aBoxItem, aBrc, BOX_LINE_RIGHT, 0, 0, true);
+NewAttr( aBoxItem );
+
+short aSizeArray[WW8_RIGHT+1]={0}; aSizeArray[WW8_RIGHT] = 1;
+SvxShadowItem aShadowItem(RES_CHRATR_SHADOW);
+if( SetShadow( aShadowItem, aSizeArray[0], aBrc ) )
+NewAttr( aShadowItem );
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - include/tools sc/source tools/source unotools/source
include/tools/ref.hxx |3 ---
sc/source/core/data/table3.cxx |2 +-
sc/source/filter/oox/formulaparser.cxx |8
tools/source/debug/debug.cxx| 13 +++--
unotools/source/config/configvaluecontainer.cxx | 10 --
5 files changed, 4 insertions(+), 32 deletions(-)
New commits:
commit e3246e806cad5f9d2c05c3408adc3019da5a575d
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 14 12:55:03 2014 +0200
loplugin:unreffun
Change-Id: Ib64683372d89896e7fbac7ac9acb608c5470531c
diff --git a/sc/source/filter/oox/formulaparser.cxx
b/sc/source/filter/oox/formulaparser.cxx
index 41331fb..1e63e9d 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -472,7 +472,6 @@ protected:
size_t appendWhiteSpaceTokens( const WhiteSpaceVec* pSpaces );
size_t insertWhiteSpaceTokens( const WhiteSpaceVec* pSpaces,
size_t nIndexFromEnd );
-size_t getOperandSize( size_t nOpCountFromEnd, size_t
nOpIndex ) const;
voidpushOperandSize( size_t nSize );
size_t popOperandSize();
@@ -725,13 +724,6 @@ size_t FormulaParserImpl::insertWhiteSpaceTokens( const
WhiteSpaceVec* pSpaces,
return pSpaces ? pSpaces-size() : 0;
}
-size_t FormulaParserImpl::getOperandSize( size_t nOpCountFromEnd, size_t
nOpIndex ) const
-{
-OSL_ENSURE( (nOpIndex nOpCountFromEnd) (nOpCountFromEnd =
maOperandSizeStack.size()),
-FormulaParserImpl::getOperandSize - invalid parameters );
-return maOperandSizeStack[ maOperandSizeStack.size() - nOpCountFromEnd +
nOpIndex ];
-}
-
void FormulaParserImpl::pushOperandSize( size_t nSize )
{
maOperandSizeStack.push_back( nSize );
commit 06a40a242fe1382a208cfb85857f371d0a6a5fa5
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 14 12:03:25 2014 +0200
-Wunused-variable
Change-Id: I3a22b16d2449a1cb2eba00164f8fca0fd022bd0a
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 6306f6a..a842d82 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -800,7 +800,7 @@ void ScTable::SortReorderByRow(
pNew-CopyAllBroadcasters(*rCell.maCell.mpFormula);
pNew-GetCode()-AdjustReferenceOnMovedOrigin(aOldPos,
aCellPos);
-sc::CellStoreType::iterator itBlk =
rCellStore.push_back(pNew);
+rCellStore.push_back(pNew);
}
break;
default:
commit 34cabe837dbb78bf7531c4bab6f50c4764e64cf5
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 14 11:29:02 2014 +0200
loplugin:unreffun
Change-Id: Idc0f3ef53f48b2e77e4cecbcdbbc44a115c6ec2e
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 4b0a37a..c956ac2 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -304,20 +304,12 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
}
}
-#else
-
-void* DbgFunc( sal_uInt16, void* ) { return NULL; }
-
#endif
+#if OSL_DEBUG_LEVEL 0
TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any caught, const
char* currentFunction, const char* fileAndLineNo)
{
-#if OSL_DEBUG_LEVEL == 0
-(void) caught;
-(void) currentFunction;
-(void) fileAndLineNo;
-#else
OString sMessage( caught an exception! );
sMessage += \nin function:;
sMessage += currentFunction;
@@ -359,9 +351,10 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const
css::uno::Any caught, const c
SAL_DETAIL_LOG_FORMAT(
SAL_DETAIL_ENABLE_LOG_WARN, SAL_DETAIL_LOG_LEVEL_WARN,
legacy.osl, fileAndLineNo, %s, sMessage.getStr());
-#endif
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/configvaluecontainer.cxx
b/unotools/source/config/configvaluecontainer.cxx
index 99a2e97..3c526e9 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -57,13 +57,10 @@ namespace utl
void bind( void* _pLocation, const Type _rType );
-boolisBound( ) const{ return ( ltUnbound
!= eLocationType ) ( NULL != pLocation ); }
const OUString getPath( ) const{ return sRelativePath; }
LocationTypegetLocType( ) const { return
eLocationType; }
void* getLocation( ) const{ return pLocation; }
const Type getDataType( ) const{ return aDataType; }
-
-bool operator == ( const NodeValueAccessor rhs ) const;
};
NodeValueAccessor::NodeValueAccessor( const OUString _rNodePath )
@@ -73,13 +70,6 @@ namespace utl
{
}
-bool NodeValueAccessor::operator == ( const NodeValueAccessor rhs ) const
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - avmedia/source
avmedia/source/opengl/oglframegrabber.cxx |7 ++-
avmedia/source/opengl/oglwindow.cxx |7 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit aa2085accb9fe7b20b36109340ee03b8a16fd43f
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Jul 14 00:21:55 2014 +0200
glTF: More rendering related error handling
If any error occurs related to glTF rendering, a question
mark is displayed at the place of the OpenGL window
(Question mark is a general concept of media objects).
Change-Id: Id7df5a47a4dd6832e640b3a7cb3c7712ebfb4408
(cherry picked from commit 58fd5a6dd6d5d599df88c9fd4ed5257577562bd9)
Reviewed-on: https://gerrit.libreoffice.org/10276
Reviewed-by: Michael Meeks michael.me...@collabora.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/avmedia/source/opengl/oglframegrabber.cxx
b/avmedia/source/opengl/oglframegrabber.cxx
index cca8cc0..2f76436 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -38,7 +38,12 @@ uno::Reference css::graphic::XGraphic SAL_CALL
OGLFrameGrabber::grabFrame( do
{
boost::scoped_arraysal_uInt8 pBuffer(new
sal_uInt8[m_rHandle.viewport.width * m_rHandle.viewport.height * 4]);
glTFHandle* pHandle = m_rHandle;
-gltf_renderer_get_bitmap(pHandle, 1, (char*)pBuffer.get(), GL_BGRA);
+int nRet = gltf_renderer_get_bitmap(pHandle, 1, (char*)pBuffer.get(),
GL_BGRA);
+if( nRet != 0 )
+{
+SAL_WARN(avmedia.opengl, Error occured while rendering to bitmap!
Error code: nRet);
+return uno::Reference css::graphic::XGraphic ();
+}
BitmapEx aBitmap =
OpenGLHelper::ConvertBGRABufferToBitmapEx(pBuffer.get(),
m_rHandle.viewport.width, m_rHandle.viewport.height);
return Graphic( aBitmap ).GetXGraphic();
}
diff --git a/avmedia/source/opengl/oglwindow.cxx
b/avmedia/source/opengl/oglwindow.cxx
index c748ca1..e02051c 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -34,7 +34,12 @@ OGLWindow::~OGLWindow()
void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException,
std::exception)
{
m_rContext.makeCurrent();
-gltf_prepare_renderer(m_rHandle);
+int nRet = gltf_prepare_renderer(m_rHandle);
+if( nRet != 0 )
+{
+SAL_WARN(avmedia.opengl, Error occured while preparing for
rendering! Error code: nRet);
+return;
+}
gltf_renderer(m_rHandle);
gltf_complete_renderer(m_rHandle);
m_rContext.swapBuffers();
___
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' - chart2/source chart2/uiconfig
chart2/source/controller/dialogs/DialogModel.cxx |4 ++
chart2/source/controller/dialogs/tp_DataSource.cxx | 29 -
chart2/source/controller/dialogs/tp_DataSource.hxx |2 -
chart2/uiconfig/ui/tp_DataSource.ui| 24 +
4 files changed, 6 insertions(+), 53 deletions(-)
New commits:
commit 2bd5cb9f62450916267ad4c6d50ebff2d824e7c0
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Sun Jun 22 04:12:04 2014 +0200
show the property mapping sequences by default
Change-Id: I32417ed53e491a66f700e77ae0fff2154fa5441c
Reviewed-on: https://gerrit.libreoffice.org/10073
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index 4cab7d9..e18c7d3 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -502,6 +502,10 @@ DialogModel::tRolesWithRanges
DialogModel::getRolesWithRanges(
// add missing optional roles
aRoles = xChartType-getSupportedOptionalRoles();
addMissingRoles(aResult, aRoles);
+
+// add missing property roles
+aRoles = xChartType-getSupportedPropertyRoles();
+addMissingRoles(aResult, aRoles);
}
}
catch( const uno::Exception ex )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 8a83c5b..99903a2 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -28,7 +28,6 @@
#include tp_DataSourceControls.hxx
#include ControllerLockGuard.hxx
#include DataSourceHelper.hxx
-#include dlg_PropertyMapping.hxx
#include com/sun/star/sheet/XRangeSelection.hpp
#include com/sun/star/table/XCellRange.hpp
#include com/sun/star/chart2/XChartType.hpp
@@ -217,7 +216,6 @@ DataSourceTabPage::DataSourceTabPage(
get(m_pFT_DATALABELS ,FT_DATALABELS);
get(m_pEDT_CATEGORIES ,EDT_CATEGORIES);
get(m_pIMB_RANGE_CAT ,IMB_RANGE_CAT);
-get(m_pBtn_AddMapping ,BTN_ADD_MAPPING);
m_pFT_CAPTION-Show(!bHideDescription);
@@ -247,9 +245,6 @@ DataSourceTabPage::DataSourceTabPage(
m_pEDT_RANGE-SetStyle( m_pEDT_RANGE-GetStyle() | WB_FORCECTRLBACKGROUND
);
m_pEDT_CATEGORIES-SetStyle( m_pEDT_CATEGORIES-GetStyle() |
WB_FORCECTRLBACKGROUND );
-// mapped properties
-m_pBtn_AddMapping-SetClickHdl( LINK( this, DataSourceTabPage,
AddMappingHdl ));
-
// set symbol font for arrows
// note: StarSymbol is substituted to OpenSymbol for OOo
Font aSymbolFont( m_pBTN_UP-GetFont());
@@ -469,12 +464,6 @@ void DataSourceTabPage::fillRoleListBox()
}
m_pLB_ROLE-SetUpdateMode( true );
-
-if(pSeriesEntry-m_xChartType
--getSupportedPropertyRoles().getLength() == 0)
-m_pBtn_AddMapping-Disable();
-else
-m_pBtn_AddMapping-Enable();
}
}
@@ -764,24 +753,6 @@ IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit*,
pEdit )
return 0;
}
-IMPL_LINK_NOARG( DataSourceTabPage, AddMappingHdl )
-{
-SeriesEntry * pSeriesEntry = dynamic_cast SeriesEntry * (
m_pLB_SERIES-FirstSelected());
-if(!pSeriesEntry)
-return 0;
-
-PropertyMappingDlg aDlg(this, pSeriesEntry-m_xChartType);
-short aRet = aDlg.Execute();
-if(aRet == RET_OK)
-{
-OUString aNewMappingName =
DialogModel::ConvertRoleFromUIToInternal(aDlg.getSelectedEntry());
-if(!aNewMappingName.isEmpty())
-m_pLB_ROLE-InsertEntry( lcl_GetRoleLBEntry( aNewMappingName,
OUString()));
-}
-
-return 0;
-}
-
void DataSourceTabPage::listeningFinished(
const OUString rNewRange )
{
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx
b/chart2/source/controller/dialogs/tp_DataSource.hxx
index b89d4d4..496333e 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -82,7 +82,6 @@ protected:
DECL_LINK( RangeUpdateDataHdl, Edit* );
DECL_LINK( UpButtonClickedHdl, void* );
DECL_LINK( DownButtonClickedHdl, void* );
-DECL_LINK( AddMappingHdl, void* );
// RangeSelectionListenerParent
virtual void listeningFinished( const OUString rNewRange ) SAL_OVERRIDE;
@@ -137,7 +136,6 @@ private:
FixedText* m_pFT_DATALABELS;//used for xy charts
Edit* m_pEDT_CATEGORIES;
PushButton*m_pIMB_RANGE_CAT;
-PushButton*m_pBtn_AddMapping;
OUString m_aFixedTextRange;
diff --git a/chart2/uiconfig/ui/tp_DataSource.ui
b/chart2/uiconfig/ui/tp_DataSource.ui
index a067a6f..f7bed1d 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -1,6 +1,7 @@
?xml version=1.0 encoding=UTF-8?
+!--
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/Library_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/Library_chartcontroller.mk|1
chart2/UIConfig_chart2.mk|1
chart2/source/controller/dialogs/dlg_PropertyMapping.cxx | 73
chart2/source/controller/dialogs/dlg_PropertyMapping.hxx | 46 -
chart2/uiconfig/ui/dlg_PropertyMapping.ui| 136 ---
5 files changed, 257 deletions(-)
New commits:
commit 8cdf36a8e98e8dbbc9cad1a72c61e91d025171c9
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Sun Jun 22 04:19:45 2014 +0200
remove now unused dialog
Change-Id: I42c340a6aee016e37ee558d46a8eab101837e9c5
Reviewed-on: https://gerrit.libreoffice.org/10074
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/chart2/Library_chartcontroller.mk
b/chart2/Library_chartcontroller.mk
index abc9e58..b7e86bf 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -105,7 +105,6 @@ $(eval $(call
gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/dialogs/dlg_InsertTitle \
chart2/source/controller/dialogs/dlg_NumberFormat \
chart2/source/controller/dialogs/dlg_ObjectProperties \
-chart2/source/controller/dialogs/dlg_PropertyMapping \
chart2/source/controller/dialogs/dlg_ShapeFont \
chart2/source/controller/dialogs/dlg_ShapeParagraph \
chart2/source/controller/dialogs/dlg_View3D \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 44f8674..d59c29e 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/datarangedialog \
chart2/uiconfig/ui/dlg_DataLabel \
chart2/uiconfig/ui/dlg_InsertErrorBars \
- chart2/uiconfig/ui/dlg_PropertyMapping \
chart2/uiconfig/ui/insertaxisdlg \
chart2/uiconfig/ui/insertgriddlg \
chart2/uiconfig/ui/inserttitledlg \
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
b/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
deleted file mode 100644
index e9a933c..000
--- a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include dlg_PropertyMapping.hxx
-
-#include DialogModel.hxx
-
-using namespace com::sun::star;
-
-namespace chart {
-
-namespace {
-
-long pListBoxTabs[] =
-{
-3,
-0, 75, 150
-};
-
-}
-
-PropertyMappingDlg::PropertyMappingDlg(Window* pParent, uno::Reference
chart2::XChartType xChartType )
-: ModalDialog(pParent, PropertyMappingDialog,
-modules/schart/ui/dlg_PropertyMapping.ui)
-{
-get(mpMappingTable, LST_PROPERTY_MAPPING);
-get(mpBtnOk, ok);
-get(mpBtnCancel, cancel);
-
-mpMappingTable-SetTabs( pListBoxTabs, MAP_APPFONT );
-uno::Sequence OUString aPropRoles =
xChartType-getSupportedPropertyRoles();
-for(sal_Int32 i = 0, n = aPropRoles.getLength(); i n; ++i)
-{
-OUString aUIString =
DialogModel::ConvertRoleFromInternalToUI(aPropRoles[i]);
-mpMappingTable-InsertEntry(aUIString);
-}
-mpBtnOk-SetClickHdl( LINK( this, PropertyMappingDlg, OkBtnHdl ) );
-mpBtnCancel-SetClickHdl( LINK( this, PropertyMappingDlg, CancelBtnHdl ) );
-}
-
-OUString PropertyMappingDlg::getSelectedEntry()
-{
-if(mpMappingTable-GetSelectionCount())
-{
-SvTreeListEntry* pEntry = mpMappingTable-FirstSelected();
-OUString aText = mpMappingTable-GetEntryText(pEntry, 0);
-return aText;
-}
-
-return OUString();
-}
-
-IMPL_LINK_NOARG(PropertyMappingDlg, OkBtnHdl)
-{
-EndDialog(RET_OK);
-return 0;
-}
-
-IMPL_LINK_NOARG(PropertyMappingDlg, CancelBtnHdl)
-{
-EndDialog(RET_CANCEL);
-return 0;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
deleted file mode 100644
index 0358a84..000
--- a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DLG_PROPERTYMAPPING_HXX
-#define
[Libreoffice-commits] core.git: 3 commits - include/sfx2 include/tools sfx2/source
include/sfx2/fcontnr.hxx | 11 +--
include/tools/ref.hxx| 27 +--
sfx2/source/inc/objshimp.hxx |2 +-
3 files changed, 23 insertions(+), 17 deletions(-)
New commits:
commit 48528e00629e746a5e091a70644b9456e5037b7f
Author: Noel Grandin n...@peralex.com
Date: Thu Jul 10 15:44:28 2014 +0200
add some comments to include/tools/ref.hxx
Change-Id: Ic38d7f5f816f2a91bfb468c0b7fb241b084a0c44
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index cc52da4..6a8a01d 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -28,6 +28,7 @@
namespace tools {
+/** T must be a class that extends SvRefBase */
templatetypename T class SvRef {
public:
SvRef(): pObj(0) {}
@@ -142,6 +143,7 @@ public:
};
+/** Classes that want to be referenced-counted via SvRefT, should extend
this base class */
class TOOLS_DLLPUBLIC SvRefBase
{
static const sal_uIntPtr SV_NO_DELETE_REFCOUNT = 0x8000;
@@ -184,27 +186,36 @@ public:
{ return nRefCount; }
};
+/** We only have one weak reference in LO, in include/sfx2/frame.hxx, class
SfxFrameWeak.
+This acts as a intermediary between SfxFrameWeak and SfxFrame_Impl.
+*/
class SvCompatWeakHdl : public SvRefBase
{
friend class SvCompatWeakBase;
void* _pObj;
+
SvCompatWeakHdl( void* pObj ) : _pObj( pObj ) {}
public:
-void ResetWeakBase( ) { _pObj = 0; }
+void ResetWeakBase( ) { _pObj = 0; }
void* GetObj(){ return _pObj; }
};
+/** We only have one place that extends this, in
sfx2/source/view/impframe.hxx, class SfxFrame_Impl,
+its function is to notify the SvCompatWeakHdl when an SfxFrame_Impl object
is deleted.
+*/
class SvCompatWeakBase
{
tools::SvRefSvCompatWeakHdl _xHdl;
public:
-SvCompatWeakHdl* GetHdl() { return _xHdl; }
-
-// does not use initializer due to compiler warnings
+// Does not use initializer due to compiler warnings,
+// because the lifetime of the _xHdl object can exceed the lifetime of
this class.
SvCompatWeakBase( void* pObj ) { _xHdl = new SvCompatWeakHdl( pObj ); }
+
~SvCompatWeakBase() { _xHdl-ResetWeakBase(); }
+
+SvCompatWeakHdl* GetHdl() { return _xHdl; }
};
#define SV_DECL_COMPAT_WEAK( ClassName )\
commit 4ed943a24b79d2e4da30bdb282143327a8bfffd8
Author: Noel Grandin n...@peralex.com
Date: Thu Jul 10 15:32:43 2014 +0200
inline SvCompatWeakHdlRef typedef
.. only used in 2 places in the same file
Change-Id: I5dc1dc77c3841bf86134f6a48597f8c1e71b2b3f
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index c2365f1..cc52da4 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -195,11 +195,9 @@ public:
void* GetObj(){ return _pObj; }
};
-typedef tools::SvRefSvCompatWeakHdl SvCompatWeakHdlRef;
-
class SvCompatWeakBase
{
-SvCompatWeakHdlRef _xHdl;
+tools::SvRefSvCompatWeakHdl _xHdl;
public:
SvCompatWeakHdl* GetHdl() { return _xHdl; }
@@ -212,7 +210,7 @@ public:
#define SV_DECL_COMPAT_WEAK( ClassName )\
class ClassName##Weak \
{ \
-SvCompatWeakHdlRef _xHdl; \
+tools::SvRefSvCompatWeakHdl _xHdl;\
public: \
inline ClassName##Weak( ) {} \
inline ClassName##Weak( ClassName* pObj ) { \
commit 6d2178b8c82ac7d2ac054e55b4221033acfab3d8
Author: Noel Grandin n...@peralex.com
Date: Thu Jul 10 15:24:02 2014 +0200
inline tools::SvRefBaseRef typedef
..it is only used in two places
Change-Id: If333936b26592ed44d3525f2eb3c21aafde7dddc
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index 8c3881a..96ebdcd 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -47,16 +47,15 @@ typedef sal_uInt16 SfxFilterContainerFlags;
class SfxRefItem : public SfxPoolItem
{
-SvRefBaseRef aRef;
+tools::SvRefSvRefBase maRef;
public:
+SfxRefItem( sal_uInt16 nWhichId, const tools::SvRefSvRefBase rValue ) :
SfxPoolItem( nWhichId )
+{ maRef = rValue; }
virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE
{ return new SfxRefItem( *this ); }
virtual bool operator==( const SfxPoolItem rL) const
SAL_OVERRIDE
-{ return ((SfxRefItem)rL).aRef == aRef; }
-SfxRefItem( sal_uInt16 nWhichId, const SvRefBaseRef rValue ) :
SfxPoolItem( nWhichId )
-{ aRef = rValue; }
-const SvRefBaseRef GetValue() const { return aRef; }
-
+{ return ((SfxRefItem)rL).maRef == maRef; }
+const tools::SvRefSvRefBase GetValue() const { return maRef; }
};
class SfxFrameWindow
diff --git
[Libreoffice-commits] core.git: configure.ac
configure.ac | 158 ++-
1 file changed, 71 insertions(+), 87 deletions(-)
New commits:
commit 986beb05e86b3a7440ce37fbabddf32754d4de7a
Author: rbuj robert@gmail.com
Date: Sat Jun 28 16:12:31 2014 +0200
OS X: SDK configuration
Adds several improvements for setting the SDK.
Change-Id: Id6aa7c972ec5f11f1a43ced90f0411e55328eef3
Reviewed-on: https://gerrit.libreoffice.org/9952
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/configure.ac b/configure.ac
index 4da4ab6..b1befc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2759,39 +2759,84 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([what Mac OS X SDK to use])
if test -z $with_macosx_sdk; then
-if test -d /Developer/SDKs/MacOSX10.6.sdk; then
-with_macosx_sdk=10.6
-elif test -d /Developer-old/SDKs/MacOSX10.6.sdk; then
-with_macosx_sdk=10.6
-elif test -d /Xcode3/SDKs/MacOSX10.6.sdk; then
-with_macosx_sdk=10.6
-elif test -d /Developer/SDKs/MacOSX10.7.sdk; then
-with_macosx_sdk=10.7
-elif test -d
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk;
then
-with_macosx_sdk=10.6
-elif test -d
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk;
then
-with_macosx_sdk=10.7
-elif test -d
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk;
then
-with_macosx_sdk=10.8
-elif test -d
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk;
then
-with_macosx_sdk=10.9
-elif test -x /usr/bin/xcode-select; then
-xcodepath=`xcode-select -print-path`
-if test -d
$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk; then
+for MACOSX_SDK_PATH in /Developer/SDKs/MacOSX10.6.sdk
/Developer-old/SDKs/MacOSX10.6.sdk /Xcode3/SDKs/MacOSX10.6.sdk; do
+if test -d $MACOSX_SDK_PATH; then
with_macosx_sdk=10.6
-elif test -d
$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk; then
+break
+fi
+done
+if test -z $with_macosx_sdk; then
+MACOSX_SDK_PATH=/Developer/SDKs/MacOSX10.7.sdk
+if test -d $MACOSX_SDK_PATH; then
with_macosx_sdk=10.7
-elif test -d
$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk; then
-with_macosx_sdk=10.8
-elif test -d
$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk; then
-with_macosx_sdk=10.9
+else
+for with_macosx_sdk in 10.6 10.7 10.8 10.9 10.10; do
+
MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk
+if test -d $MACOSX_SDK_PATH; then
+break
+fi
+done
+if test ! -d $MACOSX_SDK_PATH; then
+for with_macosx_sdk in 10.6 10.7 10.8 10.9 10.10; do
+MACOSX_SDK_PATH=`xcrun --sdk macosx${with_macosx_sdk}
--show-sdk-path 2 /dev/null`
+if test -d $MACOSX_SDK_PATH; then
+break
+else
+MACOSX_SDK_PATH=`xcode-select
-print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk
+if test -d $MACOSX_SDK_PATH; then
+break
+fi
+fi
+done
+if test ! -d $MACOSX_SDK_PATH; then
+AC_MSG_ERROR([Could not figure out the location of a
Mac OS X SDK and its version])
+fi
+fi
fi
fi
-if test -z $with_macosx_sdk; then
-AC_MSG_ERROR([Could not figure out the location of a Mac OS X SDK
and its version])
+else
+# with --with-macosx-sdk=something
+case $with_macosx_sdk in
+10.5|10.6)
+if test -d /Developer-old/SDKs/MacOSX${with_macosx_sdk}.sdk; then
+
MACOSX_SDK_PATH=/Developer-old/SDKs/MacOSX${with_macosx_sdk}.sdk
+elif test -d /Xcode3/SDKs/MacOSX${with_macosx_sdk}.sdk; then
+MACOSX_SDK_PATH=/Xcode3/SDKs/MacOSX${with_macosx_sdk}.sdk
+fi
+;;
+esac
+if test -z $MACOSX_SDK_PATH; then
+case $with_macosx_sdk in
+10.5|10.6|10.7)
+if test -d
[GSoC] Varga Mihai - progress report week 8
Hello, Last week I've worked on the SharePoint connection, namely on the authentication and the object representation. Best regards, Mihai ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/UnpackedTarball_coinmp.mk |3
external/coinmp/macosx.build.patch.1 | 315 ++
2 files changed, 317 insertions(+), 1 deletion(-)
New commits:
commit 2729671e358bf713048a393c1343054339876460
Author: rbuj robert@gmail.com
Date: Fri Jul 11 12:35:03 2014 +0200
coinmp: macosx.build.patch
Fix UNAME_PROCESSOR detection in Mac OS X.
Add a filter expression before to apply a platform-specific patch.
Change-Id: I9fc4cf790f16255f4e807e070dbae0e5a1f28781
Reviewed-on: https://gerrit.libreoffice.org/10227
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk
b/external/coinmp/UnpackedTarball_coinmp.mk
index d2d9f0c..5937f16 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -20,7 +20,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-format-security.patch.0 \
external/coinmp/werror-undef.patch.0 \
- external/coinmp/windows.build.patch.1 \
+ $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \
+ $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/macosx.build.patch.1
b/external/coinmp/macosx.build.patch.1
new file mode 100644
index 000..8130836
--- /dev/null
+++ b/external/coinmp/macosx.build.patch.1
@@ -0,0 +1,315 @@
+--- coinmp/BuildTools/config.guess
coinmp/BuildTools/config.guess
+@@ -1232,9 +1232,31 @@
+ exit ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++ eval $set_cc_for_build
++ if test $UNAME_PROCESSOR = unknown ; then
++ UNAME_PROCESSOR=powerpc
++ fi
++ if test `echo $UNAME_RELEASE | sed -e 's/\..*//'` -le 10 ; then
++ if [ $CC_FOR_BUILD != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif')
| \
++ (CCOPTS= $CC_FOR_BUILD -E - 2/dev/null) | \
++ grep IS_64BIT_ARCH /dev/null
++ then
+ case $UNAME_PROCESSOR in
+- unknown) UNAME_PROCESSOR=powerpc ;;
++ i386) UNAME_PROCESSOR=x86_64 ;;
++ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
++ fi
++ fi
++ elif test $UNAME_PROCESSOR = i386 ; then
++ # Avoid executing cc on OS X 10.9, as it ships with a stub
++ # that puts up a graphical alert prompting to install
++ # developer tools. Any system running Mac OS X 10.7 or
++ # later (Darwin 11 and later) is required to have a 64-bit
++ # processor. This is not true of the ARM version of Darwin
++ # that Apple uses in portable devices.
++ UNAME_PROCESSOR=x86_64
++ fi
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+--- coinmp/Cbc/config.guess
coinmp/Cbc/config.guess
+@@ -1232,9 +1232,31 @@
+ exit ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++ eval $set_cc_for_build
++ if test $UNAME_PROCESSOR = unknown ; then
++ UNAME_PROCESSOR=powerpc
++ fi
++ if test `echo $UNAME_RELEASE | sed -e 's/\..*//'` -le 10 ; then
++ if [ $CC_FOR_BUILD != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif')
| \
++ (CCOPTS= $CC_FOR_BUILD -E - 2/dev/null) | \
++ grep IS_64BIT_ARCH /dev/null
++ then
+ case $UNAME_PROCESSOR in
+- unknown) UNAME_PROCESSOR=powerpc ;;
++ i386) UNAME_PROCESSOR=x86_64 ;;
++ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
++ fi
++ fi
++ elif test $UNAME_PROCESSOR = i386 ; then
++ # Avoid executing cc on OS X 10.9, as it ships with a stub
++ # that puts up a graphical alert prompting to install
++ # developer tools. Any system running Mac OS X 10.7 or
++ # later (Darwin 11 and later) is required to have a 64-bit
++ # processor. This is not true of the ARM version of Darwin
++ # that Apple uses in portable devices.
++ UNAME_PROCESSOR=x86_64
++ fi
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+--- coinmp/Cgl/config.guess
coinmp/Cgl/config.guess
+@@ -1232,9 +1232,31 @@
+ exit ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++ eval $set_cc_for_build
++ if test $UNAME_PROCESSOR = unknown ; then
++ UNAME_PROCESSOR=powerpc
++ fi
++ if test `echo $UNAME_RELEASE | sed
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa sw/source
sw/qa/extras/rtfimport/data/fdo80905.rtf | 12
sw/qa/extras/rtfimport/rtfimport.cxx | 10 ++
sw/source/core/unocore/unofield.cxx |4 ++--
3 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit a4fd1b2eafcc49486cb6a360d792f779659b68e2
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sun Jul 13 18:02:29 2014 +0200
fdo#80905 SwXTextFieldMasters::hasByName(): sync with SwXFieldMaster
Normally a mail merge field has a name like
css.text.fieldmaster.DataBase.datasource name.table name.column
name, however this isn't enforced: just
css.text.fieldmaster.DataBase.TEST is also accepted (even if its
semantics are ~undefined).
If SwXFieldMaster::setPropertyValue() allows setting such a field master
name, then SwXTextFieldMasters::hasByName() should not ignore such field
masters that have no dot in their name (TEST) or use Database, not
DataBase, otherwise (sane) client code in writerfilter ends up with
hasByName() returning false, but setPropertyValue() throwing an
exception, because the field master does have such a name.
This fixes DOCX/RTF import of multiple mail merge fields with the same
field command.
(cherry picked from commit d0a7a60cfa1a34ec7218656489b7463cd9eb1aad)
Conflicts:
sw/source/core/unocore/unofield.cxx
Change-Id: I498eabace25f8e466b3504ba13fa3060d4ba22da
Reviewed-on: https://gerrit.libreoffice.org/10269
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/rtfimport/data/fdo80905.rtf
b/sw/qa/extras/rtfimport/data/fdo80905.rtf
new file mode 100644
index 000..c088fe0
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo80905.rtf
@@ -0,0 +1,12 @@
+{\rtf1
+\pard\plain
+{\field
+{\*\fldinst MERGEFIELD TEST \\* Upper \\* MERGEFORMAT}
+{\fldrslt \'abTEST\'bb}
+}
+{\field
+{\*\fldinst MERGEFIELD TEST \\* Upper \\* MERGEFORMAT}
+{\fldrslt \'abTEST\'bb}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 4fd6941..6f6dede 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1709,6 +1709,16 @@ DECLARE_RTFIMPORT_TEST(testFdo73241, fdo73241.rtf)
CPPUNIT_ASSERT_EQUAL(1, getPages());
}
+DECLARE_RTFIMPORT_TEST(testFdo80905, fdo80905.rtf)
+{
+uno::Referencetext::XTextFieldsSupplier xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xFieldsAccess(xTextFieldsSupplier-getTextFields());
+uno::Referencecontainer::XEnumeration
xFields(xFieldsAccess-createEnumeration());
+xFields-nextElement();
+// The problem was that there was only one field in the document, but
there should be true.
+CPPUNIT_ASSERT_EQUAL(true, static_castbool(xFields-hasMoreElements()));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 3043353..56be0c0 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2674,11 +2674,11 @@ static sal_uInt16 lcl_GetIdByName( OUString rName,
OUString rTypeName )
if( sUIName != sFldTypName )
rName = comphelper::string::setToken(rName, 1, '.', sUIName);
}
-else if (rTypeName == DataBase)
+else if (rTypeName.equalsIgnoreAsciiCase(DataBase))
{
rName = rName.copy(RTL_CONSTASCII_LENGTH(DataBase.));
sal_uInt16 nDotCount = comphelper::string::getTokenCount(rName, '.');
-if( 2 = nDotCount )
+if( 1 = nDotCount )
{
// #i51815#
rName = DataBase. + rName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'test/for/libreoffice-4-2' - 0 commits -
Rebased ref, commits from common ancestor: ___ 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' - sax/source
sax/source/fastparser/fastparser.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit b8d8ec78c3e242d94963beef5aff6335f047ef59
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Jul 11 20:49:33 2014 +0100
fdo#81214 - tolerate exceptions thrown inside XFastParser callbacks.
Not an ideal solution; ideally we should not throw the exceptions,
and stop the parser as soon as something bad like this happens; but
hopefully exception throwing is reasonable exceptional.
Change-Id: If619592533b2929c671e2b03eb8a83480bd92c54
Reviewed-on: https://gerrit.libreoffice.org/10289
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index e10ce3f..2ae9abf 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -627,12 +627,11 @@ void Entity::throwException( const ::rtl::Reference
FastLocatorImpl xDocumen
// the consuming thread.
void Entity::saveException( const Exception e )
{
-// only store the first exception
-if( !maSavedException.hasValue() )
-{
-maSavedException = e;
-XML_StopParser( mpParser, /* resumable? */ XML_FALSE );
-}
+// fdo#81214 - allow the parser to run on after an exception,
+// unexpectedly some 'startElements' produce an UNO_QUERY_THROW
+// for XComponent; and yet expect to continue parsing.
+SAL_WARN(sax, Unexpected exception from XML parser e.Message);
+maSavedException = e;
}
} // namespace
___
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-chained-text-boxes' - 2 commits - include/svx svx/source
include/svx/svdotext.hxx|4 +
svx/source/svdraw/svdotext.cxx |5 --
svx/source/svdraw/svdotextdecomposition.cxx | 57 +++-
3 files changed, 58 insertions(+), 8 deletions(-)
New commits:
commit 643d9cf5e73e523c88d1b545dd27d98feb1bf088
Author: matteocam matteo.campane...@gmail.com
Date: Mon Jul 14 14:22:43 2014 +0200
Copying text from one box to another
Change-Id: I0465b22d3e7746c3b778c148eccc8bc08dc3c2ae
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 7a7226a..44c652a 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -586,6 +586,7 @@ public:
const drawinglayer::primitive2d::SdrStretchTextPrimitive2D
rSdrStretchTextPrimitive,
const drawinglayer::geometry::ViewInformation2D aViewInformation)
const;
+void impCopyTextInTextObj(SdrTextObj *pNextTextObj) const;
// timing generators
void impGetBlinkTextTiming(drawinglayer::animation::AnimationEntryList
rAnimList) const;
@@ -596,6 +597,7 @@ public:
Also checks for one empty paragraph.
*/
static bool HasTextImpl( SdrOutliner* pOutliner );
+
};
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 0c53ea3..f44499c 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -103,6 +103,7 @@ namespace
void impFlushLinePrimitivesToParagraphPrimitives();
void impHandleDrawPortionInfo(const DrawPortionInfo rInfo);
void impHandleDrawBulletInfo(const DrawBulletInfo rInfo);
+void impHandleTruncatedPortion(const DrawPortionInfo rInfo);
public:
impTextBreakupHandler(SdrOutliner rOutliner)
@@ -525,7 +526,7 @@ namespace
if ( bTruncateText ) // truncate text
-impHandleTruncatedPortion(rInfo)
+impHandleTruncatedPortion(rInfo);
else // no chaining or truncating
impCreateTextPortionPrimitive(rInfo);
@@ -553,10 +554,33 @@ namespace
// make text portion primitive with the first part of the portion
impCreateTextPortionPrimitive(rTruncatedPortionInfo);
-// if text is left in original portion send it back to editeng
+/* Some Experiments */
+
+const SdrTextObj *pCurTextObj = mrOutliner.GetTextObj();
+// page for list of objects
+SdrPage *pPage = pCurTextObj-GetPage();
+
+// we use (text) object 0 and 1 for these experiments
+// we can try to set text of obj 0 to obj 1 or something
+
+SdrTextObj *pNextTextObj;
+if ( pPage-GetObjCount() 1) {
+pNextTextObj = dynamic_cast SdrTextObj * (
+pPage-GetObj(1) );
+} else {
+fprintf(stderr, Make New Object please\n);
+return;
+}
+
+pCurTextObj-impCopyTextInTextObj(pNextTextObj);
+
+/* End Experiments */
+
+// if text is left in original portion, send it back to editeng
// FIXME(matteocam)
}
+
void impTextBreakupHandler::impHandleDrawBulletInfo(const DrawBulletInfo
rInfo)
{
basegfx::B2DHomMatrix aNewTransform;
@@ -760,6 +784,35 @@ void SdrTextObj::impDecomposeContourTextPrimitive(
rTarget = aConverter.getPrimitive2DSequence();
}
+void SdrTextObj::impCopyTextInTextObj(SdrTextObj *pNextTextObj) const
+{
+// Code from FitFrameToTextSize
+
+// trying to copy text in obj 1
+SdrText* pText = getActiveText();
+
+if( pText!=NULL pText-GetOutlinerParaObject() pModel!=NULL)
+{
+Rectangle aNextRect = pNextTextObj-aRect;
+SdrOutliner rOutliner = pNextTextObj-ImpGetDrawOutliner();
+
rOutliner.SetPaperSize(Size(aNextRect.Right()-aNextRect.Left(),aNextRect.Bottom()-aNextRect.Top()));
+rOutliner.SetUpdateMode(true);
+rOutliner.SetText(*pText-GetOutlinerParaObject());
+Size aNewSize(rOutliner.CalcTextSize());
+rOutliner.Clear();
+aNewSize.Width()++; // because of possible rounding errors
+aNewSize.Width()+=GetTextLeftDistance()+GetTextRightDistance();
+aNewSize.Height()+=GetTextUpperDistance()+GetTextLowerDistance();
+
+Rectangle aNewRect(aNextRect);
+aNewRect.SetSize(aNewSize);
+pNextTextObj-ImpJustifyRect(aNewRect);
+if (aNewRect!=aNextRect) {
+pNextTextObj-SetLogicRect(aNewRect);
+}
+}
+}
+
void SdrTextObj::impDecomposeAutoFitTextPrimitive(
drawinglayer::primitive2d::Primitive2DSequence rTarget,
const drawinglayer::primitive2d::SdrAutoFitTextPrimitive2D
rSdrAutofitTextPrimitive,
commit 569ee644106aaf90895c2a4abd01ce19cfa4bbc2
Author: matteocam matteo.campane...@gmail.com
Date: Mon Jul 14 12:42:46 2014 +0200
Removed mbChained
Change-Id: I8e6b313433ddc2827aa2c744dd8519da5838bc40
diff --git a/include/svx/svdotext.hxx
[Libreoffice-commits] core.git: download.lst external/libgltf Makefile.fetch
Makefile.fetch |3 download.lst |2 external/libgltf/UnpackedTarball_libgltf.mk | 17 -- external/libgltf/patches/comma_at_end_of_enumerator_list.patch | 51 -- external/libgltf/patches/compiler_error_fixes.patch | 41 - external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch | 76 - external/libgltf/patches/extra_semicolon.patch | 18 -- external/libgltf/patches/fix_package_file.patch | 13 - external/libgltf/patches/init_scene_set_handle.patch | 80 -- external/libgltf/patches/libgltf_configure.patch | 61 --- external/libgltf/patches/move_fps_closer_to_the_corner.patch | 12 - external/libgltf/patches/no_animation_in_orbit_mode.patch | 43 - external/libgltf/patches/no_effect_of_set_looping.patch | 14 - external/libgltf/patches/remove_config_h_in_dependencies.patch | 12 - external/libgltf/patches/stop_a_potential_memory_leak.patch | 27 --- external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch | 12 - external/libgltf/patches/wrong_animation_state_when_set_time_to_null.patch | 12 - external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch | 13 - external/libgltf/patches/wrong_media_time_at_first_run_caused_by_uninitilized_member.patch | 11 - external/libgltf/patches/wrong_media_time_caused_by_missing_fmod.patch | 14 - 20 files changed, 3 insertions(+), 529 deletions(-) New commits: commit 11b328103f9184b98a822577aaac18d1cdbc5868 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Mon Jul 14 12:07:06 2014 +0200 Update libgltf: various fixes, memory usage optimization (second try) Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Change-Id: Ie0f65be3312688196fcca634eb396c577f991073 Reviewed-on: https://gerrit.libreoffice.org/10274 Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com Tested-by: Zolnai Tamás zolnaitamas2...@gmail.com diff --git a/Makefile.fetch b/Makefile.fetch index 1c0d53e..e8ccf5b 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -156,7 +156,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ $(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \ - $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \ $(call fetch_Optional,LIBPNG,PNG_TARBALL) \ @@ -236,6 +235,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \ ,$(call fetch_Download_item_unchecked,http://dev-www.libreoffice.org/mozilla,$(item))) + $(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ + , $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL))) @mkdir -p $(dir $@) touch $@ # vim: set noet sw=4 ts=4: diff --git a/download.lst b/download.lst index 61ef420..ee8cf9c 100644 --- a/download.lst +++ b/download.lst @@ -87,7 +87,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 -export LIBGLTF_TARBALL := 9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2 +export LIBGLTF_TARBALL := 3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
[Libreoffice-commits] core.git: 2 commits - sc/source unotools/source
sc/source/filter/oox/formulaparser.cxx |8
unotools/source/config/configvaluecontainer.cxx | 10 ++
2 files changed, 18 insertions(+)
New commits:
commit c72498d7adb1345aeed9df3398b0007549e6e0da
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 14 14:12:31 2014 +0200
Revert loplugin:unreffun
This reverts commit e3246e806cad5f9d2c05c3408adc3019da5a575d.
Which was a mistake.
diff --git a/sc/source/filter/oox/formulaparser.cxx
b/sc/source/filter/oox/formulaparser.cxx
index 1e63e9d..41331fb 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -472,6 +472,7 @@ protected:
size_t appendWhiteSpaceTokens( const WhiteSpaceVec* pSpaces );
size_t insertWhiteSpaceTokens( const WhiteSpaceVec* pSpaces,
size_t nIndexFromEnd );
+size_t getOperandSize( size_t nOpCountFromEnd, size_t
nOpIndex ) const;
voidpushOperandSize( size_t nSize );
size_t popOperandSize();
@@ -724,6 +725,13 @@ size_t FormulaParserImpl::insertWhiteSpaceTokens( const
WhiteSpaceVec* pSpaces,
return pSpaces ? pSpaces-size() : 0;
}
+size_t FormulaParserImpl::getOperandSize( size_t nOpCountFromEnd, size_t
nOpIndex ) const
+{
+OSL_ENSURE( (nOpIndex nOpCountFromEnd) (nOpCountFromEnd =
maOperandSizeStack.size()),
+FormulaParserImpl::getOperandSize - invalid parameters );
+return maOperandSizeStack[ maOperandSizeStack.size() - nOpCountFromEnd +
nOpIndex ];
+}
+
void FormulaParserImpl::pushOperandSize( size_t nSize )
{
maOperandSizeStack.push_back( nSize );
commit c29338e6e13e6f9d1b78280d8af9a92c781eb8bd
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 14 13:40:03 2014 +0200
revert bad fix
partially revert my commit 34cabe837dbb78 loplugin:unreffun
Change-Id: Idbfc9d1e43180c7c14e58c7b9417f3001d9805d4
diff --git a/unotools/source/config/configvaluecontainer.cxx
b/unotools/source/config/configvaluecontainer.cxx
index 3c526e9..99a2e97 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -57,10 +57,13 @@ namespace utl
void bind( void* _pLocation, const Type _rType );
+boolisBound( ) const{ return ( ltUnbound
!= eLocationType ) ( NULL != pLocation ); }
const OUString getPath( ) const{ return sRelativePath; }
LocationTypegetLocType( ) const { return
eLocationType; }
void* getLocation( ) const{ return pLocation; }
const Type getDataType( ) const{ return aDataType; }
+
+bool operator == ( const NodeValueAccessor rhs ) const;
};
NodeValueAccessor::NodeValueAccessor( const OUString _rNodePath )
@@ -70,6 +73,13 @@ namespace utl
{
}
+bool NodeValueAccessor::operator == ( const NodeValueAccessor rhs ) const
+{
+return ( sRelativePath == rhs.sRelativePath )
+ ( eLocationType == rhs.eLocationType )
+ ( pLocation == rhs.pLocation );
+}
+
void NodeValueAccessor::bind( void* _pLocation, const Type _rType )
{
DBG_ASSERT( !isBound(), NodeValueAccessor::bind: already bound! );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: xmlsecurity build error
On 13/07/14 19:36, Marina Latini wrote: Tried without success (with master sources updated before the build). :( [build CXX] xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx /home/build/sources/LibreOffice/libreoffice/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx: In member function ‘virtual sal_Int32 SecurityEnvironment_NssImpl::verifyCertificate(const com::sun::star::uno::Referencecom::sun::star::security::XCertificate, const com::sun::star::uno::Sequencecom::sun::star::uno::Referencecom::sun::star::security::XCertificate )’: /home/build/sources/LibreOffice/libreoffice/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx:732:66: error: ‘__CERT_NewTempCertificate’ was not declared in this scope PR_TRUE /* copyDER */); ^ make[1]: *** [/home/build/sources/LibreOffice/libreoffice/workdir/CxxObject/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.o] Errore 1 make[1]: *** Attesa per i processi non terminati can you try to build with the attached patch, it should create a preprocessed file workdir/CxxObject/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.o.ii that perhaps contains a clue about what is going on... This is my autogen.lastrun --enable-pch does removing the --enable-pch do anything about the problem? diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 6c8c574..037d940 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -54,8 +54,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ $(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS)) \ $(2) \ - -c $(3) \ - -o $(1) \ + -E $(3) \ + -o $(1).ii \ $(call gb_cxx_dep_generation_options,$(1),$(4)) \ -I$(dir $(3)) \ $(INCLUDE) \ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/guisaveas.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f3d7734af45f30a87d6de76aa3de7593d541bdc8
Author: David Tardon dtar...@redhat.com
Date: Mon Jul 14 15:07:52 2014 +0200
fdo#81304 don't parse file name as part of URL
... because the name is not URL-encoded at this point, so parsing it as
a part of the URL will interpret special characters, e.g. #.
Change-Id: I780baed1753e9674d835dc296d31c088b67d8ba7
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index b6efad1..2294772 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1279,7 +1279,8 @@ OUString ModelData_Impl::GetRecommendedName( const
OUString aSuggestedName, con
uno::UNO_QUERY );
if ( xTypeDetection.is() )
{
-INetURLObject aObj( OUString( file:///c:/ ) +
aRecommendedName );
+INetURLObject aObj( OUString( file:///c:/ ) );
+aObj.SetName( aRecommendedName );
uno::Sequence beans::PropertyValue aTypeNameProps;
if ( ( xTypeDetection-getByName( aTypeName ) =
aTypeNameProps ) aTypeNameProps.getLength() )
___
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/inc sc/source
sc/inc/formulacell.hxx |2 +-
sc/source/core/data/formulacell.cxx |4 ++--
sc/source/core/data/table3.cxx |3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit caf35a3ab2fa19134a900dcfd2dcc86936e435a5
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 11 18:35:39 2014 +0200
resolved fdo#79441 keep 3D references intact during sort
Change-Id: I9e96d8e7cb99a3c280dd24495eefb9efd6d10888
(cherry picked from commit e463de2a56453a0d2cb0b5b58e96f7639f37cdd1)
Reviewed-on: https://gerrit.libreoffice.org/10238
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 11c5cb1..49b20b1 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -160,7 +160,7 @@ public:
virtual ~ScFormulaCell();
ScFormulaCell* Clone() const;
-ScFormulaCell* Clone( const ScAddress rPos ) const;
+ScFormulaCell* Clone( const ScAddress rPos, int nCloneFlags ) const;
ScFormulaCell( ScDocument* pDoc, const ScAddress rPos );
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index af6aed4..2ff6079 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -841,9 +841,9 @@ ScFormulaCell* ScFormulaCell::Clone() const
return new ScFormulaCell(*this, *pDocument, aPos);
}
-ScFormulaCell* ScFormulaCell::Clone( const ScAddress rPos ) const
+ScFormulaCell* ScFormulaCell::Clone( const ScAddress rPos, int nCloneFlags )
const
{
-return new ScFormulaCell(*this, *pDocument, rPos);
+return new ScFormulaCell(*this, *pDocument, rPos, nCloneFlags);
}
size_t ScFormulaCell::GetHash() const
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index b544711..1b2f86c 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -683,7 +683,8 @@ void ScTable::SortReorderByRow( ScSortInfoArray* pArray,
ScProgress* pProgress )
{
assert(rCell.mpAttr);
size_t n = rCellStore.size();
-sc::CellStoreType::iterator itBlk =
rCellStore.push_back(rCell.maCell.mpFormula-Clone(aCellPos));
+sc::CellStoreType::iterator itBlk = rCellStore.push_back(
rCell.maCell.mpFormula-Clone(
+aCellPos, SC_CLONECELL_DEFAULT |
SC_CLONECELL_ADJUST3DREL));
// Join the formula cells as we fill the container.
size_t nOffset = n - itBlk-position;
___
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/tool/token.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 7aa2b94ac57b7c99e1e45d5f652a423ee603dd55
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 11 23:15:50 2014 +0200
resolved fdo#77018 keep external references intact during sort
Needs e463de2a56453a0d2cb0b5b58e96f7639f37cdd1 fix for fdo#79441 to
work.
Change-Id: Ide1cbeb4b25b17b5102977ccbdf8e6dbfcadfc60
(cherry picked from commit db0a4c2575ffba1c170d74882b0f5a6229ec072f)
Reviewed-on: https://gerrit.libreoffice.org/10243
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 4ac537f..8738877 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -529,6 +529,9 @@ bool ScToken::Is3DRef() const
if ( GetSingleRef().IsFlag3D() )
return true;
break;
+case svExternalSingleRef:
+case svExternalDoubleRef:
+return true;
default:
{
// added to avoid warnings
@@ -2261,6 +2264,20 @@ void ScTokenArray::ReadjustRelative3DReferences( const
ScAddress rOldPos,
}
}
break;
+case svExternalDoubleRef :
+{
+ScSingleRefData rRef2 =
static_castScToken*(pCode[j])-GetSingleRef2();
+ScAddress aAbs = rRef2.toAbs(rOldPos);
+rRef2.SetAddress(aAbs, rNewPos);
+}
+//! fallthru
+case svExternalSingleRef :
+{
+ScSingleRefData rRef1 =
static_castScToken*(pCode[j])-GetSingleRef();
+ScAddress aAbs = rRef1.toAbs(rOldPos);
+rRef1.SetAddress(aAbs, rNewPos);
+}
+break;
default:
{
// added to avoid warnings
___
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-chained-text-boxes' - svx/source
svx/source/svdraw/svdotextdecomposition.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 4715b14fc26ff98ef973b11d212e11d4ce300617 Author: matteocam matteo.campane...@gmail.com Date: Mon Jul 14 15:47:30 2014 +0200 Minor changes Change-Id: I9cf33ab30784c4f4f47ed57a931b9c798346410d diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index f44499c..57a3d6d 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -554,6 +554,11 @@ namespace // make text portion primitive with the first part of the portion impCreateTextPortionPrimitive(rTruncatedPortionInfo); +// for debugging purposes (skip experiments) +bool b = true; +if (b) +return; + /* Some Experiments */ const SdrTextObj *pCurTextObj = mrOutliner.GetTextObj(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/fields/cellfml.cxx | 36 ++--
sw/source/core/txtnode/atrfld.cxx |3 +++
2 files changed, 25 insertions(+), 14 deletions(-)
New commits:
commit b384441c10475c9784eae3ea501afb22e0317468
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Jul 14 13:36:56 2014 +
125228: correct consideration of InputFields in table cells are part of
table formulas
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index 4e77fdf..23abcfe 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -156,27 +156,26 @@ double SwTableBox::GetValue( SwTblCalcPara rCalcPara )
const
if ( nSttPos rTxt.Len()
( CH_TXTATR_BREAKWORD == Char || CH_TXTATR_INWORD == Char ) )
{
-SwIndex aIdx( pTxtNd, nSttPos );
-SwTxtFld * const pTxtFld = static_castSwTxtFld*(
-pTxtNd-GetTxtAttrForCharAt(aIdx.GetIndex(),
RES_TXTATR_FIELD));
-if( !pTxtFld )
+SwTxtFld * const pTxtFld =
+static_castSwTxtFld*( pTxtNd-GetTxtAttrForCharAt( nSttPos,
RES_TXTATR_FIELD ) );
+if ( pTxtFld == NULL )
break;
rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
const SwField* pFld = pTxtFld-GetFmtFld().GetField();
-switch( pFld-GetTyp()-Which() )
+switch ( pFld-GetTyp()-Which() )
{
case RES_SETEXPFLD:
-nRet = ((SwSetExpField*)pFld)-GetValue();
+nRet = ( (SwSetExpField*) pFld )-GetValue();
break;
case RES_USERFLD:
-nRet = ((SwUserFieldType*)pFld)-GetValue();
+nRet = ( (SwUserFieldType*) pFld )-GetValue();
break;
case RES_TABLEFLD:
{
-SwTblField* pTblFld = (SwTblField*)pFld;
-if( !pTblFld-IsValid() ) // ist der Wert gueltig ??
+SwTblField* pTblFld = (SwTblField*) pFld;
+if ( !pTblFld-IsValid() ) // ist der Wert gueltig ??
{
// die richtige Tabelle mitgeben!
const SwTable* pTmp = rCalcPara.pTbl;
@@ -189,20 +188,29 @@ double SwTableBox::GetValue( SwTblCalcPara rCalcPara )
const
break;
case RES_DATETIMEFLD:
-nRet = ((SwDateTimeField*)pFld)-GetValue();
+nRet = ( (SwDateTimeField*) pFld )-GetValue();
break;
case RES_JUMPEDITFLD:
-//JP 14.09.98: Bug 56112 - der Platzhalter kann nie einen
-// gueltigen Inhalt haben!
+// placeholder does not have valid content
nRet = 0;
break;
default:
-String const value(pFld-ExpandField(true));
-nRet = rCalcPara.rCalc.Calculate(value).GetDouble();
+String const value( pFld-ExpandField( true ) );
+nRet = rCalcPara.rCalc.Calculate( value ).GetDouble();
}
}
+else if ( nSttPos rTxt.Len()
+ Char == CH_TXT_ATR_INPUTFIELDSTART )
+{
+const SwTxtInputFld * pTxtInputFld =
+dynamic_cast const SwTxtInputFld* (
+pTxtNd-GetTxtAttrAt( nSttPos, RES_TXTATR_INPUTFIELD,
SwTxtNode::DEFAULT ) );
+if ( pTxtInputFld == NULL )
+break;
+nRet = rCalcPara.rCalc.Calculate( pTxtInputFld-GetFieldContent()
).GetDouble();
+}
else
{
// Ergebnis ist 0 und kein Fehler!
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index f60d07c..a6cad4c 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -28,6 +28,7 @@
#include fmtfld.hxx
#include txtfld.hxx
#include txtannotationfld.hxx
+#include docfld.hxx
#include docufld.hxx
#include doc.hxx
@@ -573,6 +574,8 @@ void SwTxtInputFld::UpdateFieldContent()
if ( pInputFld != NULL )
{
const_castSwInputField*(pInputFld)-applyFieldContent(
aNewFieldContent );
+// trigger update of fields for scenarios in which the Input
Field's content is part of e.g. a table formula
+GetTxtNode().GetDoc()-GetUpdtFlds().SetFieldsDirty( sal_True );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst external/libgltf Makefile.fetch
Makefile.fetch |3 download.lst |2 external/libgltf/UnpackedTarball_libgltf.mk | 16 -- external/libgltf/patches/comma_at_end_of_enumerator_list.patch | 51 -- external/libgltf/patches/compiler_error_fixes.patch | 41 - external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch | 76 - external/libgltf/patches/extra_semicolon.patch | 18 -- external/libgltf/patches/fix_package_file.patch | 13 - external/libgltf/patches/init_scene_set_handle.patch | 80 -- external/libgltf/patches/libgltf_configure.patch | 61 --- external/libgltf/patches/move_fps_closer_to_the_corner.patch | 12 - external/libgltf/patches/no_animation_in_orbit_mode.patch | 43 - external/libgltf/patches/no_effect_of_set_looping.patch | 14 - external/libgltf/patches/remove_config_h_in_dependencies.patch | 12 - external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch | 12 - external/libgltf/patches/wrong_animation_state_when_set_time_to_null.patch | 12 - external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch | 13 - external/libgltf/patches/wrong_media_time_at_first_run_caused_by_uninitilized_member.patch | 11 - external/libgltf/patches/wrong_media_time_caused_by_missing_fmod.patch | 14 - 19 files changed, 3 insertions(+), 501 deletions(-) New commits: commit b3af0dbd159c251480dc761a7a00204a3ad74ecb Author: Zolnai Tamás tamas.zol...@collabora.com Date: Mon Jul 14 12:07:06 2014 +0200 Update libgltf: various fixes, memory usage optimization (second try) Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Reviewed-on: https://gerrit.libreoffice.org/10274 Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com Tested-by: Zolnai Tamás zolnaitamas2...@gmail.com (cherry picked from commit 11b328103f9184b98a822577aaac18d1cdbc5868) Signed-off-by: Michael Meeks michael.me...@collabora.com Conflicts: download.lst external/libgltf/UnpackedTarball_libgltf.mk Change-Id: Ie0f65be3312688196fcca634eb396c577f991073 diff --git a/Makefile.fetch b/Makefile.fetch index 204c8f8..ffb9d66 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -156,7 +156,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ $(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \ - $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \ $(call fetch_Optional,LIBPNG,PNG_TARBALL) \ @@ -235,6 +234,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \ ,$(call fetch_Download_item_unchecked,http://dev-www.libreoffice.org/mozilla,$(item))) + $(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ + , $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL))) @mkdir -p $(dir $@) touch $@ # vim: set noet sw=4 ts=4: diff --git a/download.lst b/download.lst index f4c38b5..896646e 100644 --- a/download.lst +++ b/download.lst @@ -87,7 +87,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 -export LIBGLTF_TARBALL := 9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2 +export LIBGLTF_TARBALL := 3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2 export LIBLANGTAG_TARBALL :=
[Libreoffice-commits] core.git: oox/source vcl/source
oox/source/export/drawingml.cxx | 34 ++
vcl/source/gdi/cvtgrf.cxx |2 ++
2 files changed, 28 insertions(+), 8 deletions(-)
New commits:
commit 6e580f3f53ae2de086a08c8ba1958b67874eb9c5
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 14 12:13:21 2014 +0100
Related: fdo#52226 ensure graphics are swapped in on DrawingML::WriteImage
I imagine it would be best that the Graphics were delivered pre-swapped in
by
higher levels in case there are second level caches or more complex caching
systemed wrapped around it, so warn about it in debug mode but give it a
last-ditch shot anyway. i.e. while the .docx problem should be fixed there
is a report of a very similar .xlsx problem
Change-Id: Ie40ee10fe5cba8ff9c321f47b83e33ee2c1425fd
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6cad974..1b35cac 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -809,14 +809,32 @@ OUString DrawingML::WriteImage( const Graphic rGraphic ,
bool bRelPathToMedia )
break;
default: {
GraphicType aType = rGraphic.GetType();
-if ( aType == GRAPHIC_BITMAP ) {
-GraphicConverter::Export( aStream, rGraphic, CVT_PNG );
-sMediaType = image/png;
-pExtension = .png;
-} else if ( aType == GRAPHIC_GDIMETAFILE ) {
-GraphicConverter::Export( aStream, rGraphic, CVT_EMF );
-sMediaType = image/x-emf;
-pExtension = .emf;
+if ( aType == GRAPHIC_BITMAP GRAPHIC_GDIMETAFILE) {
+bool bSwapped = rGraphic.IsSwapOut();
+
+//Warn rather than just happily swap in because of the comments
+//in the sw export filters about needing to go through the
+//hairy SwGrfNode::SwapIn which we would subvert by swapping in
+//without it knowing about it, so while those ones are fixed we
+//probably have to assume that we should ideally be presented
+//here with already swapped in graphics.
+SAL_WARN_IF(bSwapped, oox, attempted to output swapped out
graphic);
+
+if (bSwapped)
+const_castGraphic(rGraphic).SwapIn();
+
+if ( aType == GRAPHIC_BITMAP ) {
+GraphicConverter::Export( aStream, rGraphic, CVT_PNG );
+sMediaType = image/png;
+pExtension = .png;
+} else {
+GraphicConverter::Export( aStream, rGraphic, CVT_EMF );
+sMediaType = image/x-emf;
+pExtension = .emf;
+}
+
+if (bSwapped)
+const_castGraphic(rGraphic).SwapOut();
} else {
OSL_TRACE( unhandled graphic type );
/*Earlier, even in case of unhandled graphic types we were
diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx
index 65cc919..68e4e07 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.cxx
@@ -56,6 +56,8 @@ sal_uLong GraphicConverter::Import( SvStream rIStm, Graphic
rGraphic, sal_uLon
sal_uLong GraphicConverter::Export( SvStream rOStm, const Graphic rGraphic,
sal_uLong nFormat )
{
+SAL_WARN_IF(rGraphic.IsSwapOut(), vcl.filter, exporting a swapped out
graphic!);
+
GraphicConverter* pCvt = ImplGetSVData()-maGDIData.mpGrfConverter;
sal_uLong nRet = ERRCODE_IO_GENERAL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 52226, which changed state. Bug 52226 Summary: FILESAVE Images in .docx and .xlsx files show Read-Error, probably corrupted by auto-save[Summary in comment # 31] https://bugs.freedesktop.org/show_bug.cgi?id=52226 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/footer-body-distance.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|7 ++
writerfilter/source/dmapper/PropertyMap.cxx | 53 +++-
3 files changed, 31 insertions(+), 29 deletions(-)
New commits:
commit f3145f74a2829526169a44696dbd3c16b2c5ae77
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Jul 14 15:38:51 2014 +0200
Clean up SectionPropertyMap::PrepareHeaderFooterProperties()
If you copy the class members on the stack and tweak those (and not
class members), then there is no need to manually restore the copy at
the end of the method.
Change-Id: I42b50cd6b99b6b277dd9809b40385ef6512ef141
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index eb83a35..ff76c13 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -791,32 +791,32 @@ void SectionPropertyMap::PrepareHeaderFooterProperties(
bool bFirstPage )
sal_Int32 nHeaderTop = m_nHeaderTop;
if(HasHeader(bFirstPage))
{
-m_nTopMargin = m_nHeaderTop;
-if( nTopMargin 0 nTopMargin m_nHeaderTop )
-m_nHeaderTop = nTopMargin - m_nHeaderTop;
+nTopMargin = nHeaderTop;
+if( m_nTopMargin 0 m_nTopMargin nHeaderTop )
+nHeaderTop = m_nTopMargin - nHeaderTop;
else
-m_nHeaderTop = 0;
+nHeaderTop = 0;
//minimum header height 1mm
-if( m_nHeaderTop MIN_HEAD_FOOT_HEIGHT )
-m_nHeaderTop = MIN_HEAD_FOOT_HEIGHT;
+if( nHeaderTop MIN_HEAD_FOOT_HEIGHT )
+nHeaderTop = MIN_HEAD_FOOT_HEIGHT;
}
-if( nTopMargin = 0 ) //fixed height header - see WW8Par6.hxx
+if( m_nTopMargin = 0 ) //fixed height header - see WW8Par6.hxx
{
operator[](PROP_HEADER_IS_DYNAMIC_HEIGHT) = uno::makeAny( true );
operator[](PROP_HEADER_DYNAMIC_SPACING) = uno::makeAny( true );
-operator[](PROP_HEADER_BODY_DISTANCE) = uno::makeAny( m_nHeaderTop -
MIN_HEAD_FOOT_HEIGHT );// ULSpace.Top()
-operator[](PROP_HEADER_HEIGHT) = uno::makeAny( m_nHeaderTop );
+operator[](PROP_HEADER_BODY_DISTANCE) = uno::makeAny( nHeaderTop -
MIN_HEAD_FOOT_HEIGHT );// ULSpace.Top()
+operator[](PROP_HEADER_HEIGHT) = uno::makeAny( nHeaderTop );
}
else
{
//todo: old filter fakes a frame into the header/footer to support
overlapping
//current setting is completely wrong!
-operator[](PROP_HEADER_HEIGHT) = uno::makeAny( m_nHeaderTop );
-operator[](PROP_HEADER_BODY_DISTANCE) = uno::makeAny( nTopMargin -
m_nHeaderTop );
+operator[](PROP_HEADER_HEIGHT) = uno::makeAny( nHeaderTop );
+operator[](PROP_HEADER_BODY_DISTANCE) = uno::makeAny( m_nTopMargin -
nHeaderTop );
operator[](PROP_HEADER_IS_DYNAMIC_HEIGHT) = uno::makeAny( false );
operator[](PROP_HEADER_DYNAMIC_SPACING) = uno::makeAny( false );
}
@@ -825,21 +825,21 @@ void SectionPropertyMap::PrepareHeaderFooterProperties(
bool bFirstPage )
sal_Int32 nHeaderBottom = m_nHeaderBottom;
if( HasFooter( bFirstPage ) )
{
-m_nBottomMargin = m_nHeaderBottom;
-if( nBottomMargin 0 nBottomMargin m_nHeaderBottom )
-m_nHeaderBottom = nBottomMargin - m_nHeaderBottom;
+nBottomMargin = nHeaderBottom;
+if( m_nBottomMargin 0 m_nBottomMargin nHeaderBottom )
+nHeaderBottom = m_nBottomMargin - nHeaderBottom;
else
-m_nHeaderBottom = 0;
-if( m_nHeaderBottom MIN_HEAD_FOOT_HEIGHT )
-m_nHeaderBottom = MIN_HEAD_FOOT_HEIGHT;
+nHeaderBottom = 0;
+if( nHeaderBottom MIN_HEAD_FOOT_HEIGHT )
+nHeaderBottom = MIN_HEAD_FOOT_HEIGHT;
}
-if( nBottomMargin = 0 ) //fixed height footer - see WW8Par6.hxx
+if( m_nBottomMargin = 0 ) //fixed height footer - see WW8Par6.hxx
{
operator[](PROP_FOOTER_IS_DYNAMIC_HEIGHT) = uno::makeAny( true );
operator[](PROP_FOOTER_DYNAMIC_SPACING) = uno::makeAny( true );
-operator[](PROP_FOOTER_BODY_DISTANCE) = uno::makeAny( m_nHeaderBottom
- MIN_HEAD_FOOT_HEIGHT);
-operator[](PROP_FOOTER_HEIGHT) = uno::makeAny( m_nHeaderBottom );
+operator[](PROP_FOOTER_BODY_DISTANCE) = uno::makeAny( nHeaderBottom -
MIN_HEAD_FOOT_HEIGHT);
+operator[](PROP_FOOTER_HEIGHT) = uno::makeAny( nHeaderBottom );
}
else
{
@@ -847,19 +847,13 @@ void SectionPropertyMap::PrepareHeaderFooterProperties(
bool bFirstPage )
//current setting is completely wrong!
operator[](PROP_FOOTER_IS_DYNAMIC_HEIGHT) = uno::makeAny( false );
operator[](PROP_FOOTER_DYNAMIC_SPACING) = uno::makeAny( false );
-operator[](PROP_FOOTER_HEIGHT) = uno::makeAny( nBottomMargin -
m_nHeaderBottom );
-operator[](PROP_FOOTER_BODY_DISTANCE) =
[GSoC] Copying content from one text box to another in svx/ - A failed attempt
Today I tried to embed some code to link the content of one text box to another in Draw. I took heavy inspiration from some existing code in SdrTextObj::FitFrameToTextSize() http://docs.libreoffice.org/svx/html/svdotext_8cxx_source.html#l00205. However I get a SIGSEGV in some other part of the code shortly afterwards. What I tried to do was the following: - Having two text boxes in the document, - I tried to copy (a part of) the content from SdrPage::GetObj(0) into SdrPage::GetObj(1). This occurs in svx's drawinglayer and in particular in impTextBreakupHandler. - The text is copied into the outliner of the second text box to be layouted again (simulating what FitFrameToTextSize above does. An important difference with that code is that now two different boxes are used). This is the link to the main commit: http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/gsoc14-draw-chained-text-boxesid=643d9cf5e73e523c88d1b545dd27d98feb1bf088 Here is the seg. fault message: Program received signal SIGSEGV, Segmentation fault. 0x7f5cb26d9b5c in ContentAttribs::GetItem (this=0x99a1, nWhich=4006) at /home/seriouspillow/Proiects/libreoffice/gsoc/core/editeng/source/editeng/editdoc.cxx:1804 1804if ( pStyle ( aAttribSet.GetItemState( nWhich, false ) != SFX_ITEM_ON ) ) Thorsten, any opinions? Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/formulacell.hxx |2 +-
sc/source/core/data/formulacell.cxx |4 ++--
sc/source/core/data/table3.cxx |3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 2d5e4e5a551ac7c2329f21327ff4c4aa8582d154
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 11 18:35:39 2014 +0200
resolved fdo#79441 keep 3D references intact during sort
Change-Id: I9e96d8e7cb99a3c280dd24495eefb9efd6d10888
(cherry picked from commit e463de2a56453a0d2cb0b5b58e96f7639f37cdd1)
Reviewed-on: https://gerrit.libreoffice.org/10240
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 326c4b8..2d25c9b 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -160,7 +160,7 @@ public:
~ScFormulaCell();
ScFormulaCell* Clone() const;
-ScFormulaCell* Clone( const ScAddress rPos ) const;
+ScFormulaCell* Clone( const ScAddress rPos, int nCloneFlags ) const;
ScFormulaCell( ScDocument* pDoc, const ScAddress rPos );
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index d4324a3..1397372 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -837,9 +837,9 @@ ScFormulaCell* ScFormulaCell::Clone() const
return new ScFormulaCell(*this, *pDocument, aPos);
}
-ScFormulaCell* ScFormulaCell::Clone( const ScAddress rPos ) const
+ScFormulaCell* ScFormulaCell::Clone( const ScAddress rPos, int nCloneFlags )
const
{
-return new ScFormulaCell(*this, *pDocument, rPos);
+return new ScFormulaCell(*this, *pDocument, rPos, nCloneFlags);
}
size_t ScFormulaCell::GetHash() const
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5fceab2..6a169ef 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -682,7 +682,8 @@ void ScTable::SortReorderByRow( ScSortInfoArray* pArray,
ScProgress* pProgress )
{
assert(rCell.mpAttr);
size_t n = rCellStore.size();
-sc::CellStoreType::iterator itBlk =
rCellStore.push_back(rCell.maCell.mpFormula-Clone(aCellPos));
+sc::CellStoreType::iterator itBlk = rCellStore.push_back(
rCell.maCell.mpFormula-Clone(
+aCellPos, SC_CLONECELL_DEFAULT |
SC_CLONECELL_ADJUST3DREL));
// Join the formula cells as we fill the container.
size_t nOffset = n - itBlk-position;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/tool/token.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 92216be6ce13990b8ea6b6264c656d2bc1746401
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 11 23:15:50 2014 +0200
resolved fdo#77018 keep external references intact during sort
Needs e463de2a56453a0d2cb0b5b58e96f7639f37cdd1 fix for fdo#79441 to
work.
Change-Id: Ide1cbeb4b25b17b5102977ccbdf8e6dbfcadfc60
(cherry picked from commit db0a4c2575ffba1c170d74882b0f5a6229ec072f)
Reviewed-on: https://gerrit.libreoffice.org/10245
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8f51a72..ab47bee 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -531,6 +531,9 @@ bool ScToken::Is3DRef() const
if ( GetSingleRef().IsFlag3D() )
return true;
break;
+case svExternalSingleRef:
+case svExternalDoubleRef:
+return true;
default:
{
// added to avoid warnings
@@ -2251,6 +2254,20 @@ void ScTokenArray::ReadjustRelative3DReferences( const
ScAddress rOldPos,
}
}
break;
+case svExternalDoubleRef :
+{
+ScSingleRefData rRef2 =
static_castScToken*(pCode[j])-GetSingleRef2();
+ScAddress aAbs = rRef2.toAbs(rOldPos);
+rRef2.SetAddress(aAbs, rNewPos);
+}
+//! fallthru
+case svExternalSingleRef :
+{
+ScSingleRefData rRef1 =
static_castScToken*(pCode[j])-GetSingleRef();
+ScAddress aAbs = rRef1.toAbs(rOldPos);
+rRef1.SetAddress(aAbs, rNewPos);
+}
+break;
default:
{
// added to avoid warnings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: README.Android
README.Android | 15 +++ 1 file changed, 15 insertions(+) New commits: commit d641b54efcbea5af1074acc2335fb00c6c845c1e Author: Jan Holesovsky ke...@collabora.com Date: Mon Jul 14 16:54:11 2014 +0200 android: Hint how to get the symbols, but not a 1.5G .apk. Change-Id: I6f6d2e7516d99a02ad813ba5e03c5cdcac2f4964 diff --git a/README.Android b/README.Android index 68bec24..9d022a7 100644 --- a/README.Android +++ b/README.Android @@ -63,6 +63,21 @@ to run: ndk-gdb and it will attach the process. In r8b the ndk-gdb seems to work a bit better, and I think it isn't necessary to use the mingw-and-ndk ndb-gdb any longer. +* Getting the symbols + +In order to be able to debug, you also need the symbols. Currently they are +stripped using a $(STRIP) call in android/Bootstrap/Makefile.shared ; make +sure you change it only to 'cp'. + +But then you need to limit the size of the resulting binary by other means, +that is strip most of the symbols (but the interesting ones) already during +the build. For that, use something like + +--enable-dbgutil +--enable-selective-debuginfo=sal/ + +in your autogen.input (but of course limit the --enable-selective-debuginfo +only to directories / libraries that are interesting to you). * Common Errors / Gotchas ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/fields/cellfml.cxx | 25 +
sw/source/core/txtnode/atrfld.cxx |3 +++
2 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit e465f0f4743162918dbdf2dcd50dedff00b1941c
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Jul 14 13:36:56 2014 +
Resolves: #i125228# correct consideration of InputFields...
in table cells are part of table formulas
(cherry picked from commit b384441c10475c9784eae3ea501afb22e0317468)
Conflicts:
sw/source/core/fields/cellfml.cxx
Change-Id: I4780ce0c1ac9ac911b654f61aa12938d7b225139
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index 796a18e..240c60a 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -151,22 +151,21 @@ double SwTableBox::GetValue( SwTblCalcPara rCalcPara )
const
const sal_Unicode Char = bOK ? sTxt[nSttPos] : 0;
if ( bOK (Char==CH_TXTATR_BREAKWORD || Char==CH_TXTATR_INWORD) )
{
-SwIndex aIdx( pTxtNd, nSttPos );
-SwTxtFld * const pTxtFld = static_castSwTxtFld*(
-pTxtNd-GetTxtAttrForCharAt(aIdx.GetIndex(),
RES_TXTATR_FIELD));
-if( !pTxtFld )
+SwTxtFld * const pTxtFld =
+static_castSwTxtFld*( pTxtNd-GetTxtAttrForCharAt( nSttPos,
RES_TXTATR_FIELD ) );
+if ( pTxtFld == NULL )
break;
rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
const SwField* pFld = pTxtFld-GetFmtFld().GetField();
-switch( pFld-GetTyp()-Which() )
+switch ( pFld-GetTyp()-Which() )
{
case RES_SETEXPFLD:
-nRet = ((SwSetExpField*)pFld)-GetValue();
+nRet = ( (SwSetExpField*) pFld )-GetValue();
break;
case RES_USERFLD:
-nRet = ((SwUserFieldType*)pFld)-GetValue();
+nRet = ( (SwUserFieldType*) pFld )-GetValue();
break;
case RES_TABLEFLD:
{
@@ -184,7 +183,7 @@ double SwTableBox::GetValue( SwTblCalcPara rCalcPara )
const
break;
case RES_DATETIMEFLD:
-nRet = ((SwDateTimeField*)pFld)-GetValue();
+nRet = ( (SwDateTimeField*) pFld )-GetValue();
break;
case RES_JUMPEDITFLD:
@@ -196,6 +195,16 @@ double SwTableBox::GetValue( SwTblCalcPara rCalcPara )
const
nRet = rCalcPara.rCalc.Calculate( pFld-ExpandField(true)
).GetDouble();
}
}
+else if ( nSttPos sTxt.getLength()
+ Char == CH_TXT_ATR_INPUTFIELDSTART )
+{
+const SwTxtInputFld * pTxtInputFld =
+dynamic_cast const SwTxtInputFld* (
+pTxtNd-GetTxtAttrAt( nSttPos, RES_TXTATR_INPUTFIELD,
SwTxtNode::DEFAULT ) );
+if ( pTxtInputFld == NULL )
+break;
+nRet = rCalcPara.rCalc.Calculate( pTxtInputFld-GetFieldContent()
).GetDouble();
+}
else
{
// result is 0 but no error!
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index b704710..035743b 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -21,6 +21,7 @@
#include fmtfld.hxx
#include txtfld.hxx
#include txtannotationfld.hxx
+#include docfld.hxx
#include docufld.hxx
#include doc.hxx
@@ -545,6 +546,8 @@ void SwTxtInputFld::UpdateFieldContent()
if ( pInputFld != NULL )
{
const_castSwInputField*(pInputFld)-applyFieldContent(
aNewFieldContent );
+// trigger update of fields for scenarios in which the Input
Field's content is part of e.g. a table formula
+GetTxtNode().GetDoc()-GetUpdtFlds().SetFieldsDirty( sal_True );
}
}
}
___
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/uibase/shells/textsh1.cxx | 34 ++
1 file changed, 18 insertions(+), 16 deletions(-)
New commits:
commit cdfd24fe2a45ab41c84f813eb0d6a52a9d731a79
Author: Maxim Monastirsky momonas...@gmail.com
Date: Mon Jul 14 17:22:40 2014 +0300
fdo#81231 Make this macro work again
Change-Id: If655b5ef94657b2771d4e05dd6a2c494aa0e587d
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index 76025c2..66b4f08 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1175,26 +1175,28 @@ void SwTextShell::Execute(SfxRequest rReq)
break;
case SID_ATTR_CHAR_COLOR_BACKGROUND:
{
+Color aSet;
if(pItem)
-{
-Color aSet = ((const SvxColorItem*)pItem)-GetValue();
-SwEditWin rEdtWin = GetView().GetEditWin();
-rEdtWin.SetTextBackColor(aSet);
-SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
+aSet = ((const SvxColorItem*)pItem)-GetValue();
+else
+aSet = COL_TRANSPARENT;
-if(!pApply (rWrtSh.HasSelection() || rReq.IsAPI()))
-{
-SvxBrushItem aBrushItem(RES_CHRATR_BACKGROUND);
-aBrushItem.SetColor(aSet);
-rWrtSh.SetAttrItem( aBrushItem );
-}
-else if(!pApply || pApply-nColor !=
SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
-{
-
GetView().GetViewFrame()-GetDispatcher()-Execute(SID_ATTR_CHAR_COLOR_BACKGROUND_EXT);
-}
+SwEditWin rEdtWin = GetView().GetEditWin();
+rEdtWin.SetTextBackColor(aSet);
+SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
-rReq.Done();
+if(!pApply (rWrtSh.HasSelection() || rReq.IsAPI()))
+{
+SvxBrushItem aBrushItem(RES_CHRATR_BACKGROUND);
+aBrushItem.SetColor(aSet);
+rWrtSh.SetAttrItem( aBrushItem );
}
+else if(!pApply || pApply-nColor !=
SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
+{
+
GetView().GetViewFrame()-GetDispatcher()-Execute(SID_ATTR_CHAR_COLOR_BACKGROUND_EXT);
+}
+
+rReq.Done();
}
break;
case SID_ATTR_CHAR_COLOR_BACKGROUND_EXT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Whiteboard Consistency
Hi Miklos, I mis-wrote in my last email, as i only do writer bug triaging, so luckily ww8 hasnt been used to mislead anyone. :) Regards, Jay Philips On 07/14/2014 12:44 PM, Miklos Vajna wrote: On Mon, Jul 14, 2014 at 01:58:56AM +0400, Jay Philips philip...@hotmail.com wrote: I have been using ww8 to cover all the doc/xls/etc. as i saw Stahl use it in one of his comments. I saw Joren using odf, so i've been using that sometimes. I dont see much benefit in breaking odf down into individual odf extensions as we can already limit queries by application. WW8 is just WinWord 8, i.e. what Microsoft calls [MS-DOC], using ww8 to refer to xls/ppt is misleading. Maybe just use the extension for all the cases? That's easy to understand for everyone, unlike WW8, OOXML, ODF, and others. BTW, Joel: I have no problem with whiteboard renames, though if you could please: 1) Send a mail to this list when you did rename them and 2) Do it with a script, so for the casual developer the rename is more or less atomic That would be excellent and make our lives much easier. :-) ___ List Name: Libreoffice-qa mailing list Mail address: libreoffice...@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b3/84441c10475c9784eae3ea501afb22e0317468
b3/84441c10475c9784eae3ea501afb22e0317468 |1 + 1 file changed, 1 insertion(+) New commits: commit 5a22be3cf0d829bd074b8795a684c37e439ba847 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 14 16:00:56 2014 +0100 Notes added by 'git notes add' diff --git a/b3/84441c10475c9784eae3ea501afb22e0317468 b/b3/84441c10475c9784eae3ea501afb22e0317468 new file mode 100644 index 000..2941b51 --- /dev/null +++ b/b3/84441c10475c9784eae3ea501afb22e0317468 @@ -0,0 +1 @@ +merged as: e465f0f4743162918dbdf2dcd50dedff00b1941c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/python3
external/python3/ExternalProject_python3.mk |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 38d0bde62bd5fe8022ac45c5657226761fcdaa30
Author: rbuj robert@gmail.com
Date: Sat Jul 12 11:33:57 2014 +0200
ExternalProject_python3.mk: MACOSX
To build a universal binary in Mac OS X 10.6+ with an Intel processor, it
is better to set --with-universal-archs=intel, remember that Rosetta is not
installed by default in Mac OS X v10.6 and it is neither included nor supported
in Mac OS X v10.7 or later.
If we don't use --with-universal-archs then the configure.ac sets the
architectures:
...
UNIVERSAL_ARCHS=32-bit
if test `uname -s` = Darwin
then
if test -n ${UNIVERSALSDK}
then
if test -z `/usr/bin/file
${UNIVERSALSDK}/usr/lib/libSystem.dylib | grep ppc`
then
UNIVERSAL_ARCHS=intel
fi
fi
fi
...
In Snow Leopard (Mac OS 10.6):
/usr/bin/file /Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib: Mach-O universal
binary with 4 architectures
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture
ppc7400): Mach-O dynamically linked shared library stub ppc
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture
ppc64):Mach-O 64-bit dynamically linked shared library stub ppc64
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture
i386): Mach-O dynamically linked shared library stub i386
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture
x86_64): Mach-O 64-bit dynamically linked shared library stub x86_64
/usr/bin/file /Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib
/Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib: Mach-O universal
binary with 3 architectures
/Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib (for architecture
x86_64): Mach-O 64-bit dynamically linked shared library stub x86_64
/Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib (for architecture
i386): Mach-O dynamically linked shared library stub i386
/Developer/SDKs/MacOSX10.6.sdk/usr/lib/libSystem.dylib (for architecture
ppc7400): Mach-O dynamically linked shared library stub ppc
If x86_64 (for OS X 10.8+) or PPC (for OS X 10.5) is only desired then a
universal binary is not useful and we don't have to use
--enable-universalsdk=${UNIVERSALSDK}.
Change-Id: Ib0578cfdb912fed5a803df3d2e04d2b037cfe13f
Reviewed-on: https://gerrit.libreoffice.org/10249
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 0d958bc..cabff00 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -70,7 +70,9 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
OPT=$(gb_COMPILERNOOPTFLAGS)
$(gb_DEBUG_CFLAGS))) \
$(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads
ac_cv_printf_zd_format=no) \
$(if $(filter MACOSX,$(OS)), \
- $(if $(filter
INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH)
--with-universal-archs=32-bit) \
+ $(if $(filter
INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \
+$(if $(filter
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),--with-universal-archs=32-bit,--with-universal-archs=intel)
\
+) \
--enable-framework=/@__OOO
--with-framework-name=LibreOfficePython, \
--enable-shared \
) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source include/svtools svtools/source svtools/uiconfig svtools/UIConfig_svt.mk
extensions/source/dbpilots/controlwizard.cxx |4 +--
extensions/source/dbpilots/controlwizard.hxx |1
extensions/source/dbpilots/dbpilots.src| 28 +
extensions/source/dbpilots/dbpresid.hrc| 10 ++--
extensions/source/dbpilots/gridwizard.cxx |3 +-
extensions/source/dbpilots/groupboxwiz.cxx |3 +-
extensions/source/dbpilots/listcombowizard.cxx |2 -
include/svtools/wizardmachine.hxx |1
include/svtools/wizdlg.hxx |1
svtools/UIConfig_svt.mk|3 +-
svtools/source/dialogs/wizardmachine.cxx | 13 +++
svtools/source/dialogs/wizdlg.cxx |8 +++
svtools/uiconfig/ui/wizarddialog.ui| 12 ++
13 files changed, 49 insertions(+), 40 deletions(-)
New commits:
commit 415ae835224d7af6eea5b31d43322e00e205a5cd
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Mon Jul 14 11:37:33 2014 +0200
Convert 3 dialogs to .ui
I converted RID_DLG_LISTCOMBOWIZARD, RID_DLG_GROUPBOXWIZARD and
RID_DLG_GRIDWIZARD to .ui
Change-Id: I221f22edbe4c638bfa80065d7775f78af24590cc
Reviewed-on: https://gerrit.libreoffice.org/10277
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/extensions/source/dbpilots/controlwizard.cxx
b/extensions/source/dbpilots/controlwizard.cxx
index 53179e6..6efb35a 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -275,9 +275,9 @@ namespace dbp
//= OControlWizard
-OControlWizard::OControlWizard( Window* _pParent, const ResId _rId,
+OControlWizard::OControlWizard( Window* _pParent,
const Reference XPropertySet _rxObjectModel, const Reference
XComponentContext _rxContext )
-:OWizardMachine(_pParent, _rId, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT |
WZB_FINISH)
+:OWizardMachine(_pParent, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT |
WZB_FINISH)
,m_xContext(_rxContext)
{
m_aContext.xObjectModel = _rxObjectModel;
diff --git a/extensions/source/dbpilots/controlwizard.hxx
b/extensions/source/dbpilots/controlwizard.hxx
index 971f2cc..52efe99 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -112,7 +112,6 @@ namespace dbp
public:
OControlWizard(
Window* _pParent,
-const ResId _rId,
const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet _rxObjectModel,
const ::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext _rxContext
);
diff --git a/extensions/source/dbpilots/dbpilots.src
b/extensions/source/dbpilots/dbpilots.src
index 9a7970b..aeca267 100644
--- a/extensions/source/dbpilots/dbpilots.src
+++ b/extensions/source/dbpilots/dbpilots.src
@@ -19,37 +19,13 @@
#include dbpresid.hrc
-ModalDialog RID_DLG_GROUPBOXWIZARD
+String RID_STR_GROUPWIZARD_TITLE
{
-HelpID = extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD;
Text [ en-US ] = Group Element Wizard;
-
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Moveable= TRUE ;
-Closeable = TRUE ;
-Hide= TRUE;
};
-ModalDialog RID_DLG_LISTCOMBOWIZARD
+String RID_STR_GRIDWIZARD_TITLE
{
-HelpID = extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Moveable= TRUE ;
-Closeable = TRUE ;
-Hide= TRUE;
-};
-
-ModalDialog RID_DLG_GRIDWIZARD
-{
-HelpID = extensions:ModalDialog:RID_DLG_GRIDWIZARD;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Moveable= TRUE ;
-Closeable = TRUE ;
-Hide= TRUE;
-
Text [ en-US ] = Table Element Wizard;
};
diff --git a/extensions/source/dbpilots/dbpresid.hrc
b/extensions/source/dbpilots/dbpresid.hrc
index 521f9a5..6c76237 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -44,18 +44,14 @@
#define RID_STR_TYPE_COMMAND(RID_STRING_START + 10 )
#define RID_STR_FIELDINFO_LISTBOX (RID_STRING_START + 11 )
#define RID_STR_FIELDINFO_COMBOBOX (RID_STRING_START + 12 )
+#define RID_STR_GRIDWIZARD_TITLE(RID_STRING_START + 13 )
+#define RID_STR_GROUPWIZARD_TITLE (RID_STRING_START + 14 )
// please adjust RID_STRING_END (below) when adding new strings
#define RID_STRING_END RID_STR_TIMEPOSTFIX
-// dialogs
-
-#define RID_DLG_GROUPBOXWIZARD ( RID_DIALOG_START + 1 )
-#define RID_DLG_LISTCOMBOWIZARD ( RID_DIALOG_START + 2 )
-#define RID_DLG_GRIDWIZARD ( RID_DIALOG_START + 3 )
-
// please adjust RID_DIALOG_END (below) when adding new dialogs
-#define RID_DIALOG_END RID_DLG_GRIDWIZARD
+#define
[Libreoffice-commits] core.git: svtools/uiconfig
svtools/uiconfig/ui/wizarddialog.ui |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit a27e7861470154132df1c93e3cdaf52595e4f303 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 14 16:37:39 2014 +0100 don't need any default width/height here Change-Id: I6cbf610123b88b29a81a33320ac2c6ce5e224486 diff --git a/svtools/uiconfig/ui/wizarddialog.ui b/svtools/uiconfig/ui/wizarddialog.ui index a38a515..4bc79ae 100644 --- a/svtools/uiconfig/ui/wizarddialog.ui +++ b/svtools/uiconfig/ui/wizarddialog.ui @@ -1,10 +1,9 @@ ?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=GtkWindow id=WizardDialog property name=can_focusFalse/property -property name=default_width600/property -property name=default_height400/property child placeholder/ /child ___ 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 cc9e4953efc90a3ba1a93f1c26f8fecbe09d39e1 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 14 16:43:16 2014 +0100 Updated core Project: help 00c49810c4e883958eb698f2f5b0d413077f14b1 diff --git a/helpcontent2 b/helpcontent2 index c7229c8..00c4981 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c7229c8a250f7387c090f20a0fd9171fdcd576d1 +Subproject commit 00c49810c4e883958eb698f2f5b0d413077f14b1 ___ 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
helpers/help_hid.lst |3 --- 1 file changed, 3 deletions(-) New commits: commit 00c49810c4e883958eb698f2f5b0d413077f14b1 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 14 16:43:16 2014 +0100 drop help ids that go nowhere Change-Id: Ie9a5dd1ad802a6aa00f32cee966496c6b9804fcb diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e22f90b..ba3230b 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5082,9 +5082,6 @@ extensions_ListBox_RID_DLG_SELECTION_LB_ENTRIES,1090178561, extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374, extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220, extensions_ModalDialog_RID_DLG_FORMLINKS,1090158592, -extensions_ModalDialog_RID_DLG_GRIDWIZARD,1396555776, -extensions_ModalDialog_RID_DLG_GROUPBOXWIZARD,1396523008, -extensions_ModalDialog_RID_DLG_LISTCOMBOWIZARD,1396539392, extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040, extensions_ModalDialog_RID_DLG_SELECTION,1090174976, extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/aqua
vcl/aqua/source/gdi/salnativewidgets.cxx | 28
1 file changed, 16 insertions(+), 12 deletions(-)
New commits:
commit cc147840647a02cdca5d59bef373ce4ec73ee969
Author: Herbert Dürr h...@apache.org
Date: Mon Jul 14 14:59:11 2014 +
#i125234# the scrollbar arrows disappeared in OSX=10.7
so the native-widget assumptions about the scrollbar layout has to be
adjusted.
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx
b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 37d23b5..457e3c9 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -131,6 +131,10 @@ static ThemeButtonValue ImplGetButtonValue( ButtonValue
aButtonValue )
}
}
+// the scrollbar arrows disappeared in OSX=10.7
+#define SCROLL_BUTTON_HEIGHT 0
+#define SCROLL_BUTTON_WIDTH 0
+
static bool AquaGetScrollRect( /* TODO: int nScreen, */ ControlPart nPart,
const Rectangle rControlRect, Rectangle rResultRect )
{
@@ -141,38 +145,38 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */
ControlPart nPart,
{
case PART_BUTTON_UP:
if( GetSalData()-mbIsScrollbarDoubleMax )
-rResultRect.Top() = rControlRect.Bottom() - 2*BUTTON_HEIGHT;
-rResultRect.Bottom() = rResultRect.Top() + BUTTON_HEIGHT;
+rResultRect.Top() = rControlRect.Bottom() -
2*SCROLL_BUTTON_HEIGHT;
+rResultRect.Bottom() = rResultRect.Top() + SCROLL_BUTTON_HEIGHT;
break;
case PART_BUTTON_DOWN:
-rResultRect.Top() = rControlRect.Bottom() - BUTTON_HEIGHT;
+rResultRect.Top() = rControlRect.Bottom() - SCROLL_BUTTON_HEIGHT;
break;
case PART_BUTTON_LEFT:
if( GetSalData()-mbIsScrollbarDoubleMax )
-rResultRect.Left() = rControlRect.Right() - 2*BUTTON_WIDTH;
-rResultRect.Right() = rResultRect.Left() + BUTTON_WIDTH;
+rResultRect.Left() = rControlRect.Right() -
2*SCROLL_BUTTON_WIDTH;
+rResultRect.Right() = rResultRect.Left() + SCROLL_BUTTON_WIDTH;
break;
case PART_BUTTON_RIGHT:
-rResultRect.Left() = rControlRect.Right() - BUTTON_WIDTH;
+rResultRect.Left() = rControlRect.Right() - SCROLL_BUTTON_WIDTH;
break;
case PART_TRACK_HORZ_AREA:
-rResultRect.Right() -= BUTTON_WIDTH + 1;
+rResultRect.Right() -= SCROLL_BUTTON_WIDTH + 1;
if( GetSalData()-mbIsScrollbarDoubleMax )
-rResultRect.Right() -= BUTTON_WIDTH;
+rResultRect.Right() -= SCROLL_BUTTON_WIDTH;
else
-rResultRect.Left() += BUTTON_WIDTH + 1;
+rResultRect.Left() += SCROLL_BUTTON_WIDTH + 1;
break;
case PART_TRACK_VERT_AREA:
-rResultRect.Bottom() -= BUTTON_HEIGHT + 1;
+rResultRect.Bottom() -= SCROLL_BUTTON_HEIGHT + 1;
if( GetSalData()-mbIsScrollbarDoubleMax )
-rResultRect.Bottom() -= BUTTON_HEIGHT;
+rResultRect.Bottom() -= SCROLL_BUTTON_HEIGHT;
else
-rResultRect.Top() += BUTTON_HEIGHT + 1;
+rResultRect.Top() += SCROLL_BUTTON_HEIGHT + 1;
break;
case PART_THUMB_HORZ:
if( GetSalData()-mbIsScrollbarDoubleMax )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sd/source svx/source
sc/source/ui/drawfunc/fusel.cxx |4 +++-
sd/source/ui/func/fusel.cxx |5 -
svx/source/svdraw/svddrgmt.cxx |3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 37c3cf70c724b7402588d1d32d3aa76a965ee41b
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Jul 14 18:08:51 2014 +0200
Related cp#184: Make this work for other apps too and set proper default
Extend d98c817cc71e62a2beecc7142062f9ef33a7149b and fix default.
Change-Id: I79ad35bd5ad6fbd6e7d260864d4bf40fafb6b604
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index c2e87ef..ff6ca89 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -21,6 +21,7 @@
#include editeng/eeitem.hxx
#include editeng/flditem.hxx
+#include svx/svddrgmt.hxx
#include svx/svdoole2.hxx
#include svx/svdotext.hxx
#include sfx2/dispatch.hxx
@@ -142,7 +143,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent rMEvt)
if ( bDrag )
{
aDragTimer.Start();
-pView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl);
+if (pView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl))
+pView-GetDragMethod()-SetShiftPressed( rMEvt.IsShift() );
bReturn = true;
}
}
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 354dc61..cc00317 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -19,6 +19,7 @@
#include fusel.hxx
#include basic/sbstar.hxx
+#include svx/svddrgmt.hxx
#include svx/svdpagv.hxx
#include svx/svdogrp.hxx
#include svx/polysc3d.hxx
@@ -223,7 +224,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent rMEvt)
}
if ( ! rMEvt.IsRight())
-mpView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl,
nDrgLog);
+if (mpView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl,
nDrgLog))
+mpView-GetDragMethod()-SetShiftPressed( rMEvt.IsShift()
);
bReturn = true;
}
else
@@ -485,6 +487,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent rMEvt)
mpView-MarkPoint(*pHdl);
if ( ! rMEvt.IsRight())
mpView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl,
nDrgLog);
+
}
}
else
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 9e5b5f4..04d2c59 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -640,7 +640,8 @@ SdrDragMethod::SdrDragMethod(SdrDragView rNewView)
maOverlayObjectList(),
mrSdrDragView(rNewView),
mbMoveOnly(false),
-mbSolidDraggingActive(getSdrDragView().IsSolidDragging())
+mbSolidDraggingActive(getSdrDragView().IsSolidDragging()),
+mbShiftPressed(false)
{
if(mbSolidDraggingActive
Application::GetSettings().GetStyleSettings().GetHighContrastMode())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgsvgnode.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit f6df52aa3aad9c7650b6ca051d9a28c4ccb6a060
Author: Joren De Cuyper jore...@libreoffice.org
Date: Mon Jul 14 17:57:06 2014 +0200
fdo#78554 - SVG: Text from SVG no longer displayed in LibreOffice
regression of 3b7472b284131c09d91b69f26d5d26d54648f939
Change-Id: I95a30acbf4b2684dda9684f5b51b887356a940e1
Reviewed-on: https://gerrit.libreoffice.org/10302
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com
diff --git a/svgio/source/svgreader/svgsvgnode.cxx
b/svgio/source/svgreader/svgsvgnode.cxx
index 50dbef7..73a5efb 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -58,8 +58,13 @@ namespace svgio
const SvgStyleAttributes* SvgSvgNode::getSvgStyleAttributes() const
{
-checkForCssStyle(OUString(svg), maSvgStyleAttributes);
-return maSvgStyleAttributes.getCssStyleParent();
+const SvgStyleAttributes* aCheckCssStyle =
checkForCssStyle(OUString(svg), maSvgStyleAttributes);
+const SvgStyleAttributes* aGetCssStyleParent =
maSvgStyleAttributes.getCssStyleParent();
+
+if (aGetCssStyleParent == NULL)
+return aCheckCssStyle;
+
+return aGetCssStyleParent;
}
void SvgSvgNode::parseAttribute(const OUString rTokenName, SVGToken
aSVGToken, const OUString aContent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 78554, which changed state. Bug 78554 Summary: SVG: Text from SVG no longer displayed in LibreOffice https://bugs.freedesktop.org/show_bug.cgi?id=78554 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
[GSOC] Personas - Weekly Report #8
Hello all! This week, I did the following things: + Fixed the thread related issues. LO does not crash anymore if the user is impatient ;) + Fixed the UI quirks in personalization_tab page. This week, I'm working on converting the dialog RID_SVX_MDLG_HANGULHANJA, as most of the work in my GSoC project is finished. -- Regards, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - include/svx sc/source sd/source svx/source sw/source
include/svx/svddrgmt.hxx |3 +++
include/svx/svdoashp.hxx |3 ++-
sc/source/ui/drawfunc/fusel.cxx|4 +++-
sd/source/ui/func/fusel.cxx|5 -
svx/source/svdraw/svddrgmt.cxx |3 ++-
svx/source/svdraw/svdoashp.cxx |8 +---
sw/source/core/frmedt/feshview.cxx |6 --
sw/source/ui/wrtsh/select.cxx |6 +++---
8 files changed, 26 insertions(+), 12 deletions(-)
New commits:
commit a32f8c730ae39d7c791f6c884df8773dac23b420
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Jul 14 18:08:51 2014 +0200
Related cp#184: Make this work for other apps too and set proper default
Extend d98c817cc71e62a2beecc7142062f9ef33a7149b and fix default.
(cherry picked from commit 37c3cf70c724b7402588d1d32d3aa76a965ee41b)
Conflicts:
sc/source/ui/drawfunc/fusel.cxx
sd/source/ui/func/fusel.cxx
Change-Id: I79ad35bd5ad6fbd6e7d260864d4bf40fafb6b604
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 13e1d30..7c928bd 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -21,6 +21,7 @@
#include editeng/eeitem.hxx
#include editeng/flditem.hxx
+#include svx/svddrgmt.hxx
#include svx/svdoole2.hxx
#include svx/svdotext.hxx
#include sfx2/dispatch.hxx
@@ -146,7 +147,8 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent
rMEvt)
if ( bDrag )
{
aDragTimer.Start();
-pView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl);
+if (pView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl))
+pView-GetDragMethod()-SetShiftPressed( rMEvt.IsShift() );
bReturn = sal_True;
}
}
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index b1cfce3..a3764e9 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -19,6 +19,7 @@
#include fusel.hxx
#include basic/sbstar.hxx
+#include svx/svddrgmt.hxx
#include svx/svdpagv.hxx
#include svx/svdogrp.hxx
#include svx/polysc3d.hxx
@@ -225,7 +226,8 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent
rMEvt)
}
if ( ! rMEvt.IsRight())
-mpView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl,
nDrgLog);
+if (mpView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl,
nDrgLog))
+mpView-GetDragMethod()-SetShiftPressed( rMEvt.IsShift()
);
bReturn = sal_True;
}
else
@@ -488,6 +490,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent
rMEvt)
mpView-MarkPoint(*pHdl);
if ( ! rMEvt.IsRight())
mpView-BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl,
nDrgLog);
+
}
}
else
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 5a6cba4..a54c3d2 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -639,7 +639,8 @@ SdrDragMethod::SdrDragMethod(SdrDragView rNewView)
maOverlayObjectList(),
mrSdrDragView(rNewView),
mbMoveOnly(false),
-mbSolidDraggingActive(getSdrDragView().IsSolidDragging())
+mbSolidDraggingActive(getSdrDragView().IsSolidDragging()),
+mbShiftPressed(false)
{
if(mbSolidDraggingActive
Application::GetSettings().GetStyleSettings().GetHighContrastMode())
{
commit f48d1e36c01ad9a433a916bfabb9eeb963a04d0e
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Jul 10 20:56:43 2014 +0200
Allow to move only callout handle with shift key (cp#184)
When line callout was used, you couldn't move the point next to
the rectangle.
Now it's possible with shift key pressed.
(cherry picked from commit d98c817cc71e62a2beecc7142062f9ef33a7149b)
Conflicts:
include/svx/svddrgmt.hxx
sw/source/core/frmedt/feshview.cxx
sw/source/uibase/wrtsh/select.cxx
Change-Id: I70565e4e3f80daf0e1007031ef7d49036fb0e26b
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index e5f9e0d..6595432 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -127,6 +127,7 @@ private:
// bitfield
unsignedmbMoveOnly : 1;
unsignedmbSolidDraggingActive : 1;
+unsignedmbShiftPressed : 1;
protected:
// access for derivated classes to maSdrDragEntries
@@ -193,6 +194,8 @@ public:
void Show();
void Hide();
+bool IsShiftPressed() { return mbShiftPressed; }
+void SetShiftPressed(bool bShiftPressed) { mbShiftPressed = bShiftPressed;
}
virtual void TakeSdrDragComment(OUString rStr) const=0;
virtual bool BeginSdrDrag()=0;
virtual void MoveSdrDrag(const Point rPnt)=0;
diff --git a/include/svx/svdoashp.hxx
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/text.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit bdab2dc21c42c33c92317d13cfacb4b142824d13
Author: David Tardon dtar...@redhat.com
Date: Mon Jul 14 18:50:14 2014 +0200
avoid memory leak
Change-Id: I89e458dbd01a45761948b64cb457424383ca5f51
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 7b95566..1c20f7f 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -2409,7 +2409,10 @@ bool OutputDevice::GetTextBoundRect( Rectangle rRect,
Point aOffset( nWidth/2, 8 );
Size aOutSize( nWidth + 2*aOffset.X(), nHeight + 2*aOffset.Y() );
if( !nWidth || !aVDev.SetOutputSizePixel( aOutSize ) )
+{
+pSalLayout-Release();
return false;
+}
// draw text in black
pSalLayout-DrawBase() = aOffset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/source writerfilter/qa
sd/source/ui/app/res_bmp.src |2 +-
sd/source/ui/app/strings.src |2 +-
writerfilter/qa/cppunittests/misc/misc.cxx | 17 -
3 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 2e95e551c52ba6054ab52506aa6f19ecf647d624
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 14 18:55:24 2014 +0200
writerfilter: add unit test for Fraction initialization
... as used by wrap polygon import, see fdo#41068 fdo#76803.
Change-Id: I4467560c2c3bbdab3fc9f8cd7a0c0b415429186c
diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx
b/writerfilter/qa/cppunittests/misc/misc.cxx
index 0bc7da4..0db80cc 100644
--- a/writerfilter/qa/cppunittests/misc/misc.cxx
+++ b/writerfilter/qa/cppunittests/misc/misc.cxx
@@ -22,7 +22,9 @@
#include rtl/ustring.hxx
#include dmapper/ConversionHelper.hxx
#include dmapper/DomainMapper_Impl.hxx
-
+#define private public
+#include ../../../source/resourcemodel/Fraction.cxx
+#undef private
using namespace std;
@@ -37,10 +39,12 @@ public:
virtual void tearDown() SAL_OVERRIDE;
void testTwipConversions();
+void testFraction();
void testFieldParameters();
CPPUNIT_TEST_SUITE(WriterfilterMiscTest);
CPPUNIT_TEST(testTwipConversions);
+CPPUNIT_TEST(testFraction);
CPPUNIT_TEST(testFieldParameters);
CPPUNIT_TEST_SUITE_END();
};
@@ -73,6 +77,17 @@ void WriterfilterMiscTest::testTwipConversions()
CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), convertTwipToMM100Unsigned(4));
}
+void WriterfilterMiscTest::testFraction()
+{
+using writerfilter::resourcemodel::Fraction;
+Fraction f1(-928800, 2717);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-928800), f1.mnNumerator); // became
positive
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2717), f1.mnDenominator);
+Fraction f2(-220869, 1350);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-24541), f2.mnNumerator); // became positive
+CPPUNIT_ASSERT_EQUAL(sal_Int32(150), f2.mnDenominator);
+}
+
void WriterfilterMiscTest::testFieldParameters()
{
using writerfilter::dmapper::lcl_SplitFieldCommand;
commit b55b96589f7fe0b2f426c2472da7174ab95aab87
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 14 18:05:24 2014 +0200
sd: stop calling graphics styles Image Styles
(regression from a71a562a9958fc58a5fb914bcf7f8056a353f618)
Change-Id: Ie3a44a80c720f59831bc2b1da91792fb8aa24d62
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index c68e9ad..2074202 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -240,7 +240,7 @@ Bitmap BMP_GRAPHIC
};
#define SfxStyleFamiliesRes1\
-Text [ en-US ] = Image Styles ;\
+Text [ en-US ] = Drawing Object Styles ;\
#define SfxStyleFamiliesRes2\
Text [ en-US ] = Presentation Styles ;\
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index b8b5237..38c3725 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1142,7 +1142,7 @@ String STR_TASKPANEL_LAYOUT_MENU_TITLE
};
String STR_GRAPHICS_STYLE_FAMILY
{
-Text [ en-US ] = Image Styles;
+Text [ en-US ] = Drawing Object Styles;
};
String STR_CELL_STYLE_FAMILY
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit a113d3a7518f65acb1d2919fe3da9c6f22d6f490
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Jul 14 20:02:54 2014 +0200
error: unused variable 'TIMEOUT'
Change-Id: I9fe3078e2c4ea4a63efcc3e26a090c8e3cbc7ccc
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 540615b..62e5ec9 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -170,7 +170,6 @@ namespace {
const float TEXT_HEIGHT = 10.0f;
float DEFAULT_CAMERA_HEIGHT = 500.0f;
-const sal_uLong TIMEOUT = 5;
const sal_uInt32 ID_STEP = 10;
#if 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Changes in SvgSvgNode::getSvgStyleAttributes()
Hi all, I see some changes in fdo#78554 which I do not understand. In AOO the method SvgSvgNode::getSvgStyleAttributes() is a simple getter for the member maSvgStyleAttributes. First was a change in commit 1d89cd08ab3566375e30b17f1b17bc240ca907a4. But the commit message does not mention, what problem this change solves. I see no bug report and no test document. The following changes try to solve a problem which seems to be introduced with the above mentioned commit. I ask, because AOO has no problems with the file attached to fdo#78554. The text is there when opening via File Open and same when insert via Insert Picture. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - download.lst external/libgltf Makefile.fetch
Makefile.fetch |3 download.lst |2 external/libgltf/UnpackedTarball_libgltf.mk | 16 -- external/libgltf/patches/comma_at_end_of_enumerator_list.patch | 51 -- external/libgltf/patches/compiler_error_fixes.patch | 41 - external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch | 76 - external/libgltf/patches/extra_semicolon.patch | 18 -- external/libgltf/patches/fix_package_file.patch | 13 - external/libgltf/patches/init_scene_set_handle.patch | 80 -- external/libgltf/patches/libgltf_configure.patch | 61 --- external/libgltf/patches/move_fps_closer_to_the_corner.patch | 12 - external/libgltf/patches/no_animation_in_orbit_mode.patch | 43 - external/libgltf/patches/no_effect_of_set_looping.patch | 14 - external/libgltf/patches/remove_config_h_in_dependencies.patch | 12 - external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch | 12 - external/libgltf/patches/wrong_animation_state_when_set_time_to_null.patch | 12 - external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch | 13 - external/libgltf/patches/wrong_media_time_at_first_run_caused_by_uninitilized_member.patch | 11 - external/libgltf/patches/wrong_media_time_caused_by_missing_fmod.patch | 14 - 19 files changed, 3 insertions(+), 501 deletions(-) New commits: commit 1293b2fde524de3668a831bfe962eb9291d7a4ae Author: Zolnai Tamás tamas.zol...@collabora.com Date: Mon Jul 14 12:07:06 2014 +0200 Update libgltf: various fixes, memory usage optimization (second try) Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Reviewed-on: https://gerrit.libreoffice.org/10274 Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com Tested-by: Zolnai Tamás zolnaitamas2...@gmail.com (cherry picked from commit 11b328103f9184b98a822577aaac18d1cdbc5868) Conflicts: download.lst external/libgltf/UnpackedTarball_libgltf.mk Change-Id: Ie0f65be3312688196fcca634eb396c577f991073 Reviewed-on: https://gerrit.libreoffice.org/10293 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-by: Jan Holesovsky ke...@collabora.com Tested-by: Jan Holesovsky ke...@collabora.com diff --git a/Makefile.fetch b/Makefile.fetch index 204c8f8..ffb9d66 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -156,7 +156,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ $(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \ - $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \ $(call fetch_Optional,LIBPNG,PNG_TARBALL) \ @@ -235,6 +234,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \ ,$(call fetch_Download_item_unchecked,http://dev-www.libreoffice.org/mozilla,$(item))) + $(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ + , $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL))) @mkdir -p $(dir $@) touch $@ # vim: set noet sw=4 ts=4: diff --git a/download.lst b/download.lst index cf5633f..51fe452 100644 --- a/download.lst +++ b/download.lst @@ -87,7 +87,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export
Re: Changes in SvgSvgNode::getSvgStyleAttributes()
Hi, On Mon, Jul 14, 2014 at 8:15 PM, Regina Henschel rb.hensc...@t-online.de wrote: Hi all, I see some changes in fdo#78554 which I do not understand. In AOO the method SvgSvgNode::getSvgStyleAttributes() is a simple getter for the member maSvgStyleAttributes. First was a change in commit 1d89cd08ab3566375e30b17f1b17bc240ca907a4. But the commit message does not mention, what problem this change solves. I see no bug report and no test document. [1] is the test document - it doesn't work correctly in AOO 4.1 I have reverse engeneered what fdo#78554 wants to fix and started writing a test, but it is not really finished yet. The following changes try to solve a problem which seems to be introduced with the above mentioned commit. I ask, because AOO has no problems with the file attached to fdo#78554. The text is there when opening via File Open and same when insert via Insert Picture. Kind regards Regina [1] http://cgit.freedesktop.org/libreoffice/core/tree/svgio/qa/cppunit/data/RectWithParentStyles.svg ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/export/drawingml.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ed64e620ea1fd077a5ffb7f756269eae89991b46
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 14 20:14:56 2014 +0100
oh for the love of...
Change-Id: I5cb90f10112afda77e68035d89cb7026d6e32eec
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 1b35cac..274453e 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -809,7 +809,7 @@ OUString DrawingML::WriteImage( const Graphic rGraphic ,
bool bRelPathToMedia )
break;
default: {
GraphicType aType = rGraphic.GetType();
-if ( aType == GRAPHIC_BITMAP GRAPHIC_GDIMETAFILE) {
+if ( aType == GRAPHIC_BITMAP || aType == GRAPHIC_GDIMETAFILE) {
bool bSwapped = rGraphic.IsSwapOut();
//Warn rather than just happily swap in because of the comments
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Changes in SvgSvgNode::getSvgStyleAttributes()
On Mon, Jul 14, 2014 at 9:05 PM, Tomaž Vajngerl qui...@gmail.com wrote: I have reverse engeneered what fdo#78554 wants to fix and started writing a test, but it is not really finished yet. I mean what 1d89cd08ab3566375e30b17f1b17bc240ca907a4 wants to fix... Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source
sd/source/ui/app/res_bmp.src |2 +-
sd/source/ui/app/strings.src |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 76e02dba9769bf1ea8c79c189b924f4d79f97ca4
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 14 18:05:24 2014 +0200
sd: stop calling graphics styles Image Styles
(regression from a71a562a9958fc58a5fb914bcf7f8056a353f618)
Change-Id: Ie3a44a80c720f59831bc2b1da91792fb8aa24d62
(cherry picked from commit b55b96589f7fe0b2f426c2472da7174ab95aab87)
Reviewed-on: https://gerrit.libreoffice.org/10307
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index cc48996..719bf99 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -240,7 +240,7 @@ Bitmap BMP_GRAPHIC
};
#define SfxStyleFamiliesRes1\
-Text [ en-US ] = Image Styles ;\
+Text [ en-US ] = Drawing Object Styles ;\
#define SfxStyleFamiliesRes2\
Text [ en-US ] = Presentation Styles ;\
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index b7f916c..6ec1d5d 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1146,7 +1146,7 @@ String STR_TASKPANEL_LAYOUT_MENU_TITLE
};
String STR_GRAPHICS_STYLE_FAMILY
{
-Text [ en-US ] = Image Styles;
+Text [ en-US ] = Drawing Object Styles;
};
String STR_CELL_STYLE_FAMILY
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cc/147840647a02cdca5d59bef373ce4ec73ee969
cc/147840647a02cdca5d59bef373ce4ec73ee969 |1 + 1 file changed, 1 insertion(+) New commits: commit 4aae7cafd391c22283c676db8961cc0e68768fa8 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 14 20:28:49 2014 +0100 Notes added by 'git notes add' diff --git a/cc/147840647a02cdca5d59bef373ce4ec73ee969 b/cc/147840647a02cdca5d59bef373ce4ec73ee969 new file mode 100644 index 000..da343ca --- /dev/null +++ b/cc/147840647a02cdca5d59bef373ce4ec73ee969 @@ -0,0 +1 @@ +prefer: e8c467d134c1c49d2b25c72fbd45dd1c6b77b171 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sc/inc sc/qa sc/source
sc/inc/chgtrack.hxx | 72 ++
sc/qa/unit/data/xls/track-changes/simple-cell-changes.xls |binary
sc/qa/unit/subsequent_export-test.cxx | 162 +-
sc/source/core/tool/chgtrack.cxx | 100 +++-
sc/source/filter/inc/XclExpChangeTrack.hxx|5
sc/source/filter/inc/XclImpChangeTrack.hxx|2
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 17 +
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 11
8 files changed, 292 insertions(+), 77 deletions(-)
New commits:
commit adf0d7b1fb8eed88f4fcd6d31662ae6f59d00812
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Jul 14 15:24:19 2014 -0400
Preserve the end of list flag for xls round-tripping.
This end of list flag determines whether the row insertion was an
automatic insertion at the bottom. Calc doesn't use this at the moment
but Excel uses it to differentiate a normal row insertion from an
automatic one.
Change-Id: I6b28669d816c54d1dc1e4c106918ba688415788d
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index b2b6cf9..59b4058 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -421,7 +421,9 @@ class ScChangeActionIns : public ScChangeAction
{
friend class ScChangeTrack;
-ScChangeActionIns( const ScRange rRange );
+bool mbEndOfList; /// whether or not a row was auto-inserted at the bottom.
+
+ScChangeActionIns( const ScRange rRange, bool bEndOfList = false );
virtual ~ScChangeActionIns();
virtual voidAddContent( ScChangeActionContent* )
SAL_OVERRIDE {}
@@ -432,17 +434,21 @@ class ScChangeActionIns : public ScChangeAction
virtual const ScChangeTrack*GetChangeTrack() const SAL_OVERRIDE {
return 0; }
public:
-ScChangeActionIns(const sal_uLong nActionNumber,
-const ScChangeActionState eState,
-const sal_uLong nRejectingNumber,
-const ScBigRange aBigRange,
-const OUString aUser,
-const DateTime aDateTime,
-const OUString sComment,
-const ScChangeActionType eType); // only to use in the XML import
+ScChangeActionIns(
+const sal_uLong nActionNumber,
+const ScChangeActionState eState,
+const sal_uLong nRejectingNumber,
+const ScBigRange aBigRange,
+const OUString aUser,
+const DateTime aDateTime,
+const OUString sComment,
+const ScChangeActionType eType,
+bool bEndOfList = false );
virtual void GetDescription(
OUString rStr, ScDocument* pDoc, bool bSplitRange = false, bool
bWarning = true) const SAL_OVERRIDE;
+
+SC_DLLPUBLIC bool IsEndOfList() const;
};
// ScChangeActionDel
@@ -1113,7 +1119,7 @@ public:
// Only use the following two if there is no different solution! (Assign
// string for NewValue or creation of a formula respectively)
-SC_DLLPUBLIC void AppendInsert( const ScRange );
+SC_DLLPUBLIC void AppendInsert( const ScRange rRange, bool bEndOfList =
false );
// pRefDoc may be NULL = no lookup of contents
// = no generation of deleted contents
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 4b57b71..a18d0d3 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -652,8 +652,9 @@ void ScChangeAction::AddDependent( sal_uLong nActionNumber,
}
// ScChangeActionIns
-ScChangeActionIns::ScChangeActionIns( const ScRange rRange )
-: ScChangeAction( SC_CAT_NONE, rRange )
+ScChangeActionIns::ScChangeActionIns( const ScRange rRange, bool bEndOfList )
:
+ScChangeAction(SC_CAT_NONE, rRange),
+mbEndOfList(bEndOfList)
{
if ( rRange.aStart.Col() == 0 rRange.aEnd.Col() == MAXCOL )
{
@@ -684,8 +685,10 @@ ScChangeActionIns::ScChangeActionIns(
const sal_uLong nActionNumber, const ScChangeActionState eStateP,
const sal_uLong nRejectingNumber, const ScBigRange aBigRangeP,
const OUString aUserP, const DateTime aDateTimeP,
-const OUString sComment, const ScChangeActionType eTypeP) :
-ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber,
eStateP, aDateTimeP, aUserP, sComment)
+const OUString sComment, const ScChangeActionType eTypeP,
+bool bEndOfList ) :
+ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber,
eStateP, aDateTimeP, aUserP, sComment),
+mbEndOfList(bEndOfList)
{
}
@@ -728,6 +731,11 @@ void ScChangeActionIns::GetDescription(
}
}
+bool ScChangeActionIns::IsEndOfList() const
+{
+return mbEndOfList;
+}
+
bool ScChangeActionIns::Reject( ScDocument* pDoc )
{
if ( !aBigRange.IsValid( pDoc ) )
@@ -2848,9 +2856,9 @@ ScChangeActionContent*
ScChangeTrack::AppendContentOnTheFly(
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - sc/source
sc/source/core/tool/interpr1.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 874859a8feb8cfadd7f491ebae99ff8aa5fd43c7
Author: Eike Rathke er...@redhat.com
Date: Thu Jul 10 16:13:40 2014 +0200
resolved fdo#80195 act on implicitly propagated error, if any
Change-Id: I1d5a55a14fc3e25edc2cddec5b53ed2afa96bd3e
(cherry picked from commit 1093b900b43d819c9a730ef6435fed0f3687a085)
Reviewed-on: https://gerrit.libreoffice.org/10199
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a834488..a42dbad 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -255,6 +255,11 @@ void ScInterpreter::ScIfError( bool bNAonly )
{
default:
Pop();
+// Act on implicitly propagated error, if any.
+if (nOldGlobalError)
+nGlobalError = nOldGlobalError;
+if (nGlobalError)
+bError = true;
break;
case svError:
PopError();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/inc sc/source
sc/inc/chgtrack.hxx | 26 +--
sc/source/core/tool/chgtrack.cxx | 46 ---
sc/source/filter/inc/XclExpChangeTrack.hxx |5 +-
sc/source/filter/inc/XclImpChangeTrack.hxx |2 -
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 17 -
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 11 +++---
6 files changed, 68 insertions(+), 39 deletions(-)
New commits:
commit 8fd0951429bfa00a054ebbc195a480f89af9f912
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Jul 14 15:24:19 2014 -0400
Preserve the end of list flag for xls round-tripping.
This end of list flag determines whether the row insertion was an
automatic insertion at the bottom. Calc doesn't use this at the moment
but Excel uses it to differentiate a normal row insertion from an
automatic one.
(cherry picked from commit adf0d7b1fb8eed88f4fcd6d31662ae6f59d00812)
Conflicts:
sc/inc/chgtrack.hxx
sc/source/filter/xcl97/XclExpChangeTrack.cxx
Change-Id: I6b28669d816c54d1dc1e4c106918ba688415788d
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 8f83d06..3d4026b 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -423,7 +423,9 @@ class ScChangeActionIns : public ScChangeAction
{
friend class ScChangeTrack;
-ScChangeActionIns( const ScRange rRange );
+bool mbEndOfList; /// whether or not a row was auto-inserted at the bottom.
+
+ScChangeActionIns( const ScRange rRange, bool bEndOfList = false );
virtual ~ScChangeActionIns();
virtual voidAddContent( ScChangeActionContent* ) {}
@@ -434,17 +436,21 @@ class ScChangeActionIns : public ScChangeAction
virtual const ScChangeTrack*GetChangeTrack() const { return 0; }
public:
-ScChangeActionIns(const sal_uLong nActionNumber,
-const ScChangeActionState eState,
-const sal_uLong nRejectingNumber,
-const ScBigRange aBigRange,
-const OUString aUser,
-const DateTime aDateTime,
-const OUString sComment,
-const ScChangeActionType eType); // only to use in the XML import
+ScChangeActionIns(
+const sal_uLong nActionNumber,
+const ScChangeActionState eState,
+const sal_uLong nRejectingNumber,
+const ScBigRange aBigRange,
+const OUString aUser,
+const DateTime aDateTime,
+const OUString sComment,
+const ScChangeActionType eType,
+bool bEndOfList = false );
virtual void GetDescription(
OUString rStr, ScDocument* pDoc, bool bSplitRange = false, bool
bWarning = true) const;
+
+SC_DLLPUBLIC bool IsEndOfList() const;
};
// ScChangeActionDel
@@ -1144,7 +1150,7 @@ public:
// Only use the following two if there is no different solution! (Assign
// string for NewValue or creation of a formula respectively)
-SC_DLLPUBLIC void AppendInsert( const ScRange );
+SC_DLLPUBLIC void AppendInsert( const ScRange rRange, bool bEndOfList =
false );
// pRefDoc may be NULL = no lookup of contents
// = no generation of deleted contents
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 87d0cdb..7512f7b 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -660,8 +660,9 @@ void ScChangeAction::AddDependent( sal_uLong nActionNumber,
}
// ScChangeActionIns
-ScChangeActionIns::ScChangeActionIns( const ScRange rRange )
-: ScChangeAction( SC_CAT_NONE, rRange )
+ScChangeActionIns::ScChangeActionIns( const ScRange rRange, bool bEndOfList )
:
+ScChangeAction(SC_CAT_NONE, rRange),
+mbEndOfList(bEndOfList)
{
if ( rRange.aStart.Col() == 0 rRange.aEnd.Col() == MAXCOL )
{
@@ -692,8 +693,10 @@ ScChangeActionIns::ScChangeActionIns(
const sal_uLong nActionNumber, const ScChangeActionState eStateP,
const sal_uLong nRejectingNumber, const ScBigRange aBigRangeP,
const OUString aUserP, const DateTime aDateTimeP,
-const OUString sComment, const ScChangeActionType eTypeP) :
-ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber,
eStateP, aDateTimeP, aUserP, sComment)
+const OUString sComment, const ScChangeActionType eTypeP,
+bool bEndOfList ) :
+ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber,
eStateP, aDateTimeP, aUserP, sComment),
+mbEndOfList(bEndOfList)
{
}
@@ -736,6 +739,11 @@ void ScChangeActionIns::GetDescription(
}
}
+bool ScChangeActionIns::IsEndOfList() const
+{
+return mbEndOfList;
+}
+
bool ScChangeActionIns::Reject( ScDocument* pDoc )
{
if ( !aBigRange.IsValid( pDoc ) )
@@ -2827,9 +2835,9 @@ ScChangeActionContent*
ScChangeTrack::AppendContentOnTheFly(
return pAct;
}
-void
[Bug 47800] Most of the predefined autotexts are missing in czech language
https://bugs.freedesktop.org/show_bug.cgi?id=47800 --- Comment #17 from michalis michalis...@yahoo.gr --- (In reply to comment #16) Which means it is a different bug. Closing again. Still most of the languages lack the autotext features as seen also from comment 13. So I believe it should be reopened. Another better solution could be, a basic thing like inserting a formula and having it numbered automatically (what fn+F3 does), to get build in with a language agnostic manner. -- 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: sw/source
sw/source/core/inc/txtfrm.hxx | 12
sw/source/core/text/frmpaint.cxx|3 ++-
sw/source/core/text/inftxt.cxx | 20 +++-
sw/source/core/text/porrst.cxx |5 +
sw/source/core/txtnode/fntcache.cxx | 25 +
5 files changed, 63 insertions(+), 2 deletions(-)
New commits:
commit 3a2010c711b0ca4d762681dd0967ad08bc1e23fc
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Jul 14 22:43:58 2014 +0200
fdo#79673 revert to old NPC for MacOSX only
Change-Id: I83cfa2f11e76e03b919216e8dd04d1121ea6afd8
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 9aaccd4..66ce49a 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -45,7 +45,19 @@ class SwScriptInfo;
class SwViewOption;
class SwWrongList;
+// LEGACY_NON_PRINTING_CHARACTER_COLOR_FUNCTIONALITY
+// Old handling of non printing character color - color is the same as current
color
+// Because of problems drawing glyphs on correct position in OSX, this
functionallity is
+// disabled on OSX. See fdo#79673 for details.
+#ifdef MACOSX
+#define LEGACY_NON_PRINTING_CHARACTER_COLOR_FUNCTIONALITY
+#else
+#undef LEGACY_NON_PRINTING_CHARACTER_COLOR_FUNCTIONALITY
+#endif
+
+#ifndef LEGACY_NON_PRINTING_CHARACTER_COLOR_FUNCTIONALITY
#define NON_PRINTING_CHARACTER_COLOR RGB_COLORDATA( 0x6A, 0xBE, 0xD3 )
+#endif
/// Represents the visualization of a paragraph.
class SwTxtFrm: public SwCntntFrm
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index cccdaf8..fa26bd9 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -562,8 +562,9 @@ bool SwTxtFrm::PaintEmpty( const SwRect rRect, bool bCheck
) const
aDrawInf.SetFrm( this );
aDrawInf.SetFont( pFnt );
aDrawInf.SetSnapToGrid( false );
-
+#ifndef LEGACY_NON_PRINTING_CHARACTER_COLOR_FUNCTIONALITY
pFnt-SetColor(NON_PRINTING_CHARACTER_COLOR);
+#endif
pFnt-_DrawText( aDrawInf );
}
delete pClip;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index b66bf33..339becb 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -891,6 +891,16 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo rInf,
const SwLinePortion rP
((SwTxtPaintInfo)rInf).SetPos( aOldPos );
}
+#ifdef LEGACY_NON_PRINTING_CHARACTER_COLOR_FUNCTIONALITY
+static void lcl_DrawSpecial( const SwTxtPaintInfo rInf, const SwLinePortion
rPor,
+ SwRect rRect, sal_Unicode cChar, sal_uInt8 nOptions )
+{
+const SwFont* pOldFnt = rInf.GetFont();
+Color aColor = pOldFnt-GetColor();
+lcl_DrawSpecial(rInf, rPor, rRect, aColor, cChar, nOptions);
+}
+#endif
+
void SwTxtPaintInfo::DrawRect( const SwRect rRect, bool bNoGraphic,
bool bRetouche ) const
{
@@ -951,7 +961,11 @@ void SwTxtPaintInfo::DrawTab( const SwLinePortion rPor )
const
const sal_Unicode cChar = GetTxtFrm()-IsRightToLeft() ? CHAR_TAB_RTL
: CHAR_TAB;
const sal_uInt8 nOptions = DRAW_SPECIAL_OPTIONS_CENTER |
DRAW_SPECIAL_OPTIONS_ROTATE;
-lcl_DrawSpecial( *this, rPor, aRect, Color(0x6a, 0xbe, 0xd3), cChar,
nOptions );
+#ifdef LEGACY_NON_PRINTING_CHARACTER_COLOR_FUNCTIONALITY
+lcl_DrawSpecial( *this, rPor, aRect, cChar, nOptions );
+#else
+lcl_DrawSpecial( *this, rPor, aRect, NON_PRINTING_CHARACTER_COLOR,
cChar, nOptions );
+#endif
}
}
@@ -971,7 +985,11 @@ void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion
rPor ) const
CHAR_LINEBREAK_RTL : CHAR_LINEBREAK;
const sal_uInt8 nOptions = 0;
+#ifdef LEGACY_NON_PRINTING_CHARACTER_COLOR_FUNCTIONALITY
+lcl_DrawSpecial( *this, rPor, aRect, cChar, nOptions );
+#else
lcl_DrawSpecial( *this, rPor, aRect,
Color(NON_PRINTING_CHARACTER_COLOR), cChar, nOptions );
+#endif
}
((SwLinePortion)rPor).Width( nOldWidth );
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index e34f0f8..e9d8598 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -61,7 +61,12 @@ void SwTmpEndPortion::Paint( const SwTxtPaintInfo rInf )
const
{
if( rInf.OnWin() rInf.GetOpt().IsParagraph() )
{
+#ifdef LEGACY_NON_PRINTING_CHARACTER_COLOR_FUNCTIONALITY
+const OUString aTmp( CH_PAR );
+rInf.DrawText( aTmp, *this );
+#else
rInf.DrawSpecial( *this, CH_PAR, Color(NON_PRINTING_CHARACTER_COLOR) );
+#endif
}
}
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index a4584df..5452107 100644
---
Re: [GSOC] Personas - Weekly Report #8
Rachit Gupta wrote This week, I'm working on converting the dialog RID_SVX_MDLG_HANGULHANJA, as most of the work in my GSoC project is finished. Hi! Are you going to introduce option to build LibreOffice with custom default persona just like current branding options? Would be great. Thanks in advance! Best regards. -- View this message in context: http://nabble.documentfoundation.org/GSOC-Personas-Weekly-Report-8-tp4115565p4115585.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
Re: Changes in SvgSvgNode::getSvgStyleAttributes()
Hi Tomaž,
Tomaž Vajngerl schrieb:
Hi,
On Mon, Jul 14, 2014 at 8:15 PM, Regina Henschel
rb.hensc...@t-online.de wrote:
Hi all,
I see some changes in fdo#78554 which I do not understand. In AOO the method
SvgSvgNode::getSvgStyleAttributes() is a simple getter for the member
maSvgStyleAttributes.
First was a change in commit 1d89cd08ab3566375e30b17f1b17bc240ca907a4. But
the commit message does not mention, what problem this change solves. I see
no bug report and no test document.
[1] is the test document - it doesn't work correctly in AOO 4.1
I have reverse engeneered what fdo#78554 wants to fix and started
writing a test, but it is not really finished yet.
Thanks for document. I can see the problem now. Indeed it does not show
correct in AOO. I think, that the problem is not in SvgSvgNode, but the
problem is, that the style inheritance is not resolved, when the style
is defined by a style _element_.
Take this example from http://www.w3.org/TR/SVG/styling.html#StylingWithCSS
?xml version=1.0 standalone=no?
!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
svg xmlns=http://www.w3.org/2000/svg; version=1.1
width=10cm height=5cm viewBox=0 0 1000 500
defs
style type=text/css![CDATA[
rect {
fill: red;
stroke: blue;
stroke-width: 3
}
]]/style
/defs
rect x=200 y=100 width=600 height=300/
/svg
It is shown correctly. The style definition selector fits to the
element. Now put the rectangle into a group and define the style for the
group.
?xml version=1.0 standalone=no?
!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
svg xmlns=http://www.w3.org/2000/svg; version=1.1
width=10cm height=5cm viewBox=0 0 1000 500
defs
style type=text/css![CDATA[
g {
fill: red;
stroke: blue;
stroke-width: 3
}
]]/style
/defs
g
rect x=200 y=100 width=600 height=300/
/g
/svg
This makes LO and AOO hang.
On the other hand, the same as style _attribute_ works in both cases.
?xml version=1.0 encoding=UTF-8 ?
svg width=120 height=120 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink;
style=stroke:#ff;fill:#00cc00
rect x=10 y=10 width=100 height=100 rx=10 ry=10
style=stroke-width: 3; /
/svg
?xml version=1.0 standalone=no?
!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
svg xmlns=http://www.w3.org/2000/svg; version=1.1
width=10cm height=5cm viewBox=0 0 1000 500
g style=fill: red; stroke: blue; stroke-width: 3
rect x=200 y=100 width=600 height=300/
/g
/svg
So it is not inheritance in general and not the fact, that the style is
on the outer svg-element, but it the problem, that the parent's style
information is in a style _element_. Therefore the fix should not be a
change in the method SvgSvgNode::getSvgStyleAttributes().
Kind regards
Regina
The following changes try to solve a problem which seems to be introduced
with the above mentioned commit.
I ask, because AOO has no problems with the file attached to fdo#78554. The
text is there when opening via File Open and same when insert via Insert
Picture.
Kind regards
Regina
[1]
http://cgit.freedesktop.org/libreoffice/core/tree/svgio/qa/cppunit/data/RectWithParentStyles.svg
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Copying content from one text box to another in svx/ - A failed attempt
On Mon, 2014-07-14 at 16:51 +0200, Matteo Campanelli wrote: Here is the seg. fault message: Program received signal SIGSEGV, Segmentation fault. 0x7f5cb26d9b5c in ContentAttribs::GetItem (this=0x99a1, nWhich=4006) at /home/seriouspillow/Proiects/libreoffice/gsoc/core/editeng/source/editeng/editdoc.cxx:1804 1804if ( pStyle ( aAttribSet.GetItemState( nWhich, false ) != SFX_ITEM_ON ) ) The long string of nines looks like the result of reading freed memory in a debug build. valgrind may be able to tell you where the memory was freed, if you have the patience to wait for it. HTH, Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Fix for Gerrit Daily Digest
Hello Le Sun, 06 Jul 2014 01:35:59 +0200, Mat M m...@gmx.fr a écrit: Hello I submitted https://gerrit.libreoffice.org/10097 to fix the gerrit digest about freshers. This will solve the issue. Since it has been reviewed, could someone update the production version on gerritbot account, please ? Regards Mat PS: the gerrit-test machine is unreachable; Could someon poke infra team to check or is it normal ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
